From 911277193cc36a9d6a6f793379320e57fc3c8d57 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 10 Dec 2014 13:27:35 +0100
Subject: [PATCH 001/600] Resolve #320 and add related migration step.

---
 .../559ce6eb0949_update_node_path_column.py   | 30 ++++++++++
 kotti/events.py                               | 19 +++---
 kotti/tests/test_node.py                      | 58 +++++++++----------
 3 files changed, 71 insertions(+), 36 deletions(-)
 create mode 100644 kotti/alembic/versions/559ce6eb0949_update_node_path_column.py

diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
new file mode 100644
index 000000000..022b55a05
--- /dev/null
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -0,0 +1,30 @@
+"""Update Node.path column
+
+Revision ID: 559ce6eb0949
+Revises: 1063d7178fa
+Create Date: 2014-12-10 13:20:29.374951
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '559ce6eb0949'
+down_revision = '1063d7178fa'
+
+
+def upgrade():
+
+    from kotti import DBSession
+    from kotti.resources import Node
+
+    for node in DBSession.query(Node).with_polymorphic([Node]):
+        # append '/' to all nodes but root
+        node.path != u'/' and node.path += u'/'
+
+
+def downgrade():
+    from kotti import DBSession
+    from kotti.resources import Node
+
+    for node in DBSession.query(Node).with_polymorphic([Node]):
+        # remove trailing '/' from all nodes but root
+        node.path == u'/' or node.path[:-1]
diff --git a/kotti/events.py b/kotti/events.py
index dc06f69a9..f884933a7 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -305,7 +305,7 @@ def reset_content_owner(event):
 def _update_children_paths(old_parent_path, new_parent_path):
     for child in DBSession.query(Node).options(
         load_only('path', 'type')).filter(
-            Node.path.startswith(old_parent_path + '/')):
+            Node.path.startswith(old_parent_path)):
         child.path = new_parent_path + child.path[len(old_parent_path):]
 
 
@@ -324,7 +324,7 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
         # Our name is about to be set to 'None', so skip.
         return
 
-    if target.__parent__ is None and value != '':
+    if target.__parent__ is None and value != u'':
         # Our parent hasn't been set yet.  Skip, unless we're the root
         # object (which always has an empty string as name).
         return
@@ -332,9 +332,12 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
     old_path = target.path
     line = tuple(reversed(tuple(lineage(target))))
     target_path = u'/'.join(node.__name__ for node in line[:-1])
-    target_path += u'/{0}'.format(value)
+    if target.__parent__ is None and value == u'':
+        # We're a new root object
+        target_path = u'/'
+    else:
+        target_path += u'/{0}/'.format(value)
     target.path = target_path
-
     # We need to set the name to value here so that the subsequent
     # UPDATE in _update_children_paths will include the new 'name'
     # already.  We have to make sure that we don't end up in an
@@ -350,7 +353,8 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
         _update_children_paths(old_path, target_path)
     else:
         for child in _all_children(target):
-            child.path = u'/'.join([child.__parent__.path, child.__name__])
+            child.path = u'{0}{1}/'.format(child.__parent__.path,
+                                           child.__name__)
 
 
 def _all_children(item, _all=None):
@@ -388,7 +392,7 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         return
 
     target_path = u'/'.join(node.__name__ for node in line)
-    target_path += u'/{0}'.format(target.__name__)
+    target_path += u'/{0}/'.format(target.__name__)
     target.path = target_path
 
     if old_path and target.id is not None:
@@ -398,7 +402,8 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # children.  This is the case when we create an object with
         # children before we assign the object itself to a parent.
         for child in _all_children(target):
-            child.path = u'/'.join([child.__parent__.path, child.__name__])
+            child.path = u'{0}{1}/'.format(child.__parent__.path,
+                                           child.__name__)
 
 
 class subscribe(object):
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 1c51d1f38..94f972202 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -250,16 +250,16 @@ def test_attribute(self, db_session, root, events):
 
         assert root.path == "/"
         child = root['child-1'] = Node()
-        assert child.path == u'/child-1'
+        assert child.path == u'/child-1/'
         subchild = root['child-1']['subchild'] = Node()
-        assert subchild.path == '/child-1/subchild'
+        assert subchild.path == '/child-1/subchild/'
 
     def test_object_moved(self, db_session, root, events):
         from kotti.resources import Node
         child = root['child-1'] = Node()
         subchild = child['subchild'] = Node()
         subchild.parent = root
-        assert subchild.path == '/subchild'
+        assert subchild.path == '/subchild/'
 
     @mark.parametrize("flush", [True, False])
     def test_parent_moved(self, db_session, root, events, flush):
@@ -271,9 +271,9 @@ def test_parent_moved(self, db_session, root, events, flush):
         if flush:
             db_session.flush()
 
-        assert subchild.path == '/child-1/child-2/subchild'
+        assert subchild.path == '/child-1/child-2/subchild/'
         child2.parent = root
-        assert subchild.path == '/child-2/subchild'
+        assert subchild.path == '/child-2/subchild/'
 
     def test_object_renamed(self, db_session, root, events):
         from kotti.resources import Node
@@ -281,7 +281,7 @@ def test_object_renamed(self, db_session, root, events):
         subchild = child['subchild'] = Node()
 
         subchild.name = u'renamed'
-        assert subchild.path == '/child-1/renamed'
+        assert subchild.path == '/child-1/renamed/'
 
     @mark.parametrize("flush", [True, False])
     def test_parent_renamed(self, db_session, root, events, flush):
@@ -294,12 +294,12 @@ def test_parent_renamed(self, db_session, root, events, flush):
             db_session.flush()
 
         child2.name = u'renamed'
-        assert subchild.path == '/child-1/renamed/subchild'
-
+        assert subchild.path == '/child-1/renamed/subchild/'
         child1.name = u'renamed-1'
-        assert child1.path == '/renamed-1'
-        assert child2.path == '/renamed-1/renamed'
-        assert subchild.path == '/renamed-1/renamed/subchild'
+        assert child2.path == '/renamed-1/renamed/'
+        assert subchild.path == '/renamed-1/renamed/subchild/'
+        # THIS FAILS, child1.path being '/renamed-1/1/' and I have no clue why
+        assert child1.path == '/renamed-1/'
 
     @mark.parametrize("flush", [True, False])
     def test_parent_copied(self, db_session, root, events, flush):
@@ -313,25 +313,25 @@ def test_parent_copied(self, db_session, root, events, flush):
 
         c1copy = root['c1copy'] = c1.copy()
 
-        assert c1copy.path == '/c1copy'
-        assert c1copy['c2'].path == '/c1copy/c2'
-        assert c1copy['c2']['c3'].path == '/c1copy/c2/c3'
+        assert c1copy.path == '/c1copy/'
+        assert c1copy['c2'].path == '/c1copy/c2/'
+        assert c1copy['c2']['c3'].path == '/c1copy/c2/c3/'
 
         c2copy = c2['c2copy'] = c2.copy()
 
-        assert c2copy.path == '/c1/c2/c2copy'
-        assert c2copy['c3'].path == '/c1/c2/c2copy/c3'
+        assert c2copy.path == '/c1/c2/c2copy/'
+        assert c2copy['c3'].path == '/c1/c2/c2copy/c3/'
 
     def test_children_append(self, db_session, root, events):
         from kotti.resources import Node
 
         child = Node(u'child-1')
         root.children.append(child)
-        assert child.path == '/child-1'
+        assert child.path == '/child-1/'
 
         child2 = Node(u'child-2')
         child.children.append(child2)
-        assert child2.path == '/child-1/child-2'
+        assert child2.path == '/child-1/child-2/'
 
     def test_replace_root(self, db_session, root, events):
         from kotti.resources import Node
@@ -350,17 +350,17 @@ def test_query_api(self, db_session, root, events):
             Node.path.startswith(u'/')).count() == 4
 
         assert db_session.query(Node).filter(
-            Node.path.startswith(u'/child-1')).count() == 3
+            Node.path.startswith(u'/child-1/')).count() == 3
 
         objs = db_session.query(Node).filter(
-            Node.path.startswith(u'/child-1/child-2')).all()
+            Node.path.startswith(u'/child-1/child-2/')).all()
 
         assert len(objs) == 2
         assert subchild in objs
         assert child2 in objs
 
         db_session.query(Node).filter(
-            Node.path.startswith(u'/child-1/child-3')).count() == 0
+            Node.path.startswith(u'/child-1/child-3/')).count() == 0
 
     def test_add_child_to_unnamed_parent(self, db_session, root, events):
         from kotti.resources import Node
@@ -369,9 +369,9 @@ def test_add_child_to_unnamed_parent(self, db_session, root, events):
         child2 = child1['child-2'] = Node()
         assert child2.__parent__.__parent__ is parent
         root['parent'] = parent
-        assert parent.path == u'/parent'
-        assert child1.path == u'/parent/child-1'
-        assert child2.path == u'/parent/child-1/child-2'
+        assert parent.path == u'/parent/'
+        assert child1.path == u'/parent/child-1/'
+        assert child2.path == u'/parent/child-1/child-2/'
 
     def test_add_child_to_unrooted_parent(self, db_session, root, events):
         from kotti.resources import Node
@@ -379,9 +379,9 @@ def test_add_child_to_unrooted_parent(self, db_session, root, events):
         child1 = parent['child-1'] = Node()
         child2 = child1['child-2'] = Node()
         root['parent'] = parent
-        assert parent.path == u'/parent'
-        assert child1.path == u'/parent/child-1'
-        assert child2.path == u'/parent/child-1/child-2'
+        assert parent.path == u'/parent/'
+        assert child1.path == u'/parent/child-1/'
+        assert child2.path == u'/parent/child-1/child-2/'
 
     def test_node_lineage_not_loaded_new_name(self, db_session, root, events):
 
@@ -396,7 +396,7 @@ def test_node_lineage_not_loaded_new_name(self, db_session, root, events):
 
         child2 = db_session.query(Node).get(child2_id)
         child3 = Node('child-3', parent=child2)
-        assert child3.path == u'/parent/child-1/child-2/child-3'
+        assert child3.path == u'/parent/child-1/child-2/child-3/'
 
     def test_node_lineage_not_loaded_new_parent(self, db_session, root, events):
 
@@ -425,7 +425,7 @@ def test_node_lineage_not_loaded_new_parent(self, db_session, root, events):
         child3.parent = child2
         child2.parent = child1
 
-        assert child3.path == u"/parent/child-1/child-2/child-3"
+        assert child3.path == u"/parent/child-1/child-2/child-3/"
 
 
 class TestLocalGroup:

From caee4efeb2cee9ce850cf78ff1dba4392190e187 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 10 Dec 2014 14:01:33 +0100
Subject: [PATCH 002/600] Fix migration bug.

---
 .../versions/559ce6eb0949_update_node_path_column.py        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
index 022b55a05..e39b7134c 100644
--- a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -18,7 +18,8 @@ def upgrade():
 
     for node in DBSession.query(Node).with_polymorphic([Node]):
         # append '/' to all nodes but root
-        node.path != u'/' and node.path += u'/'
+        if node.path != u'/':
+            node.path += u'/'
 
 
 def downgrade():
@@ -27,4 +28,5 @@ def downgrade():
 
     for node in DBSession.query(Node).with_polymorphic([Node]):
         # remove trailing '/' from all nodes but root
-        node.path == u'/' or node.path[:-1]
+        if node.path != u'/':
+            node.path = node.path[:-1]

From 0071d4092c02bdfc5d93a8f0547dfc36e553b50a Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 18 Dec 2014 12:26:16 -0800
Subject: [PATCH 003/600] Fix #292; A better Link.selected(): it can select a
 link with the @@ prefix; doesn't get confused by Links a shorter version of
 their own name

---
 kotti/tests/test_util.py | 47 ++++++++++++++++++++++++++++++++++++++++
 kotti/util.py            | 22 ++++++++++++++-----
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 6524f2aa8..e3a5f0a9b 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -100,3 +100,50 @@ def test_getattr(self):
 
         item = TemplateStructure(u'123')
         assert item.split('2') == [u'1', u'3']
+
+
+class TestLink:
+
+    def test_link_selected(self):
+        from kotti.util import Link
+        from kotti.testing import DummyRequest
+
+        req = DummyRequest()
+        req.url = "http://example.com/@@manage"
+
+        assert Link('manage').selected(Mock(__name__=None), req)
+
+        req.url = "http://example.com/@@manage_cats"
+        assert not Link('manage').selected(Mock(__name__=None), req)
+
+    def test_link_selected_no_view_markers(self):
+        from kotti.util import Link
+        from kotti.testing import DummyRequest
+        from mock import Mock
+
+        req = DummyRequest()
+        root = Mock(__name__=None)
+        manage = Mock(__name__='manage',
+                      __parent__=Mock(__name__=None))
+
+        req.url = "http://example.com/manage"
+        assert Link('manage').selected(root, req)
+
+        req.url = "http://example.com/manage/"
+        assert not Link('manage').selected(root, req)
+
+        req.url = "http://example.com/"
+        assert Link('').selected(root, req)
+
+        req.url = "http://example.com/manage/"
+        link = Link('')
+        assert link.selected(manage, req)
+
+        req.url = "http://example.com/manage"
+        assert not link.selected(manage, req)
+
+        req.url = "http://example.com/"
+        assert link.selected(root, req)
+
+        req.url = "http://example.com"
+        assert link.selected(root, req)
diff --git a/kotti/util.py b/kotti/util.py
index 375078fac..e4084c614 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -9,6 +9,7 @@
 
 import re
 import urllib
+from urlparse import urlparse, urlunparse
 
 from docopt import docopt
 from pyramid.i18n import get_localizer
@@ -97,8 +98,21 @@ def __call__(self, context, request):
             )
 
     def selected(self, context, request):
-        return urllib.unquote(request.url).startswith(
-            self.url(context, request))
+        """ Returns True if the Link's url, based on its name,
+        matches the request url
+
+        If the link name is '', it will be selected for all urls ending in '/'
+        """
+        parsed = urlparse(urllib.unquote(request.url))
+
+        # insert view markers @@ in last component of the path
+        path = parsed.path.split('/')
+        if not '@@' in path[-1]:
+            path[-1] = '@@' + path[-1]
+        path = '/'.join(path)
+        url = urlunparse((parsed[0], parsed[1], path, '', '', ''))
+
+        return url == self.url(context, request)
 
     def permitted(self, context, request):
         from kotti.security import view_permitted
@@ -169,10 +183,6 @@ def __init__(self, name, title=None, predicate=None):
     def url(self, context, request):
         return resource_url(context, request) + '@@' + self.name
 
-    def selected(self, context, request):
-        return urllib.unquote(request.url).startswith(
-            self.url(context, request))
-
     def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)
 

From e74ee14d25478b1505590ae92667362b22dbe2f2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 15 Dec 2014 09:35:13 +0100
Subject: [PATCH 004/600] Only give out a warning instead of failing completely
 if scaffold's save_settings fails.

---
 kotti/scaffolds/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kotti/scaffolds/__init__.py b/kotti/scaffolds/__init__.py
index 9242676e1..819b379cb 100644
--- a/kotti/scaffolds/__init__.py
+++ b/kotti/scaffolds/__init__.py
@@ -42,7 +42,10 @@ def _get(self, key, caption):  # pragma: no cover
         s = self._settings
         s[key] = raw_input(u'{} [{}]: '.format(caption, s[key])) or s[key]
 
-        s.save_settings()
+        try:
+            s.save_settings()
+        except OSError:
+            self.out("Your answers were not saved for later use.")
 
         return s[key]
 

From 0dcdfd2f42a045753d9cea4531a579b95d7507b8 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 18 Dec 2014 12:26:16 -0800
Subject: [PATCH 005/600] Fix #292; A better Link.selected(): it can select a
 link with the @@ prefix; doesn't get confused by Links a shorter version of
 their own name

---
 kotti/tests/test_util.py | 47 ++++++++++++++++++++++++++++++++++++++++
 kotti/util.py            | 22 ++++++++++++++-----
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 6524f2aa8..e3a5f0a9b 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -100,3 +100,50 @@ def test_getattr(self):
 
         item = TemplateStructure(u'123')
         assert item.split('2') == [u'1', u'3']
+
+
+class TestLink:
+
+    def test_link_selected(self):
+        from kotti.util import Link
+        from kotti.testing import DummyRequest
+
+        req = DummyRequest()
+        req.url = "http://example.com/@@manage"
+
+        assert Link('manage').selected(Mock(__name__=None), req)
+
+        req.url = "http://example.com/@@manage_cats"
+        assert not Link('manage').selected(Mock(__name__=None), req)
+
+    def test_link_selected_no_view_markers(self):
+        from kotti.util import Link
+        from kotti.testing import DummyRequest
+        from mock import Mock
+
+        req = DummyRequest()
+        root = Mock(__name__=None)
+        manage = Mock(__name__='manage',
+                      __parent__=Mock(__name__=None))
+
+        req.url = "http://example.com/manage"
+        assert Link('manage').selected(root, req)
+
+        req.url = "http://example.com/manage/"
+        assert not Link('manage').selected(root, req)
+
+        req.url = "http://example.com/"
+        assert Link('').selected(root, req)
+
+        req.url = "http://example.com/manage/"
+        link = Link('')
+        assert link.selected(manage, req)
+
+        req.url = "http://example.com/manage"
+        assert not link.selected(manage, req)
+
+        req.url = "http://example.com/"
+        assert link.selected(root, req)
+
+        req.url = "http://example.com"
+        assert link.selected(root, req)
diff --git a/kotti/util.py b/kotti/util.py
index 375078fac..e4084c614 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -9,6 +9,7 @@
 
 import re
 import urllib
+from urlparse import urlparse, urlunparse
 
 from docopt import docopt
 from pyramid.i18n import get_localizer
@@ -97,8 +98,21 @@ def __call__(self, context, request):
             )
 
     def selected(self, context, request):
-        return urllib.unquote(request.url).startswith(
-            self.url(context, request))
+        """ Returns True if the Link's url, based on its name,
+        matches the request url
+
+        If the link name is '', it will be selected for all urls ending in '/'
+        """
+        parsed = urlparse(urllib.unquote(request.url))
+
+        # insert view markers @@ in last component of the path
+        path = parsed.path.split('/')
+        if not '@@' in path[-1]:
+            path[-1] = '@@' + path[-1]
+        path = '/'.join(path)
+        url = urlunparse((parsed[0], parsed[1], path, '', '', ''))
+
+        return url == self.url(context, request)
 
     def permitted(self, context, request):
         from kotti.security import view_permitted
@@ -169,10 +183,6 @@ def __init__(self, name, title=None, predicate=None):
     def url(self, context, request):
         return resource_url(context, request) + '@@' + self.name
 
-    def selected(self, context, request):
-        return urllib.unquote(request.url).startswith(
-            self.url(context, request))
-
     def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)
 

From f58017f1fef44f93d0f15b5a00c62c3b966ea54e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 19 Dec 2014 13:56:36 +0100
Subject: [PATCH 006/600] Add special handling in ``_update_children_paths``
 when the "child" is the node being renamed, in which case the path has
 already been updated.

---
 CHANGES.txt              | 6 ++++++
 kotti/events.py          | 4 ++++
 kotti/tests/test_node.py | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7cd85d875..a700bbea0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,6 +52,12 @@ Change History
   corresponding deprecation in Pyramid 1.5.  You should now use
   ``request.has_permission`` instead.
 
+- Make all values in ``Node.path`` end in ``/``.  This makes it consistent over
+  all nodes (*including* root) and correspond to the values of
+  ``request.resource_url``.  As a side effect querying becomes easier.
+  However, this might need adjustments in your code if you were expecting the
+  old path values before.  A migration step for DB upgrades is included.
+
 0.10b1 - 2014-07-11
 -------------------
 
diff --git a/kotti/events.py b/kotti/events.py
index f884933a7..877c3b0f3 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -306,6 +306,10 @@ def _update_children_paths(old_parent_path, new_parent_path):
     for child in DBSession.query(Node).options(
         load_only('path', 'type')).filter(
             Node.path.startswith(old_parent_path)):
+        if child.path == new_parent_path:
+            # The child is the node itself and has already be renamed.
+            # Nothing to do!
+            continue
         child.path = new_parent_path + child.path[len(old_parent_path):]
 
 
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 94f972202..1c948d297 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -298,7 +298,6 @@ def test_parent_renamed(self, db_session, root, events, flush):
         child1.name = u'renamed-1'
         assert child2.path == '/renamed-1/renamed/'
         assert subchild.path == '/renamed-1/renamed/subchild/'
-        # THIS FAILS, child1.path being '/renamed-1/1/' and I have no clue why
         assert child1.path == '/renamed-1/'
 
     @mark.parametrize("flush", [True, False])

From 6acdfd1b8eb1b1107f672ee382518c0817483f51 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 19 Dec 2014 14:28:29 +0100
Subject: [PATCH 007/600] Fix #364.  [ci skip]

---
 kotti/locale/Kotti.pot                  | 112 +++++++++++-----------
 kotti/locale/de/LC_MESSAGES/Kotti.mo    | Bin 18610 -> 15091 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po    | 114 +++++++++++------------
 kotti/locale/en/LC_MESSAGES/Kotti.mo    | Bin 449 -> 449 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po    | 112 +++++++++++-----------
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 11596 -> 11596 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po | 112 +++++++++++-----------
 kotti/locale/it/LC_MESSAGES/Kotti.mo    | Bin 16093 -> 12656 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po    | 118 ++++++++++++------------
 kotti/locale/ja/LC_MESSAGES/Kotti.mo    | Bin 12364 -> 12364 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po    | 112 +++++++++++-----------
 kotti/locale/ko/LC_MESSAGES/Kotti.mo    | Bin 18321 -> 14928 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po    | 114 +++++++++++------------
 kotti/locale/nl/LC_MESSAGES/Kotti.mo    | Bin 11253 -> 11253 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po    | 112 +++++++++++-----------
 kotti/locale/pt/LC_MESSAGES/Kotti.mo    | Bin 7711 -> 7711 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po    | 112 +++++++++++-----------
 kotti/populate.py                       |   2 +-
 18 files changed, 510 insertions(+), 510 deletions(-)

diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 877894b48..e9361f4dc 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2014-11-21 22:44+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\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"
@@ -47,7 +47,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -121,78 +121,78 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:610 ./kotti/views/edit/content.py:81
+#: ./kotti/resources.py:606 ./kotti/views/edit/content.py:81
 msgid "Document"
 msgstr ""
 
-#: ./kotti/resources.py:649 ./kotti/views/edit/content.py:113
+#: ./kotti/resources.py:645 ./kotti/views/edit/content.py:113
 #: ./kotti/views/edit/content.py:62
 msgid "File"
 msgstr ""
 
-#: ./kotti/resources.py:726 ./kotti/views/edit/content.py:144
+#: ./kotti/resources.py:697 ./kotti/views/edit/content.py:144
 msgid "Image"
 msgstr ""
 
-#: ./kotti/resources.py:500
+#: ./kotti/resources.py:496
 msgid "Folder view"
 msgstr ""
 
-#: ./kotti/resources.py:487 ./kotti/templates/view/folder.pt:17
+#: ./kotti/resources.py:483 ./kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr ""
 
-#: ./kotti/resources.py:488 ./kotti/templates/edit/nav-tree.pt:10
+#: ./kotti/resources.py:484 ./kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: ./kotti/resources.py:489
+#: ./kotti/resources.py:485
 msgid "Share"
 msgstr ""
 
-#: ./kotti/resources.py:490 ./kotti/templates/actions-dropdown.pt:5
+#: ./kotti/resources.py:486 ./kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr ""
 
-#: ./kotti/resources.py:491 ./kotti/views/edit/actions.py:445
+#: ./kotti/resources.py:487 ./kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr ""
 
-#: ./kotti/resources.py:492 ./kotti/views/edit/actions.py:446
+#: ./kotti/resources.py:488 ./kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr ""
 
-#: ./kotti/resources.py:493 ./kotti/views/edit/actions.py:442
+#: ./kotti/resources.py:489 ./kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr ""
 
-#: ./kotti/resources.py:494 ./kotti/templates/edit/rename-nodes.pt:7
+#: ./kotti/resources.py:490 ./kotti/templates/edit/rename-nodes.pt:7
 #: ./kotti/templates/edit/rename-nodes.pt:55
-#: ./kotti/templates/edit/rename.pt:42 ./kotti/views/edit/actions.py:447
+#: ./kotti/templates/edit/rename.pt:42 ./kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr ""
 
-#: ./kotti/resources.py:495 ./kotti/templates/edit/delete-nodes.pt:8
+#: ./kotti/resources.py:491 ./kotti/templates/edit/delete-nodes.pt:8
 #: ./kotti/templates/edit/delete-nodes.pt:90
 #: ./kotti/templates/edit/delete.pt:28
 #: ./kotti/templates/site-setup/delete-user.pt:36 ./kotti/views/users.py:443
-#: ./kotti/views/edit/actions.py:449
+#: ./kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr ""
 
-#: ./kotti/security.py:165
+#: ./kotti/security.py:189
 msgid "Viewer"
 msgstr ""
 
-#: ./kotti/security.py:166
+#: ./kotti/security.py:190
 msgid "Editor"
 msgstr ""
 
-#: ./kotti/security.py:167
+#: ./kotti/security.py:191
 msgid "Owner"
 msgstr ""
 
-#: ./kotti/security.py:168
+#: ./kotti/security.py:192
 msgid "Admin"
 msgstr ""
 
@@ -265,7 +265,7 @@ msgstr ""
 msgid "Username or email"
 msgstr ""
 
-#: ./kotti/templates/login.pt:34 ./kotti/views/login.py:213
+#: ./kotti/templates/login.pt:34 ./kotti/views/login.py:212
 #: ./kotti/views/users.py:212
 msgid "Password"
 msgstr ""
@@ -587,7 +587,7 @@ msgid "Welcome, you are not logged in."
 msgstr ""
 
 #: ./kotti/views/form.py:79 ./kotti/views/users.py:69
-#: ./kotti/views/edit/actions.py:363 ./kotti/views/edit/actions.py:407
+#: ./kotti/views/edit/actions.py:364 ./kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr ""
 
@@ -614,75 +614,75 @@ msgstr ""
 msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/views/login.py:238
+#: ./kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr ""
 
-#: ./kotti/views/login.py:200
+#: ./kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr ""
 
-#: ./kotti/views/login.py:66 ./kotti/views/users.py:270
+#: ./kotti/views/login.py:65 ./kotti/views/users.py:270
 msgid "Full name"
 msgstr ""
 
-#: ./kotti/views/login.py:69
+#: ./kotti/views/login.py:68
 msgid "Username"
 msgstr ""
 
-#: ./kotti/views/login.py:74 ./kotti/views/login.py:225
+#: ./kotti/views/login.py:73 ./kotti/views/login.py:224
 #: ./kotti/views/users.py:199
 msgid "Email"
 msgstr ""
 
-#: ./kotti/views/login.py:109
+#: ./kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: ./kotti/views/login.py:124
+#: ./kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr ""
 
-#: ./kotti/views/login.py:164
+#: ./kotti/views/login.py:163
 msgid "Login failed."
 msgstr ""
 
-#: ./kotti/views/login.py:286
+#: ./kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: ./kotti/views/login.py:160
+#: ./kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr ""
 
-#: ./kotti/views/login.py:173
+#: ./kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing so"
 " will activate your account."
 msgstr ""
 
-#: ./kotti/views/login.py:178
+#: ./kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr ""
 
-#: ./kotti/views/login.py:83
+#: ./kotti/views/login.py:82
 msgid "Register"
 msgstr ""
 
-#: ./kotti/views/login.py:90 ./kotti/views/login.py:257
+#: ./kotti/views/login.py:89 ./kotti/views/login.py:256
 msgid "There was an error."
 msgstr ""
 
-#: ./kotti/views/login.py:250
+#: ./kotti/views/login.py:249
 msgid "Submit"
 msgstr ""
 
-#: ./kotti/views/login.py:279
+#: ./kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr ""
 
@@ -748,8 +748,8 @@ msgid "Add Group"
 msgstr ""
 
 #: ./kotti/views/users.py:465 ./kotti/views/users.py:71
-#: ./kotti/views/edit/actions.py:301 ./kotti/views/edit/actions.py:367
-#: ./kotti/views/edit/actions.py:413 ./kotti/views/edit/actions.py:409
+#: ./kotti/views/edit/actions.py:302 ./kotti/views/edit/actions.py:368
+#: ./kotti/views/edit/actions.py:414 ./kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr ""
 
@@ -794,68 +794,68 @@ msgstr ""
 msgid "${title} was cut."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:182
+#: ./kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:270 ./kotti/views/edit/actions.py:295
+#: ./kotti/views/edit/actions.py:271 ./kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:158
+#: ./kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:161
+#: ./kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:224
+#: ./kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:227
+#: ./kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:292
+#: ./kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:328 ./kotti/views/edit/actions.py:355
+#: ./kotti/views/edit/actions.py:329 ./kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:332
+#: ./kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:454
+#: ./kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:455
+#: ./kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:456
+#: ./kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:457
+#: ./kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:496
+#: ./kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:453
+#: ./kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr ""
 
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index f0e4abdc0f3bbc1f406cc95791e7a3a3e36bb105..2ab463a51f33ac5ce5fee7973dccf11e5954a620 100644
GIT binary patch
delta 3875
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

delta 7408
zcmb`J36K=k8OPgj>3X1|f(ZCnIYilA4h4h-1eQg@A)<JK*gMm+(_yB2nC{teA<}B%
zkwft|1Qm&jLe!{KFsULMi&!zyR3uiks7e{iSgBaX3W?FAqABzHclRupAZohmo8Nn{
z`@Q#F?|bup<(b<Li{3oG``s4L)5rki;U1RtH#qW0et7<JjAh-_)3V-y$8@u-<tJL!
zaK^9gXIZ1*WAF^P1NMR4PqwTRU_W>qY=BI$rb4}6l)iW2Fw2UpRWye3;t|N+*2}OL
z+z#2-+5y?u+6mdidK(@E{|k?Rb^R^taCib#e;_;>4u|^g?DYL~sP*T-S?~gQH2Yg?
zXpCUsQ8*fIhiAcVrz9FrfXCCH3;V*QP@by7?(i-sMb|)W_#o^JpMbLbXK)OB4NiqU
znY;$J!tv~H?W7?K`VCAL91P{sVNjM_0Of(DP#a|6AXtJ5#cGJo*0WHG{0<I=JD?Q#
z2r8OKGD(K?h1%~77(GQ}EDc%mHar!+1GVuHbhKb!DAx^w`fdo+0wZ8290L{e$DuZQ
z0V))~f%3o`Y5zSa1O5dyzq`TzTKH&_Y}5y8LjSZs3TnggFoexe-#-nHh0j7M`Vy3-
zuR|r>pJ5UH8_Iwj?$Ep<)b|0@_;rJ$WZ-576w`a47T64B!HZDI_*+Q6S#Llo^mnN5
zKZLTRPkpk^02sR#YW~=ilc5Zo1&6>TP@%X!qM@X^8{&2A38-W83Y1HC!VdTWlm&&;
zk`2mG{gqHIzb+lWCFMO(>#T!A;btg{cR+b+C*(w1(JmT<!}<gcgQudNENq3EFbC?x
zg-{-_p%h*TW#OHW#J28-6X8#xf&YXG(TVIXMTbGHGZJ=(lVF|B|GDYF9N2>w3!pZ>
zIOP(kq{%`}Tn@*=4k!yZ!5;8AsQ15sGUQiKitd8i_;3b^mem*PyK`V~o&PB`w9tI0
z*tbE&FiiW`KuuT;d&0XQnp<n3a$^IOrB6c5e;y8j+o3%BAym?x#938{hd_C91{}!#
z))E?xa3yr%CcS_soNifX!ZDEOSXaUq4kKycuwItcLXoKJW?9QdCo%4zYMsM(_d%`q
zIy?#XI6F~n08|BSgfe&*jFe<o&=5;d3)}!l!RKKQxC<T*KTP|dKqXy|afzbGL0R4e
zH9if><@3`1VyIB$p$gTt>HD?g@V{KMiGii?C+Ua%##6WHkAhQS4z|DzurGWUo&>v1
zNL<<<Dksi?Jz)_lIYTH#RzWFv3)H-I@KU&C0{&l2qc>*X3JY)={0M5H$)vO_Z-LX{
zJg8XT29=cSp^np&P%eKCl5f^~P_gbaDVaY8DkmmE&A$q2{_=>%sWetWZS(-#03U@)
zviZ%)#LJ)x#ww`s+o2S^4=O|tL0P;Jz6>|RQ(!bXNxrpE^EX1perw9;RT^^9+fWL;
z54G^ekQ}qRO-XX&NT`iX$}^!nHV*1^ya*MVUqfy57L=<$fO7p&#PMD@2x^}#2_x%y
z8YeUGQu^X8D23jI2L1<Xfm6;+7Hohg(r<x-;N?&XbV37HK`FW}<))NBhDy$#Ln-)5
z%*e9-NJE<c18U(q5<spqP_b-=df%3E1>8vg4k$~SNepo&R0!rnCH19H8|I*5U4~jG
zf~1#qFRWvKYda0a<PT6T+XV;1UNbD~bT|TPp@mSfz7onqS=b*2DQ|^RWFxGH&%jII
z@1c^fp(R;=AykN67-^vr4NZ)o>cGuVvA-Yc!$(p+4)xt;sPDEyS+*Uv!Z)EjH*{vA
z=rq`k{wzpMv*tj(51>N2dM4+8D2??DXyIQ%#pYG0@jpSi><CuZMuTBL*a-FgET~v7
zNZ((Pj_08iT%PhqID-CKI1IiBW%yrP@xP(*5d(7lfLX~o9t%las}0@?*TW%j)Onm?
zxCk0}J3I_((PfC9M-Z*G1R0O$`8skr@&uxd&p?`xn-u?jpD_$*Gr35QDx01)$O5E{
z$V;;5YJ`(&osX1|uOV`|s^@Kp@<ykm2hts>JvXL}XcY~)3Qxx_Uz)xUu1nhk;a$jC
z$X5}C;2K08${`9xPejj?$Z2saiTS;>{j{%BqlBEA_CXZ?7eAAh;@ca!6uA%4b8!Oe
zdnvyIgS0&gb|7<+Md_HZB5ms^o}0GkL7fymvlCePnE2nLp%~Ym<utBDzK;};5V;+h
zh+Ku}xfW?hE<p7B0GSrI_(zm-B&??GyHhIMI_jI!{!<!w6uAt!1<4?K`XYBAk0X?F
z>qm&52N4~ii;(q*p4AEB-*542_ULD6k3(E!Mmqj5Q~|0W5eXb;v?|uOkxpbWas%=-
zqGxb|xTvJf_|iI-&gsaUbnqeg0J0KkLq;PF$Ttx^*CP{<b?WeZSMl#fV>;4`T!^$F
zUqNi-8^~Iui0F9?xgu^Q=l;aBEet?zM&=_9ax${#^Fum~$U@|PWCNo8t$W0}=KPo`
zbNzPXdd*EV>zYeb>I~0ie#K;L&otX6Q?P?za(!Fq8KfboWHL?=)SG<S$xW^=`0cJ&
zKLx~V*i%gCn@+z{Hh~*D@mjW*H9=^XLzBtd9-p_H$PELN@x9RT!l2QZ**VQIdAq~$
zhU+^&a6Dt15?fdOa@OSha=cc&vYjouyv=0%iWizrCmd<qaCo6$3hpwe&}rHn)9e(d
zEU!A{u(P>|W@BA*6PDGiJ3sO=j&>Ygb_}YwJ6W_J8IQ0`;5a7CJEpztbQ&k?hJM+!
z*@#o{tMQxAFU9J3c8A+;hpvxr?6M3AP1R)yyP!{H6YdDAZkWk4J*+yI#fniVFUT<+
zu2WT;{o)lfm2w%UV0pV^>;S{k1xqCd6>84yaB;6+4r+#F-HuwI%6_#z31ageqZz-@
zP|P-*mAr}+W24~D@V%VdUMV|C{Nr)GO7o!BZ*|etuY@Kq5BQ2*GEFv?%^W`r-Qj@=
z-LQb#d|R}=PUB-0iQw?kYY$8%h^@xXWdC^az%7=T6FOIiCg;*3wDFp8C+G}9r`Q;~
zMxV!FtSPmxlKUsC>*f6VuF2^<5;r1q^I=$;*wnO4syCJ$JBzYeKNB?i<@P4WYbw~G
z6NF7!r-QJU(7dT;bR6);d{```j;<*LYyM1<0xwkT!d?nAH`!C_y6o?=r@4t>eOB1w
zeH686*=&RF1qYAWG~-o@Z3Mv289SL!%gZQ9OnmMTE9H8w;$@V_cEJq^TznqWxW*^>
z{~LlRDIRGEN}VOQvD6vneJ^&t`csFFoo2@xO%6!>On#VMEKLfXa&dATvHd-tBw@|c
z{e4~wl3X6euRov9Tl`F=$kB`=dvMQR;(J;AUd`K~Df-kH6#|vhtj}o<^CpT9%v578
z(I*8r<9Gp?&+)PYMi-KeT@|6Gcalr0gvpx9?Q${6#V%{R@=3D}d_JODH9yb+IrQ_f
ze<1d9RF`J4LdtzL`X{}#$fR*daObAeKHmIV@96lt(G6opn=zv&o;_~!;`)V$Map}x
z=oGTfK9|*nu49&M+v0f?*TALHdX+=Jx$Lebxw|T=T!cZ<n@-xbIc`{?I;$Ve_VRWi
zbj)m$w`?xtl|xPEK4V`>e=9XVFw&*X4OI7*Ih3*m$qhzr+qShFPxVZFe1X-Q%PZ~N
zhbBjvX?F@vyTae*a1RyiO6Z`4>jX|<^4qp#@<A9??R+`N<XM%3$$!QbH{a$Hshzk?
zMsOYCx>!Tj(Di0loITA93XV&;#S5IXc=CC6r4*)@T%=nraPl&?#pgD!xm+f%sJc?k
zV>?BF8+lLnRUHg)3Ro8SRlcsucN~k>inmNfhk14-z(aV}JJ6Mup4kK5X-cX1N}H43
zO^0w$b*-f?A!6t-lJn`rF4Fi#s98wkJv;LF6I0+;kROyNT-^o2!)+&9icTJ%Rj5>o
z+g|3&+hxOVj-Y5+>TZ_X#bvJk;V_i?@?cfA>&}pw`~5BZ@&|d3i>}Qki2Gi5(U-XI
z;@C)U{R>m)^OfG2WilorWk}=N;qO{<pMNUzIKJn(g`8tLh*LbXHnHaAIKIg#p1o&K
zS5$&+4~Hvsy7tP=yz8x~<f3g`+5BJ;s;MOVzCeIJ;~I=U-#xgO<)2=KrSG9fBsqWa
z94c{(Kj%<y!`3qYWs|z2+Q1Rxf31p!=W|#%QXC=`-S|%Ak7ImB(gVR|xG1hhRVOO&
zqHN~6D;#fyVNQor-nJ!|<4TU}A*GA2=Tb70y>tp&{AIhfOiFNERO9not3tDPU!(_%
j?{52JAAErTf7V~kPrFKY>p$8%^e86BYxAblX7~LcCKQ)z

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index cb99a3992..a8d467ad9 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7dev4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2014-11-21 22:44+0100\n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: de <kotti@googlegroups.com>\n"
@@ -28,7 +28,7 @@ msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Herzlichen Glückwunsch! Sie haben Kotti erfolgreich installiert."
 
 #: kotti/populate.py:66
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
@@ -55,7 +55,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -224,77 +224,77 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr "Datei"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr "Bild"
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr "Ordneransicht"
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Inhalt"
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr "Teilen"
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Aktionen"
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Kopieren"
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Einfügen"
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr "Löschen"
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr "Betrachter"
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr "Bearbeiter"
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr "Besitzer"
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr "Administrator"
 
@@ -371,7 +371,7 @@ msgstr "Anmelden"
 msgid "Username or email"
 msgstr "Benutzername oder E-Mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Passwort"
@@ -689,7 +689,7 @@ msgid "Welcome, you are not logged in."
 msgstr "Willkommen! Sie sind nicht angemeldet."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr "Ihre Änderungen wurden übernommen."
 
@@ -716,27 +716,27 @@ msgstr "${type} in ${title} erstellen"
 msgid "Add ${type}."
 msgstr "${type} erstellen"
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr "Sie wurden abgemeldet."
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr "Benutzername"
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-Mail"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
@@ -744,26 +744,26 @@ msgstr ""
 "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
 "einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrieren - ${title}"
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Passwort zurücksetzen - ${title}"
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Willkommen, ${user}!"
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
 "so will activate your account."
@@ -771,23 +771,23 @@ msgstr ""
 "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
 "einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr "Registrieren"
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr "Ein Fehler ist aufgetreten."
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr "Absenden"
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
@@ -856,8 +856,8 @@ msgid "Add Group"
 msgstr "Neue Gruppe"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr "Keine Änderungen."
 
@@ -902,68 +902,68 @@ msgstr "${title} kopiert."
 msgid "${title} was cut."
 msgstr "${title} ausgeschnitten."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} verschoben."
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} gelöscht."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} eingefügt."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr "Inhalt konnte nicht eingefügt werden, da er nicht mehr existiert."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} wird nun in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr "Nichts wurde gelöscht."
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr "Name und Titel werden benötigt."
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr "Objekt umbenannt."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr "Nach oben verschieben"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr "Nach unten verschieben"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr "Anzeigen"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr "Verstecken"
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr "Status ändern"
 
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index c8f41979e4fc72ee701de039c436098ff74ffc01..f6db2b84dfcd0486a9d22579ec0be61d5f990ff9 100644
GIT binary patch
delta 21
ccmX@ee2{s<G%h1uLrVoi6DuS0jSCbR0ZC2<9RL6T

delta 21
ccmX@ee2{s<G%iD3BSQrvLn~9WjSCbR0Z8%&6#xJL

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index 8572739e7..a0b80df3e 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -133,77 +133,77 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr ""
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr ""
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr ""
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr ""
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr ""
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr ""
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr ""
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr ""
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr ""
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr ""
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr ""
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr ""
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr ""
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr ""
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr ""
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr ""
 
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Username or email"
 msgstr ""
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr ""
@@ -582,7 +582,7 @@ msgid "Welcome, you are not logged in."
 msgstr ""
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr ""
 
@@ -609,74 +609,74 @@ msgstr ""
 msgid "Add ${type}."
 msgstr ""
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr ""
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr ""
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 msgid "Full name"
 msgstr ""
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr ""
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr ""
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr ""
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr ""
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr ""
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
 "so will activate your account."
 msgstr ""
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr ""
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr ""
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr ""
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr ""
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr ""
 
@@ -742,8 +742,8 @@ msgid "Add Group"
 msgstr ""
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr ""
 
@@ -788,68 +788,68 @@ msgstr ""
 msgid "${title} was cut."
 msgstr ""
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr ""
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr ""
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr ""
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr ""
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr ""
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr ""
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr ""
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr ""
 
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index 7c1e7faa5777244877723c378814ae73d870349b..fc0a2343edfec55505e6fce39d89654f7440d085 100644
GIT binary patch
delta 23
ecmX>TbtY=VSt%|fT|-L+LlY|_^Uc?#N`(My2M7uP

delta 23
ecmX>TbtY=VSt%|<T_ZyUBSR}wv(49~N`(MxqX+^3

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 1c962e1da..ba62174ed 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9a3dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2013-09-22 20:21+0100\n"
 "Last-Translator: Fabien Castarède <fabien.castarede@free.fr>\n"
 "Language-Team: French\n"
@@ -54,7 +54,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -133,77 +133,77 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr "Fichier"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr "Image"
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr "Contenus"
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Contenus"
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modifier"
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr "Permissions"
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Actions"
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Copier"
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Couper"
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Coller"
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Renommer"
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr "Supprimer"
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr "Lecteur"
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr "Editeur"
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -279,7 +279,7 @@ msgstr "Identifiant"
 msgid "Username or email"
 msgstr "Identifiant ou e-mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Mot de passe"
@@ -606,7 +606,7 @@ msgid "Welcome, you are not logged in."
 msgstr "Bienvenue, vous n'êtes pas connecté."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr "Vos modifications ont été enregistrées."
 
@@ -633,27 +633,27 @@ msgstr "Ajouter un(e) ${type} dans ${title}."
 msgid "Add ${type}."
 msgstr "Ajouter ${type}."
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "Vous avez réinitialisé votre mot de passe."
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr "Vous avez été déconnecté."
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 msgid "Full name"
 msgstr "Nom complet"
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr "Identifiant"
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-mail"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
@@ -662,26 +662,26 @@ msgstr ""
 "recevoir un e-mail contenant le lien permettant d'initialiser votre mot de "
 "passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "S'inscrire - ${title}"
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr "Connexion échouée."
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Réinitialiser votre mot de passe - ${title}"
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bienvenue, ${user} !"
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
 "so will activate your account."
@@ -689,23 +689,23 @@ msgstr ""
 "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre "
 "mot de passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr "S'inscrire"
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr "Il y a une erreur."
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr "Soumettre"
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
@@ -773,8 +773,8 @@ msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr "Aucune modification a été effectuée."
 
@@ -819,68 +819,68 @@ msgstr "${title} a été copié."
 msgid "${title} was cut."
 msgstr "${title} a été coupé."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} a été déplacé."
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} a été supprimé."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} a été collé."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr "Ne peut pas coller ce contenu. Il n'existe plus."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} est désormais visible dans la navigation."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nest plus visible dans la navigation."
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr "Rien n'a été supprimé."
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr "Le nom et le titre sont obligatoires."
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr "L'élément a été renommé."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr "Décaler vers le haut"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr "Décaler vers le bas"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr "Rendre visible"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr "Cacher"
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr "Vous avez sélectionné des éléments afin de les traiter."
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr "Modifier le statut"
 
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index 6ab94fe69a81eff7e2d5a35ab9be4536ead2e7e3..878bf07184b56c0a634bb920ed04af42eaf7a9ca 100644
GIT binary patch
delta 3724
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
KKU_<!ZuB3&+D}IS

literal 16093
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

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index b93cd4156..454b65b10 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9.2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2014-01-19 11:14+0100\n"
 "Last-Translator: Xavi Torné <xavitorne@gmail.com>\n"
 "Language-Team: it \n"
@@ -26,7 +26,7 @@ msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Congratulazioni! Avete installato Kotti con successo."
 
 #: kotti/populate.py:66
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
@@ -53,7 +53,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -114,8 +114,8 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html"
-"\">               Manuale di configurazione\n"
+"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration."
+"html\">               Manuale di configurazione\n"
 "            </a>\n"
 "        </p>\n"
 "    </div>\n"
@@ -191,77 +191,77 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr "File"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr "Immagine"
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr "Vista della cartella"
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Contenuti"
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modificare"
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr "Condividi"
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Azioni"
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Copia"
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Taglia"
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Incolla"
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Rinomina"
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr "Elimina"
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr "Visualizzatore"
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr "Propietario"
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr "Admin"
 
@@ -334,7 +334,7 @@ msgstr "Accedi"
 msgid "Username or email"
 msgstr "Username o email"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Password"
@@ -650,7 +650,7 @@ msgid "Welcome, you are not logged in."
 msgstr "Benvenuto, non sei loggato."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr "Le tue modifiche sono state salvate."
 
@@ -677,27 +677,27 @@ msgstr "Aggiungere ${type} a ${title}."
 msgid "Add ${type}."
 msgstr "Aggiungere ${type}."
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "Hai resettato la tua password."
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr "Sei uscito."
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 msgid "Full name"
 msgstr "Nome completo"
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr "Username"
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr "Email"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
@@ -705,26 +705,26 @@ msgstr ""
 "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per "
 "settare la tua password e attivare il tuo account."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrazione - ${title}"
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr "Errore nell'accesso."
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetta la tua password - ${title}."
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Benvenuto, ${user}!"
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
 "so will activate your account."
@@ -732,23 +732,23 @@ msgstr ""
 "Dovresti ricevere una email con un link per resettare la tua password. "
 "Clikkandolo si attiverà il tuo account."
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr "Questo username o email non è riconosciuto dal sistema."
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr "Registrazione"
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr "C'è stato un errore."
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr "Invia"
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr "Il token per resettare la tua password è scaduto."
 
@@ -816,8 +816,8 @@ msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr "Non sono state fatte modifiche."
 
@@ -862,68 +862,68 @@ msgstr "${title} è stato copiato."
 msgid "${title} was cut."
 msgstr "${title} è stato tagliato."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} è stato spostato."
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} è stato cancellato."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} è stato incollato."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr "Non si può incollare l'elemento. L'elemento non è più esistente."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} è ora visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} non è più visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr "Non è stato cancellato niente."
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr "Nome e titolo sono obbligatori."
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr "L'elemento è stato rinominato"
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr "Muovere su"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr "Muovi giù"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr "Mostra"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr "Nascondi"
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr "Devi selezionare degli elementi per fare quest'azione."
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr "Cambia stato"
 
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index ddfb265496ee362933fcfd0a9ff9d4b2e40f06e2..a15d8fe503e1b788aeef54512bf5c1325b18c3fc 100644
GIT binary patch
delta 23
ecmX?;a3*2HWhpKrT|-L+LlY|_^UZgq@<jn{eh41`

delta 23
ecmX?;a3*2HWhpL0T_ZyUBSR}wv(0y<@<jn{8VDBv

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 4b0403afc..4d4d74ccf 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7.0\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2013-09-19 02:45+0900\n"
 "Last-Translator: OCHIAI, Gouji <gjo.ext@gmail.com>\n"
 "Language-Team: ja <kotti@googlegroups.com>\n"
@@ -55,7 +55,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -134,77 +134,77 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr "ドキュメント"
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr "ファイル"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr "画像"
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr "フォルダー表示"
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "編集"
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr "共有"
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "アクション"
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "コピー"
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "切り取り"
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "貼り付け"
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "名称変更"
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr "削除"
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr "閲覧者"
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr "編集者"
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr "所有者"
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr "管理者"
 
@@ -281,7 +281,7 @@ msgstr "ログイン"
 msgid "Username or email"
 msgstr "ユーザー名またはメールアドレス"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "パスワード"
@@ -606,7 +606,7 @@ msgid "Welcome, you are not logged in."
 msgstr "ようこそ。ログインしていません。"
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr "変更内容を保存しました。"
 
@@ -633,27 +633,27 @@ msgstr "${title} に ${type} を追加する。"
 msgid "Add ${type}."
 msgstr "${type} を追加する。"
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "パスワードのリセットに成功しました。"
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr "ログアウトしました。"
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 msgid "Full name"
 msgstr "フルネーム"
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr "ユーザー名"
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr "メールアドレス"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
@@ -661,26 +661,26 @@ msgstr ""
 "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワー"
 "ドを設定して下さい。"
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "登録 - ${title}"
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "パスワードのリセット - ${title}"
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "ようこそ ${user}!"
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
 "so will activate your account."
@@ -688,23 +688,23 @@ msgstr ""
 "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されま"
 "す。"
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr "登録"
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr "エラーが発生しました。"
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr "送信"
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
@@ -772,8 +772,8 @@ msgid "Add Group"
 msgstr "グループ追加"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr "変更箇所がありませんでした。"
 
@@ -818,68 +818,68 @@ msgstr "${title} をコピーしました。"
 msgid "${title} was cut."
 msgstr "${title} を切り取りました。"
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} を移動しました。"
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} を削除しました。"
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} を貼り付けました。"
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr "ノードを張り付けできません。何も存在していません。"
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} がナビゲーションに表示されるようになりました。"
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} がナビゲーションでは非表示になりました。"
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr "削除対象がありません。"
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr "名称とタイトルは必須です。"
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr "名称変更しました"
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr "上に移動する"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr "下に移動する"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr "表示中にする"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr "非表示にする"
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr "状態を変更"
 
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index 149baa2196d34bd8c2f800983555b7c3c1ef7535..309ce7b2bc43db585e3b395fecd025fcaab72207 100644
GIT binary patch
delta 3747
zcmX}td2o(L0LSr-+=<+$DB?&6AxA@qXrx4<s&U0ps*V!UN*qBP?JJH%+(+Z81f@k(
zhlZK9%os{L$@n8Q(`pUV8`G&)V~k;1{r=u}(`Wqh+1>Yf_SxNMpU3vCZcU|*+o2xS
zhT{Zzj+A;D^DAEU;}6HQKw|>kjhT+!sm~8FCK>l&Pi(+2e2C%b6KV`a(*Ywe3H5sp
z>i0<)kHr{gjKfq@;GX6jdgDd(!Up8NrU|358QbC?=!;L#2R-Or^#BaODAajzsNYjj
z{SU-k%toD8g$dl>?52=H!$nNP7UZAl!Em{U$;2qkN3BpHdf-~rK&wzU+=f9|gPQqC
zOvNuS3m@TL?8lGk*n~dZ-}pqjIt)QAX(Vcd*{BuBN8Mm7cEo9@N8!L2Jc=5~CG3n1
zsDb>B{`eHN65h<>6b7Rva1kAyD11plH~bCN(L>adJw=`9#`>!RFI<K}$Ye|v>ISu_
zM^J~F`59YpL=C(d)!&b({_mj9yC2Q^tHGn4>qh=qN<A2L!8#1aji>?cN6oAbwaGrm
zd3Y7oPX^1O>#|Yj=c3vRY<&vq5f-7YuZ&^+HS)bQX!9LL`Z6a_Grxkmpb@nKcTgSw
zW$XW<uJ>;5G6XfV_Sg+mP<v=RvY2Kr>JgTs_SiuO1uf+nT!Ia#84TvGy5TTXJs-8y
z1-5;<wFuSGB8<aI)QnG}R_YA$=9<f>NBuR%V+(46j+hRv3p$}rj7N>MFKT8ZF#{)H
zEbc%(l6us@E~Bn%M0NNb>eF%C*6*RtyN?>!L+evyZ#YaF)<YKt;qw@dno%C=!YTIm
z8K{vLqHeeawcBg#?-x)rzKpuQ8TE|sqE_;Wt-G@fx?co(>HUwPpb>XQ?SVwp4AW2@
z<X|_Pfc!Hn`QzM-NS~$-wPzZTNtvIq54y$jyfGQoz7Kohr`Q#L!3u{Pqti5a(YJOn
zra#4PamEbA2Gr6AGVKH$Ze4_l)N7D`rqTMqwny`E$fP|7`{8P2pPJ9m3!AMs(V>Q)
zC}_m@FczbGxMny2wGz3uJ`uGdvr(J2%>KR^wO49!J|45}?HF}$>OC<TC!$uM3bk@)
z_5IbznrYCI{E1qOFg}ACSYK-<YEuqDE&XI$pNm7Nm*XhBf~PQ&y9~mwFc>{qF7+3Q
zqp<_}VM(IH^@Una17Ar~iTY;OqDFoV>C-$zb<mSW4KxL{5(TLCLTfQTpuV`Zon_Ve
z#i;Xlpf4W5w)nAwf;u>d0eA_|ViRg*Dw13?IE1?J6Vzrpk2?Q*>s?eokF5V7+sSya
z?rQIjy1ozQVSn51D5t<T$E-&!@ez#0^Qe*E!lmez;_6_Tbq(sg&FGv7@=Y=4kQcz*
zKrQiO3`TdBRRa!3y`Ei=fjLY+3VOW;p*os@dK4w74l1nMQ623^_Ln(n{RY{$=9#rS
zACWZb`Kb1_s7Lq_uEcLqD>06fobUfs3cB$u)Cd=%PFQ8zH(&_$-N;ih$58{hfm*qH
zw(i;2HLyrz(k2VF^b4$IsQWljk9HIKvj5Cc3WM=9>b3YA^(aDkdDTGzs-BD*SRQHs
zW9;uUQ3Efs^)jmiy=kwo^(~k~y&BcuO?1BhE%t;bsMp3V-Sv#JP)j%#b>kJN8?Qsn
zV3+l@ZNG|ol($d=Z^PG2*ZEq*Q0*Ns9=rAD`D@dRpn-dvIjE&OfPr`o`3RaHQ0I9K
zaBaG-sAoD9=V1w|!&|6+JThD#sDbE4eG{2N^yU<iqvUm>{b#D6g1kzG5zV+a(T8Xb
zSwnP$6ZVdCFQ~3#4AGKm)*9$I(t6CIP}5q$EhK>~C2L7E8LQ{NjA$0SiH`SNIA^$(
z@{6`E4w1nsaOe@}m`TcsKbb_d0y<8R@y?R#KOz-(kO@Q^cLve@&1?F@QAYG?by3A0
zdVZ}(I|}c%R`5exejAsQ^|r2E&P!oFAllH`<V|vr=y;!ua+d7#Po%;J%T$vBqFq}`
zbcB*RvRxGpJ!iegI!2O>B$K>Bbi6}$66eft2+^Vaq@$8}5q;ct>8xoKj+4zKp9~@|
z6F<^=9H8(D$s^NkV=V5oWp@l9M{IpH_9C^mUV@8Bl&w#-{y)kEwqXS(6Cc8+cOJRc
zw{V0lcd~k5x-AdImq-xVVB4~=4_QSPk_@6_n+xM;Lt!*2whfDLHt{6;iC#y&^OK2=
zC1f}`M%Iy3!uQJX<~cvxU<%1zvWLtkFOV=YkQ^ovWFj$snLDp1J+5zw2n_X0?VU0p
VHYF`1HND=yM@P5%>q!@){sZeERr3G<

delta 7136
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

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index f713edaad..bb4c27e7e 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.10b2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2014-10-19 08:22+0900\n"
 "Last-Translator: mete0r <mete0r@sarangbang.or.kr>\n"
 "Language-Team: Korean\n"
@@ -27,7 +27,7 @@ msgid "Congratulations! You have successfully installed Kotti."
 msgstr "축하합니다! 성공적으로 Kotti를 설치했습니다."
 
 #: kotti/populate.py:66
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
@@ -54,7 +54,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -218,77 +218,77 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr "문서"
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr "파일"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr "화상"
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr "폴더로 보임"
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "컨텐츠 항목"
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "편집"
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr "공유"
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "동작"
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "복사"
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "잘라내기"
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr "삭제"
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr "열람자"
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr "편집자"
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr "소유자"
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr "관리자"
 
@@ -361,7 +361,7 @@ msgstr "로그인"
 msgid "Username or email"
 msgstr "사용자 이름 혹은 전자메일"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "암호"
@@ -675,7 +675,7 @@ msgid "Welcome, you are not logged in."
 msgstr "환영합니다, 로그인되지 않았습니다."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr "수정사항이 저장되었습니다."
 
@@ -702,27 +702,27 @@ msgstr "${type}을(를) \"${title}\"에 추가합니다."
 msgid "Add ${type}."
 msgstr "${type}을(를) 추가합니다."
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "암호를 재설정했습니다."
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr "로그아웃되었습니다."
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 msgid "Full name"
 msgstr "전체 이름"
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr "사용자 이름"
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr "전자메일"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
@@ -730,49 +730,49 @@ msgstr ""
 "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 "
 "받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "등록 - ${title}"
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr "로그인이 실패했습니다."
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "암호를 재설정하세요 - ${title}."
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "${user}님, 환영합니다!"
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
 "so will activate your account."
 msgstr ""
 "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr "등록하기"
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr "오류가 있습니다."
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr "제출"
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
@@ -840,8 +840,8 @@ msgid "Add Group"
 msgstr "그룹 추가"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr "아무 것도 바뀌지 않았습니다."
 
@@ -886,68 +886,68 @@ msgstr "\"${title}\"이(가) 복사되었습니다."
 msgid "${title} was cut."
 msgstr "\"${title}\"이(가) 잘라내어졌습니다."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr "\"${title}\"이(가) 옮겨졌습니다."
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr "\"${title}\"이(가) 지워졌습니다."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr "\"${title}\"이(가) 붙여넣어졌습니다."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr "노드를 붙여넣을 수 없습니다. 그 노드가 존재하지 않습니다."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr "아무것도 지워지지 않았습니다."
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr "이름과 제목이 필요합니다."
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr "항목이 재명명되었습니다."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr "위로 옮김"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr "아래로 옮김"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr "보이기"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr "숨기기"
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr "적용할 항목을 선택해야합니다."
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr "작업 상태 바꾸기"
 
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index cffeb201e6f1d5a9b42055da499c9e605b8f9a54..97bf2fdcb4a11740a2bbb0218fbe310694f75dd2 100644
GIT binary patch
delta 23
ecmeww{xy8VWhpKrT|-L+LlY|_^UZgqBm@C+UI+vL

delta 23
ecmeww{xy8VWhpL0T_ZyUBSR}wv(0y<Bm@C*`Um^~

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index 8d2f1f5c4..4aca31860 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2014-02-13 21:51+0100\n"
 "Last-Translator: Wim Boucquaert <wim.boucquaert@gmail.com>\n"
 "Language-Team: nl <kotti@googlegroups.com>\n"
@@ -54,7 +54,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -133,77 +133,77 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr "Bestand"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr "Afbeelding"
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr "Map weergave"
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Inhoud"
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bewerken"
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr "Delen"
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Acties"
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Knippen"
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Plakken"
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr "Lezer"
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -279,7 +279,7 @@ msgstr "Aanmelden"
 msgid "Username or email"
 msgstr "Gebuikersnaam of e-mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Wachtwoord"
@@ -607,7 +607,7 @@ msgid "Welcome, you are not logged in."
 msgstr "Wilkom, je bent niet aangemeld."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr "Je wijzigingen werden opgeslagen."
 
@@ -634,27 +634,27 @@ msgstr "Voeg ${type} aan ${title} toe."
 msgid "Add ${type}."
 msgstr "Voeg ${type} toe."
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "Je wachtwoord werd hersteld."
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr "Je bent afgemeld."
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-mailadres"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
@@ -662,26 +662,26 @@ msgstr ""
 "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link "
 "om je wachtwoord in te stellen. Deze handeling zal je account activeren."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Refistreer - ${title}"
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr "Aanmelden mislukt."
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Herstel je wachtwoord - ${title}."
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Welkom, ${user}!"
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
 "so will activate your account."
@@ -689,23 +689,23 @@ msgstr ""
 "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via "
 "deze link activeer je je account."
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
 msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr "Registreer"
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr "Er trad een fout op."
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr "Verzenden"
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
@@ -773,8 +773,8 @@ msgid "Add Group"
 msgstr "Groep toevoegen"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 msgid "No changes were made."
 msgstr "Geen wijzigingen aangebracht."
 
@@ -819,68 +819,68 @@ msgstr "${title} werd gekopieerd."
 msgid "${title} was cut."
 msgstr "${title} werd geknipt."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} werd verplaatst."
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} werd verwijderd."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} werd geplakt."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 msgid "Could not paste node. It no longer exists."
 msgstr "De node kon niet geplakt worden. Hij bestaat niet meer."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} is nu zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} is niet langer zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 msgid "Nothing was deleted."
 msgstr "Er werd niks verwijderd."
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr "Naam en titel zijn vereist."
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 msgid "Item was renamed."
 msgstr "Item werd hernoemd."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr "Naar boven"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr "Weergeven"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr "Verbergen"
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 msgid "You have to select items to perform an action."
 msgstr "Je dient items te selecteren om acties uit te voeren."
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr "Wijzig Status."
 
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index eaf4bd6fef6d225aaf516cf76de2b409fb2af071..c3bc8089aecefd92cbea2014517a0c3e07be6687 100644
GIT binary patch
delta 23
ecmbPlGv8*zVIeLfT|-L+LlY|_^UY_4g17-)mIo#P

delta 23
ecmbPlGv8*zVIeL<T_ZyUBSR}wv(0CPg17-)G6x<2

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 0f59bc137..ef403c067 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-21 21:56+0100\n"
+"POT-Creation-Date: 2014-12-19 14:27+0100\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: Nuno Teixeira <teixas@gmail.com>\n"
 "Language-Team: pt <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgid ""
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -133,77 +133,77 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:610 kotti/views/edit/content.py:81
+#: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:649 kotti/views/edit/content.py:113
+#: kotti/resources.py:645 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:62
 msgid "File"
 msgstr "Ficheiro"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:144
+#: kotti/resources.py:697 kotti/views/edit/content.py:144
 msgid "Image"
 msgstr "Imagem"
 
-#: kotti/resources.py:500
+#: kotti/resources.py:496
 msgid "Folder view"
 msgstr "Vista de pasta"
 
-#: kotti/resources.py:487 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: kotti/resources.py:488 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Editar"
 
-#: kotti/resources.py:489
+#: kotti/resources.py:485
 msgid "Share"
 msgstr "Partilha"
 
-#: kotti/resources.py:490 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Ações"
 
-#: kotti/resources.py:491 kotti/views/edit/actions.py:445
+#: kotti/resources.py:487 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Copiar"
 
-#: kotti/resources.py:492 kotti/views/edit/actions.py:446
+#: kotti/resources.py:488 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Cortar"
 
-#: kotti/resources.py:493 kotti/views/edit/actions.py:442
+#: kotti/resources.py:489 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Colar"
 
-#: kotti/resources.py:494 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:447
+#: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Renomear"
 
-#: kotti/resources.py:495 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:449
+#: kotti/views/edit/actions.py:450
 msgid "Delete"
 msgstr "Apagar"
 
-#: kotti/security.py:165
+#: kotti/security.py:189
 msgid "Viewer"
 msgstr "Leitor"
 
-#: kotti/security.py:166
+#: kotti/security.py:190
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:167
+#: kotti/security.py:191
 msgid "Owner"
 msgstr "Dono"
 
-#: kotti/security.py:168
+#: kotti/security.py:192
 msgid "Admin"
 msgstr "Admin"
 
@@ -280,7 +280,7 @@ msgstr "Entrar"
 msgid "Username or email"
 msgstr "Utilizador ou e-mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:213
+#: kotti/templates/login.pt:34 kotti/views/login.py:212
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Palavra passe"
@@ -610,7 +610,7 @@ msgid "Welcome, you are not logged in."
 msgstr "Bem-vindo, você não está autenticado."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:363 kotti/views/edit/actions.py:407
+#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
 msgid "Your changes have been saved."
 msgstr "As suas alterações foram guardadas."
 
@@ -638,29 +638,29 @@ msgstr "Adicionar ${type} em ${title}"
 msgid "Add ${type}."
 msgstr "Adicionar ${type}"
 
-#: kotti/views/login.py:238
+#: kotti/views/login.py:237
 #, fuzzy
 msgid "You have reset your password."
 msgstr "Você reinicializou a palavra passe com sucesso"
 
-#: kotti/views/login.py:200
+#: kotti/views/login.py:199
 msgid "You have been logged out."
 msgstr "Você desligou a sessão"
 
-#: kotti/views/login.py:66 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:270
 #, fuzzy
 msgid "Full name"
 msgstr "Nome completo"
 
-#: kotti/views/login.py:69
+#: kotti/views/login.py:68
 msgid "Username"
 msgstr "Nome utilizador"
 
-#: kotti/views/login.py:74 kotti/views/login.py:225 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-mail"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:108
 #, fuzzy
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
@@ -669,26 +669,26 @@ msgstr ""
 "Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma "
 "ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:123
 #, fuzzy, python-format
 msgid "Register - ${title}"
 msgstr "Registar ${title}"
 
-#: kotti/views/login.py:164
+#: kotti/views/login.py:163
 msgid "Login failed."
 msgstr "Erro de autenticação"
 
-#: kotti/views/login.py:286
+#: kotti/views/login.py:285
 #, fuzzy, python-format
 msgid "Reset your password - ${title}."
 msgstr "Reiniciar a sua palavra passe - ${title}"
 
-#: kotti/views/login.py:160
+#: kotti/views/login.py:159
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bem-vindo, ${user}!"
 
-#: kotti/views/login.py:173
+#: kotti/views/login.py:172
 #, fuzzy
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing "
@@ -697,24 +697,24 @@ msgstr ""
 "Você deverá receber um e-mail com uma ligação temporária para reiniciar a "
 "sua palavra passe."
 
-#: kotti/views/login.py:178
+#: kotti/views/login.py:177
 #, fuzzy
 msgid "That username or email is not known by this system."
 msgstr "Este utilizador ou e-mail não são reconhecidos."
 
-#: kotti/views/login.py:83
+#: kotti/views/login.py:82
 msgid "Register"
 msgstr "Registar-se"
 
-#: kotti/views/login.py:90 kotti/views/login.py:257
+#: kotti/views/login.py:89 kotti/views/login.py:256
 msgid "There was an error."
 msgstr "Ocorreu um erro."
 
-#: kotti/views/login.py:250
+#: kotti/views/login.py:249
 msgid "Submit"
 msgstr "Enviar"
 
-#: kotti/views/login.py:279
+#: kotti/views/login.py:278
 msgid "Your password reset token may have expired."
 msgstr "A seu pedido para alterar a palavra passe expirou."
 
@@ -782,8 +782,8 @@ msgid "Add Group"
 msgstr "Adicionar Grupo"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:301 kotti/views/edit/actions.py:367
-#: kotti/views/edit/actions.py:413 kotti/views/edit/actions.py:409
+#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
 #, fuzzy
 msgid "No changes were made."
 msgstr "Não foram efectuadas nenhumas alterações"
@@ -833,72 +833,72 @@ msgstr "${title} copiado."
 msgid "${title} was cut."
 msgstr "${title} cortado."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:183
 #, fuzzy, python-format
 msgid "${title} was moved."
 msgstr "${title} movido."
 
-#: kotti/views/edit/actions.py:270 kotti/views/edit/actions.py:295
+#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
 #, fuzzy, python-format
 msgid "${title} was deleted."
 msgstr "${title} apagado."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:159
 #, fuzzy, python-format
 msgid "${title} was pasted."
 msgstr "${title} colado."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:162
 #, fuzzy
 msgid "Could not paste node. It no longer exists."
 msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} encontra-se visivel na navegação."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:228
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} já não está visivel na navegação."
 
-#: kotti/views/edit/actions.py:292
+#: kotti/views/edit/actions.py:293
 #, fuzzy
 msgid "Nothing was deleted."
 msgstr "Nada foi apagado."
 
-#: kotti/views/edit/actions.py:328 kotti/views/edit/actions.py:355
+#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
 msgid "Name and title are required."
 msgstr "Nome e título são obrigatórios."
 
-#: kotti/views/edit/actions.py:332
+#: kotti/views/edit/actions.py:333
 #, fuzzy
 msgid "Item was renamed."
 msgstr "Item renomeado"
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:455
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:456
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:457
 msgid "Show"
 msgstr "Mostrar"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:458
 msgid "Hide"
 msgstr "Esconder"
 
-#: kotti/views/edit/actions.py:496
+#: kotti/views/edit/actions.py:497
 #, fuzzy
 msgid "You have to select items to perform an action."
 msgstr "Terá de escolher items para executar a ação."
 
-#: kotti/views/edit/actions.py:453
+#: kotti/views/edit/actions.py:454
 msgid "Change State"
 msgstr "Alterar Estado"
 
diff --git a/kotti/populate.py b/kotti/populate.py
index 94a19ec35..a8807698e 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -84,7 +84,7 @@ def populate():
         </p>
         <p>
             <a class="btn btn-info"
-               href="http://kotti.readthedocs.org/en/latest/developing/configuration.html">
+               href="http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html">
                Configuration manual
             </a>
         </p>

From 691907007cbf75c96074f8090a049e341721d26b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 00:56:53 +0100
Subject: [PATCH 008/600] Update docstrings to refer to
 :class:`kotti.request.Request` instead of its base class from Pyramid.  [ci
 skip]

---
 kotti/events.py                                        |  2 +-
 kotti/message.py                                       |  2 +-
 kotti/resources.py                                     | 10 +++++-----
 .../scaffolds/package/+package+/views/__init__.py_tmpl |  2 +-
 kotti/security.py                                      |  2 +-
 kotti/views/edit/upload.py                             |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kotti/events.py b/kotti/events.py
index 877c3b0f3..380df4468 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -54,7 +54,7 @@ def __init__(self, object, request=None):
         :type object: arbitrary
 
         :param request: current request
-        :type request: :class:`pyramid.request.Request`
+        :type request: :class:`kotti.request.Request`
         """
 
         self.object = object
diff --git a/kotti/message.py b/kotti/message.py
index a4f2dcc2f..d9015497a 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -79,7 +79,7 @@ def send_email(request, recipients, template_name, template_vars={}):
     """ General email sender.
 
     :param request: current request.
-    :type request: :class:`pyramid.request.Request`
+    :type request: :class:`kotti.request.Request`
 
     :param recipients: list of email addresses. Each email should be a
                        string like: u'"John Doe" <joedoe@foo.com>'.
diff --git a/kotti/resources.py b/kotti/resources.py
index 25786b06e..4a2db5cc6 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -141,7 +141,7 @@ def children_with_permission(self, request, permission='view'):
         the request has the asked permission.
 
         :param request: current request
-        :type request: :class:`pyramid.request.Request`
+        :type request: :class:`kotti.request.Request`
         :param permission: The permission for which you want the allowed
                            children
         :type permission: str
@@ -353,7 +353,7 @@ def addable(self, context, request):
                        :class:`~kotti.resources.TypeInfo`)
 
         :param request: current request
-        :type request: :class:`pyramid.request.Request`
+        :type request: :class:`kotti.request.Request`
 
         :result: True if the type described in 'self' may be added to 'context',
                  False otherwise.
@@ -665,7 +665,7 @@ def from_field_storage(cls, fs):
             through a webbrowser.
 
         :param fs: FieldStorage instance as found in a
-                   :class:`pyramid.request.Request`'s ``POST`` MultiDict.
+                   :class:`kotti.request.Request`'s ``POST`` MultiDict.
         :type fs: :class:`cgi.FieldStorage`
 
         :result: The created instance.
@@ -707,7 +707,7 @@ def get_root(request=None):
        return its result.
 
     :param request: current request (optional)
-    :type request: :class:`pyramid.request.Request`
+    :type request: :class:`kotti.request.Request`
 
     :result: a node in the node tree
     :rtype: :class:`~kotti.resources.Node` or descendant;
@@ -719,7 +719,7 @@ def default_get_root(request=None):
     """Default implementation for :func:`~kotti.resources.get_root`.
 
     :param request: Current request (optional)
-    :type request: :class:`pyramid.request.Request`
+    :type request: :class:`kotti.request.Request`
 
     :result: Node in the object tree that has no parent.
     :rtype: :class:`~kotti.resources.Node` or descendant; in a fresh Kotti site
diff --git a/kotti/scaffolds/package/+package+/views/__init__.py_tmpl b/kotti/scaffolds/package/+package+/views/__init__.py_tmpl
index a95087b4b..4e050c322 100644
--- a/kotti/scaffolds/package/+package+/views/__init__.py_tmpl
+++ b/kotti/scaffolds/package/+package+/views/__init__.py_tmpl
@@ -16,7 +16,7 @@ class BaseView(object):
         :type context: :class:`kotti.resources.Content`
 
         :param request: Current request
-        :type request: :class:`pyramid.request.Request`
+        :type request: :class:`kotti.request.Request`
         """
 
         super(BaseView, self).__init__()
diff --git a/kotti/security.py b/kotti/security.py
index 27f3041d0..3b39f4fd8 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -48,7 +48,7 @@ def has_permission(permission, context, request):
     :type context: :class:``kotti.resources.Node``
 
     :param request: current request
-    :type request: :class:`pyramid.request.Request`
+    :type request: :class:`kotti.request.Request`
 
     :result: ``True`` if request has the permission, ``False`` else
     :rtype: bool
diff --git a/kotti/views/edit/upload.py b/kotti/views/edit/upload.py
index 0c62983ad..06d313ffe 100644
--- a/kotti/views/edit/upload.py
+++ b/kotti/views/edit/upload.py
@@ -32,7 +32,7 @@ def __init__(self, context, request):
         :type context: :class:`kotti.resources.Content` or descendants.
 
         :param request: Current request.
-        :type request: :class:`pyramid.request.Request`
+        :type request: :class:`kotti.request.Request`
         """
 
         self.context = context

From 757dece7b5c79ff81bb6c4771f075de74348abb2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 00:57:53 +0100
Subject: [PATCH 009/600] Reorder imports.  [ci skip]

---
 kotti/views/file.py | 4 +++-
 kotti/views/form.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kotti/views/file.py b/kotti/views/file.py
index 5ac25f258..1c81e627d 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -1,8 +1,10 @@
-from kotti.resources import File
+# -*- coding: utf-8 -*-
 
 from pyramid.response import Response
 from pyramid.view import view_config
 
+from kotti.resources import File
+
 
 @view_config(name='view', context=File, permission='view',
              renderer='kotti:templates/view/file.pt')
diff --git a/kotti/views/form.py b/kotti/views/form.py
index f67a04159..0e1984405 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -21,8 +21,8 @@
 from kotti.fanstatic import tagit
 from kotti.resources import Tag
 from kotti.util import _
-from kotti.util import translate
 from kotti.util import title_to_name
+from kotti.util import translate
 
 
 def get_appstruct(context, schema):

From d1f142d46762041c3f2bb3aff405ed1f6f08733e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 00:58:14 +0100
Subject: [PATCH 010/600] Add a BaseView class for convenience.

---
 kotti/views/__init__.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/kotti/views/__init__.py b/kotti/views/__init__.py
index dcf6617f9..ec5b692c6 100644
--- a/kotti/views/__init__.py
+++ b/kotti/views/__init__.py
@@ -1,5 +1,27 @@
-from .util import RootOnlyPredicate
-from .util import SettingHasValuePredicate
+# -*- coding: utf-8 -*-
+
+from kotti.views.util import RootOnlyPredicate
+from kotti.views.util import SettingHasValuePredicate
+
+
+class BaseView(object):
+    """ Very basic view class that can be subclassed.  Does nothing more than
+    assignment of ``context`` and ``request`` to instance attributes on
+    initialization. """
+
+    def __init__(self, context, request):
+        """ Constructor
+
+        :param context: Context of the view
+        :type context: :class:`kotti.resources.Node` or descendant for views on
+                       content.
+
+        :param request: Current request object
+        :type request: :class:`kotti.request.Request`
+        """
+
+        self.context = context
+        self.request = request
 
 
 def includeme(config):

From c21ebbf5ccf5f7711a99b731539459dedff836d3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 04:09:53 +0100
Subject: [PATCH 011/600] Update some docs, make sure "framework" is the
 primary description everywhere.  [ci skip]

---
 README.rst                              |  10 +-
 docs/developing/basic/configuration.rst | 152 +++++++++---------------
 docs/developing/basic/deployment.rst    |  24 ++--
 docs/first_steps/installation.rst       |  52 ++++----
 docs/first_steps/overview.rst           |  37 +++---
 docs/index.rst                          |   6 +-
 setup.py                                |   4 +-
 7 files changed, 119 insertions(+), 166 deletions(-)

diff --git a/README.rst b/README.rst
index 84a7490c4..fa22f2326 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,9 @@
 Kotti
 =====
 
-A user-friendly, light-weight and extensible web content management
-system, based on Pyramid and SQLAlchemy.  |build status|_
+Kotti is a high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.
+It includes an extensible Content Management System called the Kotti CMS (see below).
+|build status|_
 
 Kotti is most useful when you are developing applications that
 
@@ -24,10 +25,11 @@ developer.
 Kotti CMS
 =========
 
-You can **try out Kotti** on `Kotti's demo page`_.
+You can **try out the Kotti CMS** on `Kotti's demo page`_.
 
 Kotti CMS is a content management system that's heavily inspired by
-Plone_.  Its **main features** are:
+Plone_.
+Its **main features** are:
 
 - **User-friendliness**: editors can edit content where it appears;
   thus the edit interface is contextual and intuitive
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index f56a73314..246854b61 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -8,10 +8,9 @@ Configuration
 INI File
 --------
 
-Kotti is configured using an INI configuration file.  The
-:ref:`installation` section explains how to get hold of a sample
-configuration file.  The ``[app:kotti]`` section in it might look like
-this:
+Kotti is configured using an INI configuration file.
+The :ref:`installation` section explains how to get hold of a sample configuration file.
+The ``[app:kotti]`` section in it might look like this:
 
 .. code-block:: ini
 
@@ -35,9 +34,8 @@ Various aspects of your site can be changed right here.
 Overview of settings
 --------------------
 
-This table provides an overview of available settings.  All these
-settings must go into the ``[app:kotti]`` section of your Paste Deploy
-configuration file.
+This table provides an overview of available settings.
+All these settings must go into the ``[app:kotti]`` section of your Paste Deploy configuration file.
 
 ============================  ==================================================
 Setting                       Description
@@ -80,23 +78,21 @@ kotti.max_file_size           Max size for file uploads, default: ```10`` (MB)
 pyramid.default_locale_name   Set the user interface language, default ``en``
 ============================  ==================================================
 
-Only the settings in bold letters required.  The rest has defaults.
+Only the settings in bold letters required.
+The rest has defaults.
 
-Do take a look at the required settings (in bold) and adjust them in
-your site's configuration.  A few of the settings are less important,
-and sometimes only used by developers, not integrators.
+Do take a look at the required settings (in bold) and adjust them in your site's configuration.
+A few of the settings are less important, and sometimes only used by developers, not integrators.
 
 kotti.secret and kotti.secret2
 ------------------------------
 
-The value of ``kotti.secret`` will define the initial password of the
-``admin`` user.  Thus, if you define ``kotti.secret = mysecret``, the
-admin password will be ``mysecret``.  Log in and change the password
-at any time through the web interface.
+The value of ``kotti.secret`` will define the initial password of the ``admin`` user.
+Thus, if you define ``kotti.secret = mysecret``, the admin password will be ``mysecret``.
+Log in and change the password at any time through the web interface.
 
-The ``kotti.secret`` token is also used for signing browser session
-cookies.  The ``kotti.secret2`` token is used for signing the password
-reset token.
+The ``kotti.secret`` token is also used for signing browser session cookies.
+The ``kotti.secret2`` token is used for signing the password reset token.
 
 Here's an example:
 
@@ -112,21 +108,14 @@ Here's an example:
 Override templates (``kotti.asset_overrides``)
 ----------------------------------------------
 
-In your settings file, set ``kotti.asset_overrides`` to a list of
-*asset specifications*.  This allows you to set up a directory in your
-package that will mirror Kotti's own and that allows you to override
-Kotti's templates on a case by case basis.
+In your settings file, set ``kotti.asset_overrides`` to a list of *asset specifications*.
+This allows you to set up a directory in your package that will mirror Kotti's own and that allows you to override Kotti's templates on a case by case basis.
 
-As an example, image that we wanted to override Kotti's master layout
-template.  Inside the Kotti source, the layout template is located at
-``kotti/templates/view/master.pt``.  To override this, we would add a
-directory to our own package called ``kotti-overrides`` and therein
-put our own version of the template so that the full path to our own
-custom template is
-``mypackage/kotti-overrides/templates/view/master.pt``.
+As an example, image that we wanted to override Kotti's master layout template.
+Inside the Kotti source, the layout template is located at ``kotti/templates/view/master.pt``.
+To override this, we would add a directory to our own package called ``kotti-overrides`` and therein put our own version of the template so that the full path to our own custom template is ``mypackage/kotti-overrides/templates/view/master.pt``.
 
-We can then register our ``kotti-overrides`` directory by use of the
-``kotti.asset_overrides`` setting, like so:
+We can then register our ``kotti-overrides`` directory by use of the ``kotti.asset_overrides`` setting, like so:
 
 .. code-block:: ini
 
@@ -135,9 +124,8 @@ We can then register our ``kotti-overrides`` directory by use of the
 Use add-ons
 -----------
 
-Add-ons will usually include in their installation instructions which
-settings one should modify to activate them.  Configuration settings
-that are used to activate add-ons are:
+Add-ons will usually include in their installation instructions which settings one should modify to activate them.
+Configuration settings that are used to activate add-ons are:
 
 - ``pyramid.includes``
 - ``kotti.available_types``
@@ -149,40 +137,33 @@ that are used to activate add-ons are:
 pyramid.includes
 ````````````````
 
-``pyramid.includes`` defines a list of hooks that will be called when
-your Kotti app starts up.  This gives the opportunity to third party
-packages to add registrations to the *Pyramid Configurator API* in
-order to configure views and more.
+``pyramid.includes`` defines a list of hooks that will be called when your Kotti app starts up.
+This gives the opportunity to third party packages to add registrations to the *Pyramid Configurator API* in order to configure views and more.
 
-Here's an example.  Let's install the `kotti_twitter`_ extension and
-add a Twitter profile widget to the right column of all pages.  First
-we install the package from PyPI:
+Here's an example.
+Let's install the `kotti_twitter`_ extension and add a Twitter profile widget to the right column of all pages.
+First we install the package from PyPI:
 
 .. code-block:: bash
 
   bin/pip install kotti_twitter
 
-Then we activate the add-on in our site by editing the
-``pyramid.includes`` setting in the ``[app:kotti]`` section of our INI
-file.  (If a line with ``pyramid.includes`` does not exist, add it.)
+Then we activate the add-on in our site by editing the ``pyramid.includes`` setting in the ``[app:kotti]`` section of our INI file (if a line with ``pyramid.includes`` does not exist, add it).
 
 .. code-block:: ini
 
   pyramid.includes = kotti_twitter.include_profile_widget
 
-kotti_twitter also asks us to configure the Twitter widget itself, so
-we add some more lines right where we were:
+kotti_twitter also asks us to configure the Twitter widget itself, so we add some more lines right where we were:
 
 .. code-block:: ini
 
   kotti_twitter.profile_widget.user = dnouri
   kotti_twitter.profile_widget.loop = true
 
-The order in which the includes are listed matters.  For example, when
-you add two slots on the right hand side, the order in which you list
-them in ``pyramid.includes`` will control the order in which they will
-appear.  As an example, here's a configuration with which the search
-widget will be displayed above the profile widget:
+The order in which the includes are listed matters.
+For example, when you add two slots on the right hand side, the order in which you list them in ``pyramid.includes`` will control the order in which they will appear.
+As an example, here's a configuration with which the search widget will be displayed above the profile widget:
 
 .. code-block:: ini
 
@@ -190,8 +171,7 @@ widget will be displayed above the profile widget:
       kotti_twitter.include_search_widget
       kotti_twitter.include_profile_widget
 
-Read more about `including packages using 'pyramid.includes'`_ in
-the Pyramid documentation.
+Read more about `including packages using 'pyramid.includes'`_ in the Pyramid documentation.
 
 .. _including packages using 'pyramid.includes': http://readthedocs.org/docs/pyramid/en/1.3-branch/narr/environment.html#including-packages
 
@@ -200,8 +180,8 @@ the Pyramid documentation.
 kotti.available_types
 `````````````````````
 
-The ``kotti.available_types`` setting defines the list of content
-types available.  The default configuration here is:
+The ``kotti.available_types`` setting defines the list of content types available.
+The default configuration here is:
 
 .. code-block:: ini
 
@@ -227,25 +207,23 @@ The default configuration here is:
 
   kotti.populators = kotti.populate.populate
 
-Populators are functions with no arguments that get called on system
-startup.  They may then make automatic changes to the database (before
-calling ``transaction.commit()``).
+Populators are functions with no arguments that get called on system startup.
+They may then make automatic changes to the database (before calling ``transaction.commit()``).
 
 .. _kotti.search_content:
 
 kotti.search_content
 ````````````````````
 
-Kotti provides a simple search over the content types based on
-kotti.resources.Content. The default configuration here is:
+Kotti provides a simple search over the content types based on kotti.resources.Content.
+The default configuration here is:
 
 .. code-block:: ini
 
   kotti.search_content = kotti.views.util.default_search_content
 
-You can provide an own search function in an add-on and register this
-in your INI file. The return value of the search function is a list of
-dictionaries, each representing a search result:
+You can provide an own search function in an add-on and register this in your INI file.
+The return value of the search function is a list of dictionaries, each representing a search result:
 
 .. code-block:: python
 
@@ -258,17 +236,15 @@ dictionaries, each representing a search result:
    ...
    ]
 
-An add-on that defines an alternative search function is
-`kotti_solr`_, which provides an integration with the `Solr`_ search
-engine.
+An add-on that defines an alternative search function is `kotti_solr`_, which provides an integration with the `Solr`_ search engine.
 
 .. _user interface language:
 
 Configure the user interface language
 -------------------------------------
 
-By default, Kotti will display its user interface in English.  The
-default configuration is:
+By default, Kotti will display its user interface in English.
+The default configuration is:
 
 .. code-block:: ini
 
@@ -286,51 +262,42 @@ The list of available languages is `here
 Configure authentication and authorization
 ------------------------------------------
 
-You can override the authentication and authorization policy that
-Kotti uses.  By default, Kotti uses these factories:
+You can override the authentication and authorization policy that Kotti uses.
+By default, Kotti uses these factories:
 
 .. code-block:: ini
 
   kotti.authn_policy_factory = kotti.authtkt_factory
   kotti.authz_policy_factory = kotti.acl_factory
 
-These settings correspond to
-`pyramid.authentication.AuthTktAuthenticationPolicy`_ and
-`pyramid.authorization.ACLAuthorizationPolicy`_ being used.
+These settings correspond to `pyramid.authentication.AuthTktAuthenticationPolicy`_ and `pyramid.authorization.ACLAuthorizationPolicy`_ being used.
 
 Sessions
 --------
 
-The ``kotti.session_factory`` configuration variable allows the
-overriding of the default session factory.  By default, Kotti uses
-``pyramid_beaker`` for sessions.
+The ``kotti.session_factory`` configuration variable allows the overriding of the default session factory.
+By default, Kotti uses ``pyramid_beaker`` for sessions.
 
 Caching
 -------
 
-You can override Kotti's default set of cache headers by changing the
-``kotti.views.cache.caching_policies`` dictionary, which maps policies
-to headers.  E.g. the ``Cache Resource`` entry there caches all static
-resources for 32 days.  You can also choose which responses match to
-which caching policy by overriding Kotti's default cache policy
-chooser through the use of the ``kotti.caching_policy_chooser``
-configuration variable.  The default is:
+You can override Kotti's default set of cache headers by changing the ``kotti.views.cache.caching_policies`` dictionary, which maps policies to headers.
+E.g. the ``Cache Resource`` entry there caches all static resources for 32 days.
+You can also choose which responses match to which caching policy by overriding Kotti's default cache policy chooser through the use of the ``kotti.caching_policy_chooser`` configuration variable.
+The default is:
 
 .. code-block:: ini
 
   kotti.caching_policy_chooser = kotti.views.cache.default_caching_policy_chooser
 
-Url normalization
+URL normalization
 -----------------
 
-Kotti normalizes document titles to URLs by replacing language specific
-characters like umlauts or accented characters with its ascii equivalents.
-You can change this default behavour by setting
-``kotti.url_normalizer.map_non_ascii_characters`` configuration variable
-to ``False``. If you do, Kotti will leave national characters in URLs.
+Kotti normalizes document titles to URLs by replacing language specific characters like umlauts or accented characters with its ascii equivalents.
+You can change this default behavour by setting ``kotti.url_normalizer.map_non_ascii_characters`` configuration variable to ``False``.
+If you do, Kotti will leave national characters in URLs.
 
-You may also replace default component used for url normalization by setting
-``kotti.url_normalizer`` configuation variable.
+You may also replace default component used for url normalization by setting ``kotti.url_normalizer`` configuation variable.
 
 The default configuration here is:
 
@@ -345,8 +312,7 @@ Local navigation
 ----------------
 
 Kotti provides a build in navigation widget, which is disabled by default.
-To enable the navigation widget add the following to the ``pyramid.includes``
-setting:
+To enable the navigation widget add the following to the ``pyramid.includes`` setting:
 
 .. code-block:: ini
 
diff --git a/docs/developing/basic/deployment.rst b/docs/developing/basic/deployment.rst
index d12da3431..46f0c6bcf 100644
--- a/docs/developing/basic/deployment.rst
+++ b/docs/developing/basic/deployment.rst
@@ -3,8 +3,8 @@
 Deployment
 ==========
 
-Kotti deployment is not different from deploying any other WSGI app.  You have
-a bunch of options on multiple layers: OS, RDBMS, Webserver, etc.
+Kotti deployment is not different from deploying any other WSGI app.
+You have a bunch of options on multiple layers: OS, RDBMS, Webserver, etc.
 
 This document assumes the following Stack:
 
@@ -113,20 +113,19 @@ Reload the supervisor config::
 
     supervisorctl reload
 
-That's all.  Your Kotti deployment should now happily serve pages.
+That's all.
+Your Kotti deployment should now happily serve pages.
 
 Fabfile
 -------
 
-**WARNING: this is only an example.  Do not run this unmodified against a host
-that is intended to do anything else or things WILL break!**
+**WARNING: this is only an example.
+Do not run this unmodified against a host that is intended to do anything else or things WILL break!**
 
 For your convenience there is a `fabric`_ file that automates all of the above.
-If you don't know what fabric is and how it works read their documentation
-first.
+If you don't know what fabric is and how it works read their documentation first.
 
-On your local machine make a separate virtualenv first and install the
-``fabric`` and ``fabtools`` packages into that virtualenv::
+On your local machine make a separate virtualenv first and install the ``fabric`` and ``fabtools`` packages into that virtualenv::
 
     mkvirtualenv kotti_deployment && cdvirtualenv
     pip install fabric fabtools
@@ -135,11 +134,12 @@ Get the fabfile::
 
     wget https://gist.github.com/gists/4079191/download
 
-Read and modify the file to fit your needs.  Then run it against your server::
+Read and modify the file to fit your needs.
+Then run it against your server::
 
     fab install_all
 
-You're done.  Everything is installed and configured to serve Kotti under
-http://kotti.yourdomain.com/
+You're done.
+Everything is installed and configured to serve Kotti under http://kotti.yourdomain.com/
 
 .. _fabric: http://docs.fabfile.org/
diff --git a/docs/first_steps/installation.rst b/docs/first_steps/installation.rst
index 0e58643fe..9a7816769 100644
--- a/docs/first_steps/installation.rst
+++ b/docs/first_steps/installation.rst
@@ -6,10 +6,11 @@ Installation
 Requirements
 ------------
 
-- Python 2.6 or 2.7
+- Python 2.6 or 2.7 (Python 3 support will land in future versions)
 - virtualenv_
-- ``build_essential`` and ``python-dev`` (on Debian or Ubuntu)
-- or ``Xcode`` (on OSX)
+- ``build_essential`` and ``python-dev`` (on Debian or Ubuntu) or
+- ``Xcode`` (on OS X) or
+- equivalent build toolchain for your OS.
 
 Installation using ``virtualenv``
 ---------------------------------
@@ -20,24 +21,21 @@ It is recommended to install Kotti inside a virtualenv:
 
   virtualenv mysite
   cd mysite
-  bin/pip install -r https://raw.github.com/Kotti/Kotti/master/requirements.txt
-  bin/pip install git+https://github.com/Kotti/Kotti.git
+  bin/pip install -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
+  bin/pip install [--pre] Kotti
 
-This will install the latest version of Kotti and all its requirements into your
-virtualenv.
+This will install the latest released version of Kotti and all its requirements into your virtualenv.
 
-Kotti uses `Paste Deploy`_ for configuration and deployment.  An
-example configuration file is included with Kotti's source
-distribution.  Download it to your virtualenv directory (mysite):
+Kotti uses `Paste Deploy`_ for configuration and deployment.
+An example configuration file is included with Kotti's source distribution.
+Download it to your virtualenv directory (mysite):
 
 .. parsed-literal::
 
-  wget https://raw.github.com/Kotti/Kotti/master/app.ini
+  wget https://raw.github.com/Kotti/Kotti/stable/app.ini
 
-See the list of `Kotti tags`_, perhaps to find the latest released
-version. You can search the `Kotti listing on PyPI`_ also, for the
-latest Kotti release (Kotti with a capital K is Kotti itself,
-kotti_this and kotti_that are add-ons in the list on PyPI).
+See the list of `Kotti tags`_, perhaps to find the latest released version.
+You can search the `Kotti listing on PyPI`_ also, for the latest Kotti release (Kotti with a capital K is Kotti itself, kotti_this and kotti_that are add-ons in the list on PyPI).
 
 .. _Kotti tags: https://github.com/Kotti/Kotti/tags
 .. _Kotti listing on PyPI: https://pypi.python.org/pypi?%3Aaction=search&term=kotti&submit=search
@@ -48,23 +46,19 @@ To run Kotti using the ``app.ini`` example configuration file:
 
   bin/pserve app.ini
 
-This command runs Waitress, Pyramid's WSGI server, which Kotti uses as a
-default server.  You will see console output giving the local URL to view the
-site in a browser.
+This command runs Waitress, Pyramid's WSGI server, which Kotti uses as a default server.
+You will see console output giving the local URL to view the site in a browser.
 
-As you learn more, install other servers, with WSGI enabled, as needed. For
-instance, for Apache, you may install the optional mod_wsgi module, or for
-Nginx, you may use choose to use uWSGI.  See the Pyramid documentation for a
-variety of server and server configuration options.
-
-The pserve command above uses SQLite as the default database. On first run,
-Kotti will create a SQLite database called Kotti.db in your mysite directory.
+As you learn more, install other servers, with WSGI enabled, as needed.
+For instance, for Apache, you may install the optional mod_wsgi module, or for Nginx, you may use choose to use uWSGI.
+See the Pyramid documentation for a variety of server and server configuration options.
 
+The pserve command above uses SQLite as the default database.
+On first run, Kotti will create a SQLite database called Kotti.db in your mysite directory.
 Kotti includes support for PostgreSQL, MySQL and SQLite (tested regularly), and
-`other SQL databases`_. The default use of SQLite makes initial development
-easy.  Although SQLite may prove to be adequate for some deployments, Kotti is
-flexible for installation of your choice of database during development or at
-deployment.
+`other SQL databases`_.
+The default use of SQLite makes initial development easy.
+Although SQLite may prove to be adequate for some deployments, Kotti is flexible for installation of your choice of database during development or at deployment.
 
 .. _other SQL databases: http://www.sqlalchemy.org/docs/core/engines.html#supported-databases
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index 17ecee00f..011b984f6 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -9,10 +9,7 @@ Kotti is most useful when you are developing CMS-like applications that
 - use workflows, and/or
 - work with hierarchical data.
 
-Built on top of a number of *best-of-breed* software components, most
-notably Pyramid_ and SQLAlchemy_, Kotti introduces only a few concepts
-of its own, thus hopefully keeping the learning curve flat for the
-developer.
+Built on top of a number of *best-of-breed* software components, most notably Pyramid_ and SQLAlchemy_, Kotti introduces only a few concepts of its own, thus hopefully keeping the learning curve flat for the developer.
 
 .. _Pyramid: http://docs.pylonsproject.org/projects/pyramid/dev/
 .. _SQLAlchemy: http://www.sqlalchemy.org/
@@ -22,8 +19,8 @@ Features
 
 You can **try out the default installation** on `Kotti's demo page`_.
 
-The Kotti CMS is a content management system that's heavily inspired
-by Plone_.  Its **main features** are:
+The Kotti CMS is a content management system that's heavily inspired by Plone_.
+Its **main features** are:
 
 - **User-friendliness**: editors can edit content where it appears;
   thus the edit interface is contextual and intuitive
@@ -53,46 +50,40 @@ by Plone_.  Its **main features** are:
 For developers
 --------------
 
-For developers, Kotti delivers a strong foundation for building
-different types of web applications that either extend or replace the
-built-in CMS.
+For developers, Kotti delivers a strong foundation for building different types of web applications that either extend or replace the built-in CMS.
 
 Developers can add and modify through a well-defined API:
 
 - views,
 - templates and layout (both via Pyramid_),
 - :ref:`content-types`,
-- portlets (see :mod:`kotti.views.slots`),
+- "portlets" (see :mod:`kotti.views.slots`),
 - access control and the user database (see :ref:`develop-security`),
 - workflows (via `repoze.workflow`_),
 - and much more.
 
-Kotti has a **down-to-earth** API.  Developers working with Kotti will
-most of the time make direct use of the Pyramid_ and SQLAlchemy_
-libraries.  Other notable components used but not enforced by Kotti
-are Colander_ and Deform_ for forms, and Chameleon_ for templating.
+Kotti has a **down-to-earth** API.
+Developers working with Kotti will most of the time make direct use of the Pyramid_ and SQLAlchemy_ libraries.
+Other notable components used but not enforced by Kotti are Colander_ and Deform_ for forms, and Chameleon_ for templating.
 
-Kotti itself is `developed on Github`_.  You can check out Kotti's
-source code via its GitHub repository.  Use this command:
+Kotti itself is `developed on Github`_.
+You can check out Kotti's source code via its GitHub repository.
+Use this command:
 
 .. code-block:: bash
 
   git clone git@github.com:Kotti/Kotti
 
-`Continuous testing`_ against different versions of Python and with
-*PostgreSQL*, *MySQL* and *SQLite* and a complete test coverage make
-Kotti a **stable** platform to work with.  |build status|_
+`Continuous testing`_ against different versions of Python and with *PostgreSQL*, *MySQL* and *SQLite* and a complete test coverage make Kotti a **stable** platform to work with.  |build status|_
 
 Support
 -------
 
-- Python 2.6 or 2.7
-- Support for PostgreSQL, MySQL and SQLite (tested regularly), and a
-  list of `other SQL databases`_
+- Python 2.6 or 2.7 (Python 3 coming soon)
+- Support for PostgreSQL, MySQL and SQLite (tested regularly), and a list of `other SQL databases`_
 - Support for WSGI and a `variety of web servers`_, including Apache
 
 
-
 .. _repoze.workflow: http://docs.repoze.org/workflow/
 .. _Chameleon: http://chameleon.repoze.org/
 .. _Colander: http://docs.pylonsproject.org/projects/colander/en/latest/
diff --git a/docs/index.rst b/docs/index.rst
index a3bb51af5..23530f631 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,12 +4,12 @@
 Kotti Documentation
 ===================
 
-Kotti is a user-friendly, nimble and extensible web content management system,
-based on Pyramid and SQLAlchemy.
+Kotti is a high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.
+It includes an extensible Content Management System called the Kotti CMS.
 
 If you are a user of a Kotti system, and either found this page through browsing or searching, or were referred here, you will likely want to go directly to the `Kotti User Manual`_.
 
-The documentation below is for developers of Kotti.
+The documentation below is for developers of Kotti or applications built on top of it.
 
 First Steps
 -----------
diff --git a/setup.py b/setup.py
index afa8a9eea..e230331c3 100644
--- a/setup.py
+++ b/setup.py
@@ -86,8 +86,8 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='0.10b2dev',
-      description="A user-friendly, light-weight and extensible web content management system. Based on Pyramid and SQLAlchemy.",
+      version='1.0.0-alpha',
+      description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[
         "Programming Language :: Python",

From a0da629bec27ab21a740491cbf838465017ecef2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 04:19:49 +0100
Subject: [PATCH 012/600] Update deprecation warnings to refer to 1.0.0 instead
 of 0.10.

---
 kotti/resources.py                           | 2 +-
 kotti/scaffolds/package/+dot+travis.yml_tmpl | 4 ++--
 kotti/util.py                                | 4 ++--
 kotti/views/util.py                          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 4a2db5cc6..7f789e271 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -318,7 +318,7 @@ class TypeInfo(object):
 
     def __init__(self, **kwargs):
         if 'action_links' in kwargs:
-            msg = ("'action_links' is deprecated as of Kotti 0.10.  "
+            msg = ("'action_links' is deprecated as of Kotti 1.0.0.  "
                    "'edit_links' includes 'action_links' and should "
                    "be used instead.")
 
diff --git a/kotti/scaffolds/package/+dot+travis.yml_tmpl b/kotti/scaffolds/package/+dot+travis.yml_tmpl
index 6710de218..d8c49f2d6 100644
--- a/kotti/scaffolds/package/+dot+travis.yml_tmpl
+++ b/kotti/scaffolds/package/+dot+travis.yml_tmpl
@@ -9,8 +9,8 @@ env:
 install:
   - pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
   - pip install psycopg2 oursql
-  - pip install -e . -r https://raw.github.com/Kotti/Kotti/0.10b1/requirements.txt
-  - pip install "Kotti==0.10b1"
+  - pip install -e . -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
+  - pip install --pre Kotti
   - pip install "wsgi_intercept==0.5.1"
   - python setup.py devbefore_script:
   - psql -c 'create database {{package}}_testing;' -U postgres
diff --git a/kotti/util.py b/kotti/util.py
index e4084c614..93b775f3f 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -132,7 +132,7 @@ def path(self):  # BBB
         return self.name
     path = deprecated(
         path,
-        "The 'path' attribute has been deprecated as of Kotti 0.10.  Please "
+        "The 'path' attribute has been deprecated as of Kotti 1.0.0.  Please "
         "use 'name' instead.",
         )
 
@@ -334,5 +334,5 @@ def command(func, doc):
 ViewLink = Link
 deprecated(
     'ViewLink',
-    "kotti.util.ViewLink has been renamed to Link as of Kotti 0.10."
+    "kotti.util.ViewLink has been renamed to Link as of Kotti 1.0.0."
     )
diff --git a/kotti/views/util.py b/kotti/views/util.py
index b3dc5777b..f7f454cba 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -78,7 +78,7 @@ def add_renderer_globals(event):
         event['api'] = api
 
 
-@deprecate("'is_root' is deprecated as of Kotti 0.10. "
+@deprecate("'is_root' is deprecated as of Kotti 1.0.0. "
            "Use the 'root_only=True' if you were using this as a "
            "'custom_predicates' predicate.")
 def is_root(context, request):
@@ -484,4 +484,4 @@ def search_content_for_tags(tags, request=None):
     deprecated(
         name,
         "kotti.views.util.{0} has been moved to the kotti.util module "
-        "as of Kotti 0.10.  Use kotti.util.{0} instead".format(name))
+        "as of Kotti 1.0.0.  Use kotti.util.{0} instead".format(name))

From 7f7a314ae70c714cc5ad103e563d56aef2effecf Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 04:20:56 +0100
Subject: [PATCH 013/600] Bump version in changelog.  [ci skip]

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a700bbea0..505310302 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-0.10 - Unreleased
------------------
+1.0.0-alpha - 2014-12-20
+------------------------
 
 - Add a new scaffold based on Pyramid's ``pcreate``.  To run the tests for the
   scaffold, you must invoke ``py.test`` with the ``--runslow`` option.  This
diff --git a/setup.py b/setup.py
index e230331c3..1b1454779 100644
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,7 @@
       ],
       author='Kotti developers',
       author_email='kotti@googlegroups.com',
-      url='http://kotti.pylonsproject.org',
+      url='http://kotti.pylonsproject.org/',
       keywords='kotti web cms wcms pylons pyramid sqlalchemy bootstrap',
       license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
       packages=find_packages(),

From cc5347dee90269266cdb13f0039acd4f3b885b6c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 04:57:50 +0100
Subject: [PATCH 014/600] Display the build status for the stable branch in the
 README / on PyPI.  [ci skip]

---
 README.rst | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index fa22f2326..d0e480e3e 100644
--- a/README.rst
+++ b/README.rst
@@ -12,12 +12,9 @@ Kotti is most useful when you are developing applications that
 - use workflows, and/or
 - work with hierarchical data.
 
-Built on top of a number of *best-of-breed* software components, most
-notably Pyramid_ and SQLAlchemy_, Kotti introduces only a few concepts
-of its own, thus hopefully keeping the learning curve flat for the
-developer.
+Built on top of a number of *best-of-breed* software components, most notably Pyramid_ and SQLAlchemy_, Kotti introduces only a few concepts of its own, thus hopefully keeping the learning curve flat for the developer.
 
-.. |build status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=master
+.. |build status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=stable
 .. _build status: http://travis-ci.org/Kotti/Kotti
 .. _Pyramid: http://docs.pylonsproject.org/projects/pyramid/dev/
 .. _SQLAlchemy: http://www.sqlalchemy.org/
@@ -27,8 +24,7 @@ Kotti CMS
 
 You can **try out the Kotti CMS** on `Kotti's demo page`_.
 
-Kotti CMS is a content management system that's heavily inspired by
-Plone_.
+Kotti CMS is a content management system that's heavily inspired by Plone_.
 Its **main features** are:
 
 - **User-friendliness**: editors can edit content where it appears;
@@ -59,11 +55,9 @@ Its **main features** are:
 Support and Documentation
 =========================
 
-`Click here to access Kotti's full documentation
-<http://kotti.readthedocs.org/>`_
+`Click here to access Kotti's full documentation <http://kotti.readthedocs.org/>`_
 
 License
 =======
 
-Kotti is offered under the BSD-derived `Repoze Public License
-<http://repoze.org/license.html>`_.
+Kotti is offered under the BSD-derived `Repoze Public License <http://repoze.org/license.html>`_.

From a079cfe2abd8e19043e5fe90947b1f8719653c93 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 05:40:35 +0100
Subject: [PATCH 015/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 505310302..5cc722709 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1-dev - unreleased
+--------------------
+
+- No changes yet.
+
 1.0.0-alpha - 2014-12-20
 ------------------------
 
diff --git a/setup.py b/setup.py
index 1b1454779..edff161d4 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.0.0-alpha',
+      version='1.1-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From df7277f8f552fc90ec354e0833e6e6a8078e7590 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 06:01:27 +0100
Subject: [PATCH 016/600] Order API docs by source.  [ci skip]

---
 docs/api/kotti.events.rst                                       | 2 +-
 docs/api/kotti.fanstatic.rst                                    | 2 +-
 docs/api/kotti.message.rst                                      | 1 +
 docs/api/kotti.migrate.rst                                      | 1 +
 docs/api/kotti.populate.rst                                     | 1 +
 docs/api/kotti.request.rst                                      | 1 +
 docs/api/kotti.resources.rst                                    | 1 +
 docs/api/kotti.security.rst                                     | 1 +
 docs/api/kotti.sqla.rst                                         | 1 +
 docs/api/kotti.testing.rst                                      | 1 +
 docs/api/kotti.tests.rst                                        | 1 +
 docs/api/kotti.util.rst                                         | 1 +
 docs/api/kotti.views/index.rst                                  | 1 +
 docs/api/kotti.views/kotti.views.cache.rst                      | 1 +
 docs/api/kotti.views/kotti.views.edit/index.rst                 | 2 +-
 .../kotti.views/kotti.views.edit/kotti.views.edit.actions.rst   | 1 +
 .../kotti.views/kotti.views.edit/kotti.views.edit.content.rst   | 1 +
 .../kotti.views.edit/kotti.views.edit.default_views.rst         | 1 +
 docs/api/kotti.views/kotti.views.file.rst                       | 1 +
 docs/api/kotti.views/kotti.views.form.rst                       | 1 +
 docs/api/kotti.views/kotti.views.image.rst                      | 1 +
 docs/api/kotti.views/kotti.views.login.rst                      | 1 +
 docs/api/kotti.views/kotti.views.site_setup.rst                 | 2 +-
 docs/api/kotti.views/kotti.views.slots.rst                      | 1 +
 docs/api/kotti.views/kotti.views.users.rst                      | 1 +
 docs/api/kotti.views/kotti.views.util.rst                       | 1 +
 docs/api/kotti.views/kotti.views.view.rst                       | 1 +
 docs/api/kotti.workflow.rst                                     | 1 +
 28 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/docs/api/kotti.events.rst b/docs/api/kotti.events.rst
index 2e4e60548..2cf951c82 100644
--- a/docs/api/kotti.events.rst
+++ b/docs/api/kotti.events.rst
@@ -5,4 +5,4 @@ kotti.events
 
 .. automodule:: kotti.events
    :members:
-
+   :member-order: bysource
diff --git a/docs/api/kotti.fanstatic.rst b/docs/api/kotti.fanstatic.rst
index 46eb8d3eb..ab42158df 100644
--- a/docs/api/kotti.fanstatic.rst
+++ b/docs/api/kotti.fanstatic.rst
@@ -5,4 +5,4 @@ kotti.fanstatic
 
 .. automodule:: kotti.fanstatic
    :members:
-
+   :member-order: bysource
diff --git a/docs/api/kotti.message.rst b/docs/api/kotti.message.rst
index 720cecae3..b0418a836 100644
--- a/docs/api/kotti.message.rst
+++ b/docs/api/kotti.message.rst
@@ -5,3 +5,4 @@ kotti.message
 
 .. automodule:: kotti.message
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.migrate.rst b/docs/api/kotti.migrate.rst
index 0a6564aff..13f9ee09b 100644
--- a/docs/api/kotti.migrate.rst
+++ b/docs/api/kotti.migrate.rst
@@ -5,3 +5,4 @@ kotti.migrate
 
 .. automodule:: kotti.migrate
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.populate.rst b/docs/api/kotti.populate.rst
index 0ed723290..37bf25ba6 100644
--- a/docs/api/kotti.populate.rst
+++ b/docs/api/kotti.populate.rst
@@ -5,3 +5,4 @@ kotti.populate
 
 .. automodule:: kotti.populate
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.request.rst b/docs/api/kotti.request.rst
index 446b31c4e..31ae253d5 100644
--- a/docs/api/kotti.request.rst
+++ b/docs/api/kotti.request.rst
@@ -5,3 +5,4 @@ kotti.request
 
 .. automodule:: kotti.request
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.resources.rst b/docs/api/kotti.resources.rst
index eb2165d96..1433abc0e 100644
--- a/docs/api/kotti.resources.rst
+++ b/docs/api/kotti.resources.rst
@@ -5,3 +5,4 @@ kotti.resources
 
 .. automodule:: kotti.resources
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.security.rst b/docs/api/kotti.security.rst
index 918f85333..bdbddfa6d 100644
--- a/docs/api/kotti.security.rst
+++ b/docs/api/kotti.security.rst
@@ -5,3 +5,4 @@ kotti.security
 
 .. automodule:: kotti.security
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.sqla.rst b/docs/api/kotti.sqla.rst
index 888d9ca09..2bfecb6bf 100644
--- a/docs/api/kotti.sqla.rst
+++ b/docs/api/kotti.sqla.rst
@@ -5,3 +5,4 @@ kotti.sqla
 
 .. automodule:: kotti.sqla
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.testing.rst b/docs/api/kotti.testing.rst
index 4175782ac..0615fd848 100644
--- a/docs/api/kotti.testing.rst
+++ b/docs/api/kotti.testing.rst
@@ -5,3 +5,4 @@ kotti.testing
 
 .. automodule:: kotti.testing
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.tests.rst b/docs/api/kotti.tests.rst
index de7d840ff..c69340676 100644
--- a/docs/api/kotti.tests.rst
+++ b/docs/api/kotti.tests.rst
@@ -5,3 +5,4 @@ kotti.tests
 
 .. automodule:: kotti.tests
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.util.rst b/docs/api/kotti.util.rst
index 4bd5b5195..42f2d4681 100644
--- a/docs/api/kotti.util.rst
+++ b/docs/api/kotti.util.rst
@@ -5,3 +5,4 @@ kotti.util
 
 .. automodule:: kotti.util
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/index.rst b/docs/api/kotti.views/index.rst
index 080d8a043..a5f29aa6f 100644
--- a/docs/api/kotti.views/index.rst
+++ b/docs/api/kotti.views/index.rst
@@ -5,6 +5,7 @@ kotti.views
 
 .. automodule:: kotti.views
    :members:
+   :member-order: bysource
 
 .. toctree::
    :maxdepth: 3
diff --git a/docs/api/kotti.views/kotti.views.cache.rst b/docs/api/kotti.views/kotti.views.cache.rst
index d1ab13156..d6f312d8d 100644
--- a/docs/api/kotti.views/kotti.views.cache.rst
+++ b/docs/api/kotti.views/kotti.views.cache.rst
@@ -5,3 +5,4 @@ kotti.views.cache
 
 .. automodule:: kotti.views.cache
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.edit/index.rst b/docs/api/kotti.views/kotti.views.edit/index.rst
index 94f7c5587..57614d5ab 100644
--- a/docs/api/kotti.views/kotti.views.edit/index.rst
+++ b/docs/api/kotti.views/kotti.views.edit/index.rst
@@ -5,7 +5,7 @@ kotti.views.edit
 
 .. automodule:: kotti.views.edit
    :members:
-
+   :member-order: bysource
 
 .. toctree::
    :maxdepth: 3
diff --git a/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.actions.rst b/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.actions.rst
index 1e5d1c7bc..a2fa0975c 100644
--- a/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.actions.rst
+++ b/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.actions.rst
@@ -5,3 +5,4 @@ kotti.views.edit.actions
 
 .. automodule:: kotti.views.edit.actions
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.content.rst b/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.content.rst
index c29b9c973..539569616 100644
--- a/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.content.rst
+++ b/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.content.rst
@@ -5,3 +5,4 @@ kotti.views.edit.content
 
 .. automodule:: kotti.views.edit.content
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.default_views.rst b/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.default_views.rst
index 06f6afa52..e83536873 100644
--- a/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.default_views.rst
+++ b/docs/api/kotti.views/kotti.views.edit/kotti.views.edit.default_views.rst
@@ -5,3 +5,4 @@ kotti.views.edit.default_views
 
 .. automodule:: kotti.views.edit.default_views
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.file.rst b/docs/api/kotti.views/kotti.views.file.rst
index d7df2c087..b92882aeb 100644
--- a/docs/api/kotti.views/kotti.views.file.rst
+++ b/docs/api/kotti.views/kotti.views.file.rst
@@ -5,3 +5,4 @@ kotti.views.file
 
 .. automodule:: kotti.views.file
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.form.rst b/docs/api/kotti.views/kotti.views.form.rst
index d2d5fccd4..a47301825 100644
--- a/docs/api/kotti.views/kotti.views.form.rst
+++ b/docs/api/kotti.views/kotti.views.form.rst
@@ -5,3 +5,4 @@ kotti.views.form
 
 .. automodule:: kotti.views.form
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.image.rst b/docs/api/kotti.views/kotti.views.image.rst
index 1869764af..290e22877 100644
--- a/docs/api/kotti.views/kotti.views.image.rst
+++ b/docs/api/kotti.views/kotti.views.image.rst
@@ -5,3 +5,4 @@ kotti.views.image
 
 .. automodule:: kotti.views.image
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.login.rst b/docs/api/kotti.views/kotti.views.login.rst
index e797bda69..ee74f058a 100644
--- a/docs/api/kotti.views/kotti.views.login.rst
+++ b/docs/api/kotti.views/kotti.views.login.rst
@@ -5,3 +5,4 @@ kotti.views.login
 
 .. automodule:: kotti.views.login
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.site_setup.rst b/docs/api/kotti.views/kotti.views.site_setup.rst
index 08b7af745..d3443d38b 100644
--- a/docs/api/kotti.views/kotti.views.site_setup.rst
+++ b/docs/api/kotti.views/kotti.views.site_setup.rst
@@ -5,4 +5,4 @@ kotti.views.site_setup
 
 .. automodule:: kotti.views.site_setup
    :members:
-
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.slots.rst b/docs/api/kotti.views/kotti.views.slots.rst
index 71e9ede0b..6e7ba93e6 100644
--- a/docs/api/kotti.views/kotti.views.slots.rst
+++ b/docs/api/kotti.views/kotti.views.slots.rst
@@ -5,3 +5,4 @@ kotti.views.slots
 
 .. automodule:: kotti.views.slots
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.users.rst b/docs/api/kotti.views/kotti.views.users.rst
index 2a2d74544..9b5abf552 100644
--- a/docs/api/kotti.views/kotti.views.users.rst
+++ b/docs/api/kotti.views/kotti.views.users.rst
@@ -5,3 +5,4 @@ kotti.views.users
 
 .. automodule:: kotti.views.users
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.util.rst b/docs/api/kotti.views/kotti.views.util.rst
index 9553fd507..c96188800 100644
--- a/docs/api/kotti.views/kotti.views.util.rst
+++ b/docs/api/kotti.views/kotti.views.util.rst
@@ -5,3 +5,4 @@ kotti.views.util
 
 .. automodule:: kotti.views.util
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.views/kotti.views.view.rst b/docs/api/kotti.views/kotti.views.view.rst
index 9f442e245..8f89a066b 100644
--- a/docs/api/kotti.views/kotti.views.view.rst
+++ b/docs/api/kotti.views/kotti.views.view.rst
@@ -5,3 +5,4 @@ kotti.views.view
 
 .. automodule:: kotti.views.view
    :members:
+   :member-order: bysource
diff --git a/docs/api/kotti.workflow.rst b/docs/api/kotti.workflow.rst
index fc4008df8..242b79c61 100644
--- a/docs/api/kotti.workflow.rst
+++ b/docs/api/kotti.workflow.rst
@@ -5,3 +5,4 @@ kotti.workflow
 
 .. automodule:: kotti.workflow
    :members:
+   :member-order: bysource

From 7c51daf6c9bef7cf04be0f3e41180a1e4c057c21 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 06:01:54 +0100
Subject: [PATCH 017/600] Add docstrings.  [ci skip]

---
 kotti/resources.py      | 16 ++++++++++------
 kotti/tests/__init__.py |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 7f789e271..5d9cf22ab 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -67,7 +67,7 @@
 
 
 class ContainerMixin(object, DictMixin):
-    """Containers form the API of a Node that's used for subitem
+    """ Containers form the API of a Node that's used for subitem
     access and in traversal.
     """
 
@@ -82,7 +82,7 @@ def __delitem__(self, key):
 
     def keys(self):
         """
-        :result: A list of children names.
+        :result: children names
         :rtype: list
         """
 
@@ -131,20 +131,24 @@ def __getitem__(self, path):
 
     @hybrid_property
     def children(self):
-        """Return *all* child nodes without considering permissions."""
+        """
+        :result: *all* child nodes without considering permissions.
+        :rtype: list
+        """
 
         return self._children
 
     def children_with_permission(self, request, permission='view'):
-        """
-        Return only those children for which the user initiating
-        the request has the asked permission.
+        """ Return only those children for which the user initiating the
+        request has the asked permission.
 
         :param request: current request
         :type request: :class:`kotti.request.Request`
+
         :param permission: The permission for which you want the allowed
                            children
         :type permission: str
+
         :result: List of child nodes
         :rtype: list
         """
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 2bf8ff658..c9366a26a 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
+
+Fixture dependencies
+--------------------
+
 .. graphviz::
 
    digraph kotti_fixtures {

From babeb68f7ff4597b9b4e89a09d88c9b7834834d5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 20 Dec 2014 06:10:37 +0100
Subject: [PATCH 018/600] Add docstrings to ``resources.LocalGroup``.  [ci
 skip]

---
 kotti/resources.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/kotti/resources.py b/kotti/resources.py
index 5d9cf22ab..6572830cf 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -160,15 +160,27 @@ def children_with_permission(self, request, permission='view'):
 
 
 class LocalGroup(Base):
+    """ Local groups allow the assignment of groups or roles to pricipals
+    (users or groups) **for a certain context** (i.e. a :class:`Node` in the
+    content tree).
+    """
 
     __tablename__ = 'local_groups'
     __table_args__ = (
         UniqueConstraint('node_id', 'principal_name', 'group_name'),
         )
 
+    #: Primary key for the node in the DB
+    #: (:class:`sqlalchemy.types.Integer`)
     id = Column(Integer(), primary_key=True)
+    #: ID of the node for this assignment
+    #: (:class:`sqlalchemy.types.Integer`)
     node_id = Column(ForeignKey('nodes.id'))
+    #: Name of the principal (user or group)
+    #: (:class:`sqlalchemy.types.Unicode`)
     principal_name = Column(Unicode(100))
+    #: Name of the assigned group or role
+    #: (:class:`sqlalchemy.types.Unicode`)
     group_name = Column(Unicode(100))
 
     def __init__(self, node, principal_name, group_name):

From 174829a31845142e866ffd3b9db093f9d764baf8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 23 Dec 2014 20:35:55 +0100
Subject: [PATCH 019/600] Update tut-1.rst

---
 docs/first_steps/tut-1.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/first_steps/tut-1.rst b/docs/first_steps/tut-1.rst
index 0471fd0cd..203b6c802 100644
--- a/docs/first_steps/tut-1.rst
+++ b/docs/first_steps/tut-1.rst
@@ -33,7 +33,7 @@ To create our add-on, we use the standard Pyramid tool ``pcreate``, with
 
 .. code-block:: bash
 
-  bin/pcreate -s kotti_addon kotti_mysite
+  bin/pcreate -s kotti kotti_mysite
 
 The script will ask a number of questions.
 It is safe to accept the defaults.

From 7f71560176bda2eb48cff1fcb42a87aa080e031c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 31 Dec 2014 23:02:18 +0100
Subject: [PATCH 020/600] Require ``kotti_tinymce==0.5.1``.  This fixes #365.

---
 CHANGES.txt      | 5 +++++
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 505310302..cba6bd650 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.0.0-alpha.2 - 2014-12-31
+--------------------------
+
+- Require ``kotti_tinymce==0.5.1``.  This fixes #365.
+
 1.0.0-alpha - 2014-12-20
 ------------------------
 
diff --git a/requirements.txt b/requirements.txt
index 9cef309d3..a00e0b1ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ js.jquery_timepicker_addon==1.3-1
 js.jqueryui==1.10.3
 js.jqueryui_tagit==2.0.24-2
 js.modernizr==2.5.3.1
-kotti_tinymce==0.5.0
+kotti_tinymce==0.5.1
 lingua==3.6.1
 peppercorn==0.5
 plone.scale==1.3.4
diff --git a/setup.py b/setup.py
index 1b1454779..1f0d3c980 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.0.0-alpha',
+      version='1.0.0-alpha.2',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 8092fb3ce1344cb84347ddcecd5271322e4cc135 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 1 Jan 2015 07:25:16 +0100
Subject: [PATCH 021/600] Change release date.  [ci skip]

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cba6bd650..c2a9cfb0b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.0.0-alpha.2 - 2014-12-31
+1.0.0-alpha.2 - 2015-01-01
 --------------------------
 
 - Require ``kotti_tinymce==0.5.1``.  This fixes #365.

From a0f2f04c202ec1563ca4c0470c95e5e9d56e7328 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 5 Jan 2015 14:26:20 +0100
Subject: [PATCH 022/600] Remove kotti.includes default

Handling of that option has been removed before, so usage should throw an exception.
---
 kotti/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index 44d010988..2a47b0ac9 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -57,7 +57,6 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.templates.api': 'kotti.views.util.TemplateAPI',
     'kotti.configurators': '',
     'pyramid.includes': '',
-    'kotti.includes': '',  # BBB
     'kotti.base_includes': ' '.join([
         'kotti',
         'kotti.events',

From c353fbe1b4d710dfb1460e5a04e933ec92662658 Mon Sep 17 00:00:00 2001
From: "I can not only fetch JSON, but parse it too."
 <Dog@users.noreply.github.com>
Date: Mon, 5 Jan 2015 14:04:24 -0800
Subject: [PATCH 023/600] Fixed view names

setup_users and setup_user are actually named setup-users and setup-user in the code.
---
 docs/developing/basic/developer-manual.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/basic/developer-manual.rst b/docs/developing/basic/developer-manual.rst
index f7d5d44e5..7816e8c31 100644
--- a/docs/developing/basic/developer-manual.rst
+++ b/docs/developing/basic/developer-manual.rst
@@ -187,7 +187,7 @@ These views are :class:`kotti.views.users.UsersManage`,
 :class:`kotti.views.users.UserManage` and
 :class:`kotti.views.users.Preferences`. Notice that you should
 override them using the standard way, that is, by overriding
-``setup_users``, ``setup_user`` or ``prefs`` views. Then you can
+``setup-users``, ``setup-user`` or ``prefs`` views. Then you can
 override any sub-view used inside them as well as include any logic
 for your usecase when it is called, if needed.
 

From b06231d7195733217d5a2213c62a83c8d30d9c6f Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 12 Jan 2015 02:12:40 -0800
Subject: [PATCH 024/600] added test for Request

---
 kotti/tests/test_request.py | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 kotti/tests/test_request.py

diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
new file mode 100644
index 000000000..a752474f5
--- /dev/null
+++ b/kotti/tests/test_request.py
@@ -0,0 +1,56 @@
+from pyramid.config import Configurator
+from pyramid.threadlocal import manager, get_current_registry
+from pyramid.view import render_view_to_response
+from pyramid.response import Response
+
+from kotti.request import Request
+from kotti.resources import Document
+
+
+class TestRequest:
+
+    def _make_request(self, name):
+        environ = {
+            'PATH_INFO': '/',
+            'SERVER_NAME': 'example.com',
+            'SERVER_PORT': '5432',
+            'QUERY_STRING': '',
+            'wsgi.url_scheme': 'http',
+            }
+
+        request = Request(environ)
+        request.view_name = name
+        registry = get_current_registry()
+        request.registry = registry
+        manager.clear()
+        manager.push({'request':request, 'registry':registry})
+
+        return request
+
+    def test_can_reify(self, root, setup_app):
+
+        registry = setup_app.registry
+        config = Configurator(registry,
+                              request_factory='kotti.request.Request')
+        manager.push({'registry':config.registry})
+
+        config.add_view(lambda context, request:Response('first'),
+                        name='view',
+                        context=Document)
+        config.commit()
+
+        response = render_view_to_response(
+            Document(), self._make_request('view1'), name='', secure=False)
+        assert response.body == 'first'
+
+        def view2(context, request):
+            assert request.req_method == 'has it'
+            return Response("second")
+
+        config.add_request_method(lambda req:'has it', 'req_method', reify=True)
+        config.add_view(view2, name='view', context=Document)
+        config.commit()
+
+        response = render_view_to_response(
+            Document(), self._make_request('view2'), name='', secure=False)
+        assert response.body == 'second'

From 1c60dc35076619db6963fb2d74a07fd2f59b0b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u?= <bizauionica@yahoo.com>
Date: Mon, 12 Jan 2015 16:33:12 +0200
Subject: [PATCH 025/600] Updated the year.

---
 COPYRIGHT.txt                  | 2 +-
 kotti/templates/view/footer.pt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index e834e369f..8dacaefd1 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
-Copyright (c) 2010-2014 Daniel Nouri and Contributors.
+Copyright (c) 2010-2015 Daniel Nouri and Contributors.
 All Rights Reserved
diff --git a/kotti/templates/view/footer.pt b/kotti/templates/view/footer.pt
index a3c6d7d51..c39d4c393 100644
--- a/kotti/templates/view/footer.pt
+++ b/kotti/templates/view/footer.pt
@@ -1,4 +1,4 @@
 <hr />
 <footer>
-  <p class="pull-right">&copy; Aliens 2014</p>
+  <p class="pull-right">&copy; Aliens 2015</p>
 </footer>

From 03e0e2b7f3f19b84a25edc9c8a5d48525709e9cd Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Mon, 12 Jan 2015 17:31:45 +0200
Subject: [PATCH 026/600] A request cannot be subclassed and then properties
 added; Added a test and a workaround for this

---
 kotti/request.py            |  8 ++++
 kotti/tests/test_request.py | 87 +++++++++++++------------------------
 2 files changed, 39 insertions(+), 56 deletions(-)

diff --git a/kotti/request.py b/kotti/request.py
index d1e274287..aa61a544c 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -47,3 +47,11 @@ def has_permission(self, permission, context=None):
 
         with authz_context(context, self):
             return BaseRequest.has_permission(self, permission, context)
+
+
+# workaround for https://github.com/Pylons/pyramid/issues/1529
+# this allows addon packages to call config.add_request_method and not lose
+# the interfaces provided by the request (for example to call a subview,
+# like kotti.view.view_content_default)
+from zope.interface import providedBy
+providedBy(Request({}))
diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index a752474f5..73ab79220 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -1,56 +1,31 @@
-from pyramid.config import Configurator
-from pyramid.threadlocal import manager, get_current_registry
-from pyramid.view import render_view_to_response
-from pyramid.response import Response
-
-from kotti.request import Request
-from kotti.resources import Document
-
-
-class TestRequest:
-
-    def _make_request(self, name):
-        environ = {
-            'PATH_INFO': '/',
-            'SERVER_NAME': 'example.com',
-            'SERVER_PORT': '5432',
-            'QUERY_STRING': '',
-            'wsgi.url_scheme': 'http',
-            }
-
-        request = Request(environ)
-        request.view_name = name
-        registry = get_current_registry()
-        request.registry = registry
-        manager.clear()
-        manager.push({'request':request, 'registry':registry})
-
-        return request
-
-    def test_can_reify(self, root, setup_app):
-
-        registry = setup_app.registry
-        config = Configurator(registry,
-                              request_factory='kotti.request.Request')
-        manager.push({'registry':config.registry})
-
-        config.add_view(lambda context, request:Response('first'),
-                        name='view',
-                        context=Document)
-        config.commit()
-
-        response = render_view_to_response(
-            Document(), self._make_request('view1'), name='', secure=False)
-        assert response.body == 'first'
-
-        def view2(context, request):
-            assert request.req_method == 'has it'
-            return Response("second")
-
-        config.add_request_method(lambda req:'has it', 'req_method', reify=True)
-        config.add_view(view2, name='view', context=Document)
-        config.commit()
-
-        response = render_view_to_response(
-            Document(), self._make_request('view2'), name='', secure=False)
-        assert response.body == 'second'
+class TestPyramidRequestProperties:
+
+    def test_it(self):
+        from pyramid.request import Request
+        from zope.interface import providedBy, implementedBy
+
+        req = Request({})
+        assert providedBy(req) == implementedBy(Request)
+
+        req._set_properties({'b':'b'})
+
+        assert providedBy(req) == implementedBy(Request)
+
+    def test_subclassing(self):
+        from pyramid.request import Request
+        from zope.interface import providedBy, implementedBy
+
+        class Subclass(Request):
+            pass
+
+        req = Subclass({})
+
+        req._set_properties({'b':'b'})
+        assert providedBy(req) != implementedBy(Subclass)
+
+        #calling providedBy(req) before _set_properties makes the test pass
+        req = Subclass({})
+        req._set_properties({'b':'b'})
+        providedBy(req)
+        assert providedBy(req) == implementedBy(Subclass)
+

From 3b9a6e15f7e1a0c599fddf7470b9b31c26c0912d Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 13 Jan 2015 15:00:35 +0200
Subject: [PATCH 027/600] Simplify workaround. Change test to make it Kotti
 specific

---
 kotti/request.py            | 12 ++++--------
 kotti/tests/test_request.py | 28 ++++------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/kotti/request.py b/kotti/request.py
index aa61a544c..a391fa264 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 
+from zope.interface import implementer
+
 from pyramid.decorator import reify
+from pyramid.interfaces import IRequest
 from pyramid.request import Request as BaseRequest
 
 
+@implementer(IRequest)
 class Request(BaseRequest):
     """ Kotti subclasses :class:`pyramid.request.Request` to make additional
     attributes / methods available on request objects and override Pyramid's
@@ -47,11 +51,3 @@ def has_permission(self, permission, context=None):
 
         with authz_context(context, self):
             return BaseRequest.has_permission(self, permission, context)
-
-
-# workaround for https://github.com/Pylons/pyramid/issues/1529
-# this allows addon packages to call config.add_request_method and not lose
-# the interfaces provided by the request (for example to call a subview,
-# like kotti.view.view_content_default)
-from zope.interface import providedBy
-providedBy(Request({}))
diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index 73ab79220..f241eedcd 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -1,31 +1,11 @@
-class TestPyramidRequestProperties:
+class TestExtendingRequest:
 
     def test_it(self):
-        from pyramid.request import Request
+        from kotti.request import Request
         from zope.interface import providedBy, implementedBy
 
         req = Request({})
-        assert providedBy(req) == implementedBy(Request)
-
-        req._set_properties({'b':'b'})
+        req._set_properties({'marker':'exists'})
 
         assert providedBy(req) == implementedBy(Request)
-
-    def test_subclassing(self):
-        from pyramid.request import Request
-        from zope.interface import providedBy, implementedBy
-
-        class Subclass(Request):
-            pass
-
-        req = Subclass({})
-
-        req._set_properties({'b':'b'})
-        assert providedBy(req) != implementedBy(Subclass)
-
-        #calling providedBy(req) before _set_properties makes the test pass
-        req = Subclass({})
-        req._set_properties({'b':'b'})
-        providedBy(req)
-        assert providedBy(req) == implementedBy(Subclass)
-
+        assert req.marker == 'exists'

From 2563be3656a809916d5774c86be0745a8ce6668a Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 13 Jan 2015 15:15:16 +0200
Subject: [PATCH 028/600] Fix pep8 problems

---
 kotti/tests/test_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index f241eedcd..a80879dfb 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -5,7 +5,7 @@ def test_it(self):
         from zope.interface import providedBy, implementedBy
 
         req = Request({})
-        req._set_properties({'marker':'exists'})
+        req._set_properties({'marker': 'exists'})
 
         assert providedBy(req) == implementedBy(Request)
         assert req.marker == 'exists'

From 314e24a8fc3b0705933a925f2867bb7de2190000 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 13 Jan 2015 15:24:53 +0200
Subject: [PATCH 029/600] Added changelog entry, added myself to contributors

---
 CHANGES.txt      | 9 +++++++++
 CONTRIBUTORS.txt | 1 +
 2 files changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index fc09bc2e3..aa5807758 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,15 @@ Change History
 
 - No changes yet.
 
+1.0.0-alpha.3 - 2015-01-13
+--------------------------
+
+- Explicitly implement ``pyramid.interfaces.IRequest`` for
+  ``kotti.request.Request``.  This allows add-on packages to use
+  ``config.add_request_method`` (with reify) and
+  ``config.add_request_property`` without breaking the interfaces provided by
+  the request. Fixes #369
+
 1.0.0-alpha.2 - 2015-01-01
 --------------------------
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 14058d45e..5a1601c05 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -100,3 +100,4 @@ Contributors
 - Fabien Castarède, 2013/08/08
 - Natan Žabkar, 2013/08/28
 - Ionică Bizău, 2014/04/09
+- Ichim Tiberiu, 2015/01/13

From 4a51f59bac409bd048dfdedfb94b41cc3e38a7d8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 13 Jan 2015 16:48:30 +0100
Subject: [PATCH 030/600] Bump version.

---
 CHANGES.txt | 5 -----
 setup.py    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa5807758..be40d010f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,6 @@
 Change History
 ==============
 
-1.1-dev - unreleased
---------------------
-
-- No changes yet.
-
 1.0.0-alpha.3 - 2015-01-13
 --------------------------
 
diff --git a/setup.py b/setup.py
index edff161d4..7804e2875 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1-dev',
+      version='1.0.0-alpha.3',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 6f0f0e952d0bdae4f5486ec004c11758124790f2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 13 Jan 2015 16:49:36 +0100
Subject: [PATCH 031/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index be40d010f..aa5807758 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1-dev - unreleased
+--------------------
+
+- No changes yet.
+
 1.0.0-alpha.3 - 2015-01-13
 --------------------------
 
diff --git a/setup.py b/setup.py
index 7804e2875..edff161d4 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.0.0-alpha.3',
+      version='1.1-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 104e20d371595731923c5db4ae7a103393a44ffd Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Fri, 16 Jan 2015 17:12:56 +0200
Subject: [PATCH 032/600] Allow restricting addview to specific contexts.

This still requires that the addable_to information is properly filled in (and will duplicate the context discriminator for the view), but it will no longer fail with TypeError in view_permitted
---
 kotti/resources.py             |  4 ++--
 kotti/tests/test_node_views.py | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 6572830cf..f0c9adc6b 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -376,8 +376,8 @@ def addable(self, context, request):
         :rtype: Boolean
         """
 
-        if view_permitted(context, request, self.add_view):
-            return context.type_info.name in self.addable_to
+        if context.type_info.name in self.addable_to:
+            return view_permitted(context, request, self.add_view)
         else:
             return False
 
diff --git a/kotti/tests/test_node_views.py b/kotti/tests/test_node_views.py
index e09a56f1d..cea46c76d 100644
--- a/kotti/tests/test_node_views.py
+++ b/kotti/tests/test_node_views.py
@@ -22,6 +22,28 @@ def test_view_permitted_no(self, config, root):
         request = DummyRequest()
         assert Document.type_info.addable(root, request) is False
 
+    def test_addable_views_registered_to_some_context(self, config, root):
+
+        from kotti.resources import Document, File
+
+        _saved = Document.type_info.addable_to
+        Document.type_info.addable_to = ['File']
+
+        config.testing_securitypolicy(permissive=True)
+        config.add_view(
+            lambda context, request: {},
+            name=Document.type_info.add_view,
+            permission='add',
+            renderer='kotti:templates/edit/node.pt',
+            context=File,
+        )
+        request = DummyRequest()
+
+        assert Document.type_info.addable(Document(), request) is False
+        assert Document.type_info.addable(File(), request) is True
+
+        Document.type_info.addable_to = _saved
+
 
 class TestNodePaste:
     def test_get_non_existing_paste_item(self, root):

From b6037e30b5685537db7380fafbc5aae4590e9663 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Fri, 16 Jan 2015 17:33:18 +0200
Subject: [PATCH 033/600] Allow restricting addview to specific contexts.

This still requires that the addable_to information is properly filled in (and will duplicate the context discriminator for the view), but it will no longer fail with TypeError in kotti.security.view_permitted
---
 kotti/resources.py             |  4 ++--
 kotti/tests/test_node_views.py | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 6572830cf..f0c9adc6b 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -376,8 +376,8 @@ def addable(self, context, request):
         :rtype: Boolean
         """
 
-        if view_permitted(context, request, self.add_view):
-            return context.type_info.name in self.addable_to
+        if context.type_info.name in self.addable_to:
+            return view_permitted(context, request, self.add_view)
         else:
             return False
 
diff --git a/kotti/tests/test_node_views.py b/kotti/tests/test_node_views.py
index e09a56f1d..cea46c76d 100644
--- a/kotti/tests/test_node_views.py
+++ b/kotti/tests/test_node_views.py
@@ -22,6 +22,28 @@ def test_view_permitted_no(self, config, root):
         request = DummyRequest()
         assert Document.type_info.addable(root, request) is False
 
+    def test_addable_views_registered_to_some_context(self, config, root):
+
+        from kotti.resources import Document, File
+
+        _saved = Document.type_info.addable_to
+        Document.type_info.addable_to = ['File']
+
+        config.testing_securitypolicy(permissive=True)
+        config.add_view(
+            lambda context, request: {},
+            name=Document.type_info.add_view,
+            permission='add',
+            renderer='kotti:templates/edit/node.pt',
+            context=File,
+        )
+        request = DummyRequest()
+
+        assert Document.type_info.addable(Document(), request) is False
+        assert Document.type_info.addable(File(), request) is True
+
+        Document.type_info.addable_to = _saved
+
 
 class TestNodePaste:
     def test_get_non_existing_paste_item(self, root):

From b3eb256641465c5dcca014ec9f84034c3539acf4 Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Fri, 16 Jan 2015 17:55:02 +0200
Subject: [PATCH 034/600] Added changelog entry for restricting add views

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa5807758..e64e345b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,15 @@ Change History
 
 - No changes yet.
 
+1.0.0-alpha.4 - unreleased
+--------------------------
+
+- Allow restricting *add views* to specific contexts. This allows third party
+  developers to register new content types that are addable in specific 
+  type of contexts, by specifying ``context=SomeContentType`` in their
+  *add view* registration and having ``type_info.addable=['SomeContentType']``
+  in the type info.
+
 1.0.0-alpha.3 - 2015-01-13
 --------------------------
 

From c7d4681fb4f53224fed82fd419fd0702df47b9b5 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 18 Jan 2015 07:22:31 -0800
Subject: [PATCH 035/600] Improve title_to_name handling of numbers in titles

For documents with duplicate titles that end in a number, append a counter instead of incrementing their number.
Fixes #245
---
 CHANGES.txt              |  5 +++++
 kotti/tests/test_util.py | 11 +++++++++++
 kotti/util.py            |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa5807758..8e85fe5c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,11 @@ Change History
 
 - No changes yet.
 
+1.0.0-alpha.4 - unreleased
+--------------------------
+- For documents with duplicate titles that end in a number, append a counter 
+  instead of incrementing their number. Fixes #245
+
 1.0.0-alpha.3 - 2015-01-13
 --------------------------
 
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index e3a5f0a9b..ccff439dc 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -71,6 +71,17 @@ def test_normal(self):
         from kotti.util import title_to_name
         assert title_to_name(u'Foo Bar') == u'foo-bar'
 
+    def test_numbering(self):
+        self.setUp()
+        from kotti.util import title_to_name
+        assert title_to_name(u'Report Part 1', blacklist=[]) == u'report-part-1'
+        assert title_to_name(u'Report Part 1',
+                             blacklist=['report-part-1']) == u'report-part-1-1'
+        assert title_to_name(u'Report Part 3',
+                             blacklist=['report-part-2']) == u'report-part-3'
+        assert title_to_name(u'Report Part 3',
+                             blacklist=['report-part-3']) == u'report-part-3-1'
+
     def test_disambiguate_name(self):
         from kotti.util import disambiguate_name
         assert disambiguate_name(u'foo') == u'foo-1'
diff --git a/kotti/util.py b/kotti/util.py
index 93b775f3f..d2a427397 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -299,6 +299,9 @@ def title_to_name(title, blacklist=()):
     from kotti import get_settings
     urlnormalizer = get_settings()['kotti.url_normalizer'][0]
     name = unicode(urlnormalizer(title, locale_name, max_length=40))
+    if name not in blacklist:
+        return name
+    name += u'-1'
     while name in blacklist:
         name = disambiguate_name(name)
     return name

From e697369e615b2bf06369df42583d6dc1448057a8 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 18 Jan 2015 10:27:50 -0800
Subject: [PATCH 036/600] Also test counter increase when blacklist has names
 with numbers

---
 kotti/tests/test_util.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index ccff439dc..6a12792af 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -74,13 +74,15 @@ def test_normal(self):
     def test_numbering(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert title_to_name(u'Report Part 1', blacklist=[]) == u'report-part-1'
+        assert title_to_name(u'Report Part 1',
+                             blacklist=[]) == u'report-part-1'
         assert title_to_name(u'Report Part 1',
                              blacklist=['report-part-1']) == u'report-part-1-1'
-        assert title_to_name(u'Report Part 3',
-                             blacklist=['report-part-2']) == u'report-part-3'
         assert title_to_name(u'Report Part 3',
                              blacklist=['report-part-3']) == u'report-part-3-1'
+        assert title_to_name(
+            u'Report Part 3', blacklist=['report-part-3', 'report-part-3-1']
+        ) == u'report-part-3-2'
 
     def test_disambiguate_name(self):
         from kotti.util import disambiguate_name

From cd3737b7bc83c18bd6e99d303a0e007a0e373dc7 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 20 Jan 2015 15:17:14 -0800
Subject: [PATCH 037/600] .travis.yml: Set sudo false for new containers

This makes Travis use a new Docker-based infrastructure that is supposed
to be faster and awesomer.

Maybe it will solve the networking-related test failures I keep seeing?
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 3baa3b755..ad816d324 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: python
+sudo: false
 python:
   - "2.6"
   - "2.7"

From 72596b038cf3354c3907e342fbb22b1d54b65b2e Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 20 Jan 2015 16:38:23 -0800
Subject: [PATCH 038/600] CustomContentEditForm: calendar => CustomContent

---
 kotti/scaffolds/package/+package+/views/edit.py_tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/+package+/views/edit.py_tmpl b/kotti/scaffolds/package/+package+/views/edit.py_tmpl
index df58fd09d..44c93dfca 100644
--- a/kotti/scaffolds/package/+package+/views/edit.py_tmpl
+++ b/kotti/scaffolds/package/+package+/views/edit.py_tmpl
@@ -36,6 +36,6 @@ class CustomContentAddForm(AddFormView):
 @view_config(name='edit', context=CustomContent, permission='edit',
              renderer='kotti:templates/edit/node.pt')
 class CustomContentEditForm(EditFormView):
-    """ Form to edit existing calendars. """
+    """ Form to edit existing CustomContent objects. """
 
     schema_factory = CustomContentSchema

From b97c4c2af347d2eeeeedf81112b17f5ee60d9b48 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 20 Jan 2015 17:48:28 -0800
Subject: [PATCH 039/600] Fix typos

---
 kotti/resources.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 6572830cf..6e23ddfa3 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -160,7 +160,7 @@ def children_with_permission(self, request, permission='view'):
 
 
 class LocalGroup(Base):
-    """ Local groups allow the assignment of groups or roles to pricipals
+    """ Local groups allow the assignment of groups or roles to principals
     (users or groups) **for a certain context** (i.e. a :class:`Node` in the
     content tree).
     """
@@ -227,10 +227,10 @@ class Node(Base, ContainerMixin, PersistentACLMixin):
     #: Name of the node as used in the URL
     #: (:class:`sqlalchemy.types.Unicode`)
     name = Column(Unicode(50), nullable=False)
-    #: Title of the node, e.g. as shown in serach results
+    #: Title of the node, e.g. as shown in search results
     #: (:class:`sqlalchemy.types.Unicode`)
     title = Column(Unicode(100))
-    #: Annotations can be used to store arbitray data in a nested dictionary
+    #: Annotations can be used to store arbitrary data in a nested dictionary
     #: (:class:`kotti.sqla.NestedMustationDict`)
     annotations = Column(NestedMutationDict.as_mutable(JsonType))
     #: The path can be used to efficiently filter for child objects

From 9398890bdf5c181c7c9d1f70c2599676ef824b6b Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 20 Jan 2015 14:39:11 -0800
Subject: [PATCH 040/600] Small tweaks to the tutorial

---
 docs/first_steps/tut-2.rst | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/first_steps/tut-2.rst b/docs/first_steps/tut-2.rst
index 5deefdd17..2c2038278 100644
--- a/docs/first_steps/tut-2.rst
+++ b/docs/first_steps/tut-2.rst
@@ -40,14 +40,15 @@ Things to note here:
 
 - ``Poll`` derives from :class:`kotti.resources.Content`, which is the common base class for all content types.
 
-- ``Poll`` declares a sqla.Column ``id``, which is required to hook it up with SQLAlchemy's inheritance.
+- ``Poll`` declares a :class:`sqlalchemy.Column <sqlalchemy.schema>` ``id``, which is required to hook it up with SQLAlchemy's inheritance.
 
-- The type_info class attribute does essential configuration.
+- The ``type_info`` class attribute does essential configuration.
   We refer to name and title, two properties already defined as part of
   ``Content``, our base class.
-  The ``add_view`` defines the name of the add view, which we'll come to in a second.  Finally, ``addable_to`` defines which content types we can add ``Poll`` items to.
+  The ``add_view`` defines the name of the add view, which we'll come to in a second.
+  Finally, ``addable_to`` defines which content types we can add ``Poll`` items to.
 
-- We do not need to define any additional sqlaColumn() properties, as the title
+- We do not need to define any additional :class:`sqlalchemy.Column <sqlalchemy.schema>` properties, as the ``title``
   is the only property we need for this content type.
 
 We'll add another content class to hold the choices for the poll.
@@ -86,7 +87,7 @@ Views (including forms) are typically put into a module called ``views``.
 The Kotti scaffolding further separates this into ``view`` and ``edit`` files inside a ``views`` directory.
 
 Open the file at ``kotti_mysite/kotti_mysite/views/edit.py``.
-It already contains code for the `CustomContent` sample content type.
+It already contains code for the ``CustomContent`` sample content type.
 We will take advantage of the imports already there.
 
 .. code-block:: python
@@ -169,11 +170,11 @@ Add this to ``views/edit.py``:
 
 
 Using the ``AddFormView`` and ``EditFormView`` base classes from Kotti, these forms are simple to define.
-We associate the schemas defined above, setting them as the schema_factory for each form, and we specify the content types to be added by each.
+We associate the schemas defined above, setting them as the ``schema_factory`` for each form, and we specify the content types to be added by each.
 
 We use ``@view_config`` to add our views to the application.
 This takes advantage of a ``config.scan()`` call in ``__init__.py`` discussed below.
-Notice that we can declare `permission`, `context`, and a `template` for each form, along with its `name`.
+Notice that we can declare ``permission``, ``context``, and a ``template`` for each form, along with its ``name``.
 
 Wiring up the Content Types and Forms
 -------------------------------------
@@ -197,9 +198,9 @@ Open ``__init__.py`` and modify the ``kotti_configure`` method so that the
         ...
 
 
-Here, we've added our two content types to the site's available_types, a global
+Here, we've added our two content types to the site's ``available_types``, a global
 registry.
-We also removed the CustomContent content type included with the scaffolding.
+We also removed the ``CustomContent`` content type included with the scaffolding.
 
 Notice the ``includeme`` method at the bottom of ``__init__.py``.
 It includes the call to ``config.scan()`` that we mentioned above while discussing the ``@view_config`` statements in our views.

From 16e80c202cf053c014ea5a66ddd8d6eb9c869d38 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 20 Jan 2015 14:00:39 -0800
Subject: [PATCH 041/600] .travis.yml: Add travis_retry

to hopefully deal with intermittent network errors
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad816d324..ea87becf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,10 @@ env:
   - KOTTI_TEST_DB_STRING=mysql+oursql://root@localhost:3306/kotti_testing
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
-  - pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
-  - pip install -e . -r requirements.txt
+  - travis_retry pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
+  - travis_retry pip install -e . -r requirements.txt
   - python setup.py dev
-  - pip install psycopg2 oursql
+  - travis_retry pip install psycopg2 oursql
 before_script:
   - psql -c 'create database kotti_testing;' -U postgres
   - mysql -e 'create database kotti_testing;'

From 3ff14f6b4a9a7282e584dda8949e829799fdfd16 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 20 Jan 2015 13:07:47 -0800
Subject: [PATCH 042/600] Add Dockerfile

---
 Dockerfile | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..3f1145c6d
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,17 @@
+# --------------------------------------------------------------------------
+# This is a Dockerfile to build an Ubuntu 14.04 Docker image with
+# Kotti
+#
+# Use a command like:
+#     docker build -t <user>/kotti .
+# --------------------------------------------------------------------------
+
+FROM  orchardup/python:2.7
+MAINTAINER  Marc Abramowitz <marc@marc-abramowitz.com> (@msabramo)
+
+RUN pip install -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
+ADD app.ini .
+
+EXPOSE 5000
+
+CMD ["pserve", "app.ini", "host=0.0.0.0"]

From ca134ea0e94fa101cace1ba6f363a7726e8b2f30 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 21 Jan 2015 23:29:22 -0800
Subject: [PATCH 043/600] events.py: Fix misspelling of "resources" in docs

---
 kotti/events.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/events.py b/kotti/events.py
index 380df4468..3332fb0e6 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -416,7 +416,7 @@ class subscribe(object):
 
         from kotti.events import ObjectInsert
         from kotti.events import subscribe
-        from kotti.resurces import Document
+        from kotti.resources import Document
 
         @subscribe()
         def on_all_events(event):

From cf7bfa0a1497bd7707b45c96821c615463dafc67 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Fri, 23 Jan 2015 09:51:51 -0800
Subject: [PATCH 044/600] Spelling fix: bject => object

---
 kotti/views/edit/actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 39e99fb04..26fc48cc9 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -520,7 +520,7 @@ def move_child_position(context, request):
                     0-based old (i.e. the current index of the child to be
                     moved) and new position (its new index) values.
     :type request:
-    :result: JSON serializable bject with a single attribute ("result") that is
+    :result: JSON serializable object with a single attribute ("result") that is
              either "success" or "error".
     :rtype: dict
     """

From 415d16105daf0f7af0fc0096d18114ec9a73cdb0 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 26 Jan 2015 13:38:52 -0800
Subject: [PATCH 045/600] Added a paragraph in the developer manual about
 registering views for context

---
 docs/developing/basic/developer-manual.rst | 6 ++++++
 docs/first_steps/tut-2.rst                 | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/docs/developing/basic/developer-manual.rst b/docs/developing/basic/developer-manual.rst
index 7816e8c31..2b8fd30b3 100644
--- a/docs/developing/basic/developer-manual.rst
+++ b/docs/developing/basic/developer-manual.rst
@@ -47,6 +47,12 @@ Document content type serves as an example here:
           self.body = body
           self.mime_type = mime_type
 
+The ``add_view`` parameter of the ``type_info`` attribute is the name of a view
+that can be used to construct a ``Document`` instance. This view has to be
+available for all content types specified in ``addable_to`` parameter. See the
+section below and the :ref:`adding-forms-and-a-view` section in the tutorial on
+how to define a view restricted to a specific context.
+
 You can configure the list of active content types in Kotti by
 modifying the :ref:`kotti.available_types` setting.
 
diff --git a/docs/first_steps/tut-2.rst b/docs/first_steps/tut-2.rst
index 5deefdd17..9b6339167 100644
--- a/docs/first_steps/tut-2.rst
+++ b/docs/first_steps/tut-2.rst
@@ -79,6 +79,8 @@ Notable differences are:
 
 - The ``type_info`` defines the title, the ``add_view`` view, and that choices may only be added *into* ``Poll`` items, with the line ``addable_to=[u'Poll']``.
 
+.. _adding-forms-and-a-view:
+
 Adding Forms and a View
 -----------------------
 

From 60837e871f188bb12e244a6ebe9cf1cdded6291a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 28 Jan 2015 16:46:23 +0100
Subject: [PATCH 046/600] Add Kotti itself to requirements.  This resolves
 #373.

---
 docs/first_steps/installation.rst | 1 -
 requirements.txt                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/first_steps/installation.rst b/docs/first_steps/installation.rst
index 9a7816769..49d903a32 100644
--- a/docs/first_steps/installation.rst
+++ b/docs/first_steps/installation.rst
@@ -22,7 +22,6 @@ It is recommended to install Kotti inside a virtualenv:
   virtualenv mysite
   cd mysite
   bin/pip install -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
-  bin/pip install [--pre] Kotti
 
 This will install the latest released version of Kotti and all its requirements into your virtualenv.
 
diff --git a/requirements.txt b/requirements.txt
index a00e0b1ca..f14537ca5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+Kotti==1.0.0-alpha.3
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.18

From c67f36c6537901d23457064b959c3ff2ac752b2c Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 28 Jan 2015 07:35:11 -0800
Subject: [PATCH 047/600] Add instructions for Docker

---
 docs/first_steps/installation.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/first_steps/installation.rst b/docs/first_steps/installation.rst
index 9a7816769..0cb913f1d 100644
--- a/docs/first_steps/installation.rst
+++ b/docs/first_steps/installation.rst
@@ -12,6 +12,18 @@ Requirements
 - ``Xcode`` (on OS X) or
 - equivalent build toolchain for your OS.
 
+Installation using Docker (experimental)
+----------------------------------------
+
+This assumes that you already have Docker_ installed:
+
+.. parsed-literal::
+
+  docker pull kotti/kotti
+  docker run -i -t -p 5000:5000 kotti/kotti
+
+This should get you a running Kotti instance on port 5000.
+
 Installation using ``virtualenv``
 ---------------------------------
 
@@ -63,3 +75,4 @@ Although SQLite may prove to be adequate for some deployments, Kotti is flexible
 .. _other SQL databases: http://www.sqlalchemy.org/docs/core/engines.html#supported-databases
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _Paste Deploy: http://pythonpaste.org/deploy/#the-config-file
+.. _Docker: http://docker.io/

From 9e19f953d5e00f121122a923151357447aaff5c1 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 28 Jan 2015 07:56:08 -0800
Subject: [PATCH 048/600] README.rst: Add link to installation instructions

Because a lot of folks will be curious about how it is installed and/or
might be eager to try it out.
---
 README.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.rst b/README.rst
index d0e480e3e..df5e4a32f 100644
--- a/README.rst
+++ b/README.rst
@@ -52,6 +52,13 @@ Its **main features** are:
 .. _Plone: http://plone.org/
 .. _Twitter Bootstrap: http://twitter.github.com/bootstrap/
 
+Install
+=======
+
+See `installation instructions`_.
+
+.. _installation instructions: http://kotti.readthedocs.org/en/latest/first_steps/installation.html
+
 Support and Documentation
 =========================
 

From f05e1be905fbd6b14629ca3359eecda00bc02804 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 28 Jan 2015 16:57:05 +0100
Subject: [PATCH 049/600] Move Docker section to the bottom, as it's labelled
 "experimental".  [ci skip]

---
 docs/first_steps/installation.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/first_steps/installation.rst b/docs/first_steps/installation.rst
index fc833d88e..9cedcda27 100644
--- a/docs/first_steps/installation.rst
+++ b/docs/first_steps/installation.rst
@@ -12,18 +12,6 @@ Requirements
 - ``Xcode`` (on OS X) or
 - equivalent build toolchain for your OS.
 
-Installation using Docker (experimental)
-----------------------------------------
-
-This assumes that you already have Docker_ installed:
-
-.. parsed-literal::
-
-  docker pull kotti/kotti
-  docker run -i -t -p 5000:5000 kotti/kotti
-
-This should get you a running Kotti instance on port 5000.
-
 Installation using ``virtualenv``
 ---------------------------------
 
@@ -71,6 +59,18 @@ Kotti includes support for PostgreSQL, MySQL and SQLite (tested regularly), and
 The default use of SQLite makes initial development easy.
 Although SQLite may prove to be adequate for some deployments, Kotti is flexible for installation of your choice of database during development or at deployment.
 
+Installation using Docker (experimental)
+----------------------------------------
+
+This assumes that you already have Docker_ installed:
+
+.. parsed-literal::
+
+  docker pull kotti/kotti
+  docker run -i -t -p 5000:5000 kotti/kotti
+
+This should get you a running Kotti instance on port 5000.
+
 .. _other SQL databases: http://www.sqlalchemy.org/docs/core/engines.html#supported-databases
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _Paste Deploy: http://pythonpaste.org/deploy/#the-config-file

From ebcfebd23024f778e78d63edca8a1a5f808c5062 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 28 Jan 2015 08:04:50 -0800
Subject: [PATCH 050/600] README.rst: Wrap long line

Rather than wrap whererever my editor (vim) chose, I decided to
experiment with [Semantic
linefeeds](http://rhodesmill.org/brandon/2012/one-sentence-per-line/)
---
 README.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index d0e480e3e..b6c902ea3 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,10 @@ Kotti is most useful when you are developing applications that
 - use workflows, and/or
 - work with hierarchical data.
 
-Built on top of a number of *best-of-breed* software components, most notably Pyramid_ and SQLAlchemy_, Kotti introduces only a few concepts of its own, thus hopefully keeping the learning curve flat for the developer.
+Built on top of a number of *best-of-breed* software components,
+most notably Pyramid_ and SQLAlchemy_,
+Kotti introduces only a few concepts of its own,
+thus hopefully keeping the learning curve flat for the developer.
 
 .. |build status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=stable
 .. _build status: http://travis-ci.org/Kotti/Kotti

From 1a7526aaf66c08bd6f977b36b691ce44ae659dfe Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 28 Jan 2015 17:06:51 +0100
Subject: [PATCH 051/600] Bootstrap isn't called "Twitter Bootstrap" for a
 while now.  [ci skip]

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index d0e480e3e..75a2e3995 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ Its **main features** are:
 
 - **WYSIWYG editor**: includes a rich text editor
 
-- **Responsive design**: Kotti builds on `Twitter Bootstrap`_, which
+- **Responsive design**: Kotti builds on `Bootstrap`_, which
   looks good both on desktop and mobile
 
 - **Templating**: you can extend the CMS with your own look & feel
@@ -50,7 +50,7 @@ Its **main features** are:
 
 .. _Kotti's demo page: http://kottidemo.danielnouri.org/
 .. _Plone: http://plone.org/
-.. _Twitter Bootstrap: http://twitter.github.com/bootstrap/
+.. _Bootstrap: http://getbootstrap.com/
 
 Support and Documentation
 =========================

From b3d578c1d63e7d00dc5da889b7b80abc045c8569 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 28 Jan 2015 08:11:30 -0800
Subject: [PATCH 052/600] README.rst: Add PyPI badge; moved badges to top

---
 README.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index b6c902ea3..c832baaec 100644
--- a/README.rst
+++ b/README.rst
@@ -2,9 +2,11 @@
 Kotti
 =====
 
+|pypi|_
+|build status|_
+
 Kotti is a high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.
 It includes an extensible Content Management System called the Kotti CMS (see below).
-|build status|_
 
 Kotti is most useful when you are developing applications that
 
@@ -19,6 +21,8 @@ thus hopefully keeping the learning curve flat for the developer.
 
 .. |build status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=stable
 .. _build status: http://travis-ci.org/Kotti/Kotti
+.. |pypi| image:: https://pypip.in/version/Kotti/badge.svg?style=flat
+.. _pypi: https://pypi.python.org/pypi/Kotti/
 .. _Pyramid: http://docs.pylonsproject.org/projects/pyramid/dev/
 .. _SQLAlchemy: http://www.sqlalchemy.org/
 

From e3340f3bf1b5601f574d918b9cc015a4688a0474 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 28 Jan 2015 08:18:33 -0800
Subject: [PATCH 053/600] README.rst: Link to Pyramid and SQLAlchemy

on first mention
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index c832baaec..5b7604125 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ Kotti
 |pypi|_
 |build status|_
 
-Kotti is a high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.
+Kotti is a high-level, Pythonic web application framework based on Pyramid_ and SQLAlchemy_.
 It includes an extensible Content Management System called the Kotti CMS (see below).
 
 Kotti is most useful when you are developing applications that

From 70e0446b6912ad7b852e09be452dd900bf73dd21 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 28 Jan 2015 08:26:23 -0800
Subject: [PATCH 054/600] CHANGES.txt: Add note about Docker support (#245)

---
 CHANGES.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8e85fe5c9..4f571bf17 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,11 +4,12 @@ Change History
 1.1-dev - unreleased
 --------------------
 
-- No changes yet.
+- Added experimental Docker support. See #374.
 
 1.0.0-alpha.4 - unreleased
 --------------------------
-- For documents with duplicate titles that end in a number, append a counter 
+
+- For documents with duplicate titles that end in a number, append a counter
   instead of incrementing their number. Fixes #245
 
 1.0.0-alpha.3 - 2015-01-13

From ac6baf31821bbf0df4fab78bf3df13bdcd62f7ae Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 28 Jan 2015 17:46:13 +0100
Subject: [PATCH 055/600] Try to add coveralls to Travis config.

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea87becf6..8611c7af9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,16 @@ env:
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
   - travis_retry pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
-  - travis_retry pip install -e . -r requirements.txt
+  - travis_retry pip install -e . -r requirements.txt --use-mirrors
   - python setup.py dev
-  - travis_retry pip install psycopg2 oursql
+  - travis_retry pip install psycopg2 oursql python-coveralls
 before_script:
   - psql -c 'create database kotti_testing;' -U postgres
   - mysql -e 'create database kotti_testing;'
-script: py.test --runslow --tb=native --cov=kotti --cov-report=term-missing
+script:
+  - py.test --runslow --tb=native --cov=kotti --cov-report=term-missing
+after_success:
+  - coveralls
 notifications:
   irc: "irc.freenode.org#kotti"
   email: false

From fdda63a9ae76e07a278e16e463ccb118298d4d28 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 29 Jan 2015 11:25:15 +0100
Subject: [PATCH 056/600] Everybody loves badges, let's have them all!  [ci
 skip]

---
 README.rst | 75 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 093a7df76..458f17dac 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,21 @@ Kotti
 =====
 
 |pypi|_
-|build status|_
+|downloads_month|_
+|license|_
+|build status stable|_
+
+.. |pypi| image:: https://img.shields.io/pypi/v/Kotti.svg?style=flat-square
+.. _pypi: https://pypi.python.org/pypi/Kotti/
+
+.. |downloads_month| image:: https://img.shields.io/pypi/dm/Kotti.svg?style=flat-square
+.. _downloads_month: https://pypi.python.org/pypi/Kotti/
+
+.. |license| image:: https://img.shields.io/pypi/l/Kotti.svg?style=flat-square
+.. _license: http://www.repoze.org/LICENSE.txt
+
+.. |build status stable| image:: https://img.shields.io/travis/Kotti/Kotti/stable.svg?style=flat-square
+.. _build status stable: http://travis-ci.org/Kotti/Kotti
 
 Kotti is a high-level, Pythonic web application framework based on Pyramid_ and SQLAlchemy_.
 It includes an extensible Content Management System called the Kotti CMS (see below).
@@ -19,10 +33,7 @@ most notably Pyramid_ and SQLAlchemy_,
 Kotti introduces only a few concepts of its own,
 thus hopefully keeping the learning curve flat for the developer.
 
-.. |build status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=stable
-.. _build status: http://travis-ci.org/Kotti/Kotti
-.. |pypi| image:: https://pypip.in/version/Kotti/badge.svg?style=flat
-.. _pypi: https://pypi.python.org/pypi/Kotti/
+
 .. _Pyramid: http://docs.pylonsproject.org/projects/pyramid/dev/
 .. _SQLAlchemy: http://www.sqlalchemy.org/
 
@@ -59,6 +70,11 @@ Its **main features** are:
 .. _Plone: http://plone.org/
 .. _Bootstrap: http://getbootstrap.com/
 
+License
+=======
+
+Kotti is offered under the BSD-derived `Repoze Public License <http://repoze.org/license.html>`_.
+
 Install
 =======
 
@@ -69,9 +85,50 @@ See `installation instructions`_.
 Support and Documentation
 =========================
 
-`Click here to access Kotti's full documentation <http://kotti.readthedocs.org/>`_
+Read Kotti's extensive `documentation <http://kotti.readthedocs.org/>`_ on `Read the Docs <https://readthedocs.org/>`_.
 
-License
-=======
+If you have questions or need help, you can post on our `mailing list / forum <http://groups.google.com/group/kotti>`_ or join us on IRC: `#kotti on irc.freenode.net <irc://irc.freenode.net/#kotti>`_.
 
-Kotti is offered under the BSD-derived `Repoze Public License <http://repoze.org/license.html>`_.
+If you think you found a bug, open an issue on or `Github bugtracker <https://github.com/Kotti/Kotti/issues>`_.
+
+Development
+===========
+
+|build status master|_
+|coveralls|_
+|codacy|_
+
+.. requirements need to be upgraded before we shoff off
+   |requires.io|_
+
+|gh_forks|_
+|gh_stars|_
+
+Kotti is actively developed and maintained.
+We adhere to `high quality coding standards`_, have an extensive test suite with `high coverage`_ and use `continuous integration`_.
+
+Contributions are always welcome, read our `contribution guidelines`_ and visit our `Github repository`_.
+
+.. |build status master| image:: https://img.shields.io/travis/Kotti/Kotti/master.svg?style=flat-square
+.. _build status master: http://travis-ci.org/Kotti/Kotti
+.. _continuous integration: http://travis-ci.org/Kotti/Kotti
+
+.. |requires.io| image:: https://img.shields.io/requires/github/Kotti/Kotti.svg?style=flat-square
+.. _requires.io: https://requires.io/github/Kotti/Kotti/requirements/?branch=master
+
+.. |gh_forks| image:: https://img.shields.io/github/forks/Kotti/Kotti.svg?style=flat-square
+.. _gh_forks: https://github.com/Kotti/Kotti/network
+
+.. |gh_stars| image:: https://img.shields.io/github/stars/Kotti/Kotti.svg?style=flat-square
+.. _gh_stars: https://github.com/Kotti/Kotti/stargazers
+
+.. |coveralls| image:: https://img.shields.io/coveralls/Kotti/Kotti.svg?style=flat-square
+.. _coveralls: https://coveralls.io/r/Kotti/Kotti
+.. _high coverage: https://coveralls.io/r/Kotti/Kotti
+
+.. |codacy| image:: https://img.shields.io/codacy/ad44331fcd904d338c074f2ca3e6a810.svg?style=flat-square
+.. _codacy: https://www.codacy.com/public/disko/Kotti
+.. _high quality coding standards: https://www.codacy.com/public/disko/Kotti
+
+.. _contribution guidelines: http://kotti.readthedocs.org/en/latest/contributing.html
+.. _Github repository: https://github.com/Kotti/Kotti

From a6c477be73e9079c1f1bc91017368506e37a7770 Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Fri, 16 Jan 2015 17:55:02 +0200
Subject: [PATCH 057/600] Added changelog entry for restricting add views

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa5807758..e64e345b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,15 @@ Change History
 
 - No changes yet.
 
+1.0.0-alpha.4 - unreleased
+--------------------------
+
+- Allow restricting *add views* to specific contexts. This allows third party
+  developers to register new content types that are addable in specific 
+  type of contexts, by specifying ``context=SomeContentType`` in their
+  *add view* registration and having ``type_info.addable=['SomeContentType']``
+  in the type info.
+
 1.0.0-alpha.3 - 2015-01-13
 --------------------------
 

From 1f847e0d01e12727648a5b92e66f6c4906e92a99 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 18 Jan 2015 07:22:31 -0800
Subject: [PATCH 058/600] Improve title_to_name handling of numbers in titles

For documents with duplicate titles that end in a number, append a counter instead of incrementing their number.
Fixes #245
---
 CHANGES.txt              |  3 +++
 kotti/tests/test_util.py | 11 +++++++++++
 kotti/util.py            |  3 +++
 3 files changed, 17 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index e64e345b1..ccebc08ba 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,9 @@ Change History
   *add view* registration and having ``type_info.addable=['SomeContentType']``
   in the type info.
 
+- For documents with duplicate titles that end in a number, append a counter 
+  instead of incrementing their number. Fixes #245
+
 1.0.0-alpha.3 - 2015-01-13
 --------------------------
 
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index e3a5f0a9b..ccff439dc 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -71,6 +71,17 @@ def test_normal(self):
         from kotti.util import title_to_name
         assert title_to_name(u'Foo Bar') == u'foo-bar'
 
+    def test_numbering(self):
+        self.setUp()
+        from kotti.util import title_to_name
+        assert title_to_name(u'Report Part 1', blacklist=[]) == u'report-part-1'
+        assert title_to_name(u'Report Part 1',
+                             blacklist=['report-part-1']) == u'report-part-1-1'
+        assert title_to_name(u'Report Part 3',
+                             blacklist=['report-part-2']) == u'report-part-3'
+        assert title_to_name(u'Report Part 3',
+                             blacklist=['report-part-3']) == u'report-part-3-1'
+
     def test_disambiguate_name(self):
         from kotti.util import disambiguate_name
         assert disambiguate_name(u'foo') == u'foo-1'
diff --git a/kotti/util.py b/kotti/util.py
index 93b775f3f..d2a427397 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -299,6 +299,9 @@ def title_to_name(title, blacklist=()):
     from kotti import get_settings
     urlnormalizer = get_settings()['kotti.url_normalizer'][0]
     name = unicode(urlnormalizer(title, locale_name, max_length=40))
+    if name not in blacklist:
+        return name
+    name += u'-1'
     while name in blacklist:
         name = disambiguate_name(name)
     return name

From 967164b74b51207ce253c90108b99b8b730619a1 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 18 Jan 2015 10:27:50 -0800
Subject: [PATCH 059/600] Also test counter increase when blacklist has names
 with numbers

---
 kotti/tests/test_util.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index ccff439dc..6a12792af 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -74,13 +74,15 @@ def test_normal(self):
     def test_numbering(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert title_to_name(u'Report Part 1', blacklist=[]) == u'report-part-1'
+        assert title_to_name(u'Report Part 1',
+                             blacklist=[]) == u'report-part-1'
         assert title_to_name(u'Report Part 1',
                              blacklist=['report-part-1']) == u'report-part-1-1'
-        assert title_to_name(u'Report Part 3',
-                             blacklist=['report-part-2']) == u'report-part-3'
         assert title_to_name(u'Report Part 3',
                              blacklist=['report-part-3']) == u'report-part-3-1'
+        assert title_to_name(
+            u'Report Part 3', blacklist=['report-part-3', 'report-part-3-1']
+        ) == u'report-part-3-2'
 
     def test_disambiguate_name(self):
         from kotti.util import disambiguate_name

From cb742289a71af8ca7767ca4067ade25a1941632e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 26 Jan 2015 13:38:52 -0800
Subject: [PATCH 060/600] Added a paragraph in the developer manual about
 registering views for context

---
 docs/developing/basic/developer-manual.rst | 6 ++++++
 docs/first_steps/tut-2.rst                 | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/docs/developing/basic/developer-manual.rst b/docs/developing/basic/developer-manual.rst
index 7816e8c31..2b8fd30b3 100644
--- a/docs/developing/basic/developer-manual.rst
+++ b/docs/developing/basic/developer-manual.rst
@@ -47,6 +47,12 @@ Document content type serves as an example here:
           self.body = body
           self.mime_type = mime_type
 
+The ``add_view`` parameter of the ``type_info`` attribute is the name of a view
+that can be used to construct a ``Document`` instance. This view has to be
+available for all content types specified in ``addable_to`` parameter. See the
+section below and the :ref:`adding-forms-and-a-view` section in the tutorial on
+how to define a view restricted to a specific context.
+
 You can configure the list of active content types in Kotti by
 modifying the :ref:`kotti.available_types` setting.
 
diff --git a/docs/first_steps/tut-2.rst b/docs/first_steps/tut-2.rst
index 5deefdd17..9b6339167 100644
--- a/docs/first_steps/tut-2.rst
+++ b/docs/first_steps/tut-2.rst
@@ -79,6 +79,8 @@ Notable differences are:
 
 - The ``type_info`` defines the title, the ``add_view`` view, and that choices may only be added *into* ``Poll`` items, with the line ``addable_to=[u'Poll']``.
 
+.. _adding-forms-and-a-view:
+
 Adding Forms and a View
 -----------------------
 

From a849085200fd41d98c06c8d9bc7523fcbc86cbe7 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 29 Jan 2015 14:59:53 +0100
Subject: [PATCH 061/600] Update all requirements except alembic to their
 latest versions.

---
 requirements.txt | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f14537ca5..f0423d5c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,25 +1,25 @@
 Kotti==1.0.0-alpha.3
 Babel==1.3
 Beaker==1.6.4
-Chameleon==2.18
+Chameleon==2.20
 FormEncode==1.2.6
-Mako==1.0.0
+Mako==1.0.1
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==2.6.1
-Pygments==2.0.1
+Pillow==2.7.0
+Pygments==2.0.2
 SQLAlchemy==0.9.8
-Unidecode==0.04.16
+Unidecode==0.04.17
 WebOb==1.4
 alembic==0.6.7
-argparse==1.2.2
-colander==1.0b1
+argparse==1.3.0
+colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-html2text==2014.9.25
+html2text==2014.12.29
 js.angular==1.1.4
-js.bootstrap==3.1.1
+js.bootstrap==3.3.1
 js.chosen==0.9.14
 js.deform==2.0a2-2
 js.fineuploader==3.3.0
@@ -35,21 +35,21 @@ js.jqueryui==1.10.3
 js.jqueryui_tagit==2.0.24-2
 js.modernizr==2.5.3.1
 kotti_tinymce==0.5.1
-lingua==3.6.1
+lingua==3.8
 peppercorn==0.5
 plone.scale==1.3.4
-polib==1.0.5
+polib==1.0.6
 py-bcrypt==0.4
 pyramid==1.5.2
 pyramid_beaker==0.8
 pyramid_chameleon==0.3
-pyramid_debugtoolbar==2.2.2
+pyramid_debugtoolbar==2.3
 pyramid_deform==0.2
-pyramid_mailer==0.13
+pyramid_mailer==0.14
 pyramid_mako==1.0.2
-pyramid_tm==0.8
+pyramid_tm==0.10
 pyramid_zcml==1.0.0
-pytz==2014.9
+pytz==2014.10
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
@@ -65,9 +65,9 @@ xlrd==0.9.3
 xlwt==0.7.5
 zope.component==4.2.1
 zope.configuration==4.0.3
-zope.deprecation==4.1.1
+zope.deprecation==4.1.2
 zope.event==4.0.3
 zope.i18nmessageid==4.0.3
-zope.interface==4.1.1
+zope.interface==4.1.2
 zope.schema==4.4.2
 zope.sqlalchemy==0.7.5

From b308204cc82bd15e62a26be107e589d3825aaa8d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 29 Jan 2015 17:38:30 +0100
Subject: [PATCH 062/600] Add a changenote.  [ci skip]

---
 CHANGES.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4d31157b3..82587d5d5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,16 +1,13 @@
 Change History
 ==============
 
-1.1-dev - unreleased
---------------------
-
-- Added experimental Docker support. See #374.
-
 1.0.0-alpha.4 - unreleased
 --------------------------
 
+- Added experimental Docker support. See #374.
+
 - Allow restricting *add views* to specific contexts. This allows third party
-  developers to register new content types that are addable in specific 
+  developers to register new content types that are addable in specific
   type of contexts, by specifying ``context=SomeContentType`` in their
   *add view* registration and having ``type_info.addable=['SomeContentType']``
   in the type info.
@@ -18,6 +15,8 @@ Change History
 - For documents with duplicate titles that end in a number, append a counter
   instead of incrementing their number. Fixes #245
 
+- Update all requirements (except alembic) to their latest respective versions.
+
 1.0.0-alpha.3 - 2015-01-13
 --------------------------
 

From 0ca6fe86b3439fb431201f804fb8faed1793bb3c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 29 Jan 2015 18:01:32 +0100
Subject: [PATCH 063/600] Also use new requirements in the scaffold.

---
 kotti/scaffolds/package/requirements.txt | 74 +++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 kotti/scaffolds/package/requirements.txt

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
deleted file mode 120000
index 5f8116083..000000000
--- a/kotti/scaffolds/package/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../requirements.txt
\ No newline at end of file
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
new file mode 100644
index 000000000..f0423d5c0
--- /dev/null
+++ b/kotti/scaffolds/package/requirements.txt
@@ -0,0 +1,73 @@
+Kotti==1.0.0-alpha.3
+Babel==1.3
+Beaker==1.6.4
+Chameleon==2.20
+FormEncode==1.2.6
+Mako==1.0.1
+MarkupSafe==0.23
+PasteDeploy==1.5.2
+Pillow==2.7.0
+Pygments==2.0.2
+SQLAlchemy==0.9.8
+Unidecode==0.04.17
+WebOb==1.4
+alembic==0.6.7
+argparse==1.3.0
+colander==1.0
+deform==2.0a2
+docopt==0.6.2
+fanstatic==1.0a5
+html2text==2014.12.29
+js.angular==1.1.4
+js.bootstrap==3.3.1
+js.chosen==0.9.14
+js.deform==2.0a2-2
+js.fineuploader==3.3.0
+js.html5shiv==3.6.2-1
+js.jquery==1.9.1
+js.jquery_form==3.09
+js.jquery_maskedinput==1.3.1
+js.jquery_maskmoney==1.4.1
+js.jquery_sortable==0.9.12
+js.jquery_tablednd==0.4
+js.jquery_timepicker_addon==1.3-1
+js.jqueryui==1.10.3
+js.jqueryui_tagit==2.0.24-2
+js.modernizr==2.5.3.1
+kotti_tinymce==0.5.1
+lingua==3.8
+peppercorn==0.5
+plone.scale==1.3.4
+polib==1.0.6
+py-bcrypt==0.4
+pyramid==1.5.2
+pyramid_beaker==0.8
+pyramid_chameleon==0.3
+pyramid_debugtoolbar==2.3
+pyramid_deform==0.2
+pyramid_mailer==0.14
+pyramid_mako==1.0.2
+pyramid_tm==0.10
+pyramid_zcml==1.0.0
+pytz==2014.10
+repoze.lru==0.6
+repoze.sendmail==4.2
+repoze.workflow==0.6.1
+repoze.zcml==0.4
+shutilwhich==1.0.1
+transaction==1.4.3
+translationstring==1.3
+usersettings==1.0.7
+venusian==1.0
+waitress==0.8.9
+wsgiref==0.1.2
+xlrd==0.9.3
+xlwt==0.7.5
+zope.component==4.2.1
+zope.configuration==4.0.3
+zope.deprecation==4.1.2
+zope.event==4.0.3
+zope.i18nmessageid==4.0.3
+zope.interface==4.1.2
+zope.schema==4.4.2
+zope.sqlalchemy==0.7.5

From 0679302be3f404c95b2ef9163ef94ee4554f77ce Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 29 Jan 2015 18:24:40 +0100
Subject: [PATCH 064/600] Bump version.

---
 CHANGES.txt                              | 2 +-
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 82587d5d5..b42321cd7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.0.0-alpha.4 - unreleased
+1.0.0-alpha.4 - 2015-01-29
 --------------------------
 
 - Added experimental Docker support. See #374.
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index f0423d5c0..0831752a7 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0-alpha.3
+Kotti==1.0.0-alpha.4
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20
diff --git a/requirements.txt b/requirements.txt
index f0423d5c0..0831752a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0-alpha.3
+Kotti==1.0.0-alpha.4
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20
diff --git a/setup.py b/setup.py
index edff161d4..36641edc7 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1-dev',
+      version='1.0.0-alpha.4',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 976f5e890c0c94307c488a0e7fb04d9c49672361 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 29 Jan 2015 18:26:40 +0100
Subject: [PATCH 065/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b42321cd7..263e845c3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1-dev - unreleased
+--------------------
+
+- No changes yet.
+
 1.0.0-alpha.4 - 2015-01-29
 --------------------------
 
diff --git a/setup.py b/setup.py
index 36641edc7..edff161d4 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.0.0-alpha.4',
+      version='1.1-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 6f507d7626a2de6407c59d5fc6a67f942ca64423 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 30 Nov 2014 14:36:46 -0800
Subject: [PATCH 066/600] Work in progress on using filedepot to store blobs

---
 development.ini             |  2 +-
 kotti/__init__.py           |  9 +++++++++
 kotti/resources.py          | 16 +++++++++++++++-
 kotti/views/edit/content.py | 28 ++++++++++++++++++++++------
 kotti/views/file.py         |  2 +-
 kotti/views/image.py        |  4 ++--
 requirements.txt            |  2 ++
 7 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/development.ini b/development.ini
index 76ed43710..e7b34d938 100644
--- a/development.ini
+++ b/development.ini
@@ -28,7 +28,7 @@ pipeline =
 
 [server:main]
 use = egg:waitress#main
-host = 127.0.0.1
+host = 0.0.0.0
 port = 5000
 
 [alembic]
diff --git a/kotti/__init__.py b/kotti/__init__.py
index 2a47b0ac9..971c9baa7 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -25,6 +25,15 @@
 TRUE_VALUES = ('1', 'y', 'yes', 't', 'true')
 FALSE_VALUES = ('0', 'n', 'no', 'f', 'false', 'none')
 
+#tibi temp
+from depot.manager import DepotManager
+# Configure a *default* depot to store files on MongoDB GridFS
+DepotManager.configure('default', {
+    'depot.backend': 'depot.io.local.LocalFileStorage',
+    'depot.storage_path': 'var/files'
+})
+#end tibi temp
+
 
 def authtkt_factory(**settings):
     from kotti.security import list_groups_callback
diff --git a/kotti/resources.py b/kotti/resources.py
index f9216d711..b1be85a28 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -13,7 +13,12 @@
 from fnmatch import fnmatch
 from UserDict import DictMixin
 
+from depot.fields.sqlalchemy import UploadedFileField
+from depot.fields.sqlalchemy import _SQLAMutationTracker
+
+from pyramid.threadlocal import get_current_registry
 from pyramid.traversal import resource_path
+from sqlalchemy import event
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
@@ -644,7 +649,8 @@ class File(Content):
     id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
     #: The binary data itself
     #: (:class:`sqlalchemy.types.LargeBinary`)
-    data = deferred(Column("data", LargeBinary()))
+    #data = deferred(Column("data", LargeBinary()))
+    data = Column(UploadedFileField)
     #: The filename is used in the attachment view to give downloads
     #: the original filename it had when it was uploaded.
     #: (:class:`sqlalchemy.types.Unicode`)
@@ -698,6 +704,14 @@ def from_field_storage(cls, fs):
 
         return cls(data=data, filename=filename, mimetype=mimetype, size=size)
 
+    @classmethod
+    def __declare_last__(cls):
+        # For the ``data`` column, use the field value setter from filedepot.
+        # filedepot already registers this event listener, but it does so in a
+        # way that won't work properly for subclasses of File
+        event.listen(cls.data, 'set',
+                     _SQLAMutationTracker._field_set, retval=True)
+
 
 class Image(File):
     """Image doesn't add anything to :class:`~kotti.resources.File`, but images
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 6e5bcbfbc..7531f62c7 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -86,7 +86,7 @@ def before(self, form):
         form.appstruct = get_appstruct(self.context, self.schema)
         if self.context.data is not None:
             form.appstruct.update({'file': {
-                'fp': StringIO(self.context.data),
+                'fp': StringIO(self.context.data.file.read()),
                 'filename': self.context.name,
                 'mimetype': self.context.mimetype,
                 'uid': str(random.randint(1000000000, 9999999999)),
@@ -102,11 +102,18 @@ def edit(self, **appstruct):
         self.context.description = appstruct['description']
         self.context.tags = appstruct['tags']
         if appstruct['file']:
-            buf = appstruct['file']['fp'].read()
+            buf = appstruct['file']['fp']
+            size = 0
+            while True:
+                chunk = buf.read(1024)
+                if not chunk:
+                    break
+                size += len(chunk)
+            buf.seek(0)
             self.context.data = buf
             self.context.filename = appstruct['file']['filename']
             self.context.mimetype = appstruct['file']['mimetype']
-            self.context.size = len(buf)
+            self.context.size = size
 
 
 class FileAddForm(AddFormView):
@@ -123,17 +130,26 @@ def save_success(self, appstruct):
         return super(FileAddForm, self).save_success(appstruct)
 
     def add(self, **appstruct):
-        buf = appstruct['file']['fp'].read()
+        buf = appstruct['file']['fp']   #.read()
+        size = 0
+        while True:
+            chunk = buf.read(1024)
+            if not chunk:
+                break
+            size += len(chunk)
+        buf.seek(0)
         filename = appstruct['file']['filename']
-        return self.item_class(
+        item = self.item_class(
             title=appstruct['title'] or filename,
             description=appstruct['description'],
             tags=appstruct['tags'],
             data=buf,
             filename=filename,
             mimetype=appstruct['file']['mimetype'],
-            size=len(buf),
+            size=size,
             )
+        import pdb; pdb.set_trace()
+        return item
 
 
 class ImageEditForm(FileEditForm):
diff --git a/kotti/views/file.py b/kotti/views/file.py
index 1c81e627d..36dd0aa7d 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -22,7 +22,7 @@ def inline_view(context, request, disposition='inline'):
             ('Content-Type', str(context.mimetype)),
             ]
         )
-    res.body = context.data
+    res.body = context.data.file.read()
     return res
 
 
diff --git a/kotti/views/image.py b/kotti/views/image.py
index ec49edb7b..5c98e9d2b 100644
--- a/kotti/views/image.py
+++ b/kotti/views/image.py
@@ -88,12 +88,12 @@ def image(self, subpath=None):
                 width, height = image_scales[scale]
 
         if width and height:
-            image, format, size = scaleImage(self.context.data,
+            image, format, size = scaleImage(self.context.data.file.read(),
                                              width=width,
                                              height=height,
                                              direction="thumb")
         else:
-            image = self.context.data
+            image = self.context.data.file.read()
 
         res = Response(
             headerlist=[('Content-Disposition', '%s;filename="%s"' % (
diff --git a/requirements.txt b/requirements.txt
index 0831752a7..7db5873aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,6 @@
 Kotti==1.0.0-alpha.4
+-e git+ssh://git@github.com/amol-/depot.git#egg=filedepot
+
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20

From d08a5dda607123af00c2c0b9f73cdc4392c97d74 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 2 Dec 2014 17:51:49 +0200
Subject: [PATCH 067/600] Cleanup code; added mock for the data column for
 test_file; make tests pass

---
 kotti/__init__.py           |  5 ++---
 kotti/resources.py          |  1 -
 kotti/tests/test_file.py    | 24 ++++++++++++++++++++----
 kotti/views/edit/content.py |  3 +--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index 971c9baa7..bc77dd84d 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -25,14 +25,13 @@
 TRUE_VALUES = ('1', 'y', 'yes', 't', 'true')
 FALSE_VALUES = ('0', 'n', 'no', 'f', 'false', 'none')
 
-#tibi temp
+# tibi temp
 from depot.manager import DepotManager
-# Configure a *default* depot to store files on MongoDB GridFS
 DepotManager.configure('default', {
     'depot.backend': 'depot.io.local.LocalFileStorage',
     'depot.storage_path': 'var/files'
 })
-#end tibi temp
+# end tibi temp
 
 
 def authtkt_factory(**settings):
diff --git a/kotti/resources.py b/kotti/resources.py
index b1be85a28..088080977 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -649,7 +649,6 @@ class File(Content):
     id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
     #: The binary data itself
     #: (:class:`sqlalchemy.types.LargeBinary`)
-    #data = deferred(Column("data", LargeBinary()))
     data = Column(UploadedFileField)
     #: The filename is used in the attachment view to give downloads
     #: the original filename it had when it was uploaded.
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 22399b3f3..41ddb56ba 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -42,7 +42,23 @@ def test_attachment_view(self, config):
 class TestFileEditForm:
     def make_one(self):
         from kotti.views.edit.content import FileEditForm
-        return FileEditForm(MagicMock(), DummyRequest())
+
+        class MockFileColumn(object):
+            def __init__(self):
+                self.file = MagicMock()
+
+            def __set__(self, instance, value):
+                if isinstance(value, StringIO):
+                    value.seek(0)
+                    rv = value.read()
+                else:
+                    rv = value
+                self.file.read.return_value = rv
+
+        class MockDepotFile(object):
+            data = MockFileColumn()
+
+        return FileEditForm(MockDepotFile(), DummyRequest())
 
     def test_edit_with_file(self):
         view = self.make_one()
@@ -57,7 +73,7 @@ def test_edit_with_file(self):
             )
         assert view.context.title == u'A title'
         assert view.context.description == u'A description'
-        assert view.context.data == 'filecontents'
+        assert view.context.data.file.read() == 'filecontents'
         assert view.context.filename == u'myfile.png'
         assert view.context.mimetype == u'image/png'
         assert view.context.size == len('filecontents')
@@ -75,7 +91,7 @@ def test_edit_without_file(self):
                   file=null)
         assert view.context.title == u'A title'
         assert view.context.description == u'A description'
-        assert view.context.data == 'filecontents'
+        assert view.context.data.file.read() == 'filecontents'
         assert view.context.filename == u'myfile.png'
         assert view.context.mimetype == u'image/png'
         assert view.context.size == 777
@@ -102,7 +118,7 @@ def test_add(self, config):
         assert file.title == u'A title'
         assert file.description == u'A description'
         assert file.tags == []
-        assert file.data == 'filecontents'
+        assert file.data.file.read() == 'filecontents'
         assert file.filename == u'myfile.png'
         assert file.mimetype == u'image/png'
         assert file.size == len('filecontents')
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 7531f62c7..1891c1150 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -130,7 +130,7 @@ def save_success(self, appstruct):
         return super(FileAddForm, self).save_success(appstruct)
 
     def add(self, **appstruct):
-        buf = appstruct['file']['fp']   #.read()
+        buf = appstruct['file']['fp']
         size = 0
         while True:
             chunk = buf.read(1024)
@@ -148,7 +148,6 @@ def add(self, **appstruct):
             mimetype=appstruct['file']['mimetype'],
             size=size,
             )
-        import pdb; pdb.set_trace()
         return item
 
 

From 86467a5e9ee28670b0cea3e7e69d8279625587c4 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 2 Dec 2014 13:21:26 -0800
Subject: [PATCH 068/600] Added test for File and Image that proves usage of
 depot store

---
 kotti/tests/test_file.py | 59 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 41ddb56ba..e32933df0 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -140,3 +140,62 @@ def test_delitem(self):
         tmpstore.session['important'] = 3
         del tmpstore['important']
         assert 'important' not in tmpstore.session
+
+
+class TestFileUsesDepotStorage:
+
+    @classmethod
+    def setup_class(cls):
+        from depot.manager import DepotManager
+        from mock import Mock
+
+        class TestStorage:
+            def __init__(self):
+                self._storage = {}
+                self._storage.setdefault(0)
+
+            def get(self, id):
+                f = Mock()
+                f.read.return_value = self._storage[id]
+                return f
+
+            def create(self, content, filename=None, content_type=None):
+                id = max(self._storage) + 1
+                self._storage[id] = content
+                return id
+
+        DepotManager._depots = {
+            'default': TestStorage()
+        }
+
+    @classmethod
+    def teardown_class(cls):
+        from depot.manager import DepotManager
+        DepotManager._depots = {}
+
+    def test_create_file(self):
+        from kotti.resources import File
+        f = File('file content')
+        assert len(f.data['files']) == 1
+        assert f.data.file.read() == 'file content'
+
+    def test_edit_file_content(self):
+        from kotti.resources import File
+        f = File('file content')
+        assert f.data.file.read() == 'file content'
+        f.data = 'edited'
+        assert f.data.file.read() == 'edited'
+
+    def test_create_image(self):
+        from kotti.resources import Image
+        f = Image('file content')
+        assert len(f.data['files']) == 1
+        assert f.data.file.read() == 'file content'
+
+    def test_edit_image_content(self):
+        from kotti.resources import Image
+        f = Image('file content')
+        assert f.data.file.read() == 'file content'
+        f.data = 'edited'
+        assert f.data.file.read() == 'edited'
+

From 16c0e521f1073f1f1eab647fdb752420151ae693 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 2 Dec 2014 14:35:02 -0800
Subject: [PATCH 069/600] Test session rollback integration for filedepot

---
 kotti/tests/test_file.py | 56 ++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index e32933df0..b68666c0f 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -1,7 +1,8 @@
 from StringIO import StringIO
-
 from colander import null
+
 from mock import MagicMock
+import pytest
 
 from kotti.testing import DummyRequest
 
@@ -142,12 +143,12 @@ def test_delitem(self):
         assert 'important' not in tmpstore.session
 
 
-class TestFileUsesDepotStorage:
+class TestDepotStore:
 
     @classmethod
     def setup_class(cls):
         from depot.manager import DepotManager
-        from mock import Mock
+        from datetime import datetime
 
         class TestStorage:
             def __init__(self):
@@ -155,8 +156,12 @@ def __init__(self):
                 self._storage.setdefault(0)
 
             def get(self, id):
-                f = Mock()
+                f = MagicMock()
                 f.read.return_value = self._storage[id]
+                f.last_modified = datetime.now()
+                f.filename = str(id)
+                f.public_url = ''
+                f.content_type = 'image/png'
                 return f
 
             def create(self, content, filename=None, content_type=None):
@@ -164,8 +169,11 @@ def create(self, content, filename=None, content_type=None):
                 self._storage[id] = content
                 return id
 
+            def delete(self, id):
+                del self._storage[int(id)]
+
         DepotManager._depots = {
-            'default': TestStorage()
+            'default': MagicMock(wraps=TestStorage())
         }
 
     @classmethod
@@ -173,29 +181,33 @@ def teardown_class(cls):
         from depot.manager import DepotManager
         DepotManager._depots = {}
 
-    def test_create_file(self):
-        from kotti.resources import File
-        f = File('file content')
+    from kotti.resources import File, Image
+
+    @pytest.mark.parametrize("factory", [File, Image])
+    def test_create(self, factory):
+        f = factory('file content')
         assert len(f.data['files']) == 1
         assert f.data.file.read() == 'file content'
 
-    def test_edit_file_content(self):
-        from kotti.resources import File
-        f = File('file content')
+    @pytest.mark.parametrize("factory", [File, Image])
+    def test_edit_content(self, factory):
+        f = factory('file content')
         assert f.data.file.read() == 'file content'
         f.data = 'edited'
         assert f.data.file.read() == 'edited'
 
-    def test_create_image(self):
-        from kotti.resources import Image
-        f = Image('file content')
-        assert len(f.data['files']) == 1
-        assert f.data.file.read() == 'file content'
+    @pytest.mark.parametrize("factory", [File, Image])
+    def test_session_rollback(self, factory, db_session):
+        from depot.manager import DepotManager
 
-    def test_edit_image_content(self):
-        from kotti.resources import Image
-        f = Image('file content')
-        assert f.data.file.read() == 'file content'
-        f.data = 'edited'
-        assert f.data.file.read() == 'edited'
+        f = factory(data='file content', name=u'content', title=u'content')
+        id = f.data['file_id']
+
+        assert id in DepotManager.get()._storage.keys()
+
+        db_session.add(f)
+        db_session.flush()
+        db_session.rollback()
 
+        assert DepotManager.get().delete.called
+        assert id not in DepotManager.get()._storage.keys()

From 2ac03829f14ed56aceff9045b10895a475807d01 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 2 Dec 2014 14:38:06 -0800
Subject: [PATCH 070/600] Better test in depot rollback test

---
 kotti/tests/test_file.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index b68666c0f..b34397b33 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -207,7 +207,7 @@ def test_session_rollback(self, factory, db_session):
 
         db_session.add(f)
         db_session.flush()
+        assert id in DepotManager.get()._storage.keys()
         db_session.rollback()
-
-        assert DepotManager.get().delete.called
         assert id not in DepotManager.get()._storage.keys()
+        assert DepotManager.get().delete.called

From 23fd86c8ccc00818b52c225aa1b67a462c022a7c Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 2 Dec 2014 15:13:13 -0800
Subject: [PATCH 071/600] Added test for depot filestorage deletion

---
 kotti/tests/test_file.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index b34397b33..01c4da28c 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -158,10 +158,13 @@ def __init__(self):
             def get(self, id):
                 f = MagicMock()
                 f.read.return_value = self._storage[id]
+
+                # needed to make JSON serializable, Mock objects are not
                 f.last_modified = datetime.now()
                 f.filename = str(id)
                 f.public_url = ''
                 f.content_type = 'image/png'
+
                 return f
 
             def create(self, content, filename=None, content_type=None):
@@ -211,3 +214,20 @@ def test_session_rollback(self, factory, db_session):
         db_session.rollback()
         assert id not in DepotManager.get()._storage.keys()
         assert DepotManager.get().delete.called
+
+    @pytest.mark.parametrize("factory", [File, Image])
+    def test_delete(self, factory, db_session, root):
+        from depot.manager import DepotManager
+
+        f = factory(data='file content', name=u'content', title=u'content')
+        id = f.data['file_id']
+        root[str(id)] = f
+        db_session.flush()
+
+        assert id in DepotManager.get()._storage.keys()
+
+        del root[str(id)]
+        import transaction; transaction.commit()
+
+        assert DepotManager.get().delete.called
+        assert id not in DepotManager.get()._storage.keys()

From c6747aec4003884da8cb24db41c78affa3f2ddac Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 2 Dec 2014 16:56:19 -0800
Subject: [PATCH 072/600] Added stuf implementation of filestorage

---
 kotti/resources.py       | 176 ++++++++++++++++++++++++++++++++++++++-
 kotti/tests/test_file.py |   3 +-
 2 files changed, 175 insertions(+), 4 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 088080977..0687318ba 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -9,12 +9,16 @@
 """
 
 import os
+import uuid
 import warnings
+
+from datetime import datetime
 from fnmatch import fnmatch
 from UserDict import DictMixin
 
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.sqlalchemy import _SQLAMutationTracker
+from depot.io.interfaces import StoredFile, FileStorage
 
 from pyramid.threadlocal import get_current_registry
 from pyramid.traversal import resource_path
@@ -647,8 +651,8 @@ class File(Content):
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
     id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
-    #: The binary data itself
-    #: (:class:`sqlalchemy.types.LargeBinary`)
+    #: Filedepot mapped blob
+    #: (:class:`depot.fileds.sqlalchemy.UploadedFileField`)
     data = Column(UploadedFileField)
     #: The filename is used in the attachment view to give downloads
     #: the original filename it had when it was uploaded.
@@ -731,6 +735,174 @@ class Image(File):
         )
 
 
+class CooperativeMeta(type):
+    def __new__(cls, name, bases, members):
+        #collect up the metaclasses
+        metas = [type(base) for base in bases]
+
+        # prune repeated or conflicting entries
+        metas = [meta for index, meta in enumerate(metas)
+            if not [later for later in metas[index+1:]
+                if issubclass(later, meta)]]
+
+        # whip up the actual combined meta class derive off all of these
+        meta = type(name, tuple(metas), dict(combined_metas = metas))
+
+        # make the actual object
+        return meta(name, bases, members)
+
+    def __init__(self, name, bases, members):
+        for meta in self.combined_metas:
+            meta.__init__(self, name, bases, members)
+
+
+class DBStoredFile(Base, StoredFile):
+    """depotfile StoredFile implementation that stores data in the db.
+
+    Can be used together with DBFileStorage to implement blobs (large files)
+    storage in the database.
+    """
+
+    __tablename__ = "blobs"
+    __metaclass__ = CooperativeMeta
+
+    #: Primary key column in the DB
+    #: (:class:`sqlalchemy.types.Integer`)
+    id = Column(Integer(), primary_key=True)
+    #: Unique id given to this blob
+    #: (:class:`sqlalchemy.types.String`)
+    file_id = Column(String(36), index=True)
+    #: The original filename it had when it was uploaded.
+    #: (:class:`sqlalchemy.types.String`)
+    filename = Column(Unicode(100))
+    #: MIME type of the blob
+    #: (:class:`sqlalchemy.types.String`)
+    content_type = Column(String(30))
+    #: Size of the blob in bytes
+    #: (:class:`sqlalchemy.types.Integer`)
+    content_length = Column(Integer())
+    #: Date / time the blob was created
+    #: (:class:`sqlalchemy.types.DateTime`)
+    last_modified = Column(DateTime())
+    #: The binary data itself
+    #: (:class:`sqlalchemy.types.LargeBinary`)
+    data = deferred(Column('data', LargeBinary()))
+
+    # def __init__(self, **kw):
+    #     for k, v in kw.items():
+    #         setattr(self, k, v)
+
+    def read(self, n=-1):  # pragma: no cover
+        """Reads ``n`` bytes from the file.
+
+        If ``n`` is not specified or is ``-1`` the whole
+        file content is read in memory and returned
+        """
+        return
+
+    def close(self, *args, **kwargs):  # pragma: no cover
+        """Closes the file.
+
+        After closing the file it won't be possible to read
+        from it anymore. Some implementation might not do anything
+        when closing the file, but they still are required to prevent
+        further reads from a closed file.
+        """
+        return
+
+    def closed(self):  # pragma: no cover
+        """Returns if the file has been closed.
+
+        When ``closed`` return ``True`` it won't be possible
+        to read anoymore from this file.
+        """
+        return
+
+
+class DBFileStorage(FileStorage):
+    """ depotfile FileStorage implementation, uses DBStoredFile to store data
+    """
+
+    def get(self, file_id):
+        """Returns the file given by the file_id
+        """
+
+        f = DBSession.query(DBStoredFile).filter_by(file_id=file_id).first()
+        if f is None:
+            raise IOError
+        return f
+
+    def create(self, content, filename=None, content_type=None):
+        """Saves a new file and returns the file id
+
+        ``content`` parameter can either be ``bytes``, another ``file object``
+        or a :class:`cgi.FieldStorage`. When ``filename`` and ``content_type``
+        parameters are not provided they are deducted from the content itself.
+        """
+        new_file_id = str(uuid.uuid1())
+        content, filename, content_type = self.fileinfo(
+            content, filename, content_type)
+        if hasattr(content, 'read'):
+            content = content.read()
+
+        fstore = DBStoredFile(data=content,
+                              file_id=new_file_id,
+                              filename=filename,
+                              content_type=content_type,
+                              content_length=len(content),
+                              last_modified=datetime.now())
+        DBSession.add(fstore)
+        return new_file_id
+
+    def replace(self, file_or_id, content, filename=None, content_type=None):  # pragma: no cover
+        """Replaces an existing file, an ``IOError`` is raised if the file didn't already exist.
+
+        Given a :class:`StoredFile` or its ID it will replace the current content
+        with the provided ``content`` value. If ``filename`` and ``content_type`` are
+        provided or can be deducted by the ``content`` itself they will also replace
+        the previous values, otherwise the current values are kept.
+        """
+
+        if isinstance(file_or_id, StoredFile):
+            file_id = file_or_id.file_id
+        else:
+            file_id = file_or_id
+
+        content, filename, content_type = self.fileinfo(
+            content, filename, content_type)
+
+        fstore = self.get(file_id)
+
+        if filename is not None:
+            fstore.filename = filename
+        if content_type is not None:
+            fstore.content_type = content_type
+
+        if hasattr(content, 'read'):
+            content = content.read()
+
+        fstore.data = content
+
+    def delete(self, file_or_id):  # pragma: no cover
+        """Deletes a file. If the file didn't exist it will just do nothing."""
+
+        if isinstance(file_or_id, StoredFile):
+            file_id = file_or_id.file_id
+        else:
+            file_id = file_or_id
+        fstore = self.get(file_id)
+        DBSession.delete(fstore)
+
+    def exists(self, file_or_id):  # pragma: no cover
+        """Returns if a file or its ID still exist."""
+        if isinstance(file_or_id, StoredFile):
+            file_id = file_or_id.file_id
+        else:
+            file_id = file_or_id
+        return bool(
+            DBSession.query(StoredFile).filter_by(file_id=file_id).count())
+
+
 def get_root(request=None):
     """Call the function defined by the ``kotti.root_factory`` setting and
        return its result.
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 01c4da28c..9b748e48d 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -206,11 +206,10 @@ def test_session_rollback(self, factory, db_session):
         f = factory(data='file content', name=u'content', title=u'content')
         id = f.data['file_id']
 
-        assert id in DepotManager.get()._storage.keys()
-
         db_session.add(f)
         db_session.flush()
         assert id in DepotManager.get()._storage.keys()
+
         db_session.rollback()
         assert id not in DepotManager.get()._storage.keys()
         assert DepotManager.get().delete.called

From 51c90b8b7599fd26a36edb6a708457931f34b883 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Thu, 4 Dec 2014 14:51:24 +0200
Subject: [PATCH 073/600] Moved filedepot code to filedepot module; make a test
 fixture for filedepot; properly implement filedepot protocol in fixture

---
 kotti/filedepot.py             | 178 +++++++++++++++++++++++++++++++++
 kotti/resources.py             | 174 --------------------------------
 kotti/tests/__init__.py        |  43 ++++++++
 kotti/tests/test_file.py       |  50 ++-------
 kotti/tests/test_functional.py |   2 +-
 kotti/views/edit/content.py    |   2 +-
 6 files changed, 229 insertions(+), 220 deletions(-)
 create mode 100644 kotti/filedepot.py

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
new file mode 100644
index 000000000..efa9211cb
--- /dev/null
+++ b/kotti/filedepot.py
@@ -0,0 +1,178 @@
+from datetime import datetime
+from depot.io.interfaces import StoredFile, FileStorage
+
+from sqlalchemy import Column
+from sqlalchemy import DateTime
+from sqlalchemy import Integer
+from sqlalchemy import LargeBinary
+from sqlalchemy import String
+from sqlalchemy import Unicode
+from sqlalchemy.orm import deferred
+
+from kotti import Base
+from kotti import DBSession
+
+import uuid
+
+class CooperativeMeta(type):
+    def __new__(cls, name, bases, members):
+        # collect up the metaclasses
+        metas = [type(base) for base in bases]
+
+        # prune repeated or conflicting entries
+        metas = [meta for index, meta in enumerate(metas)
+            if not [later for later in metas[index + 1:]
+                if issubclass(later, meta)]]
+
+        # whip up the actual combined meta class derive off all of these
+        meta = type(name, tuple(metas), dict(combined_metas=metas))
+
+        # make the actual object
+        return meta(name, bases, members)
+
+    def __init__(self, name, bases, members):
+        for meta in self.combined_metas:
+            meta.__init__(self, name, bases, members)
+
+
+class DBStoredFile(Base, StoredFile):
+    """depotfile StoredFile implementation that stores data in the db.
+
+    Can be used together with DBFileStorage to implement blobs (large files)
+    storage in the database.
+    """
+
+    __tablename__ = "blobs"
+    __metaclass__ = CooperativeMeta
+
+    #: Primary key column in the DB
+    #: (:class:`sqlalchemy.types.Integer`)
+    id = Column(Integer(), primary_key=True)
+    #: Unique id given to this blob
+    #: (:class:`sqlalchemy.types.String`)
+    file_id = Column(String(36), index=True)
+    #: The original filename it had when it was uploaded.
+    #: (:class:`sqlalchemy.types.String`)
+    filename = Column(Unicode(100))
+    #: MIME type of the blob
+    #: (:class:`sqlalchemy.types.String`)
+    content_type = Column(String(30))
+    #: Size of the blob in bytes
+    #: (:class:`sqlalchemy.types.Integer`)
+    content_length = Column(Integer())
+    #: Date / time the blob was created
+    #: (:class:`sqlalchemy.types.DateTime`)
+    last_modified = Column(DateTime())
+    #: The binary data itself
+    #: (:class:`sqlalchemy.types.LargeBinary`)
+    data = deferred(Column('data', LargeBinary()))
+
+    def read(self, n=-1):  # pragma: no cover
+        """Reads ``n`` bytes from the file.
+
+        If ``n`` is not specified or is ``-1`` the whole
+        file content is read in memory and returned
+        """
+        return
+
+    def close(self, *args, **kwargs):  # pragma: no cover
+        """Closes the file.
+
+        After closing the file it won't be possible to read
+        from it anymore. Some implementation might not do anything
+        when closing the file, but they still are required to prevent
+        further reads from a closed file.
+        """
+        return
+
+    def closed(self):  # pragma: no cover
+        """Returns if the file has been closed.
+
+        When ``closed`` return ``True`` it won't be possible
+        to read anoymore from this file.
+        """
+        return
+
+
+class DBFileStorage(FileStorage):
+    """ depotfile FileStorage implementation, uses DBStoredFile to store data
+    """
+
+    def get(self, file_id):
+        """Returns the file given by the file_id
+        """
+
+        f = DBSession.query(DBStoredFile).filter_by(file_id=file_id).first()
+        if f is None:
+            raise IOError
+        return f
+
+    def create(self, content, filename=None, content_type=None):
+        """Saves a new file and returns the file id
+
+        ``content`` parameter can either be ``bytes``, another ``file object``
+        or a :class:`cgi.FieldStorage`. When ``filename`` and ``content_type``
+        parameters are not provided they are deducted from the content itself.
+        """
+        new_file_id = str(uuid.uuid1())
+        content, filename, content_type = self.fileinfo(
+            content, filename, content_type)
+        if hasattr(content, 'read'):
+            content = content.read()
+
+        fstore = DBStoredFile(data=content,
+                              file_id=new_file_id,
+                              filename=filename,
+                              content_type=content_type,
+                              content_length=len(content),
+                              last_modified=datetime.now())
+        DBSession.add(fstore)
+        return new_file_id
+
+    def replace(self, file_or_id, content, filename=None, content_type=None):  # pragma: no cover
+        """Replaces an existing file, an ``IOError`` is raised if the file didn't already exist.
+
+        Given a :class:`StoredFile` or its ID it will replace the current content
+        with the provided ``content`` value. If ``filename`` and ``content_type`` are
+        provided or can be deducted by the ``content`` itself they will also replace
+        the previous values, otherwise the current values are kept.
+        """
+
+        if isinstance(file_or_id, StoredFile):
+            file_id = file_or_id.file_id
+        else:
+            file_id = file_or_id
+
+        content, filename, content_type = self.fileinfo(
+            content, filename, content_type)
+
+        fstore = self.get(file_id)
+
+        if filename is not None:
+            fstore.filename = filename
+        if content_type is not None:
+            fstore.content_type = content_type
+
+        if hasattr(content, 'read'):
+            content = content.read()
+
+        fstore.data = content
+
+    def delete(self, file_or_id):  # pragma: no cover
+        """Deletes a file. If the file didn't exist it will just do nothing."""
+
+        if isinstance(file_or_id, StoredFile):
+            file_id = file_or_id.file_id
+        else:
+            file_id = file_or_id
+        fstore = self.get(file_id)
+        DBSession.delete(fstore)
+
+    def exists(self, file_or_id):  # pragma: no cover
+        """Returns if a file or its ID still exist."""
+        if isinstance(file_or_id, StoredFile):
+            file_id = file_or_id.file_id
+        else:
+            file_id = file_or_id
+        return bool(
+            DBSession.query(StoredFile).filter_by(file_id=file_id).count())
diff --git a/kotti/resources.py b/kotti/resources.py
index 0687318ba..f7a15d3ea 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -9,18 +9,14 @@
 """
 
 import os
-import uuid
 import warnings
 
-from datetime import datetime
 from fnmatch import fnmatch
 from UserDict import DictMixin
 
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.sqlalchemy import _SQLAMutationTracker
-from depot.io.interfaces import StoredFile, FileStorage
 
-from pyramid.threadlocal import get_current_registry
 from pyramid.traversal import resource_path
 from sqlalchemy import event
 from sqlalchemy import Boolean
@@ -28,7 +24,6 @@
 from sqlalchemy import DateTime
 from sqlalchemy import ForeignKey
 from sqlalchemy import Integer
-from sqlalchemy import LargeBinary
 from sqlalchemy import String
 from sqlalchemy import Unicode
 from sqlalchemy import UnicodeText
@@ -37,7 +32,6 @@
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.orm import backref
-from sqlalchemy.orm import deferred
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.orm import relation
 from sqlalchemy.orm.exc import NoResultFound
@@ -735,174 +729,6 @@ class Image(File):
         )
 
 
-class CooperativeMeta(type):
-    def __new__(cls, name, bases, members):
-        #collect up the metaclasses
-        metas = [type(base) for base in bases]
-
-        # prune repeated or conflicting entries
-        metas = [meta for index, meta in enumerate(metas)
-            if not [later for later in metas[index+1:]
-                if issubclass(later, meta)]]
-
-        # whip up the actual combined meta class derive off all of these
-        meta = type(name, tuple(metas), dict(combined_metas = metas))
-
-        # make the actual object
-        return meta(name, bases, members)
-
-    def __init__(self, name, bases, members):
-        for meta in self.combined_metas:
-            meta.__init__(self, name, bases, members)
-
-
-class DBStoredFile(Base, StoredFile):
-    """depotfile StoredFile implementation that stores data in the db.
-
-    Can be used together with DBFileStorage to implement blobs (large files)
-    storage in the database.
-    """
-
-    __tablename__ = "blobs"
-    __metaclass__ = CooperativeMeta
-
-    #: Primary key column in the DB
-    #: (:class:`sqlalchemy.types.Integer`)
-    id = Column(Integer(), primary_key=True)
-    #: Unique id given to this blob
-    #: (:class:`sqlalchemy.types.String`)
-    file_id = Column(String(36), index=True)
-    #: The original filename it had when it was uploaded.
-    #: (:class:`sqlalchemy.types.String`)
-    filename = Column(Unicode(100))
-    #: MIME type of the blob
-    #: (:class:`sqlalchemy.types.String`)
-    content_type = Column(String(30))
-    #: Size of the blob in bytes
-    #: (:class:`sqlalchemy.types.Integer`)
-    content_length = Column(Integer())
-    #: Date / time the blob was created
-    #: (:class:`sqlalchemy.types.DateTime`)
-    last_modified = Column(DateTime())
-    #: The binary data itself
-    #: (:class:`sqlalchemy.types.LargeBinary`)
-    data = deferred(Column('data', LargeBinary()))
-
-    # def __init__(self, **kw):
-    #     for k, v in kw.items():
-    #         setattr(self, k, v)
-
-    def read(self, n=-1):  # pragma: no cover
-        """Reads ``n`` bytes from the file.
-
-        If ``n`` is not specified or is ``-1`` the whole
-        file content is read in memory and returned
-        """
-        return
-
-    def close(self, *args, **kwargs):  # pragma: no cover
-        """Closes the file.
-
-        After closing the file it won't be possible to read
-        from it anymore. Some implementation might not do anything
-        when closing the file, but they still are required to prevent
-        further reads from a closed file.
-        """
-        return
-
-    def closed(self):  # pragma: no cover
-        """Returns if the file has been closed.
-
-        When ``closed`` return ``True`` it won't be possible
-        to read anoymore from this file.
-        """
-        return
-
-
-class DBFileStorage(FileStorage):
-    """ depotfile FileStorage implementation, uses DBStoredFile to store data
-    """
-
-    def get(self, file_id):
-        """Returns the file given by the file_id
-        """
-
-        f = DBSession.query(DBStoredFile).filter_by(file_id=file_id).first()
-        if f is None:
-            raise IOError
-        return f
-
-    def create(self, content, filename=None, content_type=None):
-        """Saves a new file and returns the file id
-
-        ``content`` parameter can either be ``bytes``, another ``file object``
-        or a :class:`cgi.FieldStorage`. When ``filename`` and ``content_type``
-        parameters are not provided they are deducted from the content itself.
-        """
-        new_file_id = str(uuid.uuid1())
-        content, filename, content_type = self.fileinfo(
-            content, filename, content_type)
-        if hasattr(content, 'read'):
-            content = content.read()
-
-        fstore = DBStoredFile(data=content,
-                              file_id=new_file_id,
-                              filename=filename,
-                              content_type=content_type,
-                              content_length=len(content),
-                              last_modified=datetime.now())
-        DBSession.add(fstore)
-        return new_file_id
-
-    def replace(self, file_or_id, content, filename=None, content_type=None):  # pragma: no cover
-        """Replaces an existing file, an ``IOError`` is raised if the file didn't already exist.
-
-        Given a :class:`StoredFile` or its ID it will replace the current content
-        with the provided ``content`` value. If ``filename`` and ``content_type`` are
-        provided or can be deducted by the ``content`` itself they will also replace
-        the previous values, otherwise the current values are kept.
-        """
-
-        if isinstance(file_or_id, StoredFile):
-            file_id = file_or_id.file_id
-        else:
-            file_id = file_or_id
-
-        content, filename, content_type = self.fileinfo(
-            content, filename, content_type)
-
-        fstore = self.get(file_id)
-
-        if filename is not None:
-            fstore.filename = filename
-        if content_type is not None:
-            fstore.content_type = content_type
-
-        if hasattr(content, 'read'):
-            content = content.read()
-
-        fstore.data = content
-
-    def delete(self, file_or_id):  # pragma: no cover
-        """Deletes a file. If the file didn't exist it will just do nothing."""
-
-        if isinstance(file_or_id, StoredFile):
-            file_id = file_or_id.file_id
-        else:
-            file_id = file_or_id
-        fstore = self.get(file_id)
-        DBSession.delete(fstore)
-
-    def exists(self, file_or_id):  # pragma: no cover
-        """Returns if a file or its ID still exist."""
-        if isinstance(file_or_id, StoredFile):
-            file_id = file_or_id.file_id
-        else:
-            file_id = file_or_id
-        return bool(
-            DBSession.query(StoredFile).filter_by(file_id=file_id).count())
-
-
 def get_root(request=None):
     """Call the function defined by the ``kotti.root_factory`` setting and
        return its result.
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index c9366a26a..0910e0b2e 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -9,6 +9,7 @@
 
    digraph kotti_fixtures {
       "allwarnings";
+      "filedepot";
       "app" -> "webtest";
       "config" -> "db_session";
       "config" -> "dummy_request";
@@ -41,6 +42,7 @@
 import warnings
 
 from pytest import fixture
+from mock import MagicMock
 
 
 @fixture
@@ -276,3 +278,44 @@ def workflow(config):
     from zope.configuration import xmlconfig
     import kotti
     xmlconfig.file('workflow.zcml', kotti, execute=True)
+
+
+@fixture
+def filedepot(request):
+    from depot.manager import DepotManager
+    from datetime import datetime
+
+    class TestStorage:
+        def __init__(self):
+            self._storage = {}
+            self._storage.setdefault(0)
+
+        def get(self, id):
+            f = MagicMock()
+            f.read.return_value = self._storage[id]
+
+            # needed to make JSON serializable, Mock objects are not
+            f.last_modified = datetime.now()
+            f.filename = str(id)
+            f.public_url = ''
+            f.content_type = 'image/png'
+
+            return f
+
+        def create(self, content, filename=None, content_type=None):
+            id = max(self._storage) + 1
+            if hasattr(content, 'read'):
+                content = content.read()
+            self._storage[id] = content
+            return id
+
+        def delete(self, id):
+            del self._storage[int(id)]
+
+    DepotManager._depots = {
+        'default': MagicMock(wraps=TestStorage())
+    }
+
+    def restore():
+        DepotManager._depots = {}
+    request.addfinalizer(restore)
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 9b748e48d..77003a77d 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -145,62 +145,23 @@ def test_delitem(self):
 
 class TestDepotStore:
 
-    @classmethod
-    def setup_class(cls):
-        from depot.manager import DepotManager
-        from datetime import datetime
-
-        class TestStorage:
-            def __init__(self):
-                self._storage = {}
-                self._storage.setdefault(0)
-
-            def get(self, id):
-                f = MagicMock()
-                f.read.return_value = self._storage[id]
-
-                # needed to make JSON serializable, Mock objects are not
-                f.last_modified = datetime.now()
-                f.filename = str(id)
-                f.public_url = ''
-                f.content_type = 'image/png'
-
-                return f
-
-            def create(self, content, filename=None, content_type=None):
-                id = max(self._storage) + 1
-                self._storage[id] = content
-                return id
-
-            def delete(self, id):
-                del self._storage[int(id)]
-
-        DepotManager._depots = {
-            'default': MagicMock(wraps=TestStorage())
-        }
-
-    @classmethod
-    def teardown_class(cls):
-        from depot.manager import DepotManager
-        DepotManager._depots = {}
-
     from kotti.resources import File, Image
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_create(self, factory):
+    def test_create(self, factory, filedepot):
         f = factory('file content')
         assert len(f.data['files']) == 1
         assert f.data.file.read() == 'file content'
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_edit_content(self, factory):
+    def test_edit_content(self, factory, filedepot):
         f = factory('file content')
         assert f.data.file.read() == 'file content'
         f.data = 'edited'
         assert f.data.file.read() == 'edited'
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_session_rollback(self, factory, db_session):
+    def test_session_rollback(self, factory, db_session, filedepot):
         from depot.manager import DepotManager
 
         f = factory(data='file content', name=u'content', title=u'content')
@@ -215,7 +176,7 @@ def test_session_rollback(self, factory, db_session):
         assert DepotManager.get().delete.called
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_delete(self, factory, db_session, root):
+    def test_delete(self, factory, db_session, root, filedepot):
         from depot.manager import DepotManager
 
         f = factory(data='file content', name=u'content', title=u'content')
@@ -226,7 +187,8 @@ def test_delete(self, factory, db_session, root):
         assert id in DepotManager.get()._storage.keys()
 
         del root[str(id)]
-        import transaction; transaction.commit()
+        import transaction
+        transaction.commit()
 
         assert DepotManager.get().delete.called
         assert id not in DepotManager.get()._storage.keys()
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index e6a238bbe..9bdd605e1 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -64,7 +64,7 @@ def test_tempstorage(self, browser):
         assert browser.contents == 'DEF'
 
     @user('admin')
-    def test_edit_uploaded_file(self, browser):
+    def test_edit_uploaded_file(self, browser, filedepot):
         browser.open(BASE_URL + '/@@add_file')
         self.add_file(browser, contents='GHI')
         browser.getLink("Edit").click()
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 1891c1150..23f095db9 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -147,7 +147,7 @@ def add(self, **appstruct):
             filename=filename,
             mimetype=appstruct['file']['mimetype'],
             size=size,
-            )
+        )
         return item
 
 

From 90a5fe5cbdd8192649190bb415d8ff3c76186b8d Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 4 Dec 2014 16:10:44 -0800
Subject: [PATCH 074/600] Configure and tests a default file depot

---
 kotti/__init__.py       | 11 +++--------
 kotti/filedepot.py      | 15 +++++++++++++++
 kotti/tests/test_app.py | 39 +++++++++++++++++++++++++++++++++++++++
 kotti/util.py           | 26 ++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index bc77dd84d..c23723ae0 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -25,14 +25,6 @@
 TRUE_VALUES = ('1', 'y', 'yes', 't', 'true')
 FALSE_VALUES = ('0', 'n', 'no', 'f', 'false', 'none')
 
-# tibi temp
-from depot.manager import DepotManager
-DepotManager.configure('default', {
-    'depot.backend': 'depot.io.local.LocalFileStorage',
-    'depot.storage_path': 'var/files'
-})
-# end tibi temp
-
 
 def authtkt_factory(**settings):
     from kotti.security import list_groups_callback
@@ -67,6 +59,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'pyramid.includes': '',
     'kotti.base_includes': ' '.join([
         'kotti',
+        'kotti.filedepot',
         'kotti.events',
         'kotti.views',
         'kotti.views.cache',
@@ -108,6 +101,8 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.datetime_format': 'medium',
     'kotti.time_format': 'medium',
     'kotti.max_file_size': '10',
+    'kotti.depot.default.backend': 'depot.io.local.LocalFileStorage',
+    'kotti.depot.default.storage_path': 'var/files',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
     'kotti.static.edit_needed': '',  # BBB
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index efa9211cb..a80633444 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -14,6 +14,7 @@
 
 import uuid
 
+
 class CooperativeMeta(type):
     def __new__(cls, name, bases, members):
         # collect up the metaclasses
@@ -176,3 +177,17 @@ def exists(self, file_or_id):  # pragma: no cover
             file_id = file_or_id
         return bool(
             DBSession.query(StoredFile).filter_by(file_id=file_id).count())
+
+
+def configure_filedepot(settings):
+    from kotti.util import flatdotted_to_dict
+    from depot.manager import DepotManager
+
+    config = flatdotted_to_dict('kotti.depot.', settings)
+    for name, conf in config.items():
+        if DepotManager.get(name) is None:
+            DepotManager.configure(name, conf, prefix='')
+
+
+def includeme(config):
+    configure_filedepot(config.get_settings())
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 00cbd41cb..33384c737 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -148,6 +148,45 @@ def test_setting_values_as_unicode(self, db_session):
         assert get_settings()['kotti_foo.site_title'] == u'K\xf6tti'
         assert get_settings()['foo.site_title'] == 'K\xc3\xb6tti'
 
+    def test_default_filedepot(self, db_session):
+        from kotti import main
+        from depot.manager import DepotManager
+
+        settings = self.required_settings()
+
+        with patch('kotti.resources.initialize_sql'):
+            main({}, **settings)
+        assert DepotManager.get().__class__.__name__ == 'LocalFileStorage'
+
+    def test_configure_filedepot(self):
+        from depot.manager import DepotManager
+        from kotti.filedepot import configure_filedepot
+        from kotti import tests
+
+        tests.TFS1 = Mock(return_value=Mock(marker="TFS1"))
+        tests.TFS2 = Mock(return_value=Mock(marker="TFS2"))
+
+        settings = {
+            'kotti.depot.default.backend': 'kotti.tests.TFS1',
+            'kotti.depot.default.location': '/tmp',
+            'kotti.depot.mongo.backend': 'kotti.tests.TFS2',
+            'kotti.depot.mongo.uri': 'mongo://',
+        }
+        depots = DepotManager._depots
+        DepotManager._depots = {}
+        configure_filedepot(settings)
+
+        assert DepotManager.get().marker == 'TFS1'
+        assert DepotManager.get('default').marker == 'TFS1'
+        assert DepotManager.get('mongo').marker == 'TFS2'
+
+        tests.TFS1.assert_called_with(location='/tmp')
+        tests.TFS2.assert_called_with(uri='mongo://')
+
+        DepotManager._depots = depots
+        del tests.TFS1
+        del tests.TFS2
+
     def test_search_content(self, db_session):
         from kotti import main
         from kotti.views.util import search_content
diff --git a/kotti/util.py b/kotti/util.py
index d2a427397..4cd225cfd 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -276,6 +276,32 @@ def extract_from_settings(prefix, settings=None):
     return extracted
 
 
+def flatdotted_to_dict(prefix, settings=None):
+    """
+      >>> settings = {
+      ...     'kotti.depot.default.backend': 'local',
+      ...     'kotti.depot.default.file_storage': 'var/files',
+      ...     'kotti.depot.mongo.backend': 'mongodb',
+      ...     'kotti.depot.mongo.uri': 'localhost://',
+      ... }
+      >>> res = flatdotted_to_dict('kotti.depot.', settings)
+      >>> print sorted(res.keys())
+      ['default', 'mongo']
+      >>> print res['default']
+      {'file_storage': 'var/files', 'backend': 'local'}
+      >>> print res['mongo']
+      {'uri': 'localhost://', 'backend': 'mongodb'}
+    """
+
+    extracted = {}
+    for k, v in extract_from_settings(prefix, settings).items():
+        name, conf = k.split('.', 1)
+        extracted.setdefault(name, {})
+        extracted[name][conf] = v
+
+    return extracted
+
+
 def disambiguate_name(name):
     parts = name.split(u'-')
     if len(parts) > 1:

From a4aca27fb830cbbb238ca8c65be0bc42c3c926a9 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 6 Dec 2014 12:09:21 -0800
Subject: [PATCH 075/600] DBStoredFile changes * Automatically set
 last_modified and content_length with an event * Stop subclassing StoredFile,
 remove CooperativeMeta * Added a test, test_filedepot.py

---
 kotti/filedepot.py            | 109 ++++++++++++++++++++++------------
 kotti/tests/test_filedepot.py |  63 ++++++++++++++++++++
 2 files changed, 135 insertions(+), 37 deletions(-)
 create mode 100644 kotti/tests/test_filedepot.py

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index a80633444..433438a7b 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -15,28 +15,7 @@
 import uuid
 
 
-class CooperativeMeta(type):
-    def __new__(cls, name, bases, members):
-        # collect up the metaclasses
-        metas = [type(base) for base in bases]
-
-        # prune repeated or conflicting entries
-        metas = [meta for index, meta in enumerate(metas)
-            if not [later for later in metas[index + 1:]
-                if issubclass(later, meta)]]
-
-        # whip up the actual combined meta class derive off all of these
-        meta = type(name, tuple(metas), dict(combined_metas=metas))
-
-        # make the actual object
-        return meta(name, bases, members)
-
-    def __init__(self, name, bases, members):
-        for meta in self.combined_metas:
-            meta.__init__(self, name, bases, members)
-
-
-class DBStoredFile(Base, StoredFile):
+class DBStoredFile(Base):   #, StoredFile):
     """depotfile StoredFile implementation that stores data in the db.
 
     Can be used together with DBFileStorage to implement blobs (large files)
@@ -44,7 +23,6 @@ class DBStoredFile(Base, StoredFile):
     """
 
     __tablename__ = "blobs"
-    __metaclass__ = CooperativeMeta
 
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
@@ -68,35 +46,77 @@ class DBStoredFile(Base, StoredFile):
     #: (:class:`sqlalchemy.types.LargeBinary`)
     data = deferred(Column('data', LargeBinary()))
 
-    def read(self, n=-1):  # pragma: no cover
+    def __init__(self, file_id, filename=None, content_type=None, last_modified=None,
+                 content_length=None, **kwds):
+        self.file_id = file_id
+        self.filename = filename
+        self.content_type = content_type
+        self.last_modified = last_modified
+        self.content_length = content_length
+
+        for k, v in kwds.items():
+            setattr(self, k, v)
+
+    def read(self, n=-1):
         """Reads ``n`` bytes from the file.
 
         If ``n`` is not specified or is ``-1`` the whole
         file content is read in memory and returned
         """
+        if n == -1:
+            return self.data
+        return self.data[:n]
+
+    def close(self, *args, **kwargs):
+        """Implement :meth:`StoredFile.close`.
+        :class:`DBStoredFile` never closes.
+        """
         return
 
-    def close(self, *args, **kwargs):  # pragma: no cover
-        """Closes the file.
+    def closed(self):
+        """Implement :meth:`StoredFile.closed`.
+        """
+        return False
 
-        After closing the file it won't be possible to read
-        from it anymore. Some implementation might not do anything
-        when closing the file, but they still are required to prevent
-        further reads from a closed file.
+    def writable(self):
+        """Implement :meth:`StoredFile.writable`.
         """
-        return
+        return False
 
-    def closed(self):  # pragma: no cover
-        """Returns if the file has been closed.
+    def seekable(self):
+        """Implement :meth:`StoredFile.seekable`.
+        """
+        return False
+
+    @property
+    def name(self):
+        """Implement :meth:`StoredFile.name`.
 
-        When ``closed`` return ``True`` it won't be possible
-        to read anoymore from this file.
+        This is the filename of the saved file
         """
-        return
+        return self.filename
+
+    @property
+    def public_url(self):
+        """The public HTTP url from which file can be accessed.
+
+        When supported by the storage this will provide the
+        public url to which the file content can be accessed.
+        In case this returns ``None`` it means that the file can
+        only be served by the :class:`DepotMiddleware` itself.
+        """
+        return None
+
+
+def set_metadata(event):
+    obj = event.object
+    obj.content_length = len(obj.data)
+    obj.last_modified = datetime.now()
 
 
 class DBFileStorage(FileStorage):
-    """ depotfile FileStorage implementation, uses DBStoredFile to store data
+    """ Implementation of :class:`depot.io.interfaces.FileStorage`, uses
+    `kotti.filedepot.DBStoredFile` to store blob data in an SQL database.
     """
 
     def get(self, file_id):
@@ -190,4 +210,19 @@ def configure_filedepot(settings):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+    from kotti.events import objectevent_listeners
+    from kotti.events import ObjectInsert
+    from kotti.events import ObjectUpdate
+
     configure_filedepot(config.get_settings())
+
+    # Update file metadata on change of blob data
+    objectevent_listeners[
+        (ObjectInsert, DBStoredFile)].append(set_metadata)
+    objectevent_listeners[
+        (ObjectUpdate, DBStoredFile)].append(set_metadata)
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
new file mode 100644
index 000000000..6095a7e70
--- /dev/null
+++ b/kotti/tests/test_filedepot.py
@@ -0,0 +1,63 @@
+import datetime
+
+class TestDBStoredFile:
+
+    def test_content_length(self, db_session, events, setup_app):
+        from kotti.filedepot import DBStoredFile
+
+        f = DBStoredFile('fileid', data="content")
+        db_session.add(f)
+        db_session.flush()
+        assert f.content_length == 7
+        f.data = 'content changed'
+        db_session.flush()
+        assert f.content_length == len('content changed')
+
+    def test_last_modified(self, monkeypatch, db_session, events, setup_app):
+        from kotti.filedepot import DBStoredFile
+        from kotti import filedepot
+
+        now = datetime.datetime.now()
+
+        class mockdatetime:
+            @staticmethod
+            def now():
+                return now
+
+        monkeypatch.setattr(filedepot, 'datetime', mockdatetime)
+
+        f = DBStoredFile('fileid', data="content")
+        db_session.add(f)
+        db_session.flush()
+
+        assert f.last_modified == now
+
+        f.last_modified = None
+        f.data = 'content changed'
+        db_session.flush()
+
+        assert f.last_modified == now
+
+    def test_storedfile_interface(self):
+        from kotti.filedepot import DBStoredFile
+
+        f = DBStoredFile('fileid', filename='f.jpg', content_type='image/jpeg',
+                         content_length=1000, data='content')
+
+        assert f.close() == None
+        assert f.closed() == False
+        assert f.seekable() == False
+        assert f.writable() == False
+
+        assert f.read() == 'content'
+        assert f.read(-1) == 'content'
+        assert f.read(0) == ''
+        assert f.read(2) == 'co'
+        assert f.read(4) == 'cont'
+
+        assert f.content_length == 1000
+        assert f.content_type == 'image/jpeg'
+        assert f.file_id == 'fileid'
+        assert f.filename == 'f.jpg'
+        assert f.name == "f.jpg"
+        assert f.public_url == None

From f3aa80ef608a230c694e5242e3bf126ef2593213 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 6 Dec 2014 14:23:10 -0800
Subject: [PATCH 076/600] Added test for DBFileStorage; Refined DBFileStorage
 implementation

---
 kotti/filedepot.py            |  67 ++++++++++++----------
 kotti/tests/test_filedepot.py | 103 ++++++++++++++++++++++++++--------
 2 files changed, 117 insertions(+), 53 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 433438a7b..4a43f0d06 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -1,5 +1,5 @@
+import uuid
 from datetime import datetime
-from depot.io.interfaces import StoredFile, FileStorage
 
 from sqlalchemy import Column
 from sqlalchemy import DateTime
@@ -9,11 +9,11 @@
 from sqlalchemy import Unicode
 from sqlalchemy.orm import deferred
 
+from depot.io.interfaces import FileStorage
+
 from kotti import Base
 from kotti import DBSession
 
-import uuid
-
 
 class DBStoredFile(Base):   #, StoredFile):
     """depotfile StoredFile implementation that stores data in the db.
@@ -109,14 +109,20 @@ def public_url(self):
 
 
 def set_metadata(event):
+    """Set DBStoredFile metadata based on data
+
+    :param event: event that trigerred this handler.
+    :type event: :class:`ObjectInsert` and :class:`ObjectUpdate`
+    """
     obj = event.object
-    obj.content_length = len(obj.data)
+    obj.content_length = obj.data and len(obj.data) or 0
     obj.last_modified = datetime.now()
 
 
 class DBFileStorage(FileStorage):
-    """ Implementation of :class:`depot.io.interfaces.FileStorage`, uses
-    `kotti.filedepot.DBStoredFile` to store blob data in an SQL database.
+    """Implementation of :class:`depot.io.interfaces.FileStorage`,
+
+    Uses `kotti.filedepot.DBStoredFile` to store blob data in an SQL database.
     """
 
     def get(self, file_id):
@@ -145,24 +151,22 @@ def create(self, content, filename=None, content_type=None):
                               file_id=new_file_id,
                               filename=filename,
                               content_type=content_type,
-                              content_length=len(content),
-                              last_modified=datetime.now())
+                              )
         DBSession.add(fstore)
         return new_file_id
 
-    def replace(self, file_or_id, content, filename=None, content_type=None):  # pragma: no cover
-        """Replaces an existing file, an ``IOError`` is raised if the file didn't already exist.
+    def replace(self, file_or_id, content, filename=None, content_type=None):
+        """Replaces an existing file, an ``IOError`` is raised if the file
+        didn't already exist.
 
-        Given a :class:`StoredFile` or its ID it will replace the current content
-        with the provided ``content`` value. If ``filename`` and ``content_type`` are
-        provided or can be deducted by the ``content`` itself they will also replace
-        the previous values, otherwise the current values are kept.
+        Given a :class:`StoredFile` or its ID it will replace the current
+        content with the provided ``content`` value. If ``filename`` and
+        ``content_type`` are provided or can be deducted by the ``content``
+        itself they will also replace the previous values, otherwise the current
+        values are kept.
         """
 
-        if isinstance(file_or_id, StoredFile):
-            file_id = file_or_id.file_id
-        else:
-            file_id = file_or_id
+        file_id = self._get_file_id(file_or_id)
 
         content, filename, content_type = self.fileinfo(
             content, filename, content_type)
@@ -179,24 +183,25 @@ def replace(self, file_or_id, content, filename=None, content_type=None):  # pra
 
         fstore.data = content
 
-    def delete(self, file_or_id):  # pragma: no cover
+    def delete(self, file_or_id):
         """Deletes a file. If the file didn't exist it will just do nothing."""
 
-        if isinstance(file_or_id, StoredFile):
-            file_id = file_or_id.file_id
-        else:
-            file_id = file_or_id
-        fstore = self.get(file_id)
-        DBSession.delete(fstore)
+        file_id = self._get_file_id(file_or_id)
+
+        DBSession.query(DBStoredFile).filter_by(file_id=file_id).delete()
 
-    def exists(self, file_or_id):  # pragma: no cover
+    def exists(self, file_or_id):
         """Returns if a file or its ID still exist."""
-        if isinstance(file_or_id, StoredFile):
-            file_id = file_or_id.file_id
-        else:
-            file_id = file_or_id
+
+        file_id = self._get_file_id(file_or_id)
+
         return bool(
-            DBSession.query(StoredFile).filter_by(file_id=file_id).count())
+            DBSession.query(DBStoredFile).filter_by(file_id=file_id).count())
+
+    def _get_file_id(self, file_or_id):
+        if hasattr(file_or_id, 'file_id'):
+            return file_or_id.file_id
+        return file_or_id
 
 
 def configure_filedepot(settings):
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 6095a7e70..3b8eb6b32 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -1,20 +1,51 @@
 import datetime
+import pytest
+
+from kotti.filedepot import DBFileStorage, DBStoredFile
+
 
 class TestDBStoredFile:
 
-    def test_content_length(self, db_session, events, setup_app):
-        from kotti.filedepot import DBStoredFile
+    def test_storedfile_interface(self, db_session, events, setup_app):
+        f = DBStoredFile('fileid', filename=u'f.jpg', content_type='image/jpeg',
+                         content_length=1000, data='content')
+
+        assert f.close() is None
+        assert f.closed() is False
+        assert f.seekable() is False
+        assert f.writable() is False
+
+        assert f.read() == 'content'
+        assert f.read(-1) == 'content'
+        assert f.read(0) == ''
+        assert f.read(2) == 'co'
+        assert f.read(4) == 'cont'
 
+        assert f.content_length == 1000
+        assert f.content_type == 'image/jpeg'
+        assert f.file_id == 'fileid'
+        assert f.filename == u'f.jpg'
+        assert f.name == u"f.jpg"
+        assert f.public_url is None
+
+        f.data = None
+        db_session.add(f)
+        db_session.flush()
+        assert f.content_length == 0
+
+    def test_content_length(self, db_session, events, setup_app):
         f = DBStoredFile('fileid', data="content")
         db_session.add(f)
         db_session.flush()
+
         assert f.content_length == 7
+
         f.data = 'content changed'
         db_session.flush()
+
         assert f.content_length == len('content changed')
 
     def test_last_modified(self, monkeypatch, db_session, events, setup_app):
-        from kotti.filedepot import DBStoredFile
         from kotti import filedepot
 
         now = datetime.datetime.now()
@@ -38,26 +69,54 @@ def now():
 
         assert f.last_modified == now
 
-    def test_storedfile_interface(self):
-        from kotti.filedepot import DBStoredFile
 
-        f = DBStoredFile('fileid', filename='f.jpg', content_type='image/jpeg',
-                         content_length=1000, data='content')
+class TestDBFileStorage:
 
-        assert f.close() == None
-        assert f.closed() == False
-        assert f.seekable() == False
-        assert f.writable() == False
+    def make_one(self,
+                 content='content here',
+                 filename=u'f.jpg',
+                 content_type='image/jpg'):
 
-        assert f.read() == 'content'
-        assert f.read(-1) == 'content'
-        assert f.read(0) == ''
-        assert f.read(2) == 'co'
-        assert f.read(4) == 'cont'
+        file_id = DBFileStorage().create(
+            content=content, filename=filename, content_type=content_type)
+        return file_id
 
-        assert f.content_length == 1000
-        assert f.content_type == 'image/jpeg'
-        assert f.file_id == 'fileid'
-        assert f.filename == 'f.jpg'
-        assert f.name == "f.jpg"
-        assert f.public_url == None
+    def test_create(self, db_session):
+        file_id = self.make_one()
+        assert len(file_id) == 36
+
+        fs = db_session.query(DBStoredFile).filter_by(file_id=file_id).one()
+        assert fs.data == "content here"
+
+    def test_get(self, db_session):
+        with pytest.raises(IOError):
+            DBFileStorage().get(1)
+
+        file_id = self.make_one()
+        assert DBFileStorage().get(file_id).data == "content here"
+
+    def test_delete(self, db_session):
+        file_id = DBFileStorage().create('content here', u'f.jpg', 'image/jpg')
+        fs = DBFileStorage().get(file_id)
+
+        db_session.add(fs)
+        db_session.flush()
+
+        assert db_session.query(DBStoredFile.file_id).one()[0] == file_id
+
+        DBFileStorage().delete(file_id)
+        assert db_session.query(DBStoredFile).count() == 0
+
+    def test_replace(self, db_session):
+        file_id = self.make_one()
+
+        DBFileStorage().replace(file_id, 'second content', u'f2.jpg', 'doc')
+        fs = DBFileStorage().get(file_id)
+        assert fs.filename == u'f2.jpg'
+        assert fs.content_type == 'doc'
+        assert fs.read() == 'second content'
+
+        DBFileStorage().replace(fs, 'third content', u'f3.jpg', 'xls')
+        assert fs.filename == u'f3.jpg'
+        assert fs.content_type == 'xls'
+        assert fs.read() == 'third content'

From 8aa9a14ea5e744d6d736a6ec02bf8fdd537492ba Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 7 Dec 2014 14:51:57 -0800
Subject: [PATCH 077/600] Added a migration, still under tests, for filedepot

---
 .../versions/413fa5fcc581_add_filedepot.py    | 50 +++++++++++++++++++
 kotti/filedepot.py                            |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 kotti/alembic/versions/413fa5fcc581_add_filedepot.py

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
new file mode 100644
index 000000000..637a52c5d
--- /dev/null
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -0,0 +1,50 @@
+"""Migrate binary file storage to filedepot
+
+Revision ID: 413fa5fcc581
+Revises: 1063d7178fa
+Create Date: 2014-12-07 05:10:04.294222
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '413fa5fcc581'
+down_revision = '1063d7178fa'
+
+#from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    sa.orm.events.MapperEvents._clear() # avoids filedepot magic
+
+    from depot.manager import DepotManager
+    from depot.fields.upload import UploadedFile
+
+    from kotti import DBSession, metadata
+    from kotti.resources import File
+
+    t = sa.Table('files', metadata)
+    t.c.data.type = sa.LargeBinary()
+
+    class UF(UploadedFile):
+        _frozen = False
+
+        def __init__(self):
+            self.depot_name = DepotManager.get_default()
+            self.files = []
+
+    for o in DBSession.query(File):
+        print o.id, len(o.data), o.filename, o.mimetype, o.modification_date
+
+        s = UF()
+        s.process_content(o.data, filename=o.filename, content_type=o.mimetype)
+        f = DepotManager.get().get(s['file_id'])
+        f.last_modified = o.modification_date   # not ok for LocalStore
+        o.data = s.encode()
+
+    DBSession.flush()
+    raise ValueError
+
+
+def downgrade():
+    pass
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 4a43f0d06..0415d6f7f 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -35,7 +35,7 @@ class DBStoredFile(Base):   #, StoredFile):
     filename = Column(Unicode(100))
     #: MIME type of the blob
     #: (:class:`sqlalchemy.types.String`)
-    content_type = Column(String(30))
+    content_type = Column(String(100))
     #: Size of the blob in bytes
     #: (:class:`sqlalchemy.types.Integer`)
     content_length = Column(Integer())

From 9d85afcd196ac6b47597a459329bbcf4f9a37f79 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 8 Dec 2014 10:10:47 -0800
Subject: [PATCH 078/600] Cleanup code in filedepot migration; Renamed default
 storage to fs0

---
 kotti/__init__.py                             |  4 +-
 .../versions/413fa5fcc581_add_filedepot.py    | 39 ++++++++-----------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index c23723ae0..97883f2ad 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -101,8 +101,8 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.datetime_format': 'medium',
     'kotti.time_format': 'medium',
     'kotti.max_file_size': '10',
-    'kotti.depot.default.backend': 'depot.io.local.LocalFileStorage',
-    'kotti.depot.default.storage_path': 'var/files',
+    'kotti.depot.fs0.backend': 'depot.io.local.LocalFileStorage',
+    'kotti.depot.fs0.storage_path': 'var/files',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
     'kotti.static.edit_needed': '',  # BBB
diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 637a52c5d..92b4fe31d 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -10,12 +10,14 @@
 revision = '413fa5fcc581'
 down_revision = '1063d7178fa'
 
-#from alembic import op
+import logging
 import sqlalchemy as sa
 
+log = logging.getLogger('kotti')
+
 
 def upgrade():
-    sa.orm.events.MapperEvents._clear() # avoids filedepot magic
+    sa.orm.events.MapperEvents._clear()     # avoids filedepot magic
 
     from depot.manager import DepotManager
     from depot.fields.upload import UploadedFile
@@ -25,26 +27,19 @@ def upgrade():
 
     t = sa.Table('files', metadata)
     t.c.data.type = sa.LargeBinary()
-
-    class UF(UploadedFile):
-        _frozen = False
-
-        def __init__(self):
-            self.depot_name = DepotManager.get_default()
-            self.files = []
-
-    for o in DBSession.query(File):
-        print o.id, len(o.data), o.filename, o.mimetype, o.modification_date
-
-        s = UF()
-        s.process_content(o.data, filename=o.filename, content_type=o.mimetype)
-        f = DepotManager.get().get(s['file_id'])
-        f.last_modified = o.modification_date   # not ok for LocalStore
-        o.data = s.encode()
-
-    DBSession.flush()
-    raise ValueError
-
+    dn = DepotManager.get_default()
+
+    for obj in DBSession.query(File):
+        uploaded_file = UploadedFile({'depot_name': dn, 'files': []})
+        uploaded_file._thaw()
+        uploaded_file.process_content(
+            obj.data, filename=obj.filename, content_type=obj.mimetype)
+        stored_file = DepotManager.get().get(uploaded_file['file_id'])
+        stored_file.last_modified = obj.modification_date
+        obj.data = uploaded_file.encode()
+
+        log.info("Migrated {} bytes for File with pk {} to {}/{}".
+                    format(len(obj.data), obj.id, dn, uploaded_file['file_id']))
 
 def downgrade():
     pass

From 39d163d64f044aeeb658b47027ead7fe79501c28 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 8 Dec 2014 10:55:18 -0800
Subject: [PATCH 079/600] Migrate column type from blob to varchar()

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 92b4fe31d..e31d4390b 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -12,6 +12,7 @@
 
 import logging
 import sqlalchemy as sa
+from alembic import op
 
 log = logging.getLogger('kotti')
 
@@ -21,6 +22,7 @@ def upgrade():
 
     from depot.manager import DepotManager
     from depot.fields.upload import UploadedFile
+    from depot.fields.sqlalchemy import UploadedFileField
 
     from kotti import DBSession, metadata
     from kotti.resources import File
@@ -41,5 +43,10 @@ def upgrade():
         log.info("Migrated {} bytes for File with pk {} to {}/{}".
                     format(len(obj.data), obj.id, dn, uploaded_file['file_id']))
 
+    DBSession.flush()
+    if DBSession.get_bind().name != 'sqlite':   # not supported by sqlite
+        op.alter_column('files', 'data', type_=UploadedFileField())
+
+
 def downgrade():
     pass

From 435dfc355e71ab0bbab739263b900877702c3372 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 8 Dec 2014 10:59:51 -0800
Subject: [PATCH 080/600] Fix test_functional; the mock depot fixture was not
 properly retrieved

---
 kotti/tests/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 0910e0b2e..d9142d440 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -313,9 +313,11 @@ def delete(self, id):
             del self._storage[int(id)]
 
     DepotManager._depots = {
-        'default': MagicMock(wraps=TestStorage())
+        'mockdepot': MagicMock(wraps=TestStorage())
     }
+    DepotManager._default_depot = 'mockdepot'
 
     def restore():
         DepotManager._depots = {}
+        DepotManager._default_depot = None
     request.addfinalizer(restore)

From 12c4ddc0e7de7f8667914c1b89afb919cf49f554 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 8 Dec 2014 11:27:41 -0800
Subject: [PATCH 081/600] Fixes to tests

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 4 ++--
 kotti/filedepot.py                                   | 2 +-
 kotti/tests/__init__.py                              | 7 +++++--
 kotti/tests/test_app.py                              | 1 +
 kotti/tests/test_file.py                             | 6 +++---
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index e31d4390b..4e8c10fcc 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -40,8 +40,8 @@ def upgrade():
         stored_file.last_modified = obj.modification_date
         obj.data = uploaded_file.encode()
 
-        log.info("Migrated {} bytes for File with pk {} to {}/{}".
-                    format(len(obj.data), obj.id, dn, uploaded_file['file_id']))
+        log.info("Migrated {} bytes for File with pk {} to {}/{}".format(
+            len(obj.data), obj.id, dn, uploaded_file['file_id']))
 
     DBSession.flush()
     if DBSession.get_bind().name != 'sqlite':   # not supported by sqlite
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 0415d6f7f..34948b7c6 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -15,7 +15,7 @@
 from kotti import DBSession
 
 
-class DBStoredFile(Base):   #, StoredFile):
+class DBStoredFile(Base):
     """depotfile StoredFile implementation that stores data in the db.
 
     Can be used together with DBFileStorage to implement blobs (large files)
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index d9142d440..eecfe9252 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -312,12 +312,15 @@ def create(self, content, filename=None, content_type=None):
         def delete(self, id):
             del self._storage[int(id)]
 
+    _old_depots = DepotManager._depots
+    _old_default_depot = DepotManager._default_depot
     DepotManager._depots = {
         'mockdepot': MagicMock(wraps=TestStorage())
     }
     DepotManager._default_depot = 'mockdepot'
 
     def restore():
-        DepotManager._depots = {}
-        DepotManager._default_depot = None
+        DepotManager._depots = _old_depots
+        DepotManager._default_depot = _old_default_depot
+
     request.addfinalizer(restore)
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 33384c737..a21910746 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -174,6 +174,7 @@ def test_configure_filedepot(self):
         }
         depots = DepotManager._depots
         DepotManager._depots = {}
+        DepotManager._default_depot = None
         configure_filedepot(settings)
 
         assert DepotManager.get().marker == 'TFS1'
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 77003a77d..a399ec628 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -18,7 +18,7 @@ def _test_common_headers(self, headers):
         assert headers["Content-Length"] == "13"
         assert headers["Content-Type"] == "image/png"
 
-    def test_inline_view(self, config):
+    def test_inline_view(self, config, filedepot):
         self._create_file(config)
         from kotti.views.file import inline_view
         res = inline_view(self.file, None)
@@ -28,7 +28,7 @@ def test_inline_view(self, config):
         assert headers["Content-Disposition"] == 'inline;filename="myfle.png"'
         assert res.body == 'file contents'
 
-    def test_attachment_view(self, config):
+    def test_attachment_view(self, config, filedepot):
         self._create_file(config)
         from kotti.views.file import attachment_view
         res = attachment_view(self.file, None)
@@ -103,7 +103,7 @@ def make_one(self):
         from kotti.views.edit.content import FileAddForm
         return FileAddForm(MagicMock(), DummyRequest())
 
-    def test_add(self, config):
+    def test_add(self, config, filedepot):
         view = self.make_one()
         file = view.add(
             title=u'A title',

From 850455117a1972d714c4071ccd60968f308ae292 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 8 Dec 2014 11:32:44 -0800
Subject: [PATCH 082/600] Don't asume name 'default' is magic for configuration
 of depots, in test

---
 kotti/tests/test_app.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index a21910746..b268d56f9 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -167,8 +167,8 @@ def test_configure_filedepot(self):
         tests.TFS2 = Mock(return_value=Mock(marker="TFS2"))
 
         settings = {
-            'kotti.depot.default.backend': 'kotti.tests.TFS1',
-            'kotti.depot.default.location': '/tmp',
+            'kotti.depot.localfs.backend': 'kotti.tests.TFS1',
+            'kotti.depot.localfs.location': '/tmp',
             'kotti.depot.mongo.backend': 'kotti.tests.TFS2',
             'kotti.depot.mongo.uri': 'mongo://',
         }
@@ -178,7 +178,7 @@ def test_configure_filedepot(self):
         configure_filedepot(settings)
 
         assert DepotManager.get().marker == 'TFS1'
-        assert DepotManager.get('default').marker == 'TFS1'
+        assert DepotManager.get('localfs').marker == 'TFS1'
         assert DepotManager.get('mongo').marker == 'TFS2'
 
         tests.TFS1.assert_called_with(location='/tmp')

From 1c82b4abe5f1e8369bae534580f0782ff0553d01 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 9 Dec 2014 10:54:55 -0800
Subject: [PATCH 083/600] Fix test failures: added the filedepot fixture where
 needed; fixed the filedepot fixture

---
 kotti/tests/__init__.py        |  3 ++-
 kotti/tests/test_app.py        | 10 ++++++++--
 kotti/tests/test_functional.py |  6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index eecfe9252..0eeace4d8 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -281,7 +281,7 @@ def workflow(config):
 
 
 @fixture
-def filedepot(request):
+def filedepot(request, db_session):
     from depot.manager import DepotManager
     from datetime import datetime
 
@@ -320,6 +320,7 @@ def delete(self, id):
     DepotManager._default_depot = 'mockdepot'
 
     def restore():
+        db_session.rollback()
         DepotManager._depots = _old_depots
         DepotManager._default_depot = _old_default_depot
 
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index b268d56f9..ddb76b907 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -172,9 +172,13 @@ def test_configure_filedepot(self):
             'kotti.depot.mongo.backend': 'kotti.tests.TFS2',
             'kotti.depot.mongo.uri': 'mongo://',
         }
-        depots = DepotManager._depots
+
+        # depot.manager.DepotManager acts as singleton, save its settings
+        _depots = DepotManager._depots
+        _default_depot = DepotManager._default_depot
         DepotManager._depots = {}
         DepotManager._default_depot = None
+
         configure_filedepot(settings)
 
         assert DepotManager.get().marker == 'TFS1'
@@ -184,7 +188,9 @@ def test_configure_filedepot(self):
         tests.TFS1.assert_called_with(location='/tmp')
         tests.TFS2.assert_called_with(uri='mongo://')
 
-        DepotManager._depots = depots
+        DepotManager._depots = _depots
+        DepotManager._default_depot = _default_depot
+
         del tests.TFS1
         del tests.TFS2
 
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 9bdd605e1..a87d059ee 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -36,13 +36,13 @@ def add_file(self, browser, contents='ABC'):
         browser.getControl('save').click()
 
     @user('admin')
-    def test_it(self, browser):
+    def test_it(self, browser, filedepot):
         browser.open(BASE_URL + '/@@add_file')
         self.add_file(browser)
         assert "Item was added" in browser.contents
 
     @user('admin')
-    def test_view_uploaded_file(self, browser):
+    def test_view_uploaded_file(self, browser, filedepot):
         browser.open(BASE_URL + '/@@add_file')
         self.add_file(browser)
         browser.getLink("View").click()
@@ -50,7 +50,7 @@ def test_view_uploaded_file(self, browser):
         assert browser.contents == 'ABC'
 
     @user('admin')
-    def test_tempstorage(self, browser):
+    def test_tempstorage(self, browser, filedepot):
         browser.open(BASE_URL + '/@@add_file')
         self.add_file(browser, contents='DEF')
         browser.getLink("Edit").click()

From a5a7751565411f919da051cea3e03c9f04a596c7 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 9 Dec 2014 14:23:10 -0800
Subject: [PATCH 084/600] Explore setting size and mimetype for File from the
 processing loop of the data field

---
 kotti/filedepot.py |  2 +-
 kotti/resources.py | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 34948b7c6..708a3b0d8 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -112,7 +112,7 @@ def set_metadata(event):
     """Set DBStoredFile metadata based on data
 
     :param event: event that trigerred this handler.
-    :type event: :class:`ObjectInsert` and :class:`ObjectUpdate`
+    :type event: :class:`ObjectInsert` or :class:`ObjectUpdate`
     """
     obj = event.object
     obj.content_length = obj.data and len(obj.data) or 0
diff --git a/kotti/resources.py b/kotti/resources.py
index f7a15d3ea..241fa07e2 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -35,6 +35,7 @@
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.orm import relation
 from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm import ColumnProperty
 from sqlalchemy.sql import and_
 from sqlalchemy.sql import select
 from sqlalchemy.util import classproperty
@@ -706,8 +707,31 @@ def __declare_last__(cls):
         # For the ``data`` column, use the field value setter from filedepot.
         # filedepot already registers this event listener, but it does so in a
         # way that won't work properly for subclasses of File
-        event.listen(cls.data, 'set',
-                     _SQLAMutationTracker._field_set, retval=True)
+
+        # mapper = cls._sa_class_manager.mapper
+        # for mapper_property in mapper.iterate_properties:
+        #     if isinstance(mapper_property, ColumnProperty):
+        #         for idx, col in enumerate(mapper_property.columns):
+        #             if isinstance(col.type, UploadedFileField):
+        #                 event.listen(
+        #                     getattr(cls, col.name),
+        #                     'set',
+        #                     _SQLAMutationTracker._field_set,
+        #                     retval=True
+        #                 )
+        event.listen(cls.data, 'set', cls.set_metadata, retval=True)
+
+    @classmethod
+    def set_metadata(cls, target, value, oldvalue, initiator):
+        newvalue = _SQLAMutationTracker._field_set(
+            target, value, oldvalue, initiator)
+
+        if newvalue is None:
+            return
+
+        target.mimetype = newvalue.file.content_type
+        target.size = newvalue.file.content_length
+        return newvalue
 
 
 class Image(File):

From 718308ae26a0aaa5ddc70e81fd93c5c4f5eabb99 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 11 Dec 2014 10:10:58 -0800
Subject: [PATCH 085/600] Cleanup after the merge; fix the digraph for the
 fixtures; switch the position of the request parameter for filedepot fixture
 to fix tests

---
 kotti/resources.py      | 1 -
 kotti/tests/__init__.py | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 241fa07e2..067c8f6eb 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -35,7 +35,6 @@
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.orm import relation
 from sqlalchemy.orm.exc import NoResultFound
-from sqlalchemy.orm import ColumnProperty
 from sqlalchemy.sql import and_
 from sqlalchemy.sql import select
 from sqlalchemy.util import classproperty
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 0eeace4d8..2a8879ca1 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -9,7 +9,6 @@
 
    digraph kotti_fixtures {
       "allwarnings";
-      "filedepot";
       "app" -> "webtest";
       "config" -> "db_session";
       "config" -> "dummy_request";
@@ -23,6 +22,7 @@
       "db_session" -> "app";
       "db_session" -> "browser";
       "db_session" -> "root";
+      "db_session" -> "filedepot";
       "dummy_mailer" -> "app";
       "dummy_mailer";
       "events" -> "app";
@@ -281,7 +281,7 @@ def workflow(config):
 
 
 @fixture
-def filedepot(request, db_session):
+def filedepot(db_session, request):
     from depot.manager import DepotManager
     from datetime import datetime
 

From 7e048a5f68c8fad3cf9a508dac656d19be182e1e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 11 Dec 2014 16:11:41 -0800
Subject: [PATCH 086/600] Refactor data saving on files; we always pass a
 cgi.FieldStorage, because that's what filedepot accepts best

---
 kotti/filedepot.py          |  4 ++--
 kotti/resources.py          | 10 ++++++++--
 kotti/tests/__init__.py     | 19 ++++++++++++++-----
 kotti/tests/test_file.py    | 34 ++++++++++++++++------------------
 kotti/util.py               | 15 +++++++++++++++
 kotti/views/edit/content.py | 27 +++------------------------
 6 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 708a3b0d8..b221c2b20 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -46,8 +46,8 @@ class DBStoredFile(Base):
     #: (:class:`sqlalchemy.types.LargeBinary`)
     data = deferred(Column('data', LargeBinary()))
 
-    def __init__(self, file_id, filename=None, content_type=None, last_modified=None,
-                 content_length=None, **kwds):
+    def __init__(self, file_id, filename=None, content_type=None,
+                 last_modified=None, content_length=None, **kwds):
         self.file_id = file_id
         self.filename = filename
         self.content_type = content_type
diff --git a/kotti/resources.py b/kotti/resources.py
index 067c8f6eb..8ce299001 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -12,6 +12,7 @@
 import warnings
 
 from fnmatch import fnmatch
+from cStringIO import StringIO
 from UserDict import DictMixin
 
 from depot.fields.sqlalchemy import UploadedFileField
@@ -62,6 +63,7 @@
 from kotti.sqla import MutationList
 from kotti.sqla import NestedMutationDict
 from kotti.util import _
+from kotti.util import _to_fieldstorage
 from kotti.util import camel_case_to_name
 from kotti.util import get_paste_items
 from kotti.util import Link
@@ -673,10 +675,13 @@ def __init__(self, data=None, filename=None, mimetype=None, size=None,
 
         super(File, self).__init__(**kwargs)
 
-        self.data = data
         self.filename = filename
         self.mimetype = mimetype
         self.size = size
+        if isinstance(data, basestring):
+            data = _to_fieldstorage(fp=StringIO(data), filename=filename,
+                                    mimetype=mimetype, size=size)
+        self.data = data
 
     @classmethod
     def from_field_storage(cls, fs):
@@ -728,8 +733,9 @@ def set_metadata(cls, target, value, oldvalue, initiator):
         if newvalue is None:
             return
 
-        target.mimetype = newvalue.file.content_type
+        target.filename = newvalue.filename
         target.size = newvalue.file.content_length
+        target.mimetype = newvalue.content_type
         return newvalue
 
 
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 2a8879ca1..4528974c2 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -291,22 +291,31 @@ def __init__(self):
             self._storage.setdefault(0)
 
         def get(self, id):
+            content = self._storage[id]['content']
             f = MagicMock()
-            f.read.return_value = self._storage[id]
+            f.read.return_value = content
 
-            # needed to make JSON serializable, Mock objects are not
-            f.last_modified = datetime.now()
-            f.filename = str(id)
+            f.filename = self._storage[id]['filename']
             f.public_url = ''
             f.content_type = 'image/png'
+            f.content_length = len(content)
+
+            # needed to make JSON serializable, Mock objects are not
+            f.last_modified = datetime.now()
 
             return f
 
         def create(self, content, filename=None, content_type=None):
             id = max(self._storage) + 1
+            if hasattr(content, 'filename'):
+                filename = filename or content.filename
+            if hasattr(content, 'type'):
+                content_type = content_type or content.type
             if hasattr(content, 'read'):
                 content = content.read()
-            self._storage[id] = content
+            elif hasattr(content, 'file'):
+                content = content.file.read()
+            self._storage[id] = {'content': content, 'filename': filename}
             return id
 
         def delete(self, id):
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index a399ec628..e54f02f5e 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -43,25 +43,11 @@ def test_attachment_view(self, config, filedepot):
 class TestFileEditForm:
     def make_one(self):
         from kotti.views.edit.content import FileEditForm
+        from kotti.resources import File
 
-        class MockFileColumn(object):
-            def __init__(self):
-                self.file = MagicMock()
-
-            def __set__(self, instance, value):
-                if isinstance(value, StringIO):
-                    value.seek(0)
-                    rv = value.read()
-                else:
-                    rv = value
-                self.file.read.return_value = rv
-
-        class MockDepotFile(object):
-            data = MockFileColumn()
-
-        return FileEditForm(MockDepotFile(), DummyRequest())
+        return FileEditForm(File(), DummyRequest())
 
-    def test_edit_with_file(self):
+    def test_edit_with_file(self, db_session, filedepot):
         view = self.make_one()
         view.edit(
             title=u'A title', description=u'A description',
@@ -70,6 +56,8 @@ def test_edit_with_file(self):
                 fp=StringIO('filecontents'),
                 filename=u'myfile.png',
                 mimetype=u'image/png',
+                size=10,
+                uid="randomabc",
                 ),
             )
         assert view.context.title == u'A title'
@@ -80,7 +68,7 @@ def test_edit_with_file(self):
         assert view.context.size == len('filecontents')
         assert view.context.tags == [u"A tag"]
 
-    def test_edit_without_file(self):
+    def test_edit_without_file(self, filedepot):
         view = self.make_one()
         view.context.data = 'filecontents'
         view.context.filename = u'myfile.png'
@@ -113,6 +101,8 @@ def test_add(self, config, filedepot):
                 fp=StringIO('filecontents'),
                 filename=u'myfile.png',
                 mimetype=u'image/png',
+                size=None,
+                uid="randomabc",
                 ),
             )
 
@@ -192,3 +182,11 @@ def test_delete(self, factory, db_session, root, filedepot):
 
         assert DepotManager.get().delete.called
         assert id not in DepotManager.get()._storage.keys()
+
+
+class TestFileSetMetadata:
+
+    def test_it(self, db_session, filedepot):
+        from kotti.resources import File
+        f = File("file contents", u"myfile.png", u"image/png")
+        assert f.filename == u"myfile.png"
diff --git a/kotti/util.py b/kotti/util.py
index 4cd225cfd..042af195f 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -7,6 +7,7 @@
 .. inheritance-diagram:: kotti.util
 """
 
+import cgi
 import re
 import urllib
 from urlparse import urlparse, urlunparse
@@ -365,3 +366,17 @@ def command(func, doc):
     'ViewLink',
     "kotti.util.ViewLink has been renamed to Link as of Kotti 1.0.0."
     )
+
+
+def _to_fieldstorage(fp, filename, mimetype, size, **_kwds):
+    """ Build a cgi.FieldStorage instance.
+
+    Deform's FileUploadWidget returns a dict, but filedepot's
+    UploadedFieldFile likes cgi.FieldStorage objects
+    """
+    f = cgi.FieldStorage()
+    f.file = fp
+    f.filename = filename
+    f.type = mimetype
+    f.length = size
+    return f
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 23f095db9..cecf417c9 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -16,6 +16,7 @@
 from kotti.resources import File
 from kotti.resources import Image
 from kotti.util import _
+from kotti.util import _to_fieldstorage
 from kotti.views.form import get_appstruct
 from kotti.views.form import AddFormView
 from kotti.views.form import EditFormView
@@ -102,18 +103,7 @@ def edit(self, **appstruct):
         self.context.description = appstruct['description']
         self.context.tags = appstruct['tags']
         if appstruct['file']:
-            buf = appstruct['file']['fp']
-            size = 0
-            while True:
-                chunk = buf.read(1024)
-                if not chunk:
-                    break
-                size += len(chunk)
-            buf.seek(0)
-            self.context.data = buf
-            self.context.filename = appstruct['file']['filename']
-            self.context.mimetype = appstruct['file']['mimetype']
-            self.context.size = size
+            self.context.data = _to_fieldstorage(**appstruct['file'])
 
 
 class FileAddForm(AddFormView):
@@ -130,23 +120,12 @@ def save_success(self, appstruct):
         return super(FileAddForm, self).save_success(appstruct)
 
     def add(self, **appstruct):
-        buf = appstruct['file']['fp']
-        size = 0
-        while True:
-            chunk = buf.read(1024)
-            if not chunk:
-                break
-            size += len(chunk)
-        buf.seek(0)
         filename = appstruct['file']['filename']
         item = self.item_class(
             title=appstruct['title'] or filename,
             description=appstruct['description'],
             tags=appstruct['tags'],
-            data=buf,
-            filename=filename,
-            mimetype=appstruct['file']['mimetype'],
-            size=size,
+            data=_to_fieldstorage(**appstruct['file']),
         )
         return item
 

From 7b58c4b03e891b9812cec13bad919fcf21ab8b02 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 11 Dec 2014 16:20:04 -0800
Subject: [PATCH 087/600] Simplify code in mock filedepot

---
 kotti/tests/__init__.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 4528974c2..a2c040c0c 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -291,15 +291,14 @@ def __init__(self):
             self._storage.setdefault(0)
 
         def get(self, id):
-            content = self._storage[id]['content']
-            f = MagicMock()
-            f.read.return_value = content
+            info = self._storage[id]
 
-            f.filename = self._storage[id]['filename']
+            f = MagicMock()
             f.public_url = ''
-            f.content_type = 'image/png'
-            f.content_length = len(content)
-
+            f.read.return_value = info['content']
+            f.filename = info['filename']
+            f.content_type = info['content_type']
+            f.content_length = len(info['content'])
             # needed to make JSON serializable, Mock objects are not
             f.last_modified = datetime.now()
 
@@ -307,15 +306,13 @@ def get(self, id):
 
         def create(self, content, filename=None, content_type=None):
             id = max(self._storage) + 1
-            if hasattr(content, 'filename'):
-                filename = filename or content.filename
-            if hasattr(content, 'type'):
-                content_type = content_type or content.type
-            if hasattr(content, 'read'):
-                content = content.read()
-            elif hasattr(content, 'file'):
+            filename = filename or getattr(content, 'filename', None)
+            content_type = content_type or getattr(content, 'type', None)
+            if not isinstance(content, str):
                 content = content.file.read()
-            self._storage[id] = {'content': content, 'filename': filename}
+            self._storage[id] = {'content': content,
+                                 'filename': filename,
+                                 'content_type': content_type}
             return id
 
         def delete(self, id):

From cdf0558e817a9e8bbf3c78fd0a5e8d2aa18c4390 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 11 Dec 2014 16:22:59 -0800
Subject: [PATCH 088/600] Make it clear about the destination of last_modified
 in mock filedepot

---
 kotti/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index a2c040c0c..e4dcd6577 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -300,7 +300,7 @@ def get(self, id):
             f.content_type = info['content_type']
             f.content_length = len(info['content'])
             # needed to make JSON serializable, Mock objects are not
-            f.last_modified = datetime.now()
+            f.last_modified = datetime(2012, 12, 30)
 
             return f
 

From 6a7da18f18e1417437d1b0b7e2ee9f11caae0f08 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Fri, 12 Dec 2014 15:42:15 -0800
Subject: [PATCH 089/600] Use a file iterator for file downloading

---
 kotti/resources.py       |  11 ---
 kotti/tests/test_file.py |  30 ++++++--
 kotti/views/file.py      | 148 +++++++++++++++++++++++++++++++++++----
 3 files changed, 158 insertions(+), 31 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 8ce299001..fbe6f0809 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -712,17 +712,6 @@ def __declare_last__(cls):
         # filedepot already registers this event listener, but it does so in a
         # way that won't work properly for subclasses of File
 
-        # mapper = cls._sa_class_manager.mapper
-        # for mapper_property in mapper.iterate_properties:
-        #     if isinstance(mapper_property, ColumnProperty):
-        #         for idx, col in enumerate(mapper_property.columns):
-        #             if isinstance(col.type, UploadedFileField):
-        #                 event.listen(
-        #                     getattr(cls, col.name),
-        #                     'set',
-        #                     _SQLAMutationTracker._field_set,
-        #                     retval=True
-        #                 )
         event.listen(cls.data, 'set', cls.set_metadata, retval=True)
 
     @classmethod
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index e54f02f5e..5110b79c2 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -19,25 +19,43 @@ def _test_common_headers(self, headers):
         assert headers["Content-Type"] == "image/png"
 
     def test_inline_view(self, config, filedepot):
-        self._create_file(config)
         from kotti.views.file import inline_view
+        from kotti.views.file import as_inline
+        from pyramid.response import IResponse
+
+        config.include('kotti.views.file')
+
+        self._create_file(config)
+
         res = inline_view(self.file, None)
-        headers = res.headers
+        assert isinstance(res, as_inline)
+
+        response = IResponse(res)
+        headers = response.headers
 
         self._test_common_headers(headers)
+
         assert headers["Content-Disposition"] == 'inline;filename="myfle.png"'
-        assert res.body == 'file contents'
+        assert response.app_iter.file.read() == 'file contents'
 
     def test_attachment_view(self, config, filedepot):
-        self._create_file(config)
         from kotti.views.file import attachment_view
+        from kotti.views.file import as_download
+        from pyramid.response import IResponse
+
+        config.include('kotti.views.file')
+
+        self._create_file(config)
         res = attachment_view(self.file, None)
-        headers = res.headers
+        assert isinstance(res, as_download)
+
+        response = IResponse(res)
+        headers = response.headers
 
         self._test_common_headers(headers)
         assert headers["Content-Disposition"] == (
             'attachment;filename="myfle.png"')
-        assert res.body == 'file contents'
+        assert response.app_iter.file.read() == 'file contents'
 
 
 class TestFileEditForm:
diff --git a/kotti/views/file.py b/kotti/views/file.py
index 36dd0aa7d..93584bdb6 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -1,10 +1,140 @@
 # -*- coding: utf-8 -*-
 
+from pyramid.response import _BLOCK_SIZE
+from pyramid.response import FileIter
+from pyramid.response import response_adapter
 from pyramid.response import Response
 from pyramid.view import view_config
 
 from kotti.resources import File
 
+import mimetypes
+
+
+class UploadedFileResponse(Response):
+    """
+    A Response object that can be used to serve a uploaded files.
+
+    ``data`` is the ``UploadedFile`` file field value.
+
+    ``request`` must be a Pyramid :term:`request` object.  Note
+    that a request *must* be passed if the response is meant to attempt to
+    use the ``wsgi.file_wrapper`` feature of the web server that you're using
+    to serve your Pyramid application.
+
+    ``cache_max_age`` is the number of seconds that should be used
+    to HTTP cache this response.
+
+    ``content_type`` is the content_type of the response.
+
+    ``content_encoding`` is the content_encoding of the response.
+    It's generally safe to leave this set to ``None`` if you're serving a
+    binary file.  This argument will be ignored if you also leave
+    ``content-type`` as ``None``.
+
+    Code adapted from pyramid.response.FileResponse
+    """
+    def __init__(self, data, request=None, disposition='attachment',
+                 cache_max_age=None, content_type=None, content_encoding=None):
+
+        filename = data.filename
+        if content_type is None:
+            content_type, content_encoding = mimetypes.guess_type(
+                filename,
+                strict=False
+                )
+            if content_type is None:
+                content_type = 'application/octet-stream'
+            # str-ifying content_type is a workaround for a bug in Python 2.7.7
+            # on Windows where mimetypes.guess_type returns unicode for the
+            # content_type.
+            content_type = str(content_type)
+        super(UploadedFileResponse, self).__init__(
+            conditional_response=True,
+            content_type=content_type,
+            content_encoding=content_encoding
+        )
+        self.last_modified = data.file.last_modified
+        content_length = data.file.content_length
+        f = data.file
+        app_iter = None
+        if request is not None:
+            environ = request.environ
+            if 'wsgi.file_wrapper' in environ:
+                app_iter = environ['wsgi.file_wrapper'](f, _BLOCK_SIZE)
+        if app_iter is None:
+            app_iter = FileIter(f, _BLOCK_SIZE)
+        self.app_iter = app_iter
+        # assignment of content_length must come after assignment of app_iter
+        self.content_length = content_length
+        if cache_max_age is not None:
+            self.cache_expires = cache_max_age
+
+        disp = '%s;filename="%s"' % (disposition,
+                                     data.filename.encode('ascii', 'ignore'))
+        self.headerlist.append(('Content-Disposition', disp))
+
+
+class as_inline(object):
+    """ ``UploadedFile`` adapter for an inline content-disposition Response
+
+    Writing a view to inline view a file (such as an image) can be as easy as::
+
+        @view_config(name='image', context=Image, permission='View')
+        def view_image(context, request):
+            return as_inline(context.imagefield)
+    """
+
+    def __init__(self, data, request):
+        """
+        :param data: :A file field obtained by reading an
+                        :class:`~depot.fields.sqlalchemy.UploadedFileField`
+        :type data: :class:`depot.fields.upload.UploadedField`,
+
+        :param request: current request
+        :type request: :class:`pyramid.request.Request`
+        """
+        self.data = data
+        self.request = request
+
+
+class as_download(object):
+    """ ``UploadedFile`` adapter for an attachment content-disposition Response
+
+    Writing a view to download a file can be as easy as::
+
+        @view_config(name='image', context=Image, permission='View')
+        def download(context, request):
+            return as_download(context.filefield)
+    """
+
+    def __init__(self, data, request):
+        """
+        :param data: :A file field obtained by reading an
+                        :class:`~depot.fields.sqlalchemy.UploadedFileField`
+        :type data: :class:`depot.fields.upload.UploadedField`,
+
+        :param request: current request
+        :type request: :class:`pyramid.request.Request`
+        """
+        self.data = data
+        self.request = request
+
+
+@response_adapter(as_download)
+def field_to_download_response(adapter):
+    return UploadedFileResponse(adapter.data,
+                                request=adapter.request,
+                                disposition='attachment')
+
+
+@response_adapter(as_inline)
+def field_to_inline_response(adapter):
+    return UploadedFileResponse(adapter.data,
+                                request=adapter.request,
+                                disposition='inline')
+>>>>>>> Use a file iterator for file downloading
+
 
 @view_config(name='view', context=File, permission='view',
              renderer='kotti:templates/view/file.pt')
@@ -12,24 +142,14 @@ def view(context, request):
     return {}
 
 
-@view_config(name='inline-view', context=File,
-             permission='view')
+@view_config(name='inline-view', context=File, permission='view')
 def inline_view(context, request, disposition='inline'):
-    res = Response(
-        headerlist=[
-            ('Content-Disposition', '%s;filename="%s"' % (
-                disposition, context.filename.encode('ascii', 'ignore'))),
-            ('Content-Type', str(context.mimetype)),
-            ]
-        )
-    res.body = context.data.file.read()
-    return res
+    return as_inline(context.data, request)
 
 
-@view_config(name='attachment-view', context=File,
-             permission='view')
+@view_config(name='attachment-view', context=File, permission='view')
 def attachment_view(context, request):
-    return inline_view(context, request, 'attachment')
+    return as_download(context.data, request)
 
 
 def includeme(config):

From a5ffdfb1b5a7ee2238c9fd3a0c1c462ea71800ba Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Fri, 12 Dec 2014 15:47:56 -0800
Subject: [PATCH 090/600] Don't complicate things with adapters, simply return
 the UploadedFileResponse in file views

---
 kotti/tests/test_file.py | 20 ++++----------------
 kotti/views/file.py      |  8 +++-----
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 5110b79c2..ece2bbd28 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -20,42 +20,30 @@ def _test_common_headers(self, headers):
 
     def test_inline_view(self, config, filedepot):
         from kotti.views.file import inline_view
-        from kotti.views.file import as_inline
-        from pyramid.response import IResponse
 
         config.include('kotti.views.file')
 
         self._create_file(config)
 
         res = inline_view(self.file, None)
-        assert isinstance(res, as_inline)
-
-        response = IResponse(res)
-        headers = response.headers
+        headers = res.headers
 
         self._test_common_headers(headers)
 
         assert headers["Content-Disposition"] == 'inline;filename="myfle.png"'
-        assert response.app_iter.file.read() == 'file contents'
+        assert res.app_iter.file.read() == 'file contents'
 
     def test_attachment_view(self, config, filedepot):
         from kotti.views.file import attachment_view
-        from kotti.views.file import as_download
-        from pyramid.response import IResponse
-
-        config.include('kotti.views.file')
 
         self._create_file(config)
         res = attachment_view(self.file, None)
-        assert isinstance(res, as_download)
-
-        response = IResponse(res)
-        headers = response.headers
+        headers = res.headers
 
         self._test_common_headers(headers)
         assert headers["Content-Disposition"] == (
             'attachment;filename="myfle.png"')
-        assert response.app_iter.file.read() == 'file contents'
+        assert res.app_iter.file.read() == 'file contents'
 
 
 class TestFileEditForm:
diff --git a/kotti/views/file.py b/kotti/views/file.py
index 93584bdb6..1e97f5082 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -2,7 +2,6 @@
 
 from pyramid.response import _BLOCK_SIZE
 from pyramid.response import FileIter
-from pyramid.response import response_adapter
 from pyramid.response import Response
 from pyramid.view import view_config
 
@@ -133,7 +132,6 @@ def field_to_inline_response(adapter):
     return UploadedFileResponse(adapter.data,
                                 request=adapter.request,
                                 disposition='inline')
->>>>>>> Use a file iterator for file downloading
 
 
 @view_config(name='view', context=File, permission='view',
@@ -143,13 +141,13 @@ def view(context, request):
 
 
 @view_config(name='inline-view', context=File, permission='view')
-def inline_view(context, request, disposition='inline'):
-    return as_inline(context.data, request)
+def inline_view(context, request):
+    return UploadedFileResponse(context.data, request, disposition='inline')
 
 
 @view_config(name='attachment-view', context=File, permission='view')
 def attachment_view(context, request):
-    return as_download(context.data, request)
+    return UploadedFileResponse(context.data, request, disposition='attachment')
 
 
 def includeme(config):

From 96449e26c3133a8406a41a76aa2f9c37ed519fb9 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 13 Dec 2014 17:35:48 -0800
Subject: [PATCH 091/600] Avoid problem with wsgi serving of files; Use the
 UploadedFileResponse in image view, where possible

---
 kotti/views/file.py  | 21 ++++++++-------------
 kotti/views/image.py | 17 +++++++++--------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/kotti/views/file.py b/kotti/views/file.py
index 1e97f5082..f4b35cb53 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -34,9 +34,11 @@ class UploadedFileResponse(Response):
     Code adapted from pyramid.response.FileResponse
     """
     def __init__(self, data, request=None, disposition='attachment',
-                 cache_max_age=None, content_type=None, content_encoding=None):
+                 cache_max_age=None, content_type=None,
+                 content_encoding=None):
 
         filename = data.filename
+
         if content_type is None:
             content_type, content_encoding = mimetypes.guess_type(
                 filename,
@@ -48,24 +50,17 @@ def __init__(self, data, request=None, disposition='attachment',
             # on Windows where mimetypes.guess_type returns unicode for the
             # content_type.
             content_type = str(content_type)
+
         super(UploadedFileResponse, self).__init__(
             conditional_response=True,
             content_type=content_type,
             content_encoding=content_encoding
         )
-        self.last_modified = data.file.last_modified
-        content_length = data.file.content_length
-        f = data.file
-        app_iter = None
-        if request is not None:
-            environ = request.environ
-            if 'wsgi.file_wrapper' in environ:
-                app_iter = environ['wsgi.file_wrapper'](f, _BLOCK_SIZE)
-        if app_iter is None:
-            app_iter = FileIter(f, _BLOCK_SIZE)
-        self.app_iter = app_iter
+
+        self.app_iter = FileIter(data.file, _BLOCK_SIZE)
         # assignment of content_length must come after assignment of app_iter
-        self.content_length = content_length
+        self.content_length = data.file.content_length
+        self.last_modified = data.file.last_modified
         if cache_max_age is not None:
             self.cache_expires = cache_max_age
 
diff --git a/kotti/views/image.py b/kotti/views/image.py
index 5c98e9d2b..6a5dd75fa 100644
--- a/kotti/views/image.py
+++ b/kotti/views/image.py
@@ -10,6 +10,7 @@
 
 from kotti.interfaces import IImage
 from kotti.util import extract_from_settings
+from kotti.views.file import UploadedFileResponse
 
 PIL.ImageFile.MAXBLOCK = 33554432
 
@@ -87,14 +88,14 @@ def image(self, subpath=None):
                 # /path/to/image/scale/thumb
                 width, height = image_scales[scale]
 
-        if width and height:
-            image, format, size = scaleImage(self.context.data.file.read(),
-                                             width=width,
-                                             height=height,
-                                             direction="thumb")
-        else:
-            image = self.context.data.file.read()
+        if not (width and height):
+            return UploadedFileResponse(
+                self.context.data, self.request, disposition)
 
+        image, format, size = scaleImage(self.context.data.file.read(),
+                                            width=width,
+                                            height=height,
+                                            direction="thumb")
         res = Response(
             headerlist=[('Content-Disposition', '%s;filename="%s"' % (
                 disposition,
@@ -103,7 +104,7 @@ def image(self, subpath=None):
                 ('Content-Type', str(self.context.mimetype)),
             ],
             body=image,
-            )
+        )
 
         return res
 

From 0c1e082e7bece03ea57cac7b9b642116a0df4bb9 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 13 Dec 2014 18:14:40 -0800
Subject: [PATCH 092/600] Fix freeze in tests caused by improper fixture

---
 kotti/tests/__init__.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index e4dcd6577..c4eea8b58 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -293,9 +293,16 @@ def __init__(self):
         def get(self, id):
             info = self._storage[id]
 
+            finished = []
+            def read(block_size=-1):
+                if not finished:
+                    finished.append(True)
+                    return info['content']
+                return None
+
             f = MagicMock()
             f.public_url = ''
-            f.read.return_value = info['content']
+            f.read = read
             f.filename = info['filename']
             f.content_type = info['content_type']
             f.content_length = len(info['content'])

From bc2ff3f84dd252be3b189866a8eeb295afd38ad9 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 13 Dec 2014 18:19:42 -0800
Subject: [PATCH 093/600] Revert changes to development.ini and
 requirements.txt to allow travis to run

---
 development.ini  | 2 +-
 requirements.txt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/development.ini b/development.ini
index e7b34d938..76ed43710 100644
--- a/development.ini
+++ b/development.ini
@@ -28,7 +28,7 @@ pipeline =
 
 [server:main]
 use = egg:waitress#main
-host = 0.0.0.0
+host = 127.0.0.1
 port = 5000
 
 [alembic]
diff --git a/requirements.txt b/requirements.txt
index 7db5873aa..40bdee355 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
 Kotti==1.0.0-alpha.4
--e git+ssh://git@github.com/amol-/depot.git#egg=filedepot
-
+filedepot==0.0.2
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20

From 9c80e5fc2299ff330feeca1c9fdb41c207c809ee Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 13 Dec 2014 18:34:58 -0800
Subject: [PATCH 094/600] Code cleanup

---
 kotti/tests/__init__.py  | 1 +
 kotti/tests/test_file.py | 7 -------
 kotti/views/image.py     | 6 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index c4eea8b58..06e94f159 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -294,6 +294,7 @@ def get(self, id):
             info = self._storage[id]
 
             finished = []
+
             def read(block_size=-1):
                 if not finished:
                     finished.append(True)
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index ece2bbd28..e2fe1eba6 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -189,10 +189,3 @@ def test_delete(self, factory, db_session, root, filedepot):
         assert DepotManager.get().delete.called
         assert id not in DepotManager.get()._storage.keys()
 
-
-class TestFileSetMetadata:
-
-    def test_it(self, db_session, filedepot):
-        from kotti.resources import File
-        f = File("file contents", u"myfile.png", u"image/png")
-        assert f.filename == u"myfile.png"
diff --git a/kotti/views/image.py b/kotti/views/image.py
index 6a5dd75fa..3a8070f07 100644
--- a/kotti/views/image.py
+++ b/kotti/views/image.py
@@ -93,9 +93,9 @@ def image(self, subpath=None):
                 self.context.data, self.request, disposition)
 
         image, format, size = scaleImage(self.context.data.file.read(),
-                                            width=width,
-                                            height=height,
-                                            direction="thumb")
+                                         width=width,
+                                         height=height,
+                                         direction="thumb")
         res = Response(
             headerlist=[('Content-Disposition', '%s;filename="%s"' % (
                 disposition,

From 369d193ef4ae96d18c17aac31b0a2443926d401a Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 02:31:52 -0800
Subject: [PATCH 095/600] Properly implement read() from DBStoredFile

---
 kotti/__init__.py             |  3 +--
 kotti/filedepot.py            | 43 ++++++++++++++++++++++++++++++++---
 kotti/tests/test_file.py      |  1 -
 kotti/tests/test_filedepot.py | 11 ++++++---
 4 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index 97883f2ad..e05af887d 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -101,8 +101,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.datetime_format': 'medium',
     'kotti.time_format': 'medium',
     'kotti.max_file_size': '10',
-    'kotti.depot.fs0.backend': 'depot.io.local.LocalFileStorage',
-    'kotti.depot.fs0.storage_path': 'var/files',
+    'kotti.depot.fs0.backend': 'kotti.filedepot.DBFileStorage',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
     'kotti.static.edit_needed': '',  # BBB
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index b221c2b20..70a600aca 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -7,6 +7,7 @@
 from sqlalchemy import LargeBinary
 from sqlalchemy import String
 from sqlalchemy import Unicode
+from sqlalchemy import event
 from sqlalchemy.orm import deferred
 
 from depot.io.interfaces import FileStorage
@@ -14,6 +15,7 @@
 from kotti import Base
 from kotti import DBSession
 
+_marker = object()
 
 class DBStoredFile(Base):
     """depotfile StoredFile implementation that stores data in the db.
@@ -46,6 +48,9 @@ class DBStoredFile(Base):
     #: (:class:`sqlalchemy.types.LargeBinary`)
     data = deferred(Column('data', LargeBinary()))
 
+    _cursor = 0
+    _data = _marker
+
     def __init__(self, file_id, filename=None, content_type=None,
                  last_modified=None, content_length=None, **kwds):
         self.file_id = file_id
@@ -63,9 +68,19 @@ def read(self, n=-1):
         If ``n`` is not specified or is ``-1`` the whole
         file content is read in memory and returned
         """
+        if self._data is _marker:
+            file_id = DBSession.merge(self).file_id
+            self._data = DBSession.query(DBStoredFile.data).\
+                filter_by(file_id=file_id).scalar()
+
         if n == -1:
-            return self.data
-        return self.data[:n]
+            result = self._data[self._cursor:]
+        else:
+            result = self._data[self._cursor:self._cursor + n]
+
+        self._cursor += len(result)
+
+        return result
 
     def close(self, *args, **kwargs):
         """Implement :meth:`StoredFile.close`.
@@ -86,7 +101,13 @@ def writable(self):
     def seekable(self):
         """Implement :meth:`StoredFile.seekable`.
         """
-        return False
+        return True
+
+    def seek(self, n):
+        self._cursor = n
+
+    def tell(self):
+        return self._cursor
 
     @property
     def name(self):
@@ -107,6 +128,19 @@ def public_url(self):
         """
         return None
 
+    @classmethod
+    def refresh_data(cls, target, value, oldvalue, initiator):
+        target._cursor = 0
+        target._data = _marker
+
+    @classmethod
+    def __declare_last__(cls):
+        # For the ``data`` column, use the field value setter from filedepot.
+        # filedepot already registers this event listener, but it does so in a
+        # way that won't work properly for subclasses of File
+
+        event.listen(DBStoredFile.data, 'set', DBStoredFile.refresh_data)
+
 
 def set_metadata(event):
     """Set DBStoredFile metadata based on data
@@ -223,6 +257,7 @@ def includeme(config):
     from kotti.events import objectevent_listeners
     from kotti.events import ObjectInsert
     from kotti.events import ObjectUpdate
+    #from sqlalchemy import event
 
     configure_filedepot(config.get_settings())
 
@@ -231,3 +266,5 @@ def includeme(config):
         (ObjectInsert, DBStoredFile)].append(set_metadata)
     objectevent_listeners[
         (ObjectUpdate, DBStoredFile)].append(set_metadata)
+
+    #event.listen(DBStoredFile, 'load', DBStoredFile.set_cursor)
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index e2fe1eba6..ab5dfb356 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -188,4 +188,3 @@ def test_delete(self, factory, db_session, root, filedepot):
 
         assert DepotManager.get().delete.called
         assert id not in DepotManager.get()._storage.keys()
-
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 3b8eb6b32..6ec17021d 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -12,14 +12,19 @@ def test_storedfile_interface(self, db_session, events, setup_app):
 
         assert f.close() is None
         assert f.closed() is False
-        assert f.seekable() is False
+        assert f.seekable() is True
         assert f.writable() is False
 
         assert f.read() == 'content'
+        assert f.read() == ''
+        f.seek(0)
+        assert f.read() == 'content'
+        f.seek(0)
         assert f.read(-1) == 'content'
-        assert f.read(0) == ''
+        f.seek(0)
         assert f.read(2) == 'co'
-        assert f.read(4) == 'cont'
+        assert f.read(4) == 'nten'
+        assert f.tell() == 6
 
         assert f.content_length == 1000
         assert f.content_type == 'image/jpeg'

From 0cadfe4289414e33cbaef391cd019337b0a18d90 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 06:09:36 -0800
Subject: [PATCH 096/600] Fix test for default depot storage configuration

---
 kotti/tests/test_app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index ddb76b907..3785d4251 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -156,7 +156,7 @@ def test_default_filedepot(self, db_session):
 
         with patch('kotti.resources.initialize_sql'):
             main({}, **settings)
-        assert DepotManager.get().__class__.__name__ == 'LocalFileStorage'
+        assert DepotManager.get().__class__.__name__ == 'DBFileStorage'
 
     def test_configure_filedepot(self):
         from depot.manager import DepotManager

From b0659ade512748ad45b8d39fb65f0592c5f3d041 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 06:12:17 -0800
Subject: [PATCH 097/600] DBFileStorage.delete happens too late with default
 depot configuration

---
 kotti/filedepot.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 70a600aca..cb58acafa 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -257,7 +257,7 @@ def includeme(config):
     from kotti.events import objectevent_listeners
     from kotti.events import ObjectInsert
     from kotti.events import ObjectUpdate
-    #from sqlalchemy import event
+    from depot.fields.sqlalchemy import _SQLAMutationTracker
 
     configure_filedepot(config.get_settings())
 
@@ -267,4 +267,9 @@ def includeme(config):
     objectevent_listeners[
         (ObjectUpdate, DBStoredFile)].append(set_metadata)
 
-    #event.listen(DBStoredFile, 'load', DBStoredFile.set_cursor)
+    # depot's _SQLAMutationTracker._session_committed is executed on
+    # after_commit, that's too late for DBFileStorage to interact with the
+    # session
+    event.listen(DBSession,
+                 'before_commit',
+                 _SQLAMutationTracker._session_committed)

From 525362154c10cecc3ec31993e681a71326b9f3f3 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 09:13:39 -0800
Subject: [PATCH 098/600] Better test of DBStoredFile.read()

---
 kotti/tests/test_filedepot.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 6ec17021d..7a9315cc5 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -25,6 +25,10 @@ def test_storedfile_interface(self, db_session, events, setup_app):
         assert f.read(2) == 'co'
         assert f.read(4) == 'nten'
         assert f.tell() == 6
+        f.seek(0)
+        f.seek(100)
+        assert f.tell() == 100
+        assert f.read() == ''
 
         assert f.content_length == 1000
         assert f.content_type == 'image/jpeg'

From 069b879ba7c003b4297968a16b35e2c7b062df22 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 10:17:52 -0800
Subject: [PATCH 099/600] Use a string as fileid in depot test

---
 kotti/filedepot.py            | 1 +
 kotti/tests/test_filedepot.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index cb58acafa..031ae400c 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -17,6 +17,7 @@
 
 _marker = object()
 
+
 class DBStoredFile(Base):
     """depotfile StoredFile implementation that stores data in the db.
 
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 7a9315cc5..c78a6b1c5 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -99,7 +99,7 @@ def test_create(self, db_session):
 
     def test_get(self, db_session):
         with pytest.raises(IOError):
-            DBFileStorage().get(1)
+            DBFileStorage().get("1")
 
         file_id = self.make_one()
         assert DBFileStorage().get(file_id).data == "content here"

From d492e23970ad5b7ff78f1b79c38d99617141c299 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 12:20:36 -0800
Subject: [PATCH 100/600] Added test for UploadedFileResponse; Parametrized the
 TestFileViews

---
 kotti/tests/__init__.py  |  9 ++++-
 kotti/tests/test_file.py | 80 +++++++++++++++++++++++++++++-----------
 kotti/views/file.py      |  1 +
 3 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 06e94f159..c4e6bd86b 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -301,9 +301,14 @@ def read(block_size=-1):
                     return info['content']
                 return None
 
-            f = MagicMock()
+            def seek(n=0):
+                finished[:]
+
+            from StringIO import StringIO
+
+            f = MagicMock(wraps=StringIO(info['content']))
+            f.seek(0)
             f.public_url = ''
-            f.read = read
             f.filename = info['filename']
             f.content_type = info['content_type']
             f.content_length = len(info['content'])
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index ab5dfb356..606f27236 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -5,6 +5,9 @@
 import pytest
 
 from kotti.testing import DummyRequest
+from kotti.views.file import inline_view
+from kotti.views.file import attachment_view
+from kotti.views.file import UploadedFileResponse
 
 
 class TestFileViews:
@@ -18,32 +21,22 @@ def _test_common_headers(self, headers):
         assert headers["Content-Length"] == "13"
         assert headers["Content-Type"] == "image/png"
 
-    def test_inline_view(self, config, filedepot):
-        from kotti.views.file import inline_view
-
-        config.include('kotti.views.file')
-
+    @pytest.mark.parametrize("params",
+                             [(inline_view, 'inline'),
+                              (attachment_view, 'attachment')])
+    def test_file_views(self, params, config, filedepot):
+        view, disposition = params
         self._create_file(config)
+        res = view(self.file, None)
 
-        res = inline_view(self.file, None)
-        headers = res.headers
+        self._test_common_headers(res.headers)
 
-        self._test_common_headers(headers)
+        assert res.headers["Content-Disposition"] == disposition + \
+            ';filename="myfle.png"'
 
-        assert headers["Content-Disposition"] == 'inline;filename="myfle.png"'
-        assert res.app_iter.file.read() == 'file contents'
-
-    def test_attachment_view(self, config, filedepot):
-        from kotti.views.file import attachment_view
-
-        self._create_file(config)
-        res = attachment_view(self.file, None)
-        headers = res.headers
-
-        self._test_common_headers(headers)
-        assert headers["Content-Disposition"] == (
-            'attachment;filename="myfle.png"')
         assert res.app_iter.file.read() == 'file contents'
+        res.app_iter.file.seek(0)
+        assert res.body == 'file contents'
 
 
 class TestFileEditForm:
@@ -188,3 +181,48 @@ def test_delete(self, factory, db_session, root, filedepot):
 
         assert DepotManager.get().delete.called
         assert id not in DepotManager.get()._storage.keys()
+
+
+class TestUploadedFileResponse:
+    def _create_file(self):
+        from kotti.resources import File
+        return File("file contents", u"myf\xfcle.png", u"image/png")
+
+    def test_as_body(self, filedepot):
+        f = self._create_file()
+        resp = UploadedFileResponse(f.data, DummyRequest())
+        assert resp.body == 'file contents'
+
+    def test_as_app_iter(self, filedepot):
+        from pyramid.response import FileIter
+
+        f = self._create_file()
+        resp = UploadedFileResponse(f.data, DummyRequest())
+        assert isinstance(resp.app_iter, FileIter)
+        assert ''.join(resp.app_iter) == 'file contents'
+
+    def test_unknown_filename(self, filedepot):
+        from kotti.resources import File
+        f = File("file contents", u"file", None)
+        resp = UploadedFileResponse(f.data, DummyRequest())
+        assert resp.headers['Content-Type'] == 'application/octet-stream'
+
+    def test_caching(self, filedepot, monkeypatch):
+        import datetime
+        import webob.response
+
+        f = self._create_file()
+        d = datetime.datetime(2012, 12, 31, 13, 0, 0)
+
+        class mockdatetime:
+            @staticmethod
+            def utcnow():
+                return d
+
+        monkeypatch.setattr(webob.response, 'datetime', mockdatetime)
+
+        resp = UploadedFileResponse(f.data, DummyRequest(), cache_max_age=10)
+
+        # this is set by filedepot fixture
+        assert resp.headers['Last-Modified'] == 'Sun, 30 Dec 2012 00:00:00 GMT'
+        assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
diff --git a/kotti/views/file.py b/kotti/views/file.py
index f4b35cb53..5b75e48e6 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -38,6 +38,7 @@ def __init__(self, data, request=None, disposition='attachment',
                  content_encoding=None):
 
         filename = data.filename
+        content_type = content_type or getattr(data, 'content_type', None)
 
         if content_type is None:
             content_type, content_encoding = mimetypes.guess_type(

From a0be53f2645c631aa9a7378c7969386a90547f53 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 12:36:40 -0800
Subject: [PATCH 101/600] Set the Content-Type as string in
 UploadedFileResponse

---
 kotti/views/file.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kotti/views/file.py b/kotti/views/file.py
index 5b75e48e6..e100c8ac8 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -38,8 +38,8 @@ def __init__(self, data, request=None, disposition='attachment',
                  content_encoding=None):
 
         filename = data.filename
-        content_type = content_type or getattr(data, 'content_type', None)
 
+        content_type = content_type or getattr(data, 'content_type', None)
         if content_type is None:
             content_type, content_encoding = mimetypes.guess_type(
                 filename,
@@ -47,10 +47,10 @@ def __init__(self, data, request=None, disposition='attachment',
                 )
             if content_type is None:
                 content_type = 'application/octet-stream'
-            # str-ifying content_type is a workaround for a bug in Python 2.7.7
-            # on Windows where mimetypes.guess_type returns unicode for the
-            # content_type.
-            content_type = str(content_type)
+        # str-ifying content_type is a workaround for a bug in Python 2.7.7
+        # on Windows where mimetypes.guess_type returns unicode for the
+        # content_type.
+        content_type = str(content_type)
 
         super(UploadedFileResponse, self).__init__(
             conditional_response=True,

From 16c662e5973bf3d2531efcacc179230e89293da9 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 12:36:51 -0800
Subject: [PATCH 102/600] Cleanup code in filedepot fixture

---
 kotti/tests/__init__.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index c4e6bd86b..146bb19b1 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -293,17 +293,6 @@ def __init__(self):
         def get(self, id):
             info = self._storage[id]
 
-            finished = []
-
-            def read(block_size=-1):
-                if not finished:
-                    finished.append(True)
-                    return info['content']
-                return None
-
-            def seek(n=0):
-                finished[:]
-
             from StringIO import StringIO
 
             f = MagicMock(wraps=StringIO(info['content']))

From d44714167f430d32e1af48260851c7b890e081f7 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 12:46:57 -0800
Subject: [PATCH 103/600] Added another test for UploadedFileResponse

---
 kotti/tests/test_file.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 606f27236..904701ff5 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -207,6 +207,12 @@ def test_unknown_filename(self, filedepot):
         resp = UploadedFileResponse(f.data, DummyRequest())
         assert resp.headers['Content-Type'] == 'application/octet-stream'
 
+    def test_guess_content_type(self, filedepot):
+        from kotti.resources import File
+        f = File("file contents", u"file.jpg", None)
+        resp = UploadedFileResponse(f.data, DummyRequest())
+        assert resp.headers['Content-Type'] == 'image/jpeg'
+
     def test_caching(self, filedepot, monkeypatch):
         import datetime
         import webob.response

From 84d0ac0059e1eef100b31e04a7a46cca69173aef Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 14 Dec 2014 13:13:41 -0800
Subject: [PATCH 104/600] Added test for DBFileStorage session delete
 integration

---
 kotti/tests/test_filedepot.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index c78a6b1c5..3b5f407b4 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -129,3 +129,23 @@ def test_replace(self, db_session):
         assert fs.filename == u'f3.jpg'
         assert fs.content_type == 'xls'
         assert fs.read() == 'third content'
+
+    def test_session_integration(self, db_session):
+        from depot.manager import DepotManager
+
+        DepotManager._default_depot = 'default'
+        DepotManager._depots = {'default': DBFileStorage()}
+
+        file_id = DepotManager.get().create('content here', u'f.jpg', 'image/jpg')
+        fs = DepotManager.get().get(file_id)
+
+        db_session.add(fs)
+        import transaction
+        transaction.commit()
+
+        transaction.begin()
+        db_session.delete(fs)
+        transaction.commit()
+
+        with pytest.raises(IOError):
+            DepotManager.get().get(file_id)

From e79f8f1e2c246123f3e2b411f313ea6421cd92f4 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Mon, 15 Dec 2014 13:08:55 +0200
Subject: [PATCH 105/600] Remove wrong comment of __declare_last__ of
 DBStoredFile

---
 kotti/filedepot.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 031ae400c..720c24ac3 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -136,10 +136,6 @@ def refresh_data(cls, target, value, oldvalue, initiator):
 
     @classmethod
     def __declare_last__(cls):
-        # For the ``data`` column, use the field value setter from filedepot.
-        # filedepot already registers this event listener, but it does so in a
-        # way that won't work properly for subclasses of File
-
         event.listen(DBStoredFile.data, 'set', DBStoredFile.refresh_data)
 
 

From 8c80ce3fa0e63178b3c14fef4df6d23819949c48 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 15 Dec 2014 13:14:16 -0800
Subject: [PATCH 106/600] UploadedFileResponse can redirect to the permanent
 public_url of an uploaded field, if set by the depot storage

---
 kotti/tests/test_file.py | 26 ++++++++++++++++++++------
 kotti/views/file.py      | 17 ++++++++++-------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 904701ff5..d4218377b 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -1,5 +1,6 @@
 from StringIO import StringIO
 from colander import null
+from pyramid.httpexceptions import HTTPMovedPermanently
 
 from mock import MagicMock
 import pytest
@@ -184,9 +185,12 @@ def test_delete(self, factory, db_session, root, filedepot):
 
 
 class TestUploadedFileResponse:
-    def _create_file(self):
+    def _create_file(self,
+                     data="file contents",
+                     filename=u"myf\xfcle.png",
+                     mimetype=u"image/png"):
         from kotti.resources import File
-        return File("file contents", u"myf\xfcle.png", u"image/png")
+        return File(data, filename, mimetype)
 
     def test_as_body(self, filedepot):
         f = self._create_file()
@@ -202,14 +206,12 @@ def test_as_app_iter(self, filedepot):
         assert ''.join(resp.app_iter) == 'file contents'
 
     def test_unknown_filename(self, filedepot):
-        from kotti.resources import File
-        f = File("file contents", u"file", None)
+        f = self._create_file("file contents", u"file", None)
         resp = UploadedFileResponse(f.data, DummyRequest())
         assert resp.headers['Content-Type'] == 'application/octet-stream'
 
     def test_guess_content_type(self, filedepot):
-        from kotti.resources import File
-        f = File("file contents", u"file.jpg", None)
+        f = self._create_file("file contents", u"file.jpg", None)
         resp = UploadedFileResponse(f.data, DummyRequest())
         assert resp.headers['Content-Type'] == 'image/jpeg'
 
@@ -232,3 +234,15 @@ def utcnow():
         # this is set by filedepot fixture
         assert resp.headers['Last-Modified'] == 'Sun, 30 Dec 2012 00:00:00 GMT'
         assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
+
+    def test_redirect(self, filedepot):
+        f = self._create_file()
+        f.data._thaw()
+        f.data['_public_url'] = 'http://example.com'
+        f.data._freeze()
+
+        with pytest.raises(HTTPMovedPermanently) as e:
+            UploadedFileResponse(f.data, DummyRequest())
+
+        response = e.value
+        assert response.headers['Location'] == 'http://example.com'
diff --git a/kotti/views/file.py b/kotti/views/file.py
index e100c8ac8..e1be1dda7 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from pyramid.httpexceptions import HTTPMovedPermanently
 from pyramid.response import _BLOCK_SIZE
 from pyramid.response import FileIter
 from pyramid.response import Response
@@ -12,7 +13,7 @@
 
 class UploadedFileResponse(Response):
     """
-    A Response object that can be used to serve a uploaded files.
+    A Response object that can be used to serve an UploadedFile instance.
 
     ``data`` is the ``UploadedFile`` file field value.
 
@@ -37,16 +38,18 @@ def __init__(self, data, request=None, disposition='attachment',
                  cache_max_age=None, content_type=None,
                  content_encoding=None):
 
+        if data._public_url:
+            raise HTTPMovedPermanently(data._public_url)
+
         filename = data.filename
 
         content_type = content_type or getattr(data, 'content_type', None)
         if content_type is None:
-            content_type, content_encoding = mimetypes.guess_type(
-                filename,
-                strict=False
-                )
-            if content_type is None:
-                content_type = 'application/octet-stream'
+            content_type, content_encoding = \
+                mimetypes.guess_type(filename, strict=False)
+
+        if content_type is None:
+            content_type = 'application/octet-stream'
         # str-ifying content_type is a workaround for a bug in Python 2.7.7
         # on Windows where mimetypes.guess_type returns unicode for the
         # content_type.

From a9954d5d2538341ef971259de27b97141cbe9a90 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 16 Dec 2014 13:36:35 -0800
Subject: [PATCH 107/600] Move last_modified modification after setting the
 data, as that automatically sets the last_modified value

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 4e8c10fcc..c29865a78 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -37,8 +37,8 @@ def upgrade():
         uploaded_file.process_content(
             obj.data, filename=obj.filename, content_type=obj.mimetype)
         stored_file = DepotManager.get().get(uploaded_file['file_id'])
-        stored_file.last_modified = obj.modification_date
         obj.data = uploaded_file.encode()
+        stored_file.last_modified = obj.modification_date
 
         log.info("Migrated {} bytes for File with pk {} to {}/{}".format(
             len(obj.data), obj.id, dn, uploaded_file['file_id']))

From 9f1fdc79fcae77908686b3a4aa82a55d5ba7f49c Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 16 Dec 2014 13:37:21 -0800
Subject: [PATCH 108/600] Improve inline documentation for filedepot.py

---
 kotti/filedepot.py | 85 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 68 insertions(+), 17 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 720c24ac3..bebd77208 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -19,10 +19,11 @@
 
 
 class DBStoredFile(Base):
-    """depotfile StoredFile implementation that stores data in the db.
+    """ :class:`depot.io.interfaces.StoredFile` implementation that stores
+    file data in SQL database.
 
-    Can be used together with DBFileStorage to implement blobs (large files)
-    storage in the database.
+    Can be used together with :class:`kotti.filedepot.DBFileStorage` to
+    implement blobs storage in the database.
     """
 
     __tablename__ = "blobs"
@@ -30,7 +31,7 @@ class DBStoredFile(Base):
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
     id = Column(Integer(), primary_key=True)
-    #: Unique id given to this blob
+    #: Unique file id given to this blob
     #: (:class:`sqlalchemy.types.String`)
     file_id = Column(String(36), index=True)
     #: The original filename it had when it was uploaded.
@@ -42,7 +43,7 @@ class DBStoredFile(Base):
     #: Size of the blob in bytes
     #: (:class:`sqlalchemy.types.Integer`)
     content_length = Column(Integer())
-    #: Date / time the blob was created
+    #: Date / time the blob was created or last modified
     #: (:class:`sqlalchemy.types.DateTime`)
     last_modified = Column(DateTime())
     #: The binary data itself
@@ -105,38 +106,54 @@ def seekable(self):
         return True
 
     def seek(self, n):
+        """ Move the file cursor to position `n`
+
+        :param n: Position for the cursor
+        :type n: int
+        """
         self._cursor = n
 
     def tell(self):
+        """ Returns current position of file cursor
+
+        :result: Current file cursor position.
+        :rtype: int
+        """
         return self._cursor
 
     @property
     def name(self):
         """Implement :meth:`StoredFile.name`.
 
-        This is the filename of the saved file
+        :result: the filename of the saved file
+        :rtype: string
         """
         return self.filename
 
     @property
     def public_url(self):
-        """The public HTTP url from which file can be accessed.
+        """ Integration with :class:`depot.middleware.DepotMiddleware`
 
         When supported by the storage this will provide the
         public url to which the file content can be accessed.
         In case this returns ``None`` it means that the file can
-        only be served by the :class:`DepotMiddleware` itself.
+        only be served by the :class:`depot.middleware.DepotMiddleware` itself.
         """
         return None
 
-    @classmethod
-    def refresh_data(cls, target, value, oldvalue, initiator):
-        target._cursor = 0
-        target._data = _marker
-
     @classmethod
     def __declare_last__(cls):
-        event.listen(DBStoredFile.data, 'set', DBStoredFile.refresh_data)
+        """ Executed by SQLAlchemy as part of mapper configuration
+
+        When the data changes, we want to reset the cursor position of target
+        instance, to allow proper streaming of data.
+        """
+        event.listen(DBStoredFile.data, 'set', handle_change_data)
+
+
+def handle_change_data(target, value, oldvalue, initiator):
+    target._cursor = 0
+    target._data = _marker
 
 
 def set_metadata(event):
@@ -158,6 +175,11 @@ class DBFileStorage(FileStorage):
 
     def get(self, file_id):
         """Returns the file given by the file_id
+
+        :param file_id: the unique id associated to the file
+        :type file_id: string
+        :result: a :class:`kotti.filedepot.DBStoredFile` instance
+        :rtype: :class:`kotti.filedepot.DBStoredFile`
         """
 
         f = DBSession.query(DBStoredFile).filter_by(file_id=file_id).first()
@@ -168,9 +190,18 @@ def get(self, file_id):
     def create(self, content, filename=None, content_type=None):
         """Saves a new file and returns the file id
 
-        ``content`` parameter can either be ``bytes``, another ``file object``
+        :param content: can either be ``bytes``, another ``file object``
         or a :class:`cgi.FieldStorage`. When ``filename`` and ``content_type``
         parameters are not provided they are deducted from the content itself.
+
+        :param filename: filename for this file
+        :type filename: string
+
+        :param content_type: Mimetype of this file
+        :type content_type: string
+
+        :return: the unique ``file_id`` associated to this file
+        :rtype: string
         """
         new_file_id = str(uuid.uuid1())
         content, filename, content_type = self.fileinfo(
@@ -195,6 +226,18 @@ def replace(self, file_or_id, content, filename=None, content_type=None):
         ``content_type`` are provided or can be deducted by the ``content``
         itself they will also replace the previous values, otherwise the current
         values are kept.
+
+        :param file_or_id: can be either ``DBStoredFile`` or a ``file_id``
+
+        :param content: can either be ``bytes``, another ``file object``
+        or a :class:`cgi.FieldStorage`. When ``filename`` and ``content_type``
+        parameters are not provided they are deducted from the content itself.
+
+        :param filename: filename for this file
+        :type filename: string
+
+        :param content_type: Mimetype of this file
+        :type content_type: string
         """
 
         file_id = self._get_file_id(file_or_id)
@@ -215,14 +258,21 @@ def replace(self, file_or_id, content, filename=None, content_type=None):
         fstore.data = content
 
     def delete(self, file_or_id):
-        """Deletes a file. If the file didn't exist it will just do nothing."""
+        """Deletes a file. If the file didn't exist it will just do nothing.
+
+        :param file_or_id: can be either ``DBStoredFile`` or a ``file_id``
+        """
 
         file_id = self._get_file_id(file_or_id)
 
         DBSession.query(DBStoredFile).filter_by(file_id=file_id).delete()
 
     def exists(self, file_or_id):
-        """Returns if a file or its ID still exist."""
+        """Returns if a file or its ID still exist.
+
+        :return: Returns if a file or its ID still exist.
+        :rtype: bool
+        """
 
         file_id = self._get_file_id(file_or_id)
 
@@ -251,6 +301,7 @@ def includeme(config):
     :param config: app config
     :type config: :class:`pyramid.config.Configurator`
     """
+
     from kotti.events import objectevent_listeners
     from kotti.events import ObjectInsert
     from kotti.events import ObjectUpdate

From ea11c9fc9d566b0ec712594d65acae86f97e6f0c Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 16 Dec 2014 14:08:53 -0800
Subject: [PATCH 109/600] Improvements to inline documentation

---
 kotti/resources.py      |  7 +++++++
 kotti/tests/__init__.py |  2 ++
 kotti/util.py           | 16 ++++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index fbe6f0809..d35afe78d 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -716,6 +716,13 @@ def __declare_last__(cls):
 
     @classmethod
     def set_metadata(cls, target, value, oldvalue, initiator):
+        """ Refresh metadata and save the binary data to the data field.
+
+        :param target: The File instance
+        :type target: :class:`kotti.resources.File` or subclass
+        :param value: The container for binary data
+        :type value: A :class:`cgi.FieldStorage` instance
+        """
         newvalue = _SQLAMutationTracker._field_set(
             target, value, oldvalue, initiator)
 
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 146bb19b1..33cb36889 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -282,6 +282,8 @@ def workflow(config):
 
 @fixture
 def filedepot(db_session, request):
+    """ Configures a mock depot store for :class:`depot.manager.DepotManager`
+    """
     from depot.manager import DepotManager
     from datetime import datetime
 
diff --git a/kotti/util.py b/kotti/util.py
index 042af195f..3c3884b6e 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -278,7 +278,14 @@ def extract_from_settings(prefix, settings=None):
 
 
 def flatdotted_to_dict(prefix, settings=None):
-    """
+    """ Merges items from a dictionary that have keys that start with `prefix`
+    to a new dictionary result.
+
+    :param prefix: A dotted string representing the prefix for the common values
+    :type prefix: string
+    :value settings: A dictionary with settings. Result is extracted from this
+    :type settings: dict
+
       >>> settings = {
       ...     'kotti.depot.default.backend': 'local',
       ...     'kotti.depot.default.file_storage': 'var/files',
@@ -369,10 +376,11 @@ def command(func, doc):
 
 
 def _to_fieldstorage(fp, filename, mimetype, size, **_kwds):
-    """ Build a cgi.FieldStorage instance.
+    """ Build a :class:`cgi.FieldStorage` instance.
 
-    Deform's FileUploadWidget returns a dict, but filedepot's
-    UploadedFieldFile likes cgi.FieldStorage objects
+    Deform's :class:`FileUploadWidget` returns a dict, but
+    :class:`depot.fields.sqlalchemy.UploadedFileField` likes
+    :class:`cgi.FieldStorage` objects
     """
     f = cgi.FieldStorage()
     f.file = fp

From 0f80ac571fcc57e034f87dc63e66597410850d01 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 18 Dec 2014 14:35:08 -0800
Subject: [PATCH 110/600] Change the way we configure the depots

---
 kotti/__init__.py       |  3 ++-
 kotti/filedepot.py      |  9 +++++----
 kotti/tests/test_app.py | 10 ++++++----
 kotti/util.py           | 39 ++++++++++++++++++++++-----------------
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index e05af887d..47641e7be 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -101,7 +101,8 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.datetime_format': 'medium',
     'kotti.time_format': 'medium',
     'kotti.max_file_size': '10',
-    'kotti.depot.fs0.backend': 'kotti.filedepot.DBFileStorage',
+    'kotti.depot.0.name': 'dbfiles',
+    'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
     'kotti.static.edit_needed': '',  # BBB
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index bebd77208..fff69bdfb 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -286,12 +286,13 @@ def _get_file_id(self, file_or_id):
 
 
 def configure_filedepot(settings):
-    from kotti.util import flatdotted_to_dict
+    from kotti.util import extract_depot_settings
     from depot.manager import DepotManager
 
-    config = flatdotted_to_dict('kotti.depot.', settings)
-    for name, conf in config.items():
-        if DepotManager.get(name) is None:
+    config = extract_depot_settings('kotti.depot.', settings)
+    for conf in config:
+        name = conf.pop('name')
+        if name not in DepotManager._depots:
             DepotManager.configure(name, conf, prefix='')
 
 
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 3785d4251..cbb0c30a3 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -167,10 +167,12 @@ def test_configure_filedepot(self):
         tests.TFS2 = Mock(return_value=Mock(marker="TFS2"))
 
         settings = {
-            'kotti.depot.localfs.backend': 'kotti.tests.TFS1',
-            'kotti.depot.localfs.location': '/tmp',
-            'kotti.depot.mongo.backend': 'kotti.tests.TFS2',
-            'kotti.depot.mongo.uri': 'mongo://',
+            'kotti.depot.0.backend': 'kotti.tests.TFS1',
+            'kotti.depot.0.name': 'localfs',
+            'kotti.depot.0.location': '/tmp',
+            'kotti.depot.1.backend': 'kotti.tests.TFS2',
+            'kotti.depot.1.uri': 'mongo://',
+            'kotti.depot.1.name': 'mongo',
         }
 
         # depot.manager.DepotManager acts as singleton, save its settings
diff --git a/kotti/util.py b/kotti/util.py
index 3c3884b6e..9f9614381 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -277,9 +277,9 @@ def extract_from_settings(prefix, settings=None):
     return extracted
 
 
-def flatdotted_to_dict(prefix, settings=None):
+def extract_depot_settings(prefix="kotti.depot.", settings=None):
     """ Merges items from a dictionary that have keys that start with `prefix`
-    to a new dictionary result.
+    to a list of dictionaries.
 
     :param prefix: A dotted string representing the prefix for the common values
     :type prefix: string
@@ -287,27 +287,32 @@ def flatdotted_to_dict(prefix, settings=None):
     :type settings: dict
 
       >>> settings = {
-      ...     'kotti.depot.default.backend': 'local',
-      ...     'kotti.depot.default.file_storage': 'var/files',
-      ...     'kotti.depot.mongo.backend': 'mongodb',
-      ...     'kotti.depot.mongo.uri': 'localhost://',
+      ...     'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
+      ...     'kotti.depot.0.file_storage': 'var/files',
+      ...     'kotti.depot.0.name': 'local',
+      ...     'kotti.depot.1.backend': 'depot.io.gridfs.GridStorage',
+      ...     'kotti.depot.1.name': 'mongodb',
+      ...     'kotti.depot.1.uri': 'localhost://',
       ... }
-      >>> res = flatdotted_to_dict('kotti.depot.', settings)
-      >>> print sorted(res.keys())
-      ['default', 'mongo']
-      >>> print res['default']
-      {'file_storage': 'var/files', 'backend': 'local'}
-      >>> print res['mongo']
-      {'uri': 'localhost://', 'backend': 'mongodb'}
+      >>> res = extract_depot_settings('kotti.depot.', settings)
+      >>> print sorted(res[0].items())
+      [('backend', 'kotti.filedepot.DBFileStorage'), ('file_storage', 'var/files'), ('name', 'local')]
+      >>> print sorted(res[1].items())
+      [('backend', 'depot.io.gridfs.GridStorage'), ('name', 'mongodb'), ('uri', 'localhost://')]
     """
 
     extracted = {}
     for k, v in extract_from_settings(prefix, settings).items():
-        name, conf = k.split('.', 1)
-        extracted.setdefault(name, {})
-        extracted[name][conf] = v
+        index, conf = k.split('.', 1)
+        index = int(index)
+        extracted.setdefault(index, {})
+        extracted[index][conf] = v
 
-    return extracted
+    result = []
+    for k in sorted(extracted.keys()):
+        result.append(extracted[k])
+
+    return result
 
 
 def disambiguate_name(name):

From 6ba346353c9f00cfc733f18583fd83c1a6e77bb6 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 18 Dec 2014 16:12:18 -0800
Subject: [PATCH 111/600] Provide automatic conversion to cgi.FieldStorage
 using an event listener on set of File.data

---
 kotti/resources.py | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index d35afe78d..290e25027 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -19,7 +19,6 @@
 from depot.fields.sqlalchemy import _SQLAMutationTracker
 
 from pyramid.traversal import resource_path
-from sqlalchemy import event
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
@@ -29,9 +28,11 @@
 from sqlalchemy import Unicode
 from sqlalchemy import UnicodeText
 from sqlalchemy import UniqueConstraint
+from sqlalchemy import event
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.orderinglist import ordering_list
+from sqlalchemy.orm import ColumnProperty
 from sqlalchemy.orm import backref
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.orm import relation
@@ -678,9 +679,6 @@ def __init__(self, data=None, filename=None, mimetype=None, size=None,
         self.filename = filename
         self.mimetype = mimetype
         self.size = size
-        if isinstance(data, basestring):
-            data = _to_fieldstorage(fp=StringIO(data), filename=filename,
-                                    mimetype=mimetype, size=size)
         self.data = data
 
     @classmethod
@@ -712,10 +710,22 @@ def __declare_last__(cls):
         # filedepot already registers this event listener, but it does so in a
         # way that won't work properly for subclasses of File
 
-        event.listen(cls.data, 'set', cls.set_metadata, retval=True)
+        mapper = cls._sa_class_manager.mapper
+
+        for mapper_property in mapper.iterate_properties:
+            if isinstance(mapper_property, ColumnProperty):
+                for idx, col in enumerate(mapper_property.columns):
+                    if isinstance(col.type, UploadedFileField):
+                        args = (mapper_property,
+                                'set',
+                                _SQLAMutationTracker._field_set)
+                        if event.contains(*args):
+                            event.remove(*args)
+
+        event.listen(cls.data, 'set', cls._save_data, retval=True)
 
     @classmethod
-    def set_metadata(cls, target, value, oldvalue, initiator):
+    def _save_data(cls, target, value, oldvalue, initiator):
         """ Refresh metadata and save the binary data to the data field.
 
         :param target: The File instance
@@ -723,15 +733,25 @@ def set_metadata(cls, target, value, oldvalue, initiator):
         :param value: The container for binary data
         :type value: A :class:`cgi.FieldStorage` instance
         """
+
+        if isinstance(value, bytes):
+            value = _to_fieldstorage(fp=StringIO(value),
+                                    filename=target.filename,
+                                    mimetype=target.mimetype,
+                                    size=len(value))
+
         newvalue = _SQLAMutationTracker._field_set(
             target, value, oldvalue, initiator)
 
         if newvalue is None:
             return
 
-        target.filename = newvalue.filename
+        if newvalue.filename:
+            target.filename = newvalue.filename
+        if newvalue.content_type:
+            target.mimetype = newvalue.content_type
+
         target.size = newvalue.file.content_length
-        target.mimetype = newvalue.content_type
         return newvalue
 
 

From 3baf09a7256d46b719d9c64feb4336672d72c5f2 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 18 Dec 2014 16:25:05 -0800
Subject: [PATCH 112/600] Cleanup File.from_field_storage method

---
 kotti/resources.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 290e25027..4a85cb3a1 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -694,15 +694,10 @@ def from_field_storage(cls, fs):
         :rtype: :class:`kotti.resources.File`
         """
 
-        data = fs.file.read()
-        filename = fs.filename
-        mimetype = fs.type
-        size = len(data)
+        if not cls.type_info.is_uploadable_mimetype(fs.type):
+            raise ValueError("Unsupported MIME type: %s" % fs.type)
 
-        if not cls.type_info.is_uploadable_mimetype(mimetype):
-            raise ValueError("Unsupported MIME type: %s" % mimetype)
-
-        return cls(data=data, filename=filename, mimetype=mimetype, size=size)
+        return cls(data=fs)
 
     @classmethod
     def __declare_last__(cls):
@@ -750,8 +745,8 @@ def _save_data(cls, target, value, oldvalue, initiator):
             target.filename = newvalue.filename
         if newvalue.content_type:
             target.mimetype = newvalue.content_type
-
         target.size = newvalue.file.content_length
+
         return newvalue
 
 

From 7bcbfc8711fa0ee042d05c6ef5458149627e7a31 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 18 Dec 2014 22:31:06 -0800
Subject: [PATCH 113/600] Simplify __declare_last__; Remove not needed code in
 _save_data

---
 kotti/resources.py | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 4a85cb3a1..34aaf49ce 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -32,7 +32,6 @@
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.orderinglist import ordering_list
-from sqlalchemy.orm import ColumnProperty
 from sqlalchemy.orm import backref
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.orm import relation
@@ -701,22 +700,15 @@ def from_field_storage(cls, fs):
 
     @classmethod
     def __declare_last__(cls):
-        # For the ``data`` column, use the field value setter from filedepot.
-        # filedepot already registers this event listener, but it does so in a
-        # way that won't work properly for subclasses of File
-
+        # Unconfigure the event set in _SQLAMutationTracker, we have _save_data
         mapper = cls._sa_class_manager.mapper
+        prop = mapper.attrs['data']
+        args = (prop, 'set', _SQLAMutationTracker._field_set)
+        if event.contains(*args):
+            event.remove(*args)
 
-        for mapper_property in mapper.iterate_properties:
-            if isinstance(mapper_property, ColumnProperty):
-                for idx, col in enumerate(mapper_property.columns):
-                    if isinstance(col.type, UploadedFileField):
-                        args = (mapper_property,
-                                'set',
-                                _SQLAMutationTracker._field_set)
-                        if event.contains(*args):
-                            event.remove(*args)
-
+        # Declaring the event on the class attribute instead of mapper property
+        # enables its registration on subclasses
         event.listen(cls.data, 'set', cls._save_data, retval=True)
 
     @classmethod
@@ -741,10 +733,8 @@ def _save_data(cls, target, value, oldvalue, initiator):
         if newvalue is None:
             return
 
-        if newvalue.filename:
-            target.filename = newvalue.filename
-        if newvalue.content_type:
-            target.mimetype = newvalue.content_type
+        target.filename = newvalue.filename
+        target.mimetype = newvalue.content_type
         target.size = newvalue.file.content_length
 
         return newvalue

From c4abf8a25fde7a1d691abaaeb5b5c4f69f8424bf Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 18 Dec 2014 22:55:17 -0800
Subject: [PATCH 114/600] Don't treat File.data for mysql engine, do it for
 DBStoredFile.data

---
 kotti/filedepot.py | 6 ++++++
 kotti/resources.py | 7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index fff69bdfb..f4becc612 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -322,3 +322,9 @@ def includeme(config):
     event.listen(DBSession,
                  'before_commit',
                  _SQLAMutationTracker._session_committed)
+
+    # adjust for engine type
+    engine = DBSession.connection().engine
+    if engine.dialect.name == 'mysql':  # pragma: no cover
+        from sqlalchemy.dialects.mysql.base import LONGBLOB
+        DBStoredFile.__table__.c.data.type = LONGBLOB()
diff --git a/kotti/resources.py b/kotti/resources.py
index 34aaf49ce..9271a6b04 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -702,13 +702,12 @@ def from_field_storage(cls, fs):
     def __declare_last__(cls):
         # Unconfigure the event set in _SQLAMutationTracker, we have _save_data
         mapper = cls._sa_class_manager.mapper
-        prop = mapper.attrs['data']
-        args = (prop, 'set', _SQLAMutationTracker._field_set)
+        args = (mapper.attrs['data'], 'set', _SQLAMutationTracker._field_set)
         if event.contains(*args):
             event.remove(*args)
 
         # Declaring the event on the class attribute instead of mapper property
-        # enables its registration on subclasses
+        # enables proper registration on its subclasses
         event.listen(cls.data, 'set', cls._save_data, retval=True)
 
     @classmethod
@@ -788,8 +787,6 @@ def default_get_root(request=None):
 
 def _adjust_for_engine(engine):
     if engine.dialect.name == 'mysql':  # pragma: no cover
-        from sqlalchemy.dialects.mysql.base import LONGBLOB
-        File.__table__.c.data.type = LONGBLOB()
         # We disable the Node.path index for Mysql; in some conditions
         # the index can't be created for columns even with 767 bytes,
         # the maximum default size for column indexes

From 87c59c5ad4b3bb79a7303a0c383b012602965e09 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 20 Dec 2014 07:51:03 -0800
Subject: [PATCH 115/600] Added some documentation for filedepot

---
 docs/developing/advanced/blobs.rst | 124 +++++++++++++++++++++++++++++
 docs/developing/advanced/index.rst |   1 +
 2 files changed, 125 insertions(+)
 create mode 100644 docs/developing/advanced/blobs.rst

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
new file mode 100644
index 000000000..af64259c7
--- /dev/null
+++ b/docs/developing/advanced/blobs.rst
@@ -0,0 +1,124 @@
+.. _blobs
+
+Working with blob data in Kotti
+===============================
+
+Kotti provides a flexible mechanism of storing blob data by with the help of
+:app:`filedepot`_ storages. Both ``File`` and ``Image`` store their data in
+:class:`depot.fields.sqlalchemy.UploadedFileField` and they will offload their
+blob data to the configured depot storage. Working together with
+:app:`filedepot` configured storages means it is possible to store blob data in
+a variety of ways: filesystem, GridFS, Amazon storage, etc. By default
+:app:`Kotti` will store its blob data in the configured SQL database, using
+``~kotti.filedepot.DBFileStorage`` storage, but you can configure your own
+preferred way of storing your blob data.
+
+Configuring a depot store
+-------------------------
+
+While :app:`filedepot` allows storing data in any of the configured
+filestorages, at this time there's no mechanism in Kotti to select, at runtime,
+the depot where new data will be saved. Instead, :app:`Kotti` will store new
+files only in the configured *default* store. If, for example, you add a new
+depot and make that the default, you should leave the old depot configured so
+that :app:`Kotti` will continue serving files uploaded there.
+
+By default, `Kotti` comes configured with a db-based filestorage.::
+
+    kotti.depot.0.name = dbfiles
+    kotti.depot.0.backend = kotti.filedepot.DBFileStorage
+
+The depot configured at position 0 is the default file depot. The minimum
+information required to configure a depot are the `name` and `backend`. The
+`name` can be any string and it is used by :app:`filedepot` to identify the
+depot store for a particular saved file. The `name` should never be changed, as
+it will make the saved files unaccessible. 
+
+Any further parameters for a particular backend will be passed as keyword
+arguments to the backend class. See this example, in which we store, by
+default, files in `/var/local/files/` using the
+:class:`depot.io.local.LocalFileStorage`::
+
+    kotti.depot.0.name = localfs
+    kotti.depot.0.backend = depot.io.local.LocalFileStorage
+    kotti.depot.0.storage_path = /var/local/files
+    kotti.depot.1.name = dbfiles
+    kotti.depot.1.backend = kotti.filedepot.DBFileStorage
+
+Notice that we kept the `dbfiles` storage, but we moved it to position 1. No
+blob data will be saved anymore, but existing files in that storage will
+continue to be served from there.
+
+Add a blob field to your model
+------------------------------
+Adding a blob data attribute to your can be as simple as::
+
+    from depot.fields.sqlalchemy import UploadedFileField
+    from kotti.resources import Content
+
+    class Person(Content):
+        avatar = UploadedFileField()
+
+While you can directly assign a `bytes` value to the `avatar` column, the
+``UploadedFileField`` column type works best when you assign a
+:class:``cgi.FieldStorage`` instance as value.::
+
+    from StringIO import StringIO
+    from kotti.util import _to_fieldstorage
+
+    content = '...'
+    data = {
+            'fp': StringIO(content),
+            'filename': 'avatar.png', 
+            'mimetype': 'image/png',
+            'size': len(content),
+            }
+    person = Person()
+    person.avatar = _to_fielstorage(**data)
+
+Note that the ``data`` dictionary described here has the same format as the
+deserialized value of a ``deform.widget.FileUploadWidget``. See the
+:class:`~kotti.views.edit.content.FileAddForm` and 
+:class:`~kotti.views.edit.content.FileEditForm` for a full example
+of how to add or edit a model with a blob field.
+
+Reading blob data
+-----------------
+
+If you try directly to read data from an `UploadedFileField` you'll get a
+:class:`depot.fields.upload.UploadedFile` instance, which offers a
+dictionary-like interface to the stored file metadata and direct access to a
+stream with the stored file through the ``file`` attribute::
+
+    person = DBSession.query(Person).get(1)
+    blob = person.avatar.file.read()
+
+You should never write to the file stream directly. Instead, you should assign
+a new value to the ``UploadedFileField`` column, as described in the previous
+section.
+
+Downloading blob data
+---------------------
+
+Serving blob data is facilitated by the
+:class:``~kotti.views.file.UploadedFileResponse``. You should return an
+instance of this class as the response of your view, and it will stream the
+blob from the storage to the client browser. As parameters it takes the blob
+column and the type of disposition: ``inline`` or ``attachment`` (to trigger a
+download in the browser). This, for example is the ``inline-view`` view for a
+:class:``~kotti.resources.File``::
+
+    @view_config(name='inline-view', context=File, permission='view')
+    def inline_view(context, request):
+        return UploadedFileResponse(context.data, request, disposition='inline')
+
+If the used depot storage offers a ``public_url`` value for the blob, then
+``UploadedFileResponse``, instead of streaming the data, will redirect instead
+to that location.
+
+Inheritance issues with UploadedFileField columns
+-------------------------------------------------
+
+You should be aware that, presently, inheriting the ``UploadedFileField`` column doesn't work properly. For a solution to this problem, look how we solve the problem using :meth:`~kotti.resources.File.__declare_last__`, which will solve the problem for the :class:`kotti.resources.Image` subclass.
+
+.. _filedepot: https://pypi.python.org/pypi/filedepot/
diff --git a/docs/developing/advanced/index.rst b/docs/developing/advanced/index.rst
index cec0acc14..b86d8746c 100644
--- a/docs/developing/advanced/index.rst
+++ b/docs/developing/advanced/index.rst
@@ -12,5 +12,6 @@ Advanced Topics
     events
     frontpage-different-template
     images
+    blobs
     static-resource-management
     understanding-kotti-startup

From 3a98d1fef96a16118e61961f5756a6572276946e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 20 Dec 2014 22:22:42 -0800
Subject: [PATCH 116/600] Fixes to blobs.rst documentation

---
 docs/developing/advanced/blobs.rst | 34 +++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index af64259c7..c15cf9ad6 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -10,7 +10,7 @@ blob data to the configured depot storage. Working together with
 :app:`filedepot` configured storages means it is possible to store blob data in
 a variety of ways: filesystem, GridFS, Amazon storage, etc. By default
 :app:`Kotti` will store its blob data in the configured SQL database, using
-``~kotti.filedepot.DBFileStorage`` storage, but you can configure your own
+:class:``~kotti.filedepot.DBFileStorage`` storage, but you can configure your own
 preferred way of storing your blob data.
 
 Configuring a depot store
@@ -29,14 +29,14 @@ By default, `Kotti` comes configured with a db-based filestorage.::
     kotti.depot.0.backend = kotti.filedepot.DBFileStorage
 
 The depot configured at position 0 is the default file depot. The minimum
-information required to configure a depot are the `name` and `backend`. The
-`name` can be any string and it is used by :app:`filedepot` to identify the
-depot store for a particular saved file. The `name` should never be changed, as
-it will make the saved files unaccessible. 
+information required to configure a depot are the ``name`` and ``backend``. The
+``name`` can be any string and it is used by :app:`filedepot` to identify the
+depot store for a particular saved file. The ``name`` should never be changed, as
+it will make the saved files unaccessible.
 
 Any further parameters for a particular backend will be passed as keyword
 arguments to the backend class. See this example, in which we store, by
-default, files in `/var/local/files/` using the
+default, files in ``/var/local/files/`` using the
 :class:`depot.io.local.LocalFileStorage`::
 
     kotti.depot.0.name = localfs
@@ -45,13 +45,13 @@ default, files in `/var/local/files/` using the
     kotti.depot.1.name = dbfiles
     kotti.depot.1.backend = kotti.filedepot.DBFileStorage
 
-Notice that we kept the `dbfiles` storage, but we moved it to position 1. No
-blob data will be saved anymore, but existing files in that storage will
-continue to be served from there.
+Notice that we kept the ``dbfiles`` storage, but we moved it to position 1. No
+blob data will be saved there anymore, but existing files in that storage will
+continue to be available from there.
 
 Add a blob field to your model
 ------------------------------
-Adding a blob data attribute to your can be as simple as::
+Adding a blob data attribute to your models can be as simple as::
 
     from depot.fields.sqlalchemy import UploadedFileField
     from kotti.resources import Content
@@ -59,7 +59,7 @@ Adding a blob data attribute to your can be as simple as::
     class Person(Content):
         avatar = UploadedFileField()
 
-While you can directly assign a `bytes` value to the `avatar` column, the
+While you can directly assign a ``bytes`` value to the ``avatar`` column, the
 ``UploadedFileField`` column type works best when you assign a
 :class:``cgi.FieldStorage`` instance as value.::
 
@@ -85,7 +85,7 @@ of how to add or edit a model with a blob field.
 Reading blob data
 -----------------
 
-If you try directly to read data from an `UploadedFileField` you'll get a
+If you try directly to read data from an ``UploadedFileField`` you'll get a
 :class:`depot.fields.upload.UploadedFile` instance, which offers a
 dictionary-like interface to the stored file metadata and direct access to a
 stream with the stored file through the ``file`` attribute::
@@ -113,12 +113,16 @@ download in the browser). This, for example is the ``inline-view`` view for a
         return UploadedFileResponse(context.data, request, disposition='inline')
 
 If the used depot storage offers a ``public_url`` value for the blob, then
-``UploadedFileResponse``, instead of streaming the data, will redirect instead
-to that location.
+``UploadedFileResponse``, instead of streaming the data, will redirect to that
+location.
 
 Inheritance issues with UploadedFileField columns
 -------------------------------------------------
 
-You should be aware that, presently, inheriting the ``UploadedFileField`` column doesn't work properly. For a solution to this problem, look how we solve the problem using :meth:`~kotti.resources.File.__declare_last__`, which will solve the problem for the :class:`kotti.resources.Image` subclass.
+You should be aware that, presently, subclassing a model with an
+``UploadedFileField`` column doesn't work properly.  As a workaround, look how
+we solve the problem using a ``__declare_last__`` classmethod in
+:meth:`~kotti.resources.File.__declare_last__`, which will solve the problem
+for the :class:`kotti.resources.Image` subclass.
 
 .. _filedepot: https://pypi.python.org/pypi/filedepot/

From d3102599271eae69f465429ece29634f0e624c28 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 20 Dec 2014 23:21:31 -0800
Subject: [PATCH 117/600] Better explanation of how to subclass model with
 UploadedFileField

---
 docs/developing/advanced/blobs.rst | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index c15cf9ad6..060aec2ab 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -120,9 +120,19 @@ Inheritance issues with UploadedFileField columns
 -------------------------------------------------
 
 You should be aware that, presently, subclassing a model with an
-``UploadedFileField`` column doesn't work properly.  As a workaround, look how
-we solve the problem using a ``__declare_last__`` classmethod in
-:meth:`~kotti.resources.File.__declare_last__`, which will solve the problem
-for the :class:`kotti.resources.Image` subclass.
+``UploadedFileField`` column doesn't work properly.  As a workaround, add a 
+``__declare_last__`` classmethod in your superclass model, similar to the one
+below, where we're fixing the ``data`` column of the ``File`` class. ::
+
+    from depot.fields.sqlalchemy import _SQLAMutationTracker
+
+    class File(Content):
+
+        data = UploadedFileField()
+
+        @classmethod
+        def __declare_last__(cls):
+            event.listen(cls.data, 'set', _SQLAMutationTracker._field_set, retval=True)
+
 
 .. _filedepot: https://pypi.python.org/pypi/filedepot/

From 6e336dc0c7df8aec11e15af5f4fbde903b708f54 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 21 Dec 2014 09:54:18 -0800
Subject: [PATCH 118/600] Added a kotti-migrate-storage command

---
 kotti/filedepot.py            | 75 +++++++++++++++++++++++++++++++----
 kotti/tests/__init__.py       | 21 ++++++++++
 kotti/tests/test_app.py       | 11 +----
 kotti/tests/test_filedepot.py | 63 +++++++++++++++++++++++++++++
 setup.py                      |  1 +
 5 files changed, 154 insertions(+), 17 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index f4becc612..fb963f87b 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -14,6 +14,7 @@
 
 from kotti import Base
 from kotti import DBSession
+from kotti.util import command
 
 _marker = object()
 
@@ -58,7 +59,7 @@ def __init__(self, file_id, filename=None, content_type=None,
         self.file_id = file_id
         self.filename = filename
         self.content_type = content_type
-        self.last_modified = last_modified
+        self.last_modified = last_modified or datetime.now()
         self.content_length = content_length
 
         for k, v in kwds.items():
@@ -296,6 +297,67 @@ def configure_filedepot(settings):
             DepotManager.configure(name, conf, prefix='')
 
 
+def migrate_storage(from_storage, to_storage):
+    from depot.fields.sqlalchemy import _SQLAMutationTracker
+    from depot.manager import DepotManager
+    from kotti.util import _to_fieldstorage
+    import logging
+
+    log = logging.getLogger(__name__)
+
+    old_default = DepotManager._default_depot
+    DepotManager._default_depot = to_storage
+
+    for klass, props in _SQLAMutationTracker.mapped_entities.items():
+        log.info("Migrating %r", klass)
+        mapper = klass._sa_class_manager.mapper
+        for instance in DBSession.query(klass):
+            for prop in props:
+                uf = getattr(instance, prop)
+                if not uf:
+                    continue
+                pk = mapper.primary_key_from_instance(instance)
+                log.info("Migrating %s for %r with pk %r", prop, klass, pk)
+
+                filename = uf['filename']
+                content_type = uf['content_type']
+                data = _to_fieldstorage(fp=uf.file,
+                                        filename=filename,
+                                        mimetype=content_type,
+                                        size=uf.file.content_length)
+                setattr(instance, prop, data)
+
+    DepotManager._default_depot = old_default
+
+
+def migrate_storages_command():  # pragma: no cover
+    __doc__ = """ Migrate blobs between two configured filedepot storages
+
+    Usage:
+      kotti-migrate-storage <config_uri> --from-storage <name> --to-storage <name>
+
+    Options:
+      -h --help                 Show this screen.
+      --from-storage <number>   The storage name that has blob data to migrate
+      --to-storage <number>     The storage name where we want to put the blobs
+    """
+    return command(
+        lambda args: migrate_storage(
+            from_storage=args['--from-storage'],
+            to_storage=args['--to-storage'],
+        ),
+        __doc__,
+    )
+
+
+def adjust_for_engine(conn, branch):
+    # adjust for engine type
+
+    if conn.engine.dialect.name == 'mysql':  # pragma: no cover
+        from sqlalchemy.dialects.mysql.base import LONGBLOB
+        DBStoredFile.__table__.c.data.type = LONGBLOB()
+
+
 def includeme(config):
     """ Pyramid includeme hook.
 
@@ -308,6 +370,11 @@ def includeme(config):
     from kotti.events import ObjectUpdate
     from depot.fields.sqlalchemy import _SQLAMutationTracker
 
+    from sqlalchemy.event import listen
+    from sqlalchemy.engine import Engine
+
+    listen(Engine, 'engine_connect', adjust_for_engine)
+
     configure_filedepot(config.get_settings())
 
     # Update file metadata on change of blob data
@@ -322,9 +389,3 @@ def includeme(config):
     event.listen(DBSession,
                  'before_commit',
                  _SQLAMutationTracker._session_committed)
-
-    # adjust for engine type
-    engine = DBSession.connection().engine
-    if engine.dialect.name == 'mysql':  # pragma: no cover
-        from sqlalchemy.dialects.mysql.base import LONGBLOB
-        DBStoredFile.__table__.c.data.type = LONGBLOB()
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 33cb36889..c1b0d84b2 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -335,3 +335,24 @@ def restore():
         DepotManager._default_depot = _old_default_depot
 
     request.addfinalizer(restore)
+
+
+@fixture
+def no_filedepots(db_session, request):
+    """ A filedepot fixture to empty and then restore DepotManager configuration
+    """
+    from depot.manager import DepotManager
+
+    _old_depots = DepotManager._depots
+    _old_default_depot = DepotManager._default_depot
+
+    DepotManager._depots = {}
+    DepotManager._default_depot = None
+
+
+    def restore():
+        db_session.rollback()
+        DepotManager._depots = _old_depots
+        DepotManager._default_depot = _old_default_depot
+
+    request.addfinalizer(restore)
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index cbb0c30a3..12dc91f88 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -158,7 +158,7 @@ def test_default_filedepot(self, db_session):
             main({}, **settings)
         assert DepotManager.get().__class__.__name__ == 'DBFileStorage'
 
-    def test_configure_filedepot(self):
+    def test_configure_filedepot(self, no_filedepots):
         from depot.manager import DepotManager
         from kotti.filedepot import configure_filedepot
         from kotti import tests
@@ -175,12 +175,6 @@ def test_configure_filedepot(self):
             'kotti.depot.1.name': 'mongo',
         }
 
-        # depot.manager.DepotManager acts as singleton, save its settings
-        _depots = DepotManager._depots
-        _default_depot = DepotManager._default_depot
-        DepotManager._depots = {}
-        DepotManager._default_depot = None
-
         configure_filedepot(settings)
 
         assert DepotManager.get().marker == 'TFS1'
@@ -190,9 +184,6 @@ def test_configure_filedepot(self):
         tests.TFS1.assert_called_with(location='/tmp')
         tests.TFS2.assert_called_with(uri='mongo://')
 
-        DepotManager._depots = _depots
-        DepotManager._default_depot = _default_depot
-
         del tests.TFS1
         del tests.TFS2
 
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 3b5f407b4..130aa77c8 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -2,6 +2,7 @@
 import pytest
 
 from kotti.filedepot import DBFileStorage, DBStoredFile
+from kotti.resources import File
 
 
 class TestDBStoredFile:
@@ -149,3 +150,65 @@ def test_session_integration(self, db_session):
 
         with pytest.raises(IOError):
             DepotManager.get().get(file_id)
+
+
+class TestMigrateBetweenStorage:
+
+    def _create_content(self, db_session, root):
+        data = [
+            ('f1', u'file1.jpg', 'image/jpeg'),
+            ('f2', u'file2.png', 'image/png'),
+        ]
+        for row in data:
+            f = File(data=row[0], filename=row[1], mimetype=row[2])
+            root[row[1]] = f
+
+        db_session.flush()
+
+    def test_migrate_between_storages(self, db_session, root, no_filedepots):
+        from kotti.filedepot import configure_filedepot
+        from kotti.filedepot import migrate_storage
+        from depot.fields.sqlalchemy import _SQLAMutationTracker
+        from sqlalchemy import event
+        import os
+        import tempfile
+        import shutil
+
+        event.listen(db_session,
+                    'before_commit',
+                    _SQLAMutationTracker._session_committed)
+
+        # save depot configuration: use a fixture "save_depot_config"
+        # configure two depots:
+
+        tmp_location = tempfile.mkdtemp()
+
+        settings = {
+            'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
+            'kotti.depot.0.name': 'dbfiles',
+
+            'kotti.depot.1.backend': 'depot.io.local.LocalFileStorage',
+            'kotti.depot.1.name': 'localfs',
+            'kotti.depot.1.storage_path': tmp_location,
+        }
+
+        configure_filedepot(settings)
+        self._create_content(db_session, root)
+
+        assert db_session.query(DBStoredFile).count() == 2
+
+        migrate_storage('dbfiles', 'localfs')
+
+        folders = os.listdir(tmp_location)
+        assert len(folders) == 2
+
+        db_session.flush()
+
+
+        for f in db_session.query(File):
+            uf = f.data
+            assert uf.file_id and uf.file_id in folders
+
+        # assert db_session.query(DBStoredFile).count() == 0
+
+        shutil.rmtree(tmp_location)
diff --git a/setup.py b/setup.py
index edff161d4..05ff26730 100644
--- a/setup.py
+++ b/setup.py
@@ -120,6 +120,7 @@
       [console_scripts]
       kotti-migrate = kotti.migrate:kotti_migrate_command
       kotti-reset-workflow = kotti.workflow:reset_workflow_command
+      kotti-migrate-storage = kotti.filedepot:migrate_storages_command
 
       [pytest11]
       kotti = kotti.tests

From 851c4db23572b48702c986f21e765fdf9a6db80d Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 21 Dec 2014 11:46:49 -0800
Subject: [PATCH 119/600] Improve kotti-migrate-storage test

---
 kotti/tests/test_filedepot.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 130aa77c8..f6b085b13 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -156,8 +156,8 @@ class TestMigrateBetweenStorage:
 
     def _create_content(self, db_session, root):
         data = [
-            ('f1', u'file1.jpg', 'image/jpeg'),
-            ('f2', u'file2.png', 'image/png'),
+            ('f1...', u'file1.jpg', 'image/jpeg'),
+            ('f2...', u'file2.png', 'image/png'),
         ]
         for row in data:
             f = File(data=row[0], filename=row[1], mimetype=row[2])
@@ -168,6 +168,7 @@ def _create_content(self, db_session, root):
     def test_migrate_between_storages(self, db_session, root, no_filedepots):
         from kotti.filedepot import configure_filedepot
         from kotti.filedepot import migrate_storage
+        from kotti.resources import Node
         from depot.fields.sqlalchemy import _SQLAMutationTracker
         from sqlalchemy import event
         import os
@@ -178,9 +179,6 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots):
                     'before_commit',
                     _SQLAMutationTracker._session_committed)
 
-        # save depot configuration: use a fixture "save_depot_config"
-        # configure two depots:
-
         tmp_location = tempfile.mkdtemp()
 
         settings = {
@@ -204,11 +202,19 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots):
 
         db_session.flush()
 
+        # here we need a transaction.commit(), but that would mess with the
+        # rest of the tests; we'll just trigger the event handler manually
+        _SQLAMutationTracker._session_committed(db_session)
+
+        root = db_session.query(Node).filter_by(parent=None).one()
+        f1 = root['file1.jpg']
+        assert f1.data.file_id in folders
+        assert f1.data.file.read() == 'f1...'
 
-        for f in db_session.query(File):
-            uf = f.data
-            assert uf.file_id and uf.file_id in folders
+        f2 = root['file2.png']
+        assert f2.data.file_id in folders
+        assert f2.data.file.read() == 'f2...'
 
-        # assert db_session.query(DBStoredFile).count() == 0
+        assert db_session.query(DBStoredFile).count() == 0
 
         shutil.rmtree(tmp_location)

From 26a276ca2e6f7594a01714b436c508d3aef1ba89 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 22 Dec 2014 15:39:44 -0800
Subject: [PATCH 120/600] Also test for Image for the filedepot migration

---
 kotti/tests/test_filedepot.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index f6b085b13..c2079b69c 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -3,6 +3,7 @@
 
 from kotti.filedepot import DBFileStorage, DBStoredFile
 from kotti.resources import File
+from kotti.resources import Image
 
 
 class TestDBStoredFile:
@@ -163,6 +164,14 @@ def _create_content(self, db_session, root):
             f = File(data=row[0], filename=row[1], mimetype=row[2])
             root[row[1]] = f
 
+        data = [
+            ('i1...', u'image1.jpg', 'image/jpeg'),
+            ('i2...', u'image2.png', 'image/png'),
+        ]
+        for row in data:
+            f = Image(data=row[0], filename=row[1], mimetype=row[2])
+            root[row[1]] = f
+
         db_session.flush()
 
     def test_migrate_between_storages(self, db_session, root, no_filedepots):
@@ -193,12 +202,12 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots):
         configure_filedepot(settings)
         self._create_content(db_session, root)
 
-        assert db_session.query(DBStoredFile).count() == 2
+        assert db_session.query(DBStoredFile).count() == 4
 
         migrate_storage('dbfiles', 'localfs')
 
         folders = os.listdir(tmp_location)
-        assert len(folders) == 2
+        assert len(folders) == 4
 
         db_session.flush()
 
@@ -215,6 +224,14 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots):
         assert f2.data.file_id in folders
         assert f2.data.file.read() == 'f2...'
 
+        i1 = root['image1.jpg']
+        assert i1.data.file_id in folders
+        assert i1.data.file.read() == 'i1...'
+
+        i2 = root['image2.png']
+        assert i2.data.file_id in folders
+        assert i2.data.file.read() == 'i2...'
+
         assert db_session.query(DBStoredFile).count() == 0
 
         shutil.rmtree(tmp_location)

From 33536a21c999db9e87c6a548ce4d9ee147754a1a Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 22 Dec 2014 15:40:28 -0800
Subject: [PATCH 121/600] In the filedepot migration, filter by type when
 discovering migratable items, to avoid polymorphic issues

---
 kotti/filedepot.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index fb963f87b..bd68f651e 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -14,6 +14,7 @@
 
 from kotti import Base
 from kotti import DBSession
+from kotti.util import camel_case_to_name
 from kotti.util import command
 
 _marker = object()
@@ -310,8 +311,13 @@ def migrate_storage(from_storage, to_storage):
 
     for klass, props in _SQLAMutationTracker.mapped_entities.items():
         log.info("Migrating %r", klass)
+
         mapper = klass._sa_class_manager.mapper
-        for instance in DBSession.query(klass):
+
+        # use type column to avoid polymorphism issues, getting the same
+        # Node item multiple times.
+        type_ = camel_case_to_name(klass.__name__)
+        for instance in DBSession.query(klass).filter_by(type=type_):
             for prop in props:
                 uf = getattr(instance, prop)
                 if not uf:

From e4dc80f6b6cd6ef0ee36f49730af8362f4e8892e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 22 Dec 2014 15:53:41 -0800
Subject: [PATCH 122/600] Added section to blobs.rst about the fixtures for
 testing UploadedFileField columns

---
 docs/developing/advanced/blobs.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 060aec2ab..7a6d7ca43 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -116,6 +116,15 @@ If the used depot storage offers a ``public_url`` value for the blob, then
 ``UploadedFileResponse``, instead of streaming the data, will redirect to that
 location.
 
+Testing UploadedFileField columns
+---------------------------------
+
+Because :class:``depot.manager.DepotManager`` acts as a singleton, special care needs to be taken when testing features that involve saving data into ``UploadedFileField`` columns.
+
+``UploadedFileField`` columns always require having at least one depot file storage configured. You can use a fixture called ``filedepot`` to have a mock file storage available for your tests.
+
+If you're developing new file depot storages you should use the ``no_filedepots`` fixture, which resets the configured depots for the test run and restores the default depots back, as a teardown.
+
 Inheritance issues with UploadedFileField columns
 -------------------------------------------------
 

From 044a5af5f78065a6e988c6a6ec581ef881e0db73 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 22 Dec 2014 15:54:19 -0800
Subject: [PATCH 123/600] Line formatting in blobs.rst

---
 docs/developing/advanced/blobs.rst | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 7a6d7ca43..d587ee11b 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -119,11 +119,17 @@ location.
 Testing UploadedFileField columns
 ---------------------------------
 
-Because :class:``depot.manager.DepotManager`` acts as a singleton, special care needs to be taken when testing features that involve saving data into ``UploadedFileField`` columns.
+Because :class:``depot.manager.DepotManager`` acts as a singleton, special care
+needs to be taken when testing features that involve saving data into
+``UploadedFileField`` columns.
 
-``UploadedFileField`` columns always require having at least one depot file storage configured. You can use a fixture called ``filedepot`` to have a mock file storage available for your tests.
+``UploadedFileField`` columns always require having at least one depot file
+storage configured. You can use a fixture called ``filedepot`` to have a mock
+file storage available for your tests.
 
-If you're developing new file depot storages you should use the ``no_filedepots`` fixture, which resets the configured depots for the test run and restores the default depots back, as a teardown.
+If you're developing new file depot storages you should use the
+``no_filedepots`` fixture, which resets the configured depots for the test run
+and restores the default depots back, as a teardown.
 
 Inheritance issues with UploadedFileField columns
 -------------------------------------------------

From f289779b5fe33bc37637681ec8d5e3b33ab4845d Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 23 Dec 2014 04:38:48 -0800
Subject: [PATCH 124/600] Small fixes to blobs.rst

---
 docs/developing/advanced/blobs.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index d587ee11b..c20f428d9 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -74,7 +74,7 @@ While you can directly assign a ``bytes`` value to the ``avatar`` column, the
             'size': len(content),
             }
     person = Person()
-    person.avatar = _to_fielstorage(**data)
+    person.avatar = _to_fieldstorage(**data)
 
 Note that the ``data`` dictionary described here has the same format as the
 deserialized value of a ``deform.widget.FileUploadWidget``. See the
@@ -123,11 +123,11 @@ Because :class:``depot.manager.DepotManager`` acts as a singleton, special care
 needs to be taken when testing features that involve saving data into
 ``UploadedFileField`` columns.
 
-``UploadedFileField`` columns always require having at least one depot file
-storage configured. You can use a fixture called ``filedepot`` to have a mock
-file storage available for your tests.
+``UploadedFileField`` columns require having at least one depot file storage
+configured. You can use a fixture called ``filedepot`` to have a mock file
+storage available for your tests.
 
-If you're developing new file depot storages you should use the
+If you're developing new depot file storages you should use the
 ``no_filedepots`` fixture, which resets the configured depots for the test run
 and restores the default depots back, as a teardown.
 

From 5ff6f34dfbf5cd11d61fcf6afec43f5192695113 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 23 Dec 2014 10:28:06 -0800
Subject: [PATCH 125/600] Filedepot documentation: added apidoc rst, added
 section on migration in blobs.rst

---
 docs/api/index.rst                 |  1 +
 docs/api/kotti.filedepot.rst       |  7 +++++
 docs/developing/advanced/blobs.rst | 45 +++++++++++++++++++++++++++---
 3 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 docs/api/kotti.filedepot.rst

diff --git a/docs/api/index.rst b/docs/api/index.rst
index 99045ac76..4b2284af7 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -17,6 +17,7 @@ API Documentation
    kotti.populate
    kotti.request
    kotti.resources
+   kotti.filedepot
    kotti.security
    kotti.sqla
    kotti.testing
diff --git a/docs/api/kotti.filedepot.rst b/docs/api/kotti.filedepot.rst
new file mode 100644
index 000000000..916745900
--- /dev/null
+++ b/docs/api/kotti.filedepot.rst
@@ -0,0 +1,7 @@
+.. _api-kotti.filedepot:
+
+kotti.filedepot
+---------------
+
+.. automodule:: kotti.filedepot
+   :members:
diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index c20f428d9..4354b9d0f 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -8,10 +8,17 @@ Kotti provides a flexible mechanism of storing blob data by with the help of
 :class:`depot.fields.sqlalchemy.UploadedFileField` and they will offload their
 blob data to the configured depot storage. Working together with
 :app:`filedepot` configured storages means it is possible to store blob data in
-a variety of ways: filesystem, GridFS, Amazon storage, etc. By default
-:app:`Kotti` will store its blob data in the configured SQL database, using
-:class:``~kotti.filedepot.DBFileStorage`` storage, but you can configure your own
-preferred way of storing your blob data.
+a variety of ways: filesystem, GridFS, Amazon storage, etc. 
+
+By default :app:`Kotti` will store its blob data in the configured SQL
+database, using :class:``~kotti.filedepot.DBFileStorage`` storage, but you can
+configure your own preferred way of storing your blob data. The benefit of
+storing files in ``DBFileStorage`` is having *all* content in a single place
+(the DB) which makes backups, exporting and importing of your site's data easy,
+as long as you don't have too many or too large files. The downsides of this
+approach appear when your database server resides on a different host (network
+performance becomes a greater issue) or your DB dumps become too large to be
+handled efficiently.
 
 Configuring a depot store
 -------------------------
@@ -150,4 +157,34 @@ below, where we're fixing the ``data`` column of the ``File`` class. ::
             event.listen(cls.data, 'set', _SQLAMutationTracker._field_set, retval=True)
 
 
+Migrating data between two different storages
+---------------------------------------------
+
+Kotti provides a script that can migrate blob data from one configured stored
+to another and update the saved fields with the new locations. It is not needed
+to do this if you just want to add a new torage, or replace the default one,
+but you can use it if you'd like to consolidate the blob data in one place
+only. You can invoke the script with::
+
+    kotti-migrate-storage <config_uri> --from-storage <name> --to-storage <name>
+
+The storage names are those assigned in the configuration file designated in
+``<config_uri>``. For example, let's assume you've started a website that has
+the default blob storage, the ``DBFileStorage`` named *dbfiles*. You'd like to
+move all the existing blob data to a :class:``depot.io.local.LocalFileStorage``
+storage and make that the default. First, add the ``LocalFileStorage`` depot, 
+make it the default and place the old ``DBFileStorage`` in position *1*:::
+
+    kotti.depot.0.backend = depot.io.local.LocalFileStorage
+    kotti.depot.0.name = localfs
+    kotti.depot.0.storage_path = /var/local/files
+    kotti.depot.1.backend = kotti.filedepot.DBFileStorage
+    kotti.depot.1.name = dbfiles
+
+Now you can invoke the migration with:::
+
+    kotti-migrate-storage <config_uri> --from-storage dbfiles --to-storage localfs
+
+As always when dealing with migrations, make sure you backup your data first!
+
 .. _filedepot: https://pypi.python.org/pypi/filedepot/

From 3a6a47467738e65bfd2761aeb0392dc6cda59d9e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 23 Dec 2014 10:38:52 -0800
Subject: [PATCH 126/600] Fix kotti-migrate-storage inline help

---
 kotti/filedepot.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index bd68f651e..e33462f3c 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -344,8 +344,8 @@ def migrate_storages_command():  # pragma: no cover
 
     Options:
       -h --help                 Show this screen.
-      --from-storage <number>   The storage name that has blob data to migrate
-      --to-storage <number>     The storage name where we want to put the blobs
+      --from-storage <name>   The storage name that has blob data to migrate
+      --to-storage <name>     The storage name where we want to put the blobs
     """
     return command(
         lambda args: migrate_storage(

From 0e59bb2cb92a8e3f57eb31b09bf62aec420002e8 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Wed, 24 Dec 2014 04:32:28 -0800
Subject: [PATCH 127/600] Added filedepot section in configuration.rst

---
 docs/developing/advanced/blobs.rst      |  2 +-
 docs/developing/basic/configuration.rst | 50 +++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 4354b9d0f..9ab2a4a5a 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -1,4 +1,4 @@
-.. _blobs
+.. _blobs:
 
 Working with blob data in Kotti
 ===============================
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 246854b61..1e925cc2c 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -75,6 +75,8 @@ kotti.datetime_format         Datetime format to use, default: ``medium``
 kotti.time_format             Time format to use, default: ``medium``
 kotti.max_file_size           Max size for file uploads, default: ```10`` (MB)
 
+kotti.depot.*.*               Configure the blob storage. More details below
+
 pyramid.default_locale_name   Set the user interface language, default ``en``
 ============================  ==================================================
 
@@ -307,6 +309,54 @@ The default configuration here is:
   kotti.url_normalizer.map_non_ascii_characters = True
 
 
+Blob storage configuration
+--------------------------
+
+By default, Kotti will store blob data (files uploaded in File and Image
+instances) in the database. Internally, Kotti integrates with :app:`filedepot`,
+so it is possible to use any :app:``filedepot`` compatible storage, including those
+provided by :app:``filedepot`` itself:
+
+- :class:``depot.io.local.LocalFileStorage``
+- :class:``depot.io.awss3.S3Storage``
+- :class:``depot.io.gridfs.GridFSStorage``
+
+The default storage for :app:``Kotti`` is
+:class:``~kotti.filedepot.DBFileStorage``. The benefit of storing files in
+``DBFileStorage`` is having *all* content in a single place (the DB) which
+makes backups, exporting and importing of your site's data easy, as long as you
+don't have too many or too large files. The downsides of this approach appear
+when your database server resides on a different host (network performance
+becomes a greater issue) or your DB dumps become too large to be handled
+efficiently.
+
+To configure a depot, several ``kotti.depot.*.*`` lines need to be added. The
+number in the first position is used to group backend configuration and to
+order the file storages in the configuration of :app:``filedepot``.  The depot
+configured with number 0 will be the default depot, where all new blob data
+will be saved.  There are 2 options that are required for every storage
+configuration: ``name`` and ``backend``. The ``name`` is a unique string that
+will be used to identify the path of saved files (it is recorded with each blob
+info), so once configured for a particular storage, it should never change. The
+``backend`` should point to a dotted path for the storage class. Then, any
+number of keyword arguments can be added, and they will be passed to the
+backend class on initialization.
+
+Example of a possible configurationi that stores blob data on the disk, in
+``/var/local/files`` using the :app:``filedepot``
+:class:``depot.io.local.LocalFileStorage`` provided backend. Kotti's default
+backend, ``DBFileStorage`` has been moved to position **1** and all data stored
+there will continue to be available. See :ref:`blobs` to see how to migrate
+blob data between storages.
+
+.. code-block:: ini
+
+  kotti.depot.0.name = localfs
+  kotti.depot.0.backend = depot.io.local.LocalFileStorage
+  kotti.depot.0.storage_path = /var/local/files
+  kotti.depot.1.name = dbfiles
+  kotti.depot.1.backend = kotti.filedepot.DBFileStorage
+
 
 Local navigation
 ----------------

From 2d918858de6fb3eaf3c7edc9e3576edf54b69582 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Wed, 24 Dec 2014 04:59:56 -0800
Subject: [PATCH 128/600] Fix stamp ids for filedepot migration

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 2 +-
 kotti/tests/__init__.py                              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index c29865a78..b5dce2843 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -8,7 +8,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '413fa5fcc581'
-down_revision = '1063d7178fa'
+down_revision = '559ce6eb0949'
 
 import logging
 import sqlalchemy as sa
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index c1b0d84b2..713cce3c5 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -349,7 +349,6 @@ def no_filedepots(db_session, request):
     DepotManager._depots = {}
     DepotManager._default_depot = None
 
-
     def restore():
         db_session.rollback()
         DepotManager._depots = _old_depots

From 0a61a59ba127d973a6d940b548e5ee9c1b9aa68d Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 26 Jan 2015 14:52:43 -0800
Subject: [PATCH 129/600] Fix rst formatting in documentation

---
 docs/developing/advanced/blobs.rst | 36 +++++++++++++++---------------
 kotti/filedepot.py                 | 10 +++++----
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 9ab2a4a5a..11c42930a 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -4,14 +4,14 @@ Working with blob data in Kotti
 ===============================
 
 Kotti provides a flexible mechanism of storing blob data by with the help of
-:app:`filedepot`_ storages. Both ``File`` and ``Image`` store their data in
+`filedepot`_ storages. Both ``File`` and ``Image`` store their data in
 :class:`depot.fields.sqlalchemy.UploadedFileField` and they will offload their
 blob data to the configured depot storage. Working together with
-:app:`filedepot` configured storages means it is possible to store blob data in
+`filedepot`_ configured storages means it is possible to store blob data in
 a variety of ways: filesystem, GridFS, Amazon storage, etc. 
 
-By default :app:`Kotti` will store its blob data in the configured SQL
-database, using :class:``~kotti.filedepot.DBFileStorage`` storage, but you can
+By default Kotti will store its blob data in the configured SQL
+database, using :class:`kotti.filedepot.DBFileStorage` storage, but you can
 configure your own preferred way of storing your blob data. The benefit of
 storing files in ``DBFileStorage`` is having *all* content in a single place
 (the DB) which makes backups, exporting and importing of your site's data easy,
@@ -23,21 +23,21 @@ handled efficiently.
 Configuring a depot store
 -------------------------
 
-While :app:`filedepot` allows storing data in any of the configured
+While `filedepot`_ allows storing data in any of the configured
 filestorages, at this time there's no mechanism in Kotti to select, at runtime,
-the depot where new data will be saved. Instead, :app:`Kotti` will store new
-files only in the configured *default* store. If, for example, you add a new
+the depot where new data will be saved. Instead, Kotti will store new
+files only in the configured ``default`` store. If, for example, you add a new
 depot and make that the default, you should leave the old depot configured so
-that :app:`Kotti` will continue serving files uploaded there.
+that Kotti will continue serving files uploaded there.
 
-By default, `Kotti` comes configured with a db-based filestorage.::
+By default, Kotti comes configured with a db-based filestorage.::
 
     kotti.depot.0.name = dbfiles
     kotti.depot.0.backend = kotti.filedepot.DBFileStorage
 
 The depot configured at position 0 is the default file depot. The minimum
 information required to configure a depot are the ``name`` and ``backend``. The
-``name`` can be any string and it is used by :app:`filedepot` to identify the
+``name`` can be any string and it is used by `filedepot`_ to identify the
 depot store for a particular saved file. The ``name`` should never be changed, as
 it will make the saved files unaccessible.
 
@@ -68,7 +68,7 @@ Adding a blob data attribute to your models can be as simple as::
 
 While you can directly assign a ``bytes`` value to the ``avatar`` column, the
 ``UploadedFileField`` column type works best when you assign a
-:class:``cgi.FieldStorage`` instance as value.::
+:class:`cgi.FieldStorage` instance as value::
 
     from StringIO import StringIO
     from kotti.util import _to_fieldstorage
@@ -84,9 +84,9 @@ While you can directly assign a ``bytes`` value to the ``avatar`` column, the
     person.avatar = _to_fieldstorage(**data)
 
 Note that the ``data`` dictionary described here has the same format as the
-deserialized value of a ``deform.widget.FileUploadWidget``. See the
-:class:`~kotti.views.edit.content.FileAddForm` and 
-:class:`~kotti.views.edit.content.FileEditForm` for a full example
+deserialized value of a ``deform.widget.FileUploadWidget``. See
+:class:`kotti.views.edit.content.FileAddForm` and 
+:class:`kotti.views.edit.content.FileEditForm` for a full example
 of how to add or edit a model with a blob field.
 
 Reading blob data
@@ -108,12 +108,12 @@ Downloading blob data
 ---------------------
 
 Serving blob data is facilitated by the
-:class:``~kotti.views.file.UploadedFileResponse``. You should return an
+:class:`kotti.views.file.UploadedFileResponse`. You should return an
 instance of this class as the response of your view, and it will stream the
 blob from the storage to the client browser. As parameters it takes the blob
 column and the type of disposition: ``inline`` or ``attachment`` (to trigger a
 download in the browser). This, for example is the ``inline-view`` view for a
-:class:``~kotti.resources.File``::
+:class:`kotti.resources.File`::
 
     @view_config(name='inline-view', context=File, permission='view')
     def inline_view(context, request):
@@ -126,7 +126,7 @@ location.
 Testing UploadedFileField columns
 ---------------------------------
 
-Because :class:``depot.manager.DepotManager`` acts as a singleton, special care
+Because :class:`depot.manager.DepotManager` acts as a singleton, special care
 needs to be taken when testing features that involve saving data into
 ``UploadedFileField`` columns.
 
@@ -171,7 +171,7 @@ only. You can invoke the script with::
 The storage names are those assigned in the configuration file designated in
 ``<config_uri>``. For example, let's assume you've started a website that has
 the default blob storage, the ``DBFileStorage`` named *dbfiles*. You'd like to
-move all the existing blob data to a :class:``depot.io.local.LocalFileStorage``
+move all the existing blob data to a :class:`depot.io.local.LocalFileStorage`
 storage and make that the default. First, add the ``LocalFileStorage`` depot, 
 make it the default and place the old ``DBFileStorage`` in position *1*:::
 
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index e33462f3c..feb968aed 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -193,8 +193,9 @@ def create(self, content, filename=None, content_type=None):
         """Saves a new file and returns the file id
 
         :param content: can either be ``bytes``, another ``file object``
-        or a :class:`cgi.FieldStorage`. When ``filename`` and ``content_type``
-        parameters are not provided they are deducted from the content itself.
+                        or a :class:`cgi.FieldStorage`. When ``filename`` and
+                        ``content_type``  parameters are not provided they are
+                        deducted from the content itself.
 
         :param filename: filename for this file
         :type filename: string
@@ -232,8 +233,9 @@ def replace(self, file_or_id, content, filename=None, content_type=None):
         :param file_or_id: can be either ``DBStoredFile`` or a ``file_id``
 
         :param content: can either be ``bytes``, another ``file object``
-        or a :class:`cgi.FieldStorage`. When ``filename`` and ``content_type``
-        parameters are not provided they are deducted from the content itself.
+                        or a :class:`cgi.FieldStorage`. When ``filename`` and
+                        ``content_type`` parameters are not provided they are
+                        deducted from the content itself.
 
         :param filename: filename for this file
         :type filename: string

From 2a5bbb0e2f54f16028faa8af6ec4f6fe4d369292 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 29 Jan 2015 13:05:10 -0800
Subject: [PATCH 130/600] Fix file broken by rebasing

---
 kotti/views/file.py | 60 ---------------------------------------------
 1 file changed, 60 deletions(-)

diff --git a/kotti/views/file.py b/kotti/views/file.py
index e1be1dda7..c0b66366d 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -73,66 +73,6 @@ def __init__(self, data, request=None, disposition='attachment',
         self.headerlist.append(('Content-Disposition', disp))
 
 
-class as_inline(object):
-    """ ``UploadedFile`` adapter for an inline content-disposition Response
-
-    Writing a view to inline view a file (such as an image) can be as easy as::
-
-        @view_config(name='image', context=Image, permission='View')
-        def view_image(context, request):
-            return as_inline(context.imagefield)
-    """
-
-    def __init__(self, data, request):
-        """
-        :param data: :A file field obtained by reading an
-                        :class:`~depot.fields.sqlalchemy.UploadedFileField`
-        :type data: :class:`depot.fields.upload.UploadedField`,
-
-        :param request: current request
-        :type request: :class:`pyramid.request.Request`
-        """
-        self.data = data
-        self.request = request
-
-
-class as_download(object):
-    """ ``UploadedFile`` adapter for an attachment content-disposition Response
-
-    Writing a view to download a file can be as easy as::
-
-        @view_config(name='image', context=Image, permission='View')
-        def download(context, request):
-            return as_download(context.filefield)
-    """
-
-    def __init__(self, data, request):
-        """
-        :param data: :A file field obtained by reading an
-                        :class:`~depot.fields.sqlalchemy.UploadedFileField`
-        :type data: :class:`depot.fields.upload.UploadedField`,
-
-        :param request: current request
-        :type request: :class:`pyramid.request.Request`
-        """
-        self.data = data
-        self.request = request
-
-
-@response_adapter(as_download)
-def field_to_download_response(adapter):
-    return UploadedFileResponse(adapter.data,
-                                request=adapter.request,
-                                disposition='attachment')
-
-
-@response_adapter(as_inline)
-def field_to_inline_response(adapter):
-    return UploadedFileResponse(adapter.data,
-                                request=adapter.request,
-                                disposition='inline')
-
-
 @view_config(name='view', context=File, permission='view',
              renderer='kotti:templates/view/file.pt')
 def view(context, request):

From 7c0a2e174cfeea56f67cd960d8c5424cfefc626d Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sat, 31 Jan 2015 10:10:50 -0800
Subject: [PATCH 131/600] Set Kotti=1.1-dev in requirements.txt. Projects that
 want to try kotti master need to be able to load requirements.txt and have
 the same Kotti version as master

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 40bdee355..532874c2e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0-alpha.4
+Kotti==1.1-dev
 filedepot==0.0.2
 Babel==1.3
 Beaker==1.6.4

From d1ea59a63ebca137320b34d4cacce8873584272c Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 1 Feb 2015 00:16:00 -0800
Subject: [PATCH 132/600] Include patch for depot to allow compatibility with
 sqlite

---
 kotti/filedepot.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index feb968aed..1f96d10bb 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -365,6 +365,20 @@ def adjust_for_engine(conn, branch):
         from sqlalchemy.dialects.mysql.base import LONGBLOB
         DBStoredFile.__table__.c.data.type = LONGBLOB()
 
+    # sqlite's Unicode columns return a buffer which can't be encoded by
+    # a json encoder. We have to convert to a unicode string so that the value
+    # can be saved corectly by
+    # :class:`depot.fields.sqlalchemy.upload.UploadedFile`
+
+    def patched_processed_result_value(self, value, dialect):
+        if not value:
+            return None
+        return self._upload_type.decode(unicode(value))
+
+    if conn.engine.dialect.name == 'sqlite':  # pragma: no cover
+        from depot.fields.sqlalchemy import UploadedFileField
+        UploadedFileField.process_result_value = patched_processed_result_value
+
 
 def includeme(config):
     """ Pyramid includeme hook.

From ec94243ecd62e8044a74b3105eee9be308a4c469 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 1 Feb 2015 13:25:56 +0100
Subject: [PATCH 133/600] Revert "Set Kotti=1.1-dev in requirements.txt."

This reverts commit 7c0a2e174cfeea56f67cd960d8c5424cfefc626d.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 532874c2e..40bdee355 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1-dev
+Kotti==1.0.0-alpha.4
 filedepot==0.0.2
 Babel==1.3
 Beaker==1.6.4

From 3f3825c1ab91624993c8c84572f28c6968cba3fb Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 1 Feb 2015 13:41:30 +0100
Subject: [PATCH 134/600] Fix Travis build errors caused by havin Kotti itself
 in requirements.txt.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8611c7af9..99dbc1b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ env:
 install:
   - travis_retry pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
   - travis_retry pip install -e . -r requirements.txt --use-mirrors
+  - pip -y uninstall Kotti
+  - python setup.py develop
   - python setup.py dev
   - travis_retry pip install psycopg2 oursql python-coveralls
 before_script:

From bf8213f6f85936da8ad4f4c0dab6a7cf01e00b14 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 1 Feb 2015 13:47:45 +0100
Subject: [PATCH 135/600] Fix wrong option position.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 99dbc1b83..e007eb4e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
 install:
   - travis_retry pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
   - travis_retry pip install -e . -r requirements.txt --use-mirrors
-  - pip -y uninstall Kotti
+  - pip uninstall -y Kotti
   - python setup.py develop
   - python setup.py dev
   - travis_retry pip install psycopg2 oursql python-coveralls

From f4175498207076cbcfff42ba16a777d432a15042 Mon Sep 17 00:00:00 2001
From: Nuno Teixeira <teixas@gmail.com>
Date: Tue, 3 Feb 2015 22:10:21 +0000
Subject: [PATCH 136/600] Reindent code by following JSLint rules

---
 kotti/static/upload.js | 267 +++++++++++++++++++++--------------------
 1 file changed, 136 insertions(+), 131 deletions(-)

diff --git a/kotti/static/upload.js b/kotti/static/upload.js
index f12b01ba0..993d28ced 100644
--- a/kotti/static/upload.js
+++ b/kotti/static/upload.js
@@ -1,143 +1,148 @@
-/*jshint multistr:true */
+// JSLint options:
+/*global $, angular, document, qq*/
 
+"use strict";
 var app = angular.module('kotti', []);
 
 // copied from https://gist.github.com/thomseddon/3511330
-app.filter('bytes', function() {
-  return function(bytes, precision) {
+app.filter('bytes', function () {
+    return function (bytes, precision) {
+
+        if (isNaN(parseFloat(bytes)) || !isFinite(bytes)) {
+            return '-';
+        }
+        if (typeof precision === 'undefined') {
+            precision = 1;
+        }
+
+        var units = ['bytes', 'kB', 'MB', 'GB', 'TB', 'PB'],
+            number = Math.floor(Math.log(bytes) / Math.log(1024));
+        if (!isFinite(number)) {
+            number = 0;
+        }
+
+        return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) + ' ' + units[number];
+    };
+});
 
-    if (isNaN(parseFloat(bytes)) || !isFinite(bytes)) return '-';
-    if (typeof precision === 'undefined') precision = 1;
+function UploadController($scope, $http, $log) {
 
-    var units = ['bytes', 'kB', 'MB', 'GB', 'TB', 'PB'];
-    var number = Math.floor(Math.log(bytes) / Math.log(1024));
-    if (!isFinite(number)) number = 0;
+    $log.info("Initializing UploadController...");
 
-    return (bytes/Math.pow(1024, Math.floor(number))).toFixed(precision) +  ' ' + units[number];
-  };
-});
+    $scope.files = [];
+    $scope.errors = [];
+    $scope.num_files_waiting = 0;
+
+    $scope.uploadAll = function () {
+        $scope.uploader.uploadStoredFiles();
+    };
 
+    $scope.dismissError = function (file) {
+        $scope.errors.splice($scope.errors.indexOf(file), 1);
+    };
 
-function UploadController ($scope, $http, $log) {
-
-  $log.info("Initializing UploadController...");
-
-  $scope.files = [];
-  $scope.errors = [];
-  $scope.num_files_waiting = 0;
-
-  $scope.uploadAll = function() {
-    $scope.uploader.uploadStoredFiles();
-  };
-
-  $scope.dismissError = function(file) {
-    $scope.errors.splice($scope.errors.indexOf(file), 1);
-  };
-
-  $scope.apply = function(fn) {
-    var phase = this.$root.$$phase;
-    if(phase == '$apply' || phase == '$digest') {
-      if(fn && (typeof(fn) === 'function')) {
-        fn();
-      }
-    } else {
-      this.$apply(fn);
-    }
-  };
-
-  $scope.uploader = new qq.FineUploaderBasic({
-    debug: true,
-    autoUpload: false,
-    button: $('#btn-select-files')[0],
-    element: document.getElementById('uploader'),
-    request: {
-      endpoint: null
-    },
-    callbacks: {
-      onValidate: function(fileOrBlobData) {
-        $log.info("onValidate");
-      },
-      onSubmit: function(id, name) {
-        $log.info("onSubmit");
-        $scope.apply(function() {
-          var file = $scope.uploader.getFile(id);
-          $http.get(
-            $scope.endpoints.content_types,
-            {params: {mimetype: file.type}})
-          .success(function(data, status, headers, config) {
-
-            var content_types = data.content_types;
-
-            var file = {
-              id: id,
-              name: name,
-              size: $scope.uploader.getSize(id),
-              file: $scope.uploader.getFile(id)
-            };
-
-            if (content_types.length === 0) {
-              // todo: display meaningful error message
-              file.status = 'Error';
-              file.error = 'There is no content type in this context that knows create items from that file type.';
-              $scope.errors.splice(id, 0, file);
-              return false;
+    $scope.apply = function (fn) {
+        var phase = this.$root.$$phase;
+        if (phase === '$apply' || phase === '$digest') {
+            if (fn && (typeof (fn) === 'function')) {
+                fn();
             }
+        } else {
+            this.$apply(fn);
+        }
+    };
+
+    $scope.uploader = new qq.FineUploaderBasic({
+        debug: true,
+        autoUpload: false,
+        button: $('#btn-select-files')[0],
+        element: document.getElementById('uploader'),
+        request: {
+            endpoint: null
+        },
+        callbacks: {
+            onValidate: function (fileOrBlobData) {
+                $log.info("onValidate");
+            },
+            onSubmit: function (id, name) {
+                $log.info("onSubmit");
+                $scope.apply(function () {
+                    var file = $scope.uploader.getFile(id);
+                    $http.get(
+                        $scope.endpoints.content_types,
+                        {params: {mimetype: file.type}}
+                    ).success(function (data, status, headers, config) {
+                        var content_types = data.content_types,
+                            file = {
+                                id: id,
+                                name: name,
+                                size: $scope.uploader.getSize(id),
+                                file: $scope.uploader.getFile(id)
+                            };
+
+                        if (content_types.length === 0) {
+                            // todo: display meaningful error message
+                            file.status = 'Error';
+                            file.error = 'There is no content type in this context that knows create items from that file type.';
+                            $scope.errors.splice(id, 0, file);
+                            return false;
+                        }
+
+                        file.status = 'ready for upload';
+                        file.transfered = {bytes: 0, percent: 0};
+                        file.allowed_types = content_types;
+                        file.desired_type = content_types[0];
+
+                        $scope.files.splice(id, 0, file);
+                        $scope.num_files_waiting += 1;
+                    });
+                });
+            },
+            onUpload: function (id, name) {
+                $log.info("onUpload");
+                $scope.apply(function () {
+                    $scope.files[id].status = 'uploading';
+                    $scope.uploader.setParams({
+                        content_type: $scope.files[id].desired_type.name
+                    }, id);
+                    $scope.num_files_waiting -= 1;
+                });
+            },
+            onProgress: function (id, name, uploadedBytes, totalBytes) {
+                $scope.apply(function () {
+                    $scope.files[id].transfered.bytes = uploadedBytes;
+                    $scope.files[id].transfered.percent = Math.round(uploadedBytes / totalBytes * 100);
+                });
+            },
+            onCancel: function (id, name) {
+                $log.info("onCancel");
+                $scope.apply(function () {
+                    $scope.files[id].status = 'cancelled';
+                });
+            },
+            onError: function (id, name, errorReason) {
+                $log.info("onError");
+                $scope.apply(function () {
+                    $scope.files[id].status = 'failed';
+                });
+                return false;
+            },
+            onComplete: function (id, name, response) {
+                $log.info("onComplete");
+                // debugger;
+                $scope.apply(function () {
+                    if ($scope.files[id].status === 'uploading') {
+                        $scope.files[id].status = 'complete';
+                        $scope.files[id].url = response.url;
+                    }
+                });
+            }
+        }
+    });
+
+    $scope.$watch('endpoints', function (endpoints) {
+        $scope.uploader.setEndpoint(endpoints.upload);
+    });
 
-            file.status = 'ready for upload';
-            file.transfered = {bytes: 0, percent: 0};
-            file.allowed_types = content_types;
-            file.desired_type = content_types[0];
-
-            $scope.files.splice(id, 0, file);
-            $scope.num_files_waiting ++;
-          });
-
-        });
-      },
-      onUpload: function(id, name){
-        $log.info("onUpload");
-        $scope.apply(function() {
-          $scope.files[id].status = 'uploading';
-          $scope.uploader.setParams(
-            {content_type: $scope.files[id].desired_type.name}, id);
-          $scope.num_files_waiting --;
-        });
-      },
-      onProgress: function(id, name, uploadedBytes, totalBytes){
-        $scope.apply(function() {
-          $scope.files[id].transfered.bytes = uploadedBytes;
-          $scope.files[id].transfered.percent = Math.round(uploadedBytes / totalBytes * 100);
-        });
-      },
-      onCancel: function(id, name) {
-        $log.info("onCancel");
-        $scope.apply(function() {
-          $scope.files[id].status = 'cancelled';
-        });
-      },
-      onError: function(id, name, errorReason) {
-        $log.info("onError");
-        $scope.apply(function() {
-          $scope.files[id].status = 'failed';
-        });
-        return false;
-      },
-      onComplete: function(id, name, response){
-        $log.info("onComplete");
-        // debugger;
-        $scope.apply(function() {
-          if ($scope.files[id].status == 'uploading') {
-            $scope.files[id].status = 'complete';
-            $scope.files[id].url = response.url;
-          }
-        });
-      }
-    }
-  });
-
-  $scope.$watch('endpoints', function(endpoints) {
-    $scope.uploader.setEndpoint(endpoints.upload);
-  });
-
-  $log.info("UploadController initialized.");
+    $log.info("UploadController initialized.");
 }

From c7ade7bab05e53d73f8089871afe1337071c0458 Mon Sep 17 00:00:00 2001
From: Nuno Teixeira <teixas@gmail.com>
Date: Tue, 3 Feb 2015 22:22:38 +0000
Subject: [PATCH 137/600] Use camel case in variable names

---
 kotti/static/kotti.js     | 14 +++++++-------
 kotti/static/kotti.min.js |  2 +-
 kotti/static/upload.js    | 18 +++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/kotti/static/kotti.js b/kotti/static/kotti.js
index 8a9290a00..f87f77c18 100644
--- a/kotti/static/kotti.js
+++ b/kotti/static/kotti.js
@@ -4,7 +4,7 @@
 
 "use strict";
 var kotti = {
-    dom_changed_handlers: []
+    domChangedHandlers: []
 };
 var jq = jQuery;
 
@@ -15,7 +15,7 @@ var jq = jQuery;
         return this.filter(selector).add(this.find(selector));
     };
 
-    kotti.dirty_forms = function (node) {
+    kotti.dirtyForms = function (node) {
         var forms = $("form").not("[class~=dirty-ignore]"),
             initial = forms.serialize();
 
@@ -35,8 +35,8 @@ var jq = jQuery;
         });
     };
 
-    kotti.dom_changed = function (node) {
-        $.each(kotti.dom_changed_handlers, function (index, func) {
+    kotti.domChanged = function (node) {
+        $.each(kotti.domChangedHandlers, function (index, func) {
             func(node);
         });
     };
@@ -48,14 +48,14 @@ var jq = jQuery;
             ];
         }
         $.each(handlers, function (index, func) {
-            kotti.dom_changed_handlers.push(func);
+            kotti.domChangedHandlers.push(func);
         });
-        kotti.dom_changed(node);
+        kotti.domChanged(node);
     };
 
     // deform might be undefined, e.g. in kotti_tinymce's kottibrowser
     if (window.deform) {
-      deform.load();
+        deform.load();
     }
 
     kotti.main();
diff --git a/kotti/static/kotti.min.js b/kotti/static/kotti.min.js
index 1cbfa0e1f..c9ea8b3b1 100644
--- a/kotti/static/kotti.min.js
+++ b/kotti/static/kotti.min.js
@@ -1 +1 @@
-"use strict";var kotti={dom_changed_handlers:[]};var jq=jQuery;(function(a){a.fn.find2=function(b){return this.filter(b).add(this.find(b))};kotti.dirty_forms=function(d){var b=a("form").not("[class~=dirty-ignore]"),c=b.serialize();a(window).unbind("beforeunload");b.submit(function(){a(window).unbind("beforeunload")});if(tinyMCE!==undefined){tinyMCE.triggerSave(true)}a(window).bind("beforeunload",function(){if(tinyMCE!==undefined){tinyMCE.triggerSave(true)}if(a("form").serialize()!==c){return"Your changes have not been saved.\nAre you sure you want to leave this page?"}return null})};kotti.dom_changed=function(b){a.each(kotti.dom_changed_handlers,function(c,d){d(b)})};kotti.main=function(b){var c=a("html");if(!b){b=[]}a.each(b,function(d,e){kotti.dom_changed_handlers.push(e)});kotti.dom_changed(c)};if(window.deform){deform.load()}kotti.main()}(jQuery));
\ No newline at end of file
+"use strict";var kotti={domChangedHandlers:[]};var jq=jQuery;(function(a){a.fn.find2=function(b){return this.filter(b).add(this.find(b))};kotti.dirtyForms=function(d){var b=a("form").not("[class~=dirty-ignore]"),c=b.serialize();a(window).unbind("beforeunload");b.submit(function(){a(window).unbind("beforeunload")});if(tinyMCE!==undefined){tinyMCE.triggerSave(true)}a(window).bind("beforeunload",function(){if(tinyMCE!==undefined){tinyMCE.triggerSave(true)}if(a("form").serialize()!==c){return"Your changes have not been saved.\nAre you sure you want to leave this page?"}return null})};kotti.domChanged=function(b){a.each(kotti.domChangedHandlers,function(c,d){d(b)})};kotti.main=function(b){var c=a("html");if(!b){b=[]}a.each(b,function(d,e){kotti.domChangedHandlers.push(e)});kotti.domChanged(c)};if(window.deform){deform.load()}kotti.main()}(jQuery));
\ No newline at end of file
diff --git a/kotti/static/upload.js b/kotti/static/upload.js
index 993d28ced..0d4385485 100644
--- a/kotti/static/upload.js
+++ b/kotti/static/upload.js
@@ -31,7 +31,7 @@ function UploadController($scope, $http, $log) {
 
     $scope.files = [];
     $scope.errors = [];
-    $scope.num_files_waiting = 0;
+    $scope.numFilesWaiting = 0;
 
     $scope.uploadAll = function () {
         $scope.uploader.uploadStoredFiles();
@@ -69,10 +69,10 @@ function UploadController($scope, $http, $log) {
                 $scope.apply(function () {
                     var file = $scope.uploader.getFile(id);
                     $http.get(
-                        $scope.endpoints.content_types,
+                        $scope.endpoints.contentTypes,
                         {params: {mimetype: file.type}}
                     ).success(function (data, status, headers, config) {
-                        var content_types = data.content_types,
+                        var contentTypes = data.contentTypes,
                             file = {
                                 id: id,
                                 name: name,
@@ -80,7 +80,7 @@ function UploadController($scope, $http, $log) {
                                 file: $scope.uploader.getFile(id)
                             };
 
-                        if (content_types.length === 0) {
+                        if (contentTypes.length === 0) {
                             // todo: display meaningful error message
                             file.status = 'Error';
                             file.error = 'There is no content type in this context that knows create items from that file type.';
@@ -90,11 +90,11 @@ function UploadController($scope, $http, $log) {
 
                         file.status = 'ready for upload';
                         file.transfered = {bytes: 0, percent: 0};
-                        file.allowed_types = content_types;
-                        file.desired_type = content_types[0];
+                        file.allowedTypes = contentTypes;
+                        file.desiredType = contentTypes[0];
 
                         $scope.files.splice(id, 0, file);
-                        $scope.num_files_waiting += 1;
+                        $scope.numFilesWaiting += 1;
                     });
                 });
             },
@@ -103,9 +103,9 @@ function UploadController($scope, $http, $log) {
                 $scope.apply(function () {
                     $scope.files[id].status = 'uploading';
                     $scope.uploader.setParams({
-                        content_type: $scope.files[id].desired_type.name
+                        contentType: $scope.files[id].desiredType.name
                     }, id);
-                    $scope.num_files_waiting -= 1;
+                    $scope.numFilesWaiting -= 1;
                 });
             },
             onProgress: function (id, name, uploadedBytes, totalBytes) {

From 82c4e8176f06fb8a4d997ed9c945c4b24d377023 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Wed, 4 Feb 2015 15:26:12 +0200
Subject: [PATCH 138/600] For depot migration, don't try to remove sqlalchemy
 events, use a low level column update instead

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index b5dce2843..261439406 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -18,8 +18,6 @@
 
 
 def upgrade():
-    sa.orm.events.MapperEvents._clear()     # avoids filedepot magic
-
     from depot.manager import DepotManager
     from depot.fields.upload import UploadedFile
     from depot.fields.sqlalchemy import UploadedFileField
@@ -31,13 +29,19 @@ def upgrade():
     t.c.data.type = sa.LargeBinary()
     dn = DepotManager.get_default()
 
+    update = t.update()
+    conn = DBSession.connection()
+
     for obj in DBSession.query(File):
         uploaded_file = UploadedFile({'depot_name': dn, 'files': []})
         uploaded_file._thaw()
         uploaded_file.process_content(
             obj.data, filename=obj.filename, content_type=obj.mimetype)
         stored_file = DepotManager.get().get(uploaded_file['file_id'])
-        obj.data = uploaded_file.encode()
+        stmt = update.where(
+            t.c.id == obj.id).values(data=uploaded_file.encode())
+        res = conn.execute(stmt)
+        assert res.rowcount == 1
         stored_file.last_modified = obj.modification_date
 
         log.info("Migrated {} bytes for File with pk {} to {}/{}".format(

From c1fae973584701eb4b0caf150a0e5549798e970a Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Fri, 6 Feb 2015 13:42:47 +0200
Subject: [PATCH 139/600] Optimized fix path migration

---
 .../559ce6eb0949_update_node_path_column.py   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
index e39b7134c..1cc3039ea 100644
--- a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -13,13 +13,21 @@
 
 def upgrade():
 
-    from kotti import DBSession
-    from kotti.resources import Node
+    from kotti.resources import metadata, DBSession
+    from sqlalchemy import Table, select, bindparam
+    from sqlalchemy.sql.expression import not_
 
-    for node in DBSession.query(Node).with_polymorphic([Node]):
-        # append '/' to all nodes but root
-        if node.path != u'/':
-            node.path += u'/'
+    nodes = Table('nodes', metadata)
+
+    to_change = [dict(nodepath=r[0], nodeid=r[1]) for r in
+                 select([nodes.c.path + '/', nodes.c.id]).
+                 where(not_(nodes.c.path == u'/')).execute()]
+
+    updater = nodes.update().\
+        where(nodes.c.id == bindparam('nodeid')).\
+        values({nodes.c.path:bindparam('nodepath')})
+
+    DBSession.execute(updater, to_change)
 
 
 def downgrade():

From cefbf8dd7d79575407a00857d5b6916cf016b502 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Fri, 6 Feb 2015 15:22:16 +0200
Subject: [PATCH 140/600] Use low-level SQL to update path

---
 .../559ce6eb0949_update_node_path_column.py   | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
index 1cc3039ea..2ad05a522 100644
--- a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -13,21 +13,10 @@
 
 def upgrade():
 
-    from kotti.resources import metadata, DBSession
-    from sqlalchemy import Table, select, bindparam
-    from sqlalchemy.sql.expression import not_
-
-    nodes = Table('nodes', metadata)
-
-    to_change = [dict(nodepath=r[0], nodeid=r[1]) for r in
-                 select([nodes.c.path + '/', nodes.c.id]).
-                 where(not_(nodes.c.path == u'/')).execute()]
-
-    updater = nodes.update().\
-        where(nodes.c.id == bindparam('nodeid')).\
-        values({nodes.c.path:bindparam('nodepath')})
-
-    DBSession.execute(updater, to_change)
+    from kotti.resources import DBSession
+    DBSession.execute(
+        "update nodes set path = path || '/' where path not like '/'"
+    )
 
 
 def downgrade():

From b1a84a0be424965c7e63e4190b9d3980d156a014 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Fri, 6 Feb 2015 19:07:38 +0200
Subject: [PATCH 141/600] Optimized memory usage for filedepot migration

---
 .../versions/413fa5fcc581_add_filedepot.py    | 63 ++++++++++++-------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 261439406..004db1147 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -12,44 +12,63 @@
 
 import logging
 import sqlalchemy as sa
-from alembic import op
+import sys
 
 log = logging.getLogger('kotti')
+log.addHandler(logging.StreamHandler(sys.stdout))
+log.setLevel(logging.INFO)
 
 
 def upgrade():
     from depot.manager import DepotManager
     from depot.fields.upload import UploadedFile
-    from depot.fields.sqlalchemy import UploadedFileField
+    from sqlalchemy import bindparam
 
     from kotti import DBSession, metadata
-    from kotti.resources import File
 
-    t = sa.Table('files', metadata)
-    t.c.data.type = sa.LargeBinary()
+    files = sa.Table('files', metadata)
+    files.c.data.type = sa.LargeBinary()
     dn = DepotManager.get_default()
 
-    update = t.update()
-    conn = DBSession.connection()
+    _saved = []
 
-    for obj in DBSession.query(File):
+    def process(thing):
+        id, data, filename, mimetype = thing
         uploaded_file = UploadedFile({'depot_name': dn, 'files': []})
         uploaded_file._thaw()
         uploaded_file.process_content(
-            obj.data, filename=obj.filename, content_type=obj.mimetype)
-        stored_file = DepotManager.get().get(uploaded_file['file_id'])
-        stmt = update.where(
-            t.c.id == obj.id).values(data=uploaded_file.encode())
-        res = conn.execute(stmt)
-        assert res.rowcount == 1
-        stored_file.last_modified = obj.modification_date
-
-        log.info("Migrated {} bytes for File with pk {} to {}/{}".format(
-            len(obj.data), obj.id, dn, uploaded_file['file_id']))
-
-    DBSession.flush()
-    if DBSession.get_bind().name != 'sqlite':   # not supported by sqlite
-        op.alter_column('files', 'data', type_=UploadedFileField())
+            data, filename=filename, content_type=mimetype)
+        _saved.append({'nodeid': id, 'data': uploaded_file.encode()})
+        log.info("Saved data for node id {}".format(id))
+
+    query =  DBSession.query(
+        files.c.id, files.c.data, files.c.filename, files.c.mimetype
+    ).order_by(files.c.id).yield_per(10)
+
+    window_size = 10  # or whatever limit you like
+    window_idx = 0
+
+    log.info("Starting migration of blob data")
+
+    while True:
+        start, stop = window_size * window_idx, window_size * (window_idx + 1)
+        things = query.slice(start, stop).all()
+        if things is None:
+            break
+        for thing in things:
+            process(thing)
+        if len(things) < window_size:
+            break
+        window_idx += 1
+
+    log.info("Files written on disk, saving information to DB")
+
+    update = files.update().where(files.c.id == bindparam('nodeid')).\
+        values({files.c.data: bindparam('data')})
+
+    DBSession.execute(update, _saved)
+
+    log.info("Blob migration completed")
 
 
 def downgrade():

From 6008acebde99fbbc771b6c320cbf0c5c0da8075e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Mon, 9 Feb 2015 11:08:57 +0200
Subject: [PATCH 142/600] Improve migration of file data

---
 .../versions/413fa5fcc581_add_filedepot.py    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 004db1147..4fc1e7423 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -10,9 +10,11 @@
 revision = '413fa5fcc581'
 down_revision = '559ce6eb0949'
 
+from alembic import op
 import logging
 import sqlalchemy as sa
 import sys
+import time
 
 log = logging.getLogger('kotti')
 log.addHandler(logging.StreamHandler(sys.stdout))
@@ -22,12 +24,12 @@
 def upgrade():
     from depot.manager import DepotManager
     from depot.fields.upload import UploadedFile
-    from sqlalchemy import bindparam
+    from sqlalchemy import bindparam, Unicode
 
     from kotti import DBSession, metadata
 
     files = sa.Table('files', metadata)
-    files.c.data.type = sa.LargeBinary()
+    files.c.data.type = sa.LargeBinary()    # this restores to old column type
     dn = DepotManager.get_default()
 
     _saved = []
@@ -45,11 +47,12 @@ def process(thing):
         files.c.id, files.c.data, files.c.filename, files.c.mimetype
     ).order_by(files.c.id).yield_per(10)
 
-    window_size = 10  # or whatever limit you like
+    window_size = 10
     window_idx = 0
 
     log.info("Starting migration of blob data")
 
+    now = time.time()
     while True:
         start, stop = window_size * window_idx, window_size * (window_idx + 1)
         things = query.slice(start, stop).all()
@@ -66,9 +69,17 @@ def process(thing):
     update = files.update().where(files.c.id == bindparam('nodeid')).\
         values({files.c.data: bindparam('data')})
 
-    DBSession.execute(update, _saved)
+    def chunks(l, n):
+        for i in xrange(0, len(l), n):
+            yield l[i:i+n]
 
-    log.info("Blob migration completed")
+    for cdata in chunks(_saved, 10):
+        DBSession.execute(update, cdata)
+
+    log.info("Blob migration completed in {} seconds".format(
+        int(time.time() - now)))
+
+    op.alter_column('files', 'data', Unicode())
 
 
 def downgrade():

From f7aa502ef85134fce38e67593056e9608149d323 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Mon, 9 Feb 2015 18:51:47 +0200
Subject: [PATCH 143/600] Drop and recreate data column before updating with
 saved data

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 4fc1e7423..6187cdfa1 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -24,7 +24,7 @@
 def upgrade():
     from depot.manager import DepotManager
     from depot.fields.upload import UploadedFile
-    from sqlalchemy import bindparam, Unicode
+    from sqlalchemy import bindparam, Unicode, Column
 
     from kotti import DBSession, metadata
 
@@ -66,6 +66,9 @@ def process(thing):
 
     log.info("Files written on disk, saving information to DB")
 
+    op.drop_column('files', 'data')
+    op.add_column('files', Column('data', Unicode(4096)))
+
     update = files.update().where(files.c.id == bindparam('nodeid')).\
         values({files.c.data: bindparam('data')})
 
@@ -79,8 +82,6 @@ def chunks(l, n):
     log.info("Blob migration completed in {} seconds".format(
         int(time.time() - now)))
 
-    op.alter_column('files', 'data', Unicode())
-
 
 def downgrade():
     pass

From 191ef0ec7f33561013a790a6d81ee97b5b3b5abc Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 10 Feb 2015 19:13:47 +0200
Subject: [PATCH 144/600] Added mock_filedepot, a mock filedepot to be used
 when dbsession fixture is not needed

---
 kotti/tests/__init__.py | 99 ++++++++++++++++++++++++++---------------
 1 file changed, 62 insertions(+), 37 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 713cce3c5..eba795644 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -44,6 +44,7 @@
 from pytest import fixture
 from mock import MagicMock
 
+from datetime import datetime
 
 @fixture
 def allwarnings(request):
@@ -280,47 +281,71 @@ def workflow(config):
     xmlconfig.file('workflow.zcml', kotti, execute=True)
 
 
+class TestStorage:
+    def __init__(self):
+        self._storage = {}
+        self._storage.setdefault(0)
+
+    def get(self, id):
+        info = self._storage[id]
+
+        from StringIO import StringIO
+
+        f = MagicMock(wraps=StringIO(info['content']))
+        f.seek(0)
+        f.public_url = ''
+        f.filename = info['filename']
+        f.content_type = info['content_type']
+        f.content_length = len(info['content'])
+        # needed to make JSON serializable, Mock objects are not
+        f.last_modified = datetime(2012, 12, 30)
+
+        return f
+
+    def create(self, content, filename=None, content_type=None):
+        id = max(self._storage) + 1
+        filename = filename or getattr(content, 'filename', None)
+        content_type = content_type or getattr(content, 'type', None)
+        if not isinstance(content, str):
+            content = content.file.read()
+        self._storage[id] = {'content': content,
+                                'filename': filename,
+                                'content_type': content_type}
+        return id
+
+    def delete(self, id):
+        del self._storage[int(id)]
+
+
 @fixture
-def filedepot(db_session, request):
+def mock_filedepot(request):
     """ Configures a mock depot store for :class:`depot.manager.DepotManager`
+
+    This filedepot is not integrated with dbsession.
+    Can be used in simple, standalone unit tests.
+    """
+    from depot.manager import DepotManager
+
+    _old_depots = DepotManager._depots
+    _old_default_depot = DepotManager._default_depot
+    DepotManager._depots = {
+        'mockdepot': MagicMock(wraps=TestStorage())
+    }
+    DepotManager._default_depot = 'mockdepot'
+
+    def restore():
+        DepotManager._depots = _old_depots
+        DepotManager._default_depot = _old_default_depot
+
+    request.addfinalizer(restore)
+
+
+@fixture
+def filedepot(db_session, request):
+    """ Configures a dbsession integrated mock depot store for
+    :class:`depot.manager.DepotManager`
     """
     from depot.manager import DepotManager
-    from datetime import datetime
-
-    class TestStorage:
-        def __init__(self):
-            self._storage = {}
-            self._storage.setdefault(0)
-
-        def get(self, id):
-            info = self._storage[id]
-
-            from StringIO import StringIO
-
-            f = MagicMock(wraps=StringIO(info['content']))
-            f.seek(0)
-            f.public_url = ''
-            f.filename = info['filename']
-            f.content_type = info['content_type']
-            f.content_length = len(info['content'])
-            # needed to make JSON serializable, Mock objects are not
-            f.last_modified = datetime(2012, 12, 30)
-
-            return f
-
-        def create(self, content, filename=None, content_type=None):
-            id = max(self._storage) + 1
-            filename = filename or getattr(content, 'filename', None)
-            content_type = content_type or getattr(content, 'type', None)
-            if not isinstance(content, str):
-                content = content.file.read()
-            self._storage[id] = {'content': content,
-                                 'filename': filename,
-                                 'content_type': content_type}
-            return id
-
-        def delete(self, id):
-            del self._storage[int(id)]
 
     _old_depots = DepotManager._depots
     _old_default_depot = DepotManager._default_depot

From 5a7dbc0afa1d0dc280622c83b9f0163519e1ec00 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 10 Feb 2015 19:14:30 +0200
Subject: [PATCH 145/600] pylint fix in test

---
 kotti/tests/test_workflow.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kotti/tests/test_workflow.py b/kotti/tests/test_workflow.py
index e3f3d2d3f..f0de99212 100644
--- a/kotti/tests/test_workflow.py
+++ b/kotti/tests/test_workflow.py
@@ -59,7 +59,9 @@ def test_workflow_callback_event(self):
         from kotti.workflow import WorkflowTransition
 
         events = []
-        my_listener = lambda event: events.append(event)
+
+        def my_listener(event):
+            events.append(event)
         listeners[WorkflowTransition].append(my_listener)
 
         context = Dummy()

From b865dbee61ab1e4751273e9a50e42a71a00ba109 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 10 Feb 2015 19:43:49 +0200
Subject: [PATCH 146/600] pep8 fixes

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 4 ++--
 kotti/tests/__init__.py                              | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 6187cdfa1..85a6056e6 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -43,7 +43,7 @@ def process(thing):
         _saved.append({'nodeid': id, 'data': uploaded_file.encode()})
         log.info("Saved data for node id {}".format(id))
 
-    query =  DBSession.query(
+    query = DBSession.query(
         files.c.id, files.c.data, files.c.filename, files.c.mimetype
     ).order_by(files.c.id).yield_per(10)
 
@@ -74,7 +74,7 @@ def process(thing):
 
     def chunks(l, n):
         for i in xrange(0, len(l), n):
-            yield l[i:i+n]
+            yield l[i:i + n]
 
     for cdata in chunks(_saved, 10):
         DBSession.execute(update, cdata)
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index eba795644..19f074cc8 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -9,6 +9,7 @@
 
    digraph kotti_fixtures {
       "allwarnings";
+      "mock_filedepot";
       "app" -> "webtest";
       "config" -> "db_session";
       "config" -> "dummy_request";
@@ -46,6 +47,7 @@
 
 from datetime import datetime
 
+
 @fixture
 def allwarnings(request):
     save_filters = warnings.filters[:]
@@ -309,8 +311,8 @@ def create(self, content, filename=None, content_type=None):
         if not isinstance(content, str):
             content = content.file.read()
         self._storage[id] = {'content': content,
-                                'filename': filename,
-                                'content_type': content_type}
+                             'filename': filename,
+                             'content_type': content_type}
         return id
 
     def delete(self, id):

From 09f1e91b7af2583a310e995bc6ad9c47b6e5c645 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Wed, 11 Feb 2015 11:45:22 +0200
Subject: [PATCH 147/600] Added E402 to list of ignored PEP8 errors

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 6fd6f5532..6de0e9b9f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ addopts =
     --cov-report=term-missing
     kotti/
 python_files = test_*.py
-pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714
+pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
 markers =
     user: mark test to be run as the given user
     slow: mark test to be run only with --runslow option

From 0efef98104939dac68f0177bdfaa72304a28d3cf Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Wed, 11 Feb 2015 13:51:14 +0200
Subject: [PATCH 148/600] Another pep8 fix

---
 kotti/tests/test_workflow.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kotti/tests/test_workflow.py b/kotti/tests/test_workflow.py
index e3f3d2d3f..3a53aafc6 100644
--- a/kotti/tests/test_workflow.py
+++ b/kotti/tests/test_workflow.py
@@ -59,8 +59,7 @@ def test_workflow_callback_event(self):
         from kotti.workflow import WorkflowTransition
 
         events = []
-        my_listener = lambda event: events.append(event)
-        listeners[WorkflowTransition].append(my_listener)
+        listeners[WorkflowTransition].append(lambda event: events.append(event))
 
         context = Dummy()
         info = Dummy()

From 8f45d9f6c10ab8a2c6e7a8d39fc551a933f6d6fe Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Wed, 11 Feb 2015 14:12:24 +0200
Subject: [PATCH 149/600] In the update_node_path_column migration, only append
 slash if path doesn't end with slash

---
 kotti/alembic/versions/559ce6eb0949_update_node_path_column.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
index 2ad05a522..ae1cd05e9 100644
--- a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -15,7 +15,7 @@ def upgrade():
 
     from kotti.resources import DBSession
     DBSession.execute(
-        "update nodes set path = path || '/' where path not like '/'"
+        "update nodes set path = path || '/' where path not like '%/'"
     )
 
 

From 2a076c2589419d426538d2bca11ed5b52a7cff19 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 17 Feb 2015 17:54:43 +0200
Subject: [PATCH 150/600] Fix migration of filedepot: values where saved b64
 encoded to database

---
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 85a6056e6..00bd7e9ba 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -68,6 +68,7 @@ def process(thing):
 
     op.drop_column('files', 'data')
     op.add_column('files', Column('data', Unicode(4096)))
+    files.c.data.type = Unicode(4096)
 
     update = files.update().where(files.c.id == bindparam('nodeid')).\
         values({files.c.data: bindparam('data')})

From cc898601132c85c70e5384b165bbbbf5903fb032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Natan=20=C5=BDabkar?= <natan.zabkar@gmail.com>
Date: Mon, 16 Feb 2015 19:44:19 +0100
Subject: [PATCH 151/600] Some minor fixes (there were some small 'errors') and
 changing things around a bit so they are nicer for beginners

---
 docs/first_steps/tut-1.rst |  5 +---
 docs/first_steps/tut-2.rst | 58 ++++++++++++++++++++++----------------
 docs/first_steps/tut-3.rst | 43 ++++++++++++++++------------
 3 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/docs/first_steps/tut-1.rst b/docs/first_steps/tut-1.rst
index 203b6c802..c141b3225 100644
--- a/docs/first_steps/tut-1.rst
+++ b/docs/first_steps/tut-1.rst
@@ -83,11 +83,9 @@ And add ``kotti_mysite.kotti_configure`` to it:
       kotti_tinymce.kotti_configure
       kotti_mysite.kotti_configure
 
-
 At this point, you should be able to restart the application, but you won't notice anything different.
 Let's make a simple CSS change and use it to see how Kotti manages static resources.
 
-
 Static Resources
 ----------------
 
@@ -171,8 +169,7 @@ Notice how we add to the string ``kotti.fanstatic.view_needed``.
    This allows a handy use of += on different lines.
    After concatenation of the string parts, blanks will delimit them.
 
-This ``kotti.fanstatic.view_needed`` setting, in turn, controls which resources
-are loaded in the public interface (as compared to the edit interface).
+This ``kotti.fanstatic.view_needed`` setting, in turn, controls which resources are loaded in the public interface (as compared to the edit interface).
 
 As you might have guessed, we could have also completely replaced Kotti's resources for the public interface by overriding the ``kotti.fanstatic.view_needed`` setting instead of adding to it, like this:
 
diff --git a/docs/first_steps/tut-2.rst b/docs/first_steps/tut-2.rst
index 4727e97b9..f057f25b6 100644
--- a/docs/first_steps/tut-2.rst
+++ b/docs/first_steps/tut-2.rst
@@ -10,7 +10,7 @@ Adding Models
 -------------
 
 When creating our add-on, the scaffolding added the file ``kotti_mysite/kotti_mysite/resources.py``.
-If you open `resources.py` you'll see that it already contains code for a sample content type ``CustomContent`` along with the following imports that we will use.
+If you open ``resources.py`` you'll see that it already contains code for a sample content type ``CustomContent`` along with the following imports that we will use.
 
 .. code-block:: python
 
@@ -19,8 +19,7 @@ If you open `resources.py` you'll see that it already contains code for a sample
   from sqlalchemy import ForeignKey
   from sqlalchemy import Integer
 
-
-Add the following definition for the ``Poll`` content type to `resources.py`.
+Add the following definition for the ``Poll`` content type to ``resources.py``.
 
 .. code-block:: python
 
@@ -43,8 +42,7 @@ Things to note here:
 - ``Poll`` declares a :class:`sqlalchemy.Column <sqlalchemy.schema>` ``id``, which is required to hook it up with SQLAlchemy's inheritance.
 
 - The ``type_info`` class attribute does essential configuration.
-  We refer to name and title, two properties already defined as part of
-  ``Content``, our base class.
+  We refer to name and title, two properties already defined as part of ``Content``, our base class.
   The ``add_view`` defines the name of the add view, which we'll come to in a second.
   Finally, ``addable_to`` defines which content types we can add ``Poll`` items to.
 
@@ -106,7 +104,9 @@ Some things to note:
 
 - Colander_ is the library that we use to define our schemas.
   Colander allows us to validate schemas against form data.
+
 - Our class inherits from :class:`kotti.views.edit.ContentSchema` which itself inherits from :class:`colander.MappingSchema`.
+
 - ``_`` is how we hook into i18n for translations.
 
 Add the following code to ``views/edit.py``:
@@ -170,7 +170,6 @@ Add this to ``views/edit.py``:
       add = Choice
       item_type = u"Choice"
 
-
 Using the ``AddFormView`` and ``EditFormView`` base classes from Kotti, these forms are simple to define.
 We associate the schemas defined above, setting them as the ``schema_factory`` for each form, and we specify the content types to be added by each.
 
@@ -199,7 +198,6 @@ Open ``__init__.py`` and modify the ``kotti_configure`` method so that the
             ' kotti_mysite.fanstatic.css_and_js')
         ...
 
-
 Here, we've added our two content types to the site's ``available_types``, a global
 registry.
 We also removed the ``CustomContent`` content type included with the scaffolding.
@@ -215,7 +213,6 @@ It includes the call to ``config.scan()`` that we mentioned above while discussi
 
 You can see the Pyramid documentation for scan_ for more information.
 
-
 Adding a Poll and Choices to the site
 -------------------------------------
 
@@ -230,8 +227,8 @@ Login with the username *admin* and password *qwerty* and click on the Add menu
 You should see a few choices, namely the base Kotti classes ``Document``, ``File`` and ``Image`` and the Content Type we added, ``Poll``.
 
 Lets go ahead and click on ``Poll``.
-For the question, let's write *What is your favourite color?*.
-Now let's add three choices, *Red*, *Green* and *Blue* in the same way we added the poll.
+For the question, let's write *"What is your favourite color?"*.
+Now let's add three choices, *"Red"*, *"Green"* and *"Blue"* in the same way we added the poll.
 Remember that you must be in the context of the poll to add each choice.
 
 If we now go to the poll we added, we can see the question, but not our choices, which is definitely not what we wanted.
@@ -246,6 +243,7 @@ Here is the code, added to ``view.py``.
 .. code-block:: python
 
   from kotti_mysite.fanstatic import css_and_js
+  from kotti_mysite.resources import Poll
 
 
   @view_defaults(context=Poll)
@@ -256,14 +254,14 @@ Here is the code, added to ``view.py``.
                    renderer='kotti_mysite:templates/poll.pt')
       def poll_view(self):
           css_and_js.need()
-          choices = self.context.values()
+          choices = self.context.children
           return {
               'choices': choices,
           }
 
-To find out if a Choice was added to the ``Poll`` we are currently viewing, we compare it's *parent_id* attribute with the *id* of the Poll - if they are the same, the ``Choice`` is a child of the ``Poll``.
-To get all the appropriate choices, we do a simple database query, filtered as specified above.
-Finally, we return a dictionary of all choices under the keyword *choices*.
+Since we want to show all ``Choices`` added to a ``Poll`` we can simply use the ``children`` attribute. This will return a list of all the 'children' of a ``Poll`` which are exactly the ``Choices`` added to that particular ``Poll``.
+The view returns a dictionary of all choices under the keyword *'choices'*.
+The keywords a view returns are automatically available in it's template.
 
 Next on, we need a template to actually show our data.
 It could look something like this.
@@ -279,27 +277,37 @@ Create a folder named ``templates`` and put the file ``poll.pt`` into it.
     <article metal:fill-slot="content" class="poll-view content">
       <h1>${context.title}</h1>
       <ul>
-          <li tal:repeat="choice choices">
-            <a href="${request.resource_url(choice)}/vote">
-              ${choice.title}
-            </a> (${choice.votes}/${all_votes})
-          </li>
+          <li tal:repeat="choice choices">${choice.title}</li>
       </ul>
     </article>
 
   </html>
 
 The first 6 lines are needed so our template plays nicely with the master template (so we keep the add/edit bar, base site structure etc.).
-The next line prints out the context.title (our question) inside the <h1> tag and then prints all choices (with links to the choice) as an unordered list.
+The next line prints out the context.title (our question) inside the ``<h1>`` tag and then prints all choices (with links to the choice) as an unordered list.
+
+.. note::
+
+  We are using two 'magically available' attributes in the template - ``context`` and ``choices``.
+
+  - ``context`` is automatically available in all templates and as the name implies it is the context of the view (in this case the ``Poll`` we are currently viewing).
+
+  - ``choices`` is available because we sent it to the template in the Python part of the view.
+    You can of course send multiple variables to the template, you just need to return them in your Python code.
 
 With this, we are done with the second tutorial.
-Restart the server instance, take a look at the new ``Poll`` view and play around with the template until you are completely satisfied with how our data is presented.
-If you will work with templates for a while (or anytime you're developing basically) I'd recommend you use the pyramid *reload_templates* and *debug_templates* options as they save you a lot of time lost on server restarts.
+Restart the application, take a look at the new ``Poll`` view and play around with the template until you are completely satisfied with how our data is presented.
+
+.. note::
+
+  If you will work with templates for a while (or any time you're developing basically) using the pyramid *'reload_templates'* and *'debug_templates'* options is recommended, as they allow you to see changes to the template without having to restart the application.
+  These options need to be put in your configuration INI under the *'[app:kotti]'* section.
 
-.. code-block:: ini
+  .. code-block:: ini
 
-  pyramid.reload_templates = true
-  pyramid.debug_templates = true
+    [app:kotti]
+    pyramid.reload_templates = true
+    pyramid.debug_templates = true
 
 In the :ref:`next tutorial <tut-3>`, we will learn how to enable our users to actually vote for one of the ``Poll`` options.
 
diff --git a/docs/first_steps/tut-3.rst b/docs/first_steps/tut-3.rst
index e571db30d..55e59b0cb 100644
--- a/docs/first_steps/tut-3.rst
+++ b/docs/first_steps/tut-3.rst
@@ -11,30 +11,34 @@ Enabling voting on Poll Choices
 We will enable users to vote using a new view.
 When the user goes to that link, his or her vote will be saved and they will be redirected back to the Poll.
 
-First, let's construct a new view, this time inside ``kotti_mysite/kotti_mysite/views/view.py``.
-Add the following code to ``views/view.py``.
+First, let's construct a new view. As before, add the following code to ``kotti_mysite/kotti_mysite/views/view.py``.
 
 .. code-block:: python
 
+  from kotti_mysite.resources import Choice
+  from pyramid.httpexceptions import HTTPFound
+
+
   @view_defaults(context=Choice)
   class ChoiceViews(BaseView):
       """ Views for :class:`kotti_mysite.resources.Choice` """
 
-      @view_config(name='vote', permission='edit')
+      @view_config(name='vote', permission='view')
       def vote_view(self):
           self.context.votes += 1
-          return HTTPFound(location=self.request.resource_url(self.context.parent))
+          return HTTPFound(
+              location=self.request.resource_url(self.context.parent))
 
-The view will be called on the Choice content type, so the context is the Choice itself.
-We add 1 to the current votes of the Choice, then we do a redirect using :class:`pyramid.httpexceptions.HTTPFound`.
-The location is the parent of our context - the Poll in which our Choice resides.
+The view will be called on the ``Choice`` content type, so the context is the ``Choice`` itself.
+We add 1 to the current votes of the ``Choice``, then we do a redirect using :class:`pyramid.httpexceptions.HTTPFound`.
+The location is the parent of our context - the ``Poll`` in which our ``Choice`` resides.
 
-With this, we can now vote on a Choice by appending /vote at the end of the Choice URL.
+With this, we can now vote on a ``Choice`` by appending ``/vote`` at the end of the ``Choice`` URL.
 
 Changing the Poll view so we see the votes
 ------------------------------------------
 
-First, we will add some extra content into our poll_view so we are able to show current votes of a Choice.
+First, we will add some extra content into our ``poll_view`` so we are able to show the distribution of votes across all choices.
 
 .. code-block:: python
   :emphasize-lines: 4,7
@@ -48,29 +52,29 @@ First, we will add some extra content into our poll_view so we are able to show
           'all_votes': all_votes
       }
 
-Our view will now be able to get the sum of all votes in the poll via the *all_votes* variable.
-We will also want to change the link to go to our new vote view.
-Open ``poll.pt`` and change the link into
+Our view will now be able to get the sum of all votes in the poll via the ``all_votes`` variable.
+We will also want to change the choices list to link to our new vote view.
+Open ``poll.pt`` and change the link into:
 
 .. code-block:: html
   :emphasize-lines: 3-5
 
   ...
   <li tal:repeat="choice choices">
-    <a href="${request.resource_url(choice)}/vote">
+    <a href="${request.resource_url(choice)}vote">
       ${choice.title}
     </a> (${choice.votes}/${all_votes})
   </li>
   ...
 
-This will add the number of votes/all_votes after each choice and enable us to vote by clicking on the Choice.
+This will add the number of votes/all_votes after each choice and enable us to vote by clicking on the choice.
 Fire up the server and go test it now.
 
 Adding an info block about voting on the view
 ---------------------------------------------
 
-As you can see, the voting now works, but it doesn't look particulary good.
-Let us at least add a nice information bubble when we vote alright?
+As you can see, the voting now works, but it doesn't look particularly good.
+Let us at least add a nice information bubble when we vote.
 The easiest way to go about that is to use ``request.session.flash``, which allows us to flash different messages (success, error, info etc.).
 Change the ``vote_view`` to include the the flash message before redirecting.
 
@@ -85,12 +89,15 @@ Change the ``vote_view`` to include the the flash message before redirecting.
       return HTTPFound(
           location=self.request.resource_url(self.context.parent))
 
+.. note::
+
+  Don't forget that since we changed the Python code, we need to restart the application, even if we enabled template reloading and debugging!
 
-As before, I encourage you to play around a bit more, as you learn much by trying our new things.
+As before, you are encouraged to play around a bit more, as you learn much by trying out new things.
 A few ideas on what you could work on are:
 
 - Change the Choice content type so it has an extra description field that is not required (if you change database content, you will need to delete the database or do a migration).
   Then make a new Choice view that will list the extra information.
+
 - Make sure only authenticated users can vote, anonymous users should see the results but when trying to vote, it should move them to the login page.
   Also make sure that each user can vote only once, and list all users who voted for the Choice on the Choice's view.
-

From ddb395a05b22d879614894abc373bc6da304c6da Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Wed, 11 Feb 2015 11:45:22 +0200
Subject: [PATCH 152/600] Added E402 to list of ignored PEP8 errors

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 6fd6f5532..6de0e9b9f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ addopts =
     --cov-report=term-missing
     kotti/
 python_files = test_*.py
-pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714
+pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
 markers =
     user: mark test to be run as the given user
     slow: mark test to be run only with --runslow option

From b9f3f95fc38c0c8c1ae46f092e2800e03771cd0c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 20 Feb 2015 17:29:33 +0100
Subject: [PATCH 153/600] Bump version.

---
 CHANGES.txt                              | 5 +++++
 kotti/scaffolds/package/requirements.txt | 2 +-
 kotti/scaffolds/package/setup.cfg_tmpl   | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 4 +---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b42321cd7..39f3e9403 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.0.0 - 2015-01-20
+------------------
+
+- No changes.
+
 1.0.0-alpha.4 - 2015-01-29
 --------------------------
 
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 0831752a7..4072ee29f 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0-alpha.4
+Kotti==1.0.0
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20
diff --git a/kotti/scaffolds/package/setup.cfg_tmpl b/kotti/scaffolds/package/setup.cfg_tmpl
index 13b1fe203..93b39155e 100644
--- a/kotti/scaffolds/package/setup.cfg_tmpl
+++ b/kotti/scaffolds/package/setup.cfg_tmpl
@@ -21,4 +21,4 @@ addopts =
 python_files = test*py
 markers =
     user: mark test to be run as the given user
-pep8ignore = E501 E122 E123 E125 E128 E711
+pep8ignore = E501 E122 E123 E125 E128 E711 E402
diff --git a/requirements.txt b/requirements.txt
index 0831752a7..4072ee29f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0-alpha.4
+Kotti==1.0.0
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20
diff --git a/setup.py b/setup.py
index 36641edc7..702c9a8ac 100644
--- a/setup.py
+++ b/setup.py
@@ -19,14 +19,12 @@
     'alembic',
     'colander>=0.9.3',
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
-    # 'deform_bootstrap>=0.1',  # checked_input widget
     'docopt',
     'formencode',
     'html2text',
     'js.angular',
     'js.bootstrap>=2.1.5',
     'js.deform>=2.0a2-2',
-    # 'js.deform_bootstrap>=0.2.4-1',
     'js.fineuploader',
     'js.html5shiv',
     'js.jquery',
@@ -86,7 +84,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.0.0-alpha.4',
+      version='1.0.0',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From c65dfbd3b49ba04628c01cd580c8c72e40f900b5 Mon Sep 17 00:00:00 2001
From: Florian Cech <loki@fsinf.at>
Date: Sat, 21 Feb 2015 09:05:10 +0100
Subject: [PATCH 154/600] * kotti/Master

Initialize pyramid.paster.logging for custom commands defined via
kotti.util.command, to allow log message output for kotti sessions started via
custom commands. The current practice would not initialize logging at all,
producing a lot of "No handlers could be found for logger "myapp.foobar"" errors
when the system encountered loggers.
---
 kotti/util.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kotti/util.py b/kotti/util.py
index 9f9614381..b271995aa 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -20,6 +20,7 @@
 from pyramid.interfaces import ITranslationDirectories
 from pyramid.location import inside
 from pyramid.paster import bootstrap
+from pyramid.paster import setup_logging
 from pyramid.renderers import render
 from pyramid.threadlocal import get_current_registry
 from pyramid.threadlocal import get_current_request
@@ -365,7 +366,11 @@ def camel_case_to_name(text):
 
 def command(func, doc):
     args = docopt(doc)
-    pyramid_env = bootstrap(args['<config_uri>'])
+    # establish config file uri
+    config_uri = args['<config_uri>']
+    pyramid_env = bootstrap(config_uri)
+    # Setup logging to allow log output from command methods
+    setup_logging(config_uri)
     try:
         func(args)
     finally:

From b39c3679273e66970b089e5588f21015afa8858d Mon Sep 17 00:00:00 2001
From: Martin Peeters <martin.peeters@affinitic.be>
Date: Sat, 21 Feb 2015 15:56:29 +0100
Subject: [PATCH 155/600] Update contributors list

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 5a1601c05..f2e26615c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -101,3 +101,4 @@ Contributors
 - Natan Žabkar, 2013/08/28
 - Ionică Bizău, 2014/04/09
 - Ichim Tiberiu, 2015/01/13
+- Martin Peeters, 2015/02/21

From b4b906505f87107dee560f69fc4e76de2d10f296 Mon Sep 17 00:00:00 2001
From: Martin Peeters <martin.peeters@affinitic.be>
Date: Sat, 21 Feb 2015 17:30:49 +0100
Subject: [PATCH 156/600] Update french translations

---
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 11596 -> 17653 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po | 114 +++++++++++++++++++++---
 2 files changed, 103 insertions(+), 11 deletions(-)

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index fc0a2343edfec55505e6fce39d89654f7440d085..f6845c5164404e5eb9d70e55513e849bb8033d71 100644
GIT binary patch
literal 17653
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

delta 3471
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
Lvpr`sW4!(cAh1iq

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index ba62174ed..500a568af 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -20,11 +20,11 @@ msgstr ""
 
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
-msgstr ""
+msgstr "Bienvenue dans Kotti"
 
 #: kotti/populate.py:65
 msgid "Congratulations! You have successfully installed Kotti."
-msgstr ""
+msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
 #: kotti/populate.py:66
 #, c-format
@@ -89,16 +89,79 @@ msgid ""
 "    </div>\n"
 "</div>\n"
 msgstr ""
+"\n"
+"<h2>Identifiez vous</h2>\n"
+"<p>\n"
+"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</"
+"a> sur votre site internet\n"
+"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de "
+"passe pour\n"
+"    votre compte administrateur, celui-ci devrait être <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition "
+"en dessous de la\n"
+"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition "
+"et la visualisation, telle qu'\n"
+"    elle apparaitra aux visiteurs.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Configuration</h2>\n"
+"        <p>\n"
+"            Trouvez comment configurer le titre de votre site ainsi que "
+"d'autres paramètres en utilisant\n"
+"            un éditeur de texte.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
+"basic/configuration.html\">\n"
+"               Configuration manuelle\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Extensions</h2>\n"
+"        <p>\n"
+"            Des extensions vous permettent d'étendre les fonctionnalités de "
+"votre site internet Kotti.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
+"term=kotti\">\n"
+"                Extensions de Kotti\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Documentation</h2>\n"
+"        <p>\n"
+"            Découvrez tout ce que vous pouvez faire avec Kotti? La License "
+"de Kotti?Parcourez le\n"
+"            manuel pour plus d'informations.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               Documentation\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
 
 #: kotti/populate.py:121
 msgid "About"
-msgstr ""
+msgstr "A propos"
 
 #: kotti/populate.py:122
 msgid ""
 "Our company is the leading manufacturer of foo widgets used in a wide "
 "variety of aviation and and industrial products."
 msgstr ""
+"Notre société est spécialisée dans la conception de pièces foo utilisées "
+"dans une grande variétée de produits."
 
 #: kotti/populate.py:123
 msgid ""
@@ -132,6 +195,35 @@ msgid ""
 "  article.\n"
 "</small></p>\n"
 msgstr ""
+"\n"
+"<p>\n"
+"  <img alt=\"Cinq avions EA300 volants en formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
+"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Nos bureaux:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Rue inconnue, Boite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"  <em>Crédit de la photot:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
+"jpg\">\n"
+"  Copyright info</a>.\n"
+"  Originalement publié sur\n"
+"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"  article.\n"
+"</small></p>\n"
 
 #: kotti/resources.py:606 kotti/views/edit/content.py:81
 msgid "Document"
@@ -497,7 +589,7 @@ msgstr "Gravatar"
 
 #: kotti/templates/edit/upload.pt:9
 msgid "Upload content from local file(s)"
-msgstr ""
+msgstr "Téléverser des contenus à partir de fichiers locaux"
 
 #: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
 #, fuzzy
@@ -506,27 +598,27 @@ msgstr "Renommer"
 
 #: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
 msgid "Size"
-msgstr ""
+msgstr "Poids"
 
 #: kotti/templates/edit/upload.pt:29
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #: kotti/templates/edit/upload.pt:32
 msgid "Progress"
-msgstr ""
+msgstr "Progression"
 
 #: kotti/templates/edit/upload.pt:124
 msgid "Select file(s) to upload..."
-msgstr ""
+msgstr "Selectionner des fichiers à téléverser..."
 
 #: kotti/templates/edit/upload.pt:134
 msgid "Upload ${number} files."
-msgstr ""
+msgstr "Téléverser ${number} fichiers."
 
 #: kotti/templates/edit/upload.pt:144
 msgid "Dismiss all errors"
-msgstr ""
+msgstr "Ignorer toutes les erreurs"
 
 #: kotti/templates/site-setup/delete-user.pt:20
 msgid "Are you sure you want to delete ${type} ${title}?"
@@ -561,7 +653,7 @@ msgstr "Rechercher des utilisateurs ou des groupes"
 
 #: kotti/templates/site-setup/users.pt:63
 msgid "User- / groupname"
-msgstr ""
+msgstr "Utilisateur / groupe"
 
 #: kotti/templates/site-setup/users.pt:70
 #, fuzzy

From 07233f772ac4aeb5a6be2b0858dcbbf3c9c8a0a0 Mon Sep 17 00:00:00 2001
From: Martin Peeters <martin.peeters@affinitic.be>
Date: Sun, 22 Feb 2015 11:33:56 +0100
Subject: [PATCH 157/600] Update translations files

---
 kotti/locale/Kotti.pot                  |  43 ++++++++++++------------
 kotti/locale/de/LC_MESSAGES/Kotti.mo    | Bin 15091 -> 15091 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po    |  38 ++++++++++-----------
 kotti/locale/en/LC_MESSAGES/Kotti.mo    | Bin 449 -> 449 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po    |  38 ++++++++++-----------
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 17653 -> 17652 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po |  38 ++++++++++-----------
 kotti/locale/it/LC_MESSAGES/Kotti.mo    | Bin 12656 -> 12656 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po    |  38 ++++++++++-----------
 kotti/locale/ja/LC_MESSAGES/Kotti.mo    | Bin 12364 -> 12364 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po    |  38 ++++++++++-----------
 kotti/locale/ko/LC_MESSAGES/Kotti.mo    | Bin 14928 -> 14928 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po    |  38 ++++++++++-----------
 kotti/locale/nl/LC_MESSAGES/Kotti.mo    | Bin 11253 -> 11253 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po    |  38 ++++++++++-----------
 kotti/locale/pt/LC_MESSAGES/Kotti.mo    | Bin 7711 -> 7711 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po    |  38 ++++++++++-----------
 17 files changed, 174 insertions(+), 173 deletions(-)

diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index e9361f4dc..587ac6352 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -1,19 +1,20 @@
 # 
 # SOME DESCRIPTIVE TITLE
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\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: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Generated-By: Lingua 3.8\n"
 
 #: ./kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -121,58 +122,58 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:606 ./kotti/views/edit/content.py:81
+#: ./kotti/resources.py:627 ./kotti/views/edit/content.py:82
 msgid "Document"
 msgstr ""
 
-#: ./kotti/resources.py:645 ./kotti/views/edit/content.py:113
-#: ./kotti/views/edit/content.py:62
+#: ./kotti/resources.py:666 ./kotti/views/edit/content.py:110
+#: ./kotti/views/edit/content.py:63
 msgid "File"
 msgstr ""
 
-#: ./kotti/resources.py:697 ./kotti/views/edit/content.py:144
+#: ./kotti/resources.py:753 ./kotti/views/edit/content.py:138
 msgid "Image"
 msgstr ""
 
-#: ./kotti/resources.py:496
+#: ./kotti/resources.py:517
 msgid "Folder view"
 msgstr ""
 
-#: ./kotti/resources.py:483 ./kotti/templates/view/folder.pt:17
+#: ./kotti/resources.py:504 ./kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr ""
 
-#: ./kotti/resources.py:484 ./kotti/templates/edit/nav-tree.pt:10
+#: ./kotti/resources.py:505 ./kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: ./kotti/resources.py:485
+#: ./kotti/resources.py:506
 msgid "Share"
 msgstr ""
 
-#: ./kotti/resources.py:486 ./kotti/templates/actions-dropdown.pt:5
+#: ./kotti/resources.py:507 ./kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr ""
 
-#: ./kotti/resources.py:487 ./kotti/views/edit/actions.py:446
+#: ./kotti/resources.py:508 ./kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr ""
 
-#: ./kotti/resources.py:488 ./kotti/views/edit/actions.py:447
+#: ./kotti/resources.py:509 ./kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr ""
 
-#: ./kotti/resources.py:489 ./kotti/views/edit/actions.py:443
+#: ./kotti/resources.py:510 ./kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr ""
 
-#: ./kotti/resources.py:490 ./kotti/templates/edit/rename-nodes.pt:7
+#: ./kotti/resources.py:511 ./kotti/templates/edit/rename-nodes.pt:7
 #: ./kotti/templates/edit/rename-nodes.pt:55
 #: ./kotti/templates/edit/rename.pt:42 ./kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr ""
 
-#: ./kotti/resources.py:491 ./kotti/templates/edit/delete-nodes.pt:8
+#: ./kotti/resources.py:512 ./kotti/templates/edit/delete-nodes.pt:8
 #: ./kotti/templates/edit/delete-nodes.pt:90
 #: ./kotti/templates/edit/delete.pt:28
 #: ./kotti/templates/site-setup/delete-user.pt:36 ./kotti/views/users.py:443
@@ -321,7 +322,7 @@ msgstr ""
 #: ./kotti/templates/edit/contents.pt:57
 #: ./kotti/templates/edit/delete-nodes.pt:33
 #: ./kotti/templates/view/folder.pt:28 ./kotti/views/users.py:196
-#: ./kotti/views/edit/content.py:31
+#: ./kotti/views/edit/content.py:32
 msgid "Title"
 msgstr ""
 
@@ -859,15 +860,15 @@ msgstr ""
 msgid "Change State"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:35
+#: ./kotti/views/edit/content.py:36
 msgid "Description"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:41
+#: ./kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:50
+#: ./kotti/views/edit/content.py:51
 msgid "Body"
 msgstr ""
 
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index 2ab463a51f33ac5ce5fee7973dccf11e5954a620..803b241d845b019ff910880b80f593efa15e6db2 100644
GIT binary patch
delta 26
hcmexd`nhz2zY?#hu7Q!Rk&%L-p_Q@m<`|{v5&(j{2vz_9

delta 26
hcmexd`nhz2zY?#BuAz~xp{0VMiItK0<`|{v5&(lO2x0&L

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index a8d467ad9..242c630f6 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7dev4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2014-11-21 22:44+0100\n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: de <kotti@googlegroups.com>\n"
@@ -224,58 +224,58 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr "Datei"
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr "Bild"
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr "Ordneransicht"
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Inhalt"
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr "Teilen"
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Aktionen"
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Kopieren"
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Einfügen"
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -430,7 +430,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titel"
 
@@ -967,15 +967,15 @@ msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 msgid "Change State"
 msgstr "Status ändern"
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr "Beschreibung"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr "Schlagworte:"
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr "Inhalt"
 
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index f6db2b84dfcd0486a9d22579ec0be61d5f990ff9..0a090a05ce65dabda58eccf9cd234e38be246e8a 100644
GIT binary patch
delta 24
fcmX@ee2{s<WL{HU10!7{BLzc4D`Vr03ltdvS~Lcu

delta 24
fcmX@ee2{s<WL^_pLnB>7O9ev{D<kub3ltdvTA2o~

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index a0b80df3e..c7186f8ca 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -133,58 +133,58 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr ""
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr ""
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr ""
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr ""
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr ""
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr ""
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr ""
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr ""
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr ""
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr ""
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr ""
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -330,7 +330,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr ""
 
@@ -853,15 +853,15 @@ msgstr ""
 msgid "Change State"
 msgstr ""
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr ""
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr ""
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr ""
 
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index f6845c5164404e5eb9d70e55513e849bb8033d71..b3cf7a02460a054e43644f929b6853ab01a18345 100644
GIT binary patch
delta 197
zcmey`$@ry{al;$VdJzT&hA1Zn25umo52QtbbTyD>0n!tJG&_)<29=)&<*x$LAbp#l
z^l>1q1?1lW(rQ4O-I;+w07&ZrX=Na752R&*bTW|E0n&{?+8Ri&b7qiZC<8KH0R=z?
vB)Tv#0GSLuKw23{U)bEq<s!pts%v1RYh<KgXlP|@y!n<|xAf*Tr+y{?sWKni

delta 199
zcmey;$@sOCal;$VdQk=jhA1Zn25ul-0Hi_u8X(OAq$dGsb|5_+DnB2}Uk#*1fa05>
z^a&uX1?1la(rQ4O!<m6W07&ZtX=Nbo0HkGsbPABx0n$xC+8Ri&cV>`dC<8KH0|h_^
xB)Kp!0GSNEKw23{U)<cu<s!ptqHAcRYiOxpXkuk#zWJ6~w=|>f=2WMCCIIheASeI;

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 500a568af..7ed43b372 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9a3dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2013-09-22 20:21+0100\n"
 "Last-Translator: Fabien Castarède <fabien.castarede@free.fr>\n"
 "Language-Team: French\n"
@@ -225,58 +225,58 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr "Fichier"
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr "Image"
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr "Contenus"
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Contenus"
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modifier"
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr "Permissions"
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Actions"
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Copier"
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Couper"
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Coller"
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Renommer"
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -432,7 +432,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titre"
 
@@ -976,15 +976,15 @@ msgstr "Vous avez sélectionné des éléments afin de les traiter."
 msgid "Change State"
 msgstr "Modifier le statut"
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr "Description"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr "Mots-clés"
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr "Contenu"
 
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index 878bf07184b56c0a634bb920ed04af42eaf7a9ca..bcf8597ed2f0ba47dd35edcabb64b608f51684e9 100644
GIT binary patch
delta 26
hcmey6^dV`3sT{AVu7Q!Rk&%L-p_Q@mW+yp4VE}sB2Y>(o

delta 26
hcmey6^dV`3sT{9~uAz~xp{0VMiItK0W+yp4VE}td2aEs!

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index 454b65b10..8d96ff5f0 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9.2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2014-01-19 11:14+0100\n"
 "Last-Translator: Xavi Torné <xavitorne@gmail.com>\n"
 "Language-Team: it \n"
@@ -191,58 +191,58 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr "File"
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr "Immagine"
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr "Vista della cartella"
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Contenuti"
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modificare"
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr "Condividi"
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Azioni"
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Copia"
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Taglia"
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Incolla"
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Rinomina"
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -392,7 +392,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titolo"
 
@@ -927,15 +927,15 @@ msgstr "Devi selezionare degli elementi per fare quest'azione."
 msgid "Change State"
 msgstr "Cambia stato"
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr "Descrizione"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr "Contenuto"
 
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index a15d8fe503e1b788aeef54512bf5c1325b18c3fc..8afab5d0692126151c0a527e48ff9c0c0a3bce65 100644
GIT binary patch
delta 26
hcmX?;a3*2H1u0%rT>~RsBO?VvLn~wB&3C2pMFE1m2&Di3

delta 26
hcmX?;a3*2H1u0$=T|*;XLrVoi6DuS0&3C2pMFE2?2(bVF

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 4d4d74ccf..6ef1c8f9d 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7.0\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2013-09-19 02:45+0900\n"
 "Last-Translator: OCHIAI, Gouji <gjo.ext@gmail.com>\n"
 "Language-Team: ja <kotti@googlegroups.com>\n"
@@ -134,58 +134,58 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr "ドキュメント"
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr "ファイル"
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr "画像"
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr "フォルダー表示"
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "編集"
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr "共有"
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "アクション"
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "コピー"
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "切り取り"
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "貼り付け"
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "名称変更"
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -343,7 +343,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "タイトル"
 
@@ -883,15 +883,15 @@ msgstr "アクションを適用するアイテムを選択してください。
 msgid "Change State"
 msgstr "状態を変更"
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr "説明"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr "タグ"
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr "本文"
 
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index 309ce7b2bc43db585e3b395fecd025fcaab72207..b401efe29124298404c7e020c704630d06da7d7d 100644
GIT binary patch
delta 26
hcmcama-n2Hnj){Mu7Q!Rk&%L-p_Q@m=3>RW5&(W`2!H?p

delta 26
hcmcama-n2Hnj)`>uAz~xp{0VMiItK0=3>RW5&(YN2#f##

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index bb4c27e7e..2f0bdb434 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.10b2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2014-10-19 08:22+0900\n"
 "Last-Translator: mete0r <mete0r@sarangbang.or.kr>\n"
 "Language-Team: Korean\n"
@@ -218,58 +218,58 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr "문서"
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr "파일"
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr "화상"
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr "폴더로 보임"
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "컨텐츠 항목"
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "편집"
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr "공유"
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "동작"
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "복사"
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "잘라내기"
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -419,7 +419,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "제목"
 
@@ -951,15 +951,15 @@ msgstr "적용할 항목을 선택해야합니다."
 msgid "Change State"
 msgstr "작업 상태 바꾸기"
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr "설명"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr "태그"
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr "본문"
 
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index 97bf2fdcb4a11740a2bbb0218fbe310694f75dd2..3cd4fc509f15f9af655bc12f9c0cb8810f43bf5f 100644
GIT binary patch
delta 26
hcmeww{xy8V1u0%rT>~RsBO?VvLn~wB&3C0F1ObR#2#Npz

delta 26
hcmeww{xy8V1u0$=T|*;XLrVoi6DuS0&3C0F1ObT62$lc<

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index 4aca31860..62d3f1596 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2014-02-13 21:51+0100\n"
 "Last-Translator: Wim Boucquaert <wim.boucquaert@gmail.com>\n"
 "Language-Team: nl <kotti@googlegroups.com>\n"
@@ -133,58 +133,58 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr "Bestand"
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr "Afbeelding"
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr "Map weergave"
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Inhoud"
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bewerken"
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr "Delen"
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Acties"
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Knippen"
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Plakken"
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -339,7 +339,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titel"
 
@@ -884,15 +884,15 @@ msgstr "Je dient items te selecteren om acties uit te voeren."
 msgid "Change State"
 msgstr "Wijzig Status."
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr "Beschrijving"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr "Inhoud"
 
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index c3bc8089aecefd92cbea2014517a0c3e07be6687..c3a7a5dcafa7882e06b053c1ffbc8183817b53e0 100644
GIT binary patch
delta 26
hcmbPlGv8*z0U=&fT>~RsBO?VvLn~wB&1Z#zxB+mc2dn@9

delta 26
hcmbPlGv8*z0U=%!T|*;XLrVoi6DuS0&1Z#zxB+n&2e<$L

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index ef403c067..3ccc8e218 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-19 14:27+0100\n"
+"POT-Creation-Date: 2015-02-22 11:33+0100\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: Nuno Teixeira <teixas@gmail.com>\n"
 "Language-Team: pt <LL@li.org>\n"
@@ -133,58 +133,58 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:606 kotti/views/edit/content.py:81
+#: kotti/resources.py:627 kotti/views/edit/content.py:82
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:645 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:62
+#: kotti/resources.py:666 kotti/views/edit/content.py:110
+#: kotti/views/edit/content.py:63
 msgid "File"
 msgstr "Ficheiro"
 
-#: kotti/resources.py:697 kotti/views/edit/content.py:144
+#: kotti/resources.py:753 kotti/views/edit/content.py:138
 msgid "Image"
 msgstr "Imagem"
 
-#: kotti/resources.py:496
+#: kotti/resources.py:517
 msgid "Folder view"
 msgstr "Vista de pasta"
 
-#: kotti/resources.py:483 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: kotti/resources.py:484 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Editar"
 
-#: kotti/resources.py:485
+#: kotti/resources.py:506
 msgid "Share"
 msgstr "Partilha"
 
-#: kotti/resources.py:486 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
 msgid "Actions"
 msgstr "Ações"
 
-#: kotti/resources.py:487 kotti/views/edit/actions.py:446
+#: kotti/resources.py:508 kotti/views/edit/actions.py:446
 msgid "Copy"
 msgstr "Copiar"
 
-#: kotti/resources.py:488 kotti/views/edit/actions.py:447
+#: kotti/resources.py:509 kotti/views/edit/actions.py:447
 msgid "Cut"
 msgstr "Cortar"
 
-#: kotti/resources.py:489 kotti/views/edit/actions.py:443
+#: kotti/resources.py:510 kotti/views/edit/actions.py:443
 msgid "Paste"
 msgstr "Colar"
 
-#: kotti/resources.py:490 kotti/templates/edit/rename-nodes.pt:7
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
 #: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
 #: kotti/views/edit/actions.py:448
 msgid "Rename"
 msgstr "Renomear"
 
-#: kotti/resources.py:491 kotti/templates/edit/delete-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
 #: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
 #: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:450
@@ -341,7 +341,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
 #: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:31
+#: kotti/views/users.py:196 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Título"
 
@@ -902,15 +902,15 @@ msgstr "Terá de escolher items para executar a ação."
 msgid "Change State"
 msgstr "Alterar Estado"
 
-#: kotti/views/edit/content.py:35
+#: kotti/views/edit/content.py:36
 msgid "Description"
 msgstr "Descrição"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:42
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: kotti/views/edit/content.py:50
+#: kotti/views/edit/content.py:51
 msgid "Body"
 msgstr "Corpo"
 

From a1113350f6f0b27cc4de3ae33383b6654bb17cf9 Mon Sep 17 00:00:00 2001
From: Martin Peeters <martin.peeters@affinitic.be>
Date: Sun, 22 Feb 2015 11:35:49 +0100
Subject: [PATCH 158/600] Fix fuzzy translations and some typos

---
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 17652 -> 18638 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po |  19 +++++--------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index b3cf7a02460a054e43644f929b6853ab01a18345..b0c1df66d24b792df1d4a385ace1cf9ec79397e5 100644
GIT binary patch
delta 4423
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

delta 3711
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
Ppl?n;SAcJqr%UjEAC_<c

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 7ed43b372..369507a06 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9a3dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-02-22 11:34+0100\n"
 "PO-Revision-Date: 2013-09-22 20:21+0100\n"
 "Last-Translator: Fabien Castarède <fabien.castarede@free.fr>\n"
 "Language-Team: French\n"
@@ -394,12 +394,11 @@ msgstr "Réinitialiser le mot de passe"
 
 #. Canonical text for ${reset_password} is: "Reset password"
 #: kotti/templates/login.pt:74
-#, fuzzy
 msgid ""
 "Fill out your username or email and click ${reset_password} below to receive "
 "an email with a link to reset your password."
 msgstr ""
-"Indiquez votre identifiant ou votre adresse e-mail ci-dessus et cliquez sur "
+"Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur "
 "${reset_password} ci-dessous afin de recevoir un mail contenant le lien de "
 "réinitialisation de votre mot de passe."
 
@@ -408,9 +407,8 @@ msgid "Not registered yet?"
 msgstr ""
 
 #: kotti/templates/login.pt:127
-#, fuzzy
 msgid "Register for an account on this site."
-msgstr "Pas encore inscrit ? ${register} sur ce site."
+msgstr "Enregistrez-vous sur ce site."
 
 #: kotti/templates/workflow-dropdown.pt:19
 msgid "Make ${state}"
@@ -592,9 +590,8 @@ msgid "Upload content from local file(s)"
 msgstr "Téléverser des contenus à partir de fichiers locaux"
 
 #: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-#, fuzzy
 msgid "Filename"
-msgstr "Renommer"
+msgstr "Nom du fichier"
 
 #: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
 msgid "Size"
@@ -634,7 +631,6 @@ msgid "Edit ${title}"
 msgstr "Modifier ${title}"
 
 #: kotti/templates/site-setup/users.pt:15
-#, fuzzy
 msgid "Search user(s) / group(s)"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
@@ -647,7 +643,6 @@ msgid "Add group"
 msgstr "Ajouter un groupe"
 
 #: kotti/templates/site-setup/users.pt:52
-#, fuzzy
 msgid "Find users or groups"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
@@ -656,24 +651,20 @@ msgid "User- / groupname"
 msgstr "Utilisateur / groupe"
 
 #: kotti/templates/site-setup/users.pt:70
-#, fuzzy
 msgid "Blank search text finds all."
 msgstr ""
 "Rechercher et modifier des utilisateurs (Laissez le champ vide pour les "
 "afficher tous)."
 
 #: kotti/templates/site-setup/users.pt:96
-#, fuzzy
 msgid "Assign global roles"
 msgstr "Assigner des rôles locaux"
 
 #: kotti/templates/site-setup/users.pt:180
-#, fuzzy
 msgid "Add new user"
 msgstr "Ajouter un utilisateur"
 
 #: kotti/templates/site-setup/users.pt:190
-#, fuzzy
 msgid "Add new group"
 msgstr "Ajouter un groupe"
 
@@ -761,7 +752,7 @@ msgstr "S'inscrire - ${title}"
 
 #: kotti/views/login.py:163
 msgid "Login failed."
-msgstr "Connexion échouée."
+msgstr "La connexion à échouée."
 
 #: kotti/views/login.py:285
 #, python-format

From 0b00b370d06dbf74f17be22870448311ada551ce Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 23 Feb 2015 09:57:20 +0100
Subject: [PATCH 159/600] Update CHANGES.txt

---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 263e845c3..595a7b433 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Change History
 1.1-dev - unreleased
 --------------------
 
-- No changes yet.
+- Initialize pyramid.paster.logging for custom commands defined via
+  ``kotti.util.command``, to allow log message output for kotti sessions 
+  started via custom commands.
 
 1.0.0-alpha.4 - 2015-01-29
 --------------------------

From 12950a9ab6d62f3eeb56718a67e913ffc95082da Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 23 Feb 2015 10:16:52 +0100
Subject: [PATCH 160/600] Add E402 to the list of ignores for the scaffold.

---
 kotti/scaffolds/package/setup.cfg_tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/setup.cfg_tmpl b/kotti/scaffolds/package/setup.cfg_tmpl
index 13b1fe203..93b39155e 100644
--- a/kotti/scaffolds/package/setup.cfg_tmpl
+++ b/kotti/scaffolds/package/setup.cfg_tmpl
@@ -21,4 +21,4 @@ addopts =
 python_files = test*py
 markers =
     user: mark test to be run as the given user
-pep8ignore = E501 E122 E123 E125 E128 E711
+pep8ignore = E501 E122 E123 E125 E128 E711 E402

From bd5dbc7a54840899aa7e560d8866b0841c5c45cd Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 23 Feb 2015 11:16:42 +0100
Subject: [PATCH 161/600] Remove unused ``kotti.js``.

---
 kotti/fanstatic.py        |  9 +-----
 kotti/static/kotti.js     | 63 ---------------------------------------
 kotti/static/kotti.min.js |  1 -
 3 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 kotti/static/kotti.js
 delete mode 100644 kotti/static/kotti.min.js

diff --git a/kotti/fanstatic.py b/kotti/fanstatic.py
index e94c37f0c..dc51b66ee 100644
--- a/kotti/fanstatic.py
+++ b/kotti/fanstatic.py
@@ -24,15 +24,10 @@
 
 # Kotti's resources
 lib_kotti = Library("kotti", "static")
-kotti_js = Resource(
-    lib_kotti,
-    "kotti.js",
-    minified="kotti.min.js",
-    bottom=True)
 contents_view_js = Resource(
     lib_kotti,
     "contents.js",
-    depends=[kotti_js, jquery_tablednd, ],
+    depends=[jquery_tablednd, ],
     minified="contents.min.js",
     bottom=True)
 base_css = Resource(
@@ -124,9 +119,7 @@ def need(self):  # pragma: no cover
     jquery,
     bootstrap_js,
     html5shiv,
-    kotti_js,
     jquery_form,
-    # deform_bootstrap_js,
     ])
 edit_needed = NeededGroup([
     edit_needed_css,
diff --git a/kotti/static/kotti.js b/kotti/static/kotti.js
deleted file mode 100644
index f87f77c18..000000000
--- a/kotti/static/kotti.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// JSLint options:
-/*global deform, jQuery, tinyMCE*/
-/*jslint browser:true*/
-
-"use strict";
-var kotti = {
-    domChangedHandlers: []
-};
-var jq = jQuery;
-
-(function ($) {
-
-    $.fn.find2 = function (selector) {
-        // A find() that also return matches on the root element(s)
-        return this.filter(selector).add(this.find(selector));
-    };
-
-    kotti.dirtyForms = function (node) {
-        var forms = $("form").not("[class~=dirty-ignore]"),
-            initial = forms.serialize();
-
-        $(window).unbind('beforeunload');
-        forms.submit(function () { $(window).unbind('beforeunload'); });
-        if (tinyMCE !== undefined) {
-            tinyMCE.triggerSave(true);
-        }
-        $(window).bind("beforeunload", function () {
-            if (tinyMCE !== undefined) {
-                tinyMCE.triggerSave(true);
-            }
-            if ($("form").serialize() !== initial) {
-                return "Your changes have not been saved.\nAre you sure you want to leave this page?";
-            }
-            return null;
-        });
-    };
-
-    kotti.domChanged = function (node) {
-        $.each(kotti.domChangedHandlers, function (index, func) {
-            func(node);
-        });
-    };
-
-    kotti.main = function (handlers) {
-        var node = $('html');
-        if (!handlers) {
-            handlers = [
-            ];
-        }
-        $.each(handlers, function (index, func) {
-            kotti.domChangedHandlers.push(func);
-        });
-        kotti.domChanged(node);
-    };
-
-    // deform might be undefined, e.g. in kotti_tinymce's kottibrowser
-    if (window.deform) {
-        deform.load();
-    }
-
-    kotti.main();
-
-}(jQuery));
diff --git a/kotti/static/kotti.min.js b/kotti/static/kotti.min.js
deleted file mode 100644
index c9ea8b3b1..000000000
--- a/kotti/static/kotti.min.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";var kotti={domChangedHandlers:[]};var jq=jQuery;(function(a){a.fn.find2=function(b){return this.filter(b).add(this.find(b))};kotti.dirtyForms=function(d){var b=a("form").not("[class~=dirty-ignore]"),c=b.serialize();a(window).unbind("beforeunload");b.submit(function(){a(window).unbind("beforeunload")});if(tinyMCE!==undefined){tinyMCE.triggerSave(true)}a(window).bind("beforeunload",function(){if(tinyMCE!==undefined){tinyMCE.triggerSave(true)}if(a("form").serialize()!==c){return"Your changes have not been saved.\nAre you sure you want to leave this page?"}return null})};kotti.domChanged=function(b){a.each(kotti.domChangedHandlers,function(c,d){d(b)})};kotti.main=function(b){var c=a("html");if(!b){b=[]}a.each(b,function(d,e){kotti.domChangedHandlers.push(e)});kotti.domChanged(c)};if(window.deform){deform.load()}kotti.main()}(jQuery));
\ No newline at end of file

From 3875ed8ed80f02b709fb51eda501b0b10402d5c2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 23 Feb 2015 11:25:38 +0100
Subject: [PATCH 162/600] Adjust tests.

---
 CHANGES.txt                | 2 ++
 kotti/tests/test_static.py | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 66463c417..b4c49842e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ Change History
   ``kotti.util.command``, to allow log message output for kotti sessions
   started via custom commands.
 
+- Remove unused ``kotti.js``.
+
 1.0.0 - 2015-01-20
 ------------------
 
diff --git a/kotti/tests/test_static.py b/kotti/tests/test_static.py
index 11402c200..286a29ebd 100644
--- a/kotti/tests/test_static.py
+++ b/kotti/tests/test_static.py
@@ -6,7 +6,7 @@ class TestStatic:
     def test_NeededGroup(self):
 
         from js.deform import deform_js
-        from kotti.fanstatic import kotti_js
+        from kotti.fanstatic import contents_view_js
         from kotti.fanstatic import NeededGroup
 
         def NeededGroupFactory(resources):
@@ -21,9 +21,9 @@ def NeededGroupFactory(resources):
 
         assert needed.resources == [deform_js, ]
 
-        needed.add(kotti_js)
+        needed.add(contents_view_js)
 
-        assert needed.resources == [deform_js, kotti_js]
+        assert needed.resources == [deform_js, contents_view_js]
 
         def needed_group_adder(resource):
             needed.add(resource)

From b264e838b6c57a188ca27ee79cf8498a5ff38b57 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 24 Feb 2015 16:34:16 +0200
Subject: [PATCH 163/600] Added changelog entries about filedepot feature

---
 CHANGES.txt | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b4c49842e..0425df5d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,41 @@ Change History
 1.1-dev - unreleased
 --------------------
 
+- Allow moving ``File`` and ``Image`` blob data from the database to
+  configurable storages. To achieve this we use `filedepot`_, a third-party
+  library with several plugin storages already built in. See
+  docs/developing/advanced/blobs.rst for details on what this brings. Upgrading
+  from any version older then 1.1.0 requires you to run a migration script on
+  your database.  To run the migration, call::
+
+    $ bin/kotti-migrate <myconfig.ini> upgrade
+
+  Please note that, before running the migration, you should take the time to
+  read the documentation and configure your desired storage scheme.
+
+.. _filedepot: https://pypi.python.org/pypi/filedepot/
+
+- Allow storing blob data in the database using ``DBStoredFile`` and
+  ``DBFileStorage``, a database centered storage plugin for ``filedepot``. This
+  storage is the default storage for blob data, unless configured otherwise.
+
+- Added a script to migrate between blob data between depot storages. See
+  docs/developing/advanced/blobs.rst for details on how to use it.
+
+- Simplify serving blob data by using the
+  :class:`kotti.views.file.UploadedFileResponse`, which also streams data.
+  Please note that the default ``DBStoredFile`` still needs to load its entire
+  data in memory, to benefit from this feature you should configure another
+  default depot storage.
+
+- Added three new test fixtures: ``mock_filedepot``, to be used in simple unit
+  tests with no dependency on a database session, ``filedepot``, which
+  integrates with the ``dbsession`` fixture and ``no_filedepot``, a fixture
+  that can be used in developing tests for new file depot plugins - by
+  preserving the depot configuration before and after running the test. NOTE:
+  in order to test edit views with uploaded data in the request, you need to
+  mixin the ``filedepot`` fixture.
+
 - Initialize pyramid.paster.logging for custom commands defined via
   ``kotti.util.command``, to allow log message output for kotti sessions
   started via custom commands.

From da26fb7211313cd3bf2df66ea2d65bdb01b7bb4e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Tue, 24 Feb 2015 16:34:50 +0200
Subject: [PATCH 164/600] Use a different depot name for the filedepot fixture

---
 kotti/tests/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 19f074cc8..f7a1d17ad 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -352,9 +352,9 @@ def filedepot(db_session, request):
     _old_depots = DepotManager._depots
     _old_default_depot = DepotManager._default_depot
     DepotManager._depots = {
-        'mockdepot': MagicMock(wraps=TestStorage())
+        'filedepot': MagicMock(wraps=TestStorage())
     }
-    DepotManager._default_depot = 'mockdepot'
+    DepotManager._default_depot = 'filedepot'
 
     def restore():
         db_session.rollback()

From 52bd28d915ecc774bd6b29ddc162594d28aeeb4c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 25 Feb 2015 17:53:52 +0100
Subject: [PATCH 165/600] Upgrade most requirements to their recent versions.

---
 kotti/scaffolds/package/requirements.txt | 17 +++++++++--------
 requirements.txt                         | 16 ++++++++--------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 4072ee29f..f60a2410f 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,8 +1,9 @@
 Kotti==1.0.0
+filedepot==0.0.3
 Babel==1.3
-Beaker==1.6.4
-Chameleon==2.20
-FormEncode==1.2.6
+Beaker==1.6.5.post1
+Chameleon==2.22
+FormEncode==1.3.0
 Mako==1.0.1
 MarkupSafe==0.23
 PasteDeploy==1.5.2
@@ -17,11 +18,11 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-html2text==2014.12.29
+html2text==2015.2.18
 js.angular==1.1.4
 js.bootstrap==3.3.1
 js.chosen==0.9.14
-js.deform==2.0a2-2
+js.deform==2.0a2-3
 js.fineuploader==3.3.0
 js.html5shiv==3.6.2-1
 js.jquery==1.9.1
@@ -35,19 +36,19 @@ js.jqueryui==1.10.3
 js.jqueryui_tagit==2.0.24-2
 js.modernizr==2.5.3.1
 kotti_tinymce==0.5.1
-lingua==3.8
+lingua==3.9
 peppercorn==0.5
 plone.scale==1.3.4
 polib==1.0.6
 py-bcrypt==0.4
-pyramid==1.5.2
+pyramid==1.5.4
 pyramid_beaker==0.8
 pyramid_chameleon==0.3
 pyramid_debugtoolbar==2.3
 pyramid_deform==0.2
 pyramid_mailer==0.14
 pyramid_mako==1.0.2
-pyramid_tm==0.10
+pyramid_tm==0.11
 pyramid_zcml==1.0.0
 pytz==2014.10
 repoze.lru==0.6
diff --git a/requirements.txt b/requirements.txt
index 67bfa2eee..f60a2410f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 Kotti==1.0.0
 filedepot==0.0.3
 Babel==1.3
-Beaker==1.6.4
-Chameleon==2.20
-FormEncode==1.2.6
+Beaker==1.6.5.post1
+Chameleon==2.22
+FormEncode==1.3.0
 Mako==1.0.1
 MarkupSafe==0.23
 PasteDeploy==1.5.2
@@ -18,11 +18,11 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-html2text==2014.12.29
+html2text==2015.2.18
 js.angular==1.1.4
 js.bootstrap==3.3.1
 js.chosen==0.9.14
-js.deform==2.0a2-2
+js.deform==2.0a2-3
 js.fineuploader==3.3.0
 js.html5shiv==3.6.2-1
 js.jquery==1.9.1
@@ -36,19 +36,19 @@ js.jqueryui==1.10.3
 js.jqueryui_tagit==2.0.24-2
 js.modernizr==2.5.3.1
 kotti_tinymce==0.5.1
-lingua==3.8
+lingua==3.9
 peppercorn==0.5
 plone.scale==1.3.4
 polib==1.0.6
 py-bcrypt==0.4
-pyramid==1.5.2
+pyramid==1.5.4
 pyramid_beaker==0.8
 pyramid_chameleon==0.3
 pyramid_debugtoolbar==2.3
 pyramid_deform==0.2
 pyramid_mailer==0.14
 pyramid_mako==1.0.2
-pyramid_tm==0.10
+pyramid_tm==0.11
 pyramid_zcml==1.0.0
 pytz==2014.10
 repoze.lru==0.6

From af2032fe2b30db01c25d47a43f28e8f0b9383c37 Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Mon, 2 Mar 2015 18:04:26 +0200
Subject: [PATCH 166/600] Update CHANGES.txt

remove duplicate word
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0425df5d3..18e7ca464 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,7 +22,7 @@ Change History
   ``DBFileStorage``, a database centered storage plugin for ``filedepot``. This
   storage is the default storage for blob data, unless configured otherwise.
 
-- Added a script to migrate between blob data between depot storages. See
+- Added a script to migrate blob data between depot storages. See
   docs/developing/advanced/blobs.rst for details on how to use it.
 
 - Simplify serving blob data by using the

From 4d36cf4735258326fdec4d8fc05d19db21368367 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Mon, 16 Mar 2015 18:39:48 +0200
Subject: [PATCH 167/600] Separate default actions, so it can be modified

---
 kotti/resources.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 9271a6b04..d6f993ff7 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -495,6 +495,16 @@ def _not_root(context, request):
     return not context is get_root()
 
 
+default_actions = LinkParent(title=_(u'Actions'), children=[
+    Link('copy', title=_(u'Copy')),
+    Link('cut', title=_(u'Cut'), predicate=_not_root),
+    Link('paste', title=_(u'Paste'), predicate=get_paste_items),
+    Link('rename', title=_(u'Rename'), predicate=_not_root),
+    Link('delete', title=_(u'Delete'), predicate=_not_root),
+    LinkRenderer('default-view-selector'),
+])
+
+
 default_type_info = TypeInfo(
     name=u'Content',
     title=u'type_info title missing',   # BBB
@@ -504,14 +514,7 @@ def _not_root(context, request):
         Link('contents', title=_(u'Contents')),
         Link('edit', title=_(u'Edit')),
         Link('share', title=_(u'Share')),
-        LinkParent(title=_(u'Actions'), children=[
-            Link('copy', title=_(u'Copy')),
-            Link('cut', title=_(u'Cut'), predicate=_not_root),
-            Link('paste', title=_(u'Paste'), predicate=get_paste_items),
-            Link('rename', title=_(u'Rename'), predicate=_not_root),
-            Link('delete', title=_(u'Delete'), predicate=_not_root),
-            LinkRenderer('default-view-selector'),
-            ]),
+        default_actions,
         ],
     selectable_default_views=[
         ("folder_view", _(u"Folder view")),

From ee94ba89b51be08206de7f20cd87098587b46fb5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 19 Mar 2015 13:22:04 +0100
Subject: [PATCH 168/600] Remove deprecated
 ``kotti.views.slots.local_navigation`` and
 ``kotti.views.slots.includeme_local_navigation``.

---
 kotti/tests/test_deprecated.py | 23 -----------------------
 kotti/views/slots.py           | 25 -------------------------
 2 files changed, 48 deletions(-)

diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 7a8bd762c..25d3727cc 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -12,29 +12,6 @@ def assert_deprecations(w, *msgs):
         assert msgs[i] in str(w[i].message)
 
 
-class TestDeprecated09:
-
-    def test_render_tree_navigation_moved(self, allwarnings):
-        with warnings.catch_warnings(record=True) as w:
-
-            from kotti.views.edit.actions import render_tree_navigation
-            render_tree_navigation  # pyflakes
-
-            assert_deprecations(
-                w, "has been moved to kotti.views.navigation as of Kotti 0.9")
-
-    def test_local_navigation_moved(self, allwarnings):
-        with warnings.catch_warnings(record=True) as w:
-
-            from kotti.views.slots import includeme_local_navigation
-            from kotti.views.slots import local_navigation
-            includeme_local_navigation  # pyflakes
-            local_navigation  # pyflakes
-
-            assert_deprecations(
-                w, "deprecated as of Kotti 0.9", "deprecated as of Kotti 0.9")
-
-
 class TestDeprecated10:
 
     def test_security_has_permission(self, allwarnings):
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index 543f94702..a36f1242d 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -135,28 +135,3 @@ class RenderEditInHead(ObjectEvent):
 slot_events = [
     RenderLeftSlot, RenderRightSlot, RenderAboveContent, RenderBelowContent,
     RenderInHead, RenderBeforeBodyEnd, RenderEditInHead, ]
-
-
-# BBB starts here --- --- --- --- --- ---
-
-from zope.deprecation import deprecated
-
-# The remainder of this file will be removed in Kotti 0.11 or 1.1, whichever
-# will be the version number we chose.
-
-from kotti.views.navigation import local_navigation
-from kotti.views.navigation import includeme_local_navigation
-
-local_navigation = local_navigation
-includeme_local_navigation = includeme_local_navigation
-
-deprecated(
-    'local_navigation',
-    'deprecated as of Kotti 0.9.  Use '
-    'kotti.views.navigation.local_navigation instead.'
-)
-deprecated(
-    'includeme_local_navigation',
-    'deprecated as of Kotti 0.9.  Use '
-    'kotti.views.navigation.includeme_local_navigation instead.'
-)

From 6c3597e9e3d2a90e4473a1479a7b31f6ab696349 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 19 Mar 2015 13:23:08 +0100
Subject: [PATCH 169/600] Upgrade ``plone.scale`` and ``SQLAlchemy`` to their
 latest stable versions.

---
 kotti/scaffolds/package/requirements.txt | 4 ++--
 requirements.txt                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index f60a2410f..ba5b99417 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -9,7 +9,7 @@ MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==2.7.0
 Pygments==2.0.2
-SQLAlchemy==0.9.8
+SQLAlchemy==0.9.9
 Unidecode==0.04.17
 WebOb==1.4
 alembic==0.6.7
@@ -38,7 +38,7 @@ js.modernizr==2.5.3.1
 kotti_tinymce==0.5.1
 lingua==3.9
 peppercorn==0.5
-plone.scale==1.3.4
+plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
 pyramid==1.5.4
diff --git a/requirements.txt b/requirements.txt
index f60a2410f..ba5b99417 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==2.7.0
 Pygments==2.0.2
-SQLAlchemy==0.9.8
+SQLAlchemy==0.9.9
 Unidecode==0.04.17
 WebOb==1.4
 alembic==0.6.7
@@ -38,7 +38,7 @@ js.modernizr==2.5.3.1
 kotti_tinymce==0.5.1
 lingua==3.9
 peppercorn==0.5
-plone.scale==1.3.4
+plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
 pyramid==1.5.4

From c034e32f52064eb92d95b94456cc0799bd773f34 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 19 Mar 2015 13:23:43 +0100
Subject: [PATCH 170/600] Add ``filedepot`` to package requirements.

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index a6f976e1a..3a5af056d 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,7 @@
     'colander>=0.9.3',
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
     'docopt',
+    'filedepot',
     'formencode',
     'html2text',
     'js.angular',

From b17a22a410b56d42521015ea4d909c94272dd7ea Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 19 Mar 2015 13:24:23 +0100
Subject: [PATCH 171/600] Add changenotes.

---
 CHANGES.txt | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 18e7ca464..a273cf8ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,11 +25,10 @@ Change History
 - Added a script to migrate blob data between depot storages. See
   docs/developing/advanced/blobs.rst for details on how to use it.
 
-- Simplify serving blob data by using the
-  :class:`kotti.views.file.UploadedFileResponse`, which also streams data.
-  Please note that the default ``DBStoredFile`` still needs to load its entire
-  data in memory, to benefit from this feature you should configure another
-  default depot storage.
+- Simplify serving blob data by using ``kotti.views.file.UploadedFileResponse``,
+  which also streams data.  Please note that the default ``DBStoredFile`` still
+  needs to load its entire data in memory, to benefit from this feature you
+  should configure another default depot storage.
 
 - Added three new test fixtures: ``mock_filedepot``, to be used in simple unit
   tests with no dependency on a database session, ``filedepot``, which
@@ -45,6 +44,13 @@ Change History
 
 - Remove unused ``kotti.js``.
 
+- Remove deprecated ``kotti.views.slots.local_navigation`` and
+  ``kotti.views.slots.includeme_local_navigation``.  Use
+  ``kotti.views.navigation.local_navigation`` and
+  ``kotti.views.navigation.includeme_local_navigation`` instead.
+
+- Upgrade ``plone.scale`` and ``SQLAlchemy`` to their latest stable versions.
+
 1.0.0 - 2015-01-20
 ------------------
 

From 847e8737cee9bad975e369ad491b87f711763a3a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 19 Mar 2015 13:29:17 +0100
Subject: [PATCH 172/600] Bump version.

---
 CHANGES.txt                              | 4 ++--
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a273cf8ef..be88a1560 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-1.1-dev - unreleased
---------------------
+1.1.0-alpha.1 - 2015-03-19
+--------------------------
 
 - Allow moving ``File`` and ``Image`` blob data from the database to
   configurable storages. To achieve this we use `filedepot`_, a third-party
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index ba5b99417..12bebae57 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0
+Kotti==1.1.0-alpha.1
 filedepot==0.0.3
 Babel==1.3
 Beaker==1.6.5.post1
diff --git a/requirements.txt b/requirements.txt
index ba5b99417..12bebae57 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0
+Kotti==1.1.0-alpha.1
 filedepot==0.0.3
 Babel==1.3
 Beaker==1.6.5.post1
diff --git a/setup.py b/setup.py
index 3a5af056d..b2a657f2e 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1-dev',
+      version='1.1.0-alpha.1',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From b5aa1c2df274ff256fbd8024d0465e6049cc8ebd Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 19 Mar 2015 15:02:35 +0100
Subject: [PATCH 173/600] Add __pycache__ to gitignores.  [ci skip]

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index e28e50f5d..5e7c94c1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ junit*.xml
 *.sublime-*
 bower_components
 node_modules
+__pycache__
+

From 6b7c9e48b5cad643ea42fd9f6f18aeaec1e190ad Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 2 Apr 2015 12:45:20 +0200
Subject: [PATCH 174/600] Bump version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b2a657f2e..6c53e9a1c 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.0-alpha.1',
+      version='1.1.0-alpha.2.dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From e2cd4b2c80ca8d55d513d245b63a99aca5705318 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 2 Apr 2015 14:36:25 +0200
Subject: [PATCH 175/600] added height=500 to the DocumentSchema's
 RichTextWidget body

---
 kotti/views/edit/content.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index cecf417c9..57bbab7f2 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -51,6 +51,7 @@ class DocumentSchema(ContentSchema):
         title=_(u'Body'),
         widget=RichTextWidget(
             # theme='advanced', width=790, height=500
+            height=500,
         ),
         missing=u"",
         )

From 0dfbbf05e3aaafd68f9f05876d54910f6c16f50d Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 2 Apr 2015 14:36:53 +0200
Subject: [PATCH 176/600] signed Kotti's contributor agreement

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f2e26615c..54b960800 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -102,3 +102,4 @@ Contributors
 - Ionică Bizău, 2014/04/09
 - Ichim Tiberiu, 2015/01/13
 - Martin Peeters, 2015/02/21
+- Davide Moro, 2015/04/02

From 313c21c4a04e6a9f8f3bf343a5f18c5217035442 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 2 Apr 2015 14:55:29 +0200
Subject: [PATCH 177/600] updated change history

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index be88a1560..774d4c775 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -51,6 +51,9 @@ Change History
 
 - Upgrade ``plone.scale`` and ``SQLAlchemy`` to their latest stable versions.
 
+- Change ``height`` property on ``body``'s widget (``RichTextField``) for
+  improved usability. See #403.
+
 1.0.0 - 2015-01-20
 ------------------
 

From c119faaab34e2cca05f79c60686b41ca6dca8d60 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 2 Apr 2015 15:33:18 +0200
Subject: [PATCH 178/600] added target attribute on kotti.util.Link. See #405

---
 CHANGES.txt                     | 2 ++
 kotti/templates/edit/el-link.pt | 2 +-
 kotti/tests/test_util.py        | 5 +++++
 kotti/util.py                   | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 774d4c775..ec367a7fc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -54,6 +54,8 @@ Change History
 - Change ``height`` property on ``body``'s widget (``RichTextField``) for
   improved usability. See #403.
 
+- Add ``target`` option to ``kotti.util.Link``. See #405.
+
 1.0.0 - 2015-01-20
 ------------------
 
diff --git a/kotti/templates/edit/el-link.pt b/kotti/templates/edit/el-link.pt
index 47decd193..90b114656 100644
--- a/kotti/templates/edit/el-link.pt
+++ b/kotti/templates/edit/el-link.pt
@@ -1,6 +1,6 @@
 <li class="${link.selected(context, request) and 'active' or None}"
     tal:condition="link.visible(context, request)">
-  <a href="${link.url(context, request)}">
+  <a href="${link.url(context, request)}" target="${link.target}">
     ${link.title}
   </a>
 </li>
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 6a12792af..b2f9b653e 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -160,3 +160,8 @@ def test_link_selected_no_view_markers(self):
 
         req.url = "http://example.com"
         assert link.selected(root, req)
+
+    def test_link_target(self):
+        from kotti.util import Link
+        assert Link('').target is None
+        assert Link('', target='_blank').target == '_blank'
diff --git a/kotti/util.py b/kotti/util.py
index b271995aa..c5f295026 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -175,12 +175,13 @@ def get_visible_children(self, context, request):
 class Link(LinkBase):
     template = 'kotti:templates/edit/el-link.pt'
 
-    def __init__(self, name, title=None, predicate=None):
+    def __init__(self, name, title=None, predicate=None, target=None):
         self.name = name
         if title is None:
             title = name.replace('-', ' ').replace('_', ' ').title()
         self.title = title
         self.predicate = predicate
+        self.target = target
 
     def url(self, context, request):
         return resource_url(context, request) + '@@' + self.name

From ac3207abfedf8fd3759be5123c09eba243da79d8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 2 Apr 2015 12:45:20 +0200
Subject: [PATCH 179/600] Bump version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b2a657f2e..6c53e9a1c 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.0-alpha.1',
+      version='1.1.0-alpha.2.dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From d24e751529dd6ce4490275461d3bf108527fb96b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Apr 2015 14:20:07 +0200
Subject: [PATCH 180/600] Add sanitizer docs.

---
 docs/api/index.rst                      |  1 +
 docs/api/kotti.sanitizers.rst           |  8 +++
 docs/conf.py                            |  1 +
 docs/developing/advanced/index.rst      |  1 +
 docs/developing/advanced/sanitizers.rst | 73 +++++++++++++++++++++++++
 docs/developing/basic/configuration.rst | 59 +++++++++-----------
 6 files changed, 109 insertions(+), 34 deletions(-)
 create mode 100644 docs/api/kotti.sanitizers.rst
 create mode 100644 docs/developing/advanced/sanitizers.rst

diff --git a/docs/api/index.rst b/docs/api/index.rst
index 4b2284af7..af5e64564 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -18,6 +18,7 @@ API Documentation
    kotti.request
    kotti.resources
    kotti.filedepot
+   kotti.sanitizers
    kotti.security
    kotti.sqla
    kotti.testing
diff --git a/docs/api/kotti.sanitizers.rst b/docs/api/kotti.sanitizers.rst
new file mode 100644
index 000000000..991524fa3
--- /dev/null
+++ b/docs/api/kotti.sanitizers.rst
@@ -0,0 +1,8 @@
+.. _api-kotti.sanitizers:
+
+kotti.sanitizers
+----------------
+
+.. automodule:: kotti.sanitizers
+   :members:
+   :member-order: bysource
diff --git a/docs/conf.py b/docs/conf.py
index bcf920dc1..84e5c2985 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -120,6 +120,7 @@
 
 # -- Options for Intersphinx ---------------------------------------------------
 intersphinx_mapping = {
+    'bleach': ('http://bleach.readthedocs.org/en/latest/', None),
     'colander': ('http://colander.readthedocs.org/en/latest/', None),
     'deform': ('http://deform.readthedocs.org/en/latest/', None),
     'fanstatic': ('http://www.fanstatic.org/en/latest/', None),
diff --git a/docs/developing/advanced/index.rst b/docs/developing/advanced/index.rst
index b86d8746c..9d1f5686b 100644
--- a/docs/developing/advanced/index.rst
+++ b/docs/developing/advanced/index.rst
@@ -15,3 +15,4 @@ Advanced Topics
     blobs
     static-resource-management
     understanding-kotti-startup
+    sanitizers
diff --git a/docs/developing/advanced/sanitizers.rst b/docs/developing/advanced/sanitizers.rst
new file mode 100644
index 000000000..c549bb8d0
--- /dev/null
+++ b/docs/developing/advanced/sanitizers.rst
@@ -0,0 +1,73 @@
+.. _sanitizers:
+
+Sanitizers
+==========
+
+Kotti provides a mechanism to *sanitize* arbitrary strings.
+
+You can configure *available* sanitizers via ``kotti.sanitizers``.
+This setting takes a list of strings, with each specifying a ``name:callable`` pair.
+``name`` is the name under which this sanitizer is registered.
+``callable`` is a dotted path to a function taking an unsanitized string and returning a sanitized version of it.
+
+The default configuration is::
+
+  kotti.sanitizers =
+      xss_protection: kotti.sanitizers.xss_protection
+      minimal_html: kotti.sanitizers.minimal_html
+      no_html: kotti.sanitizers.no_html
+
+For thorough explaination of the included sanitizers see :mod:`kotti.sanitizers`.
+
+Explicit sanitization
+---------------------
+
+You can explicitly use any configured sanitizer like this::
+
+  from kotti.sanitizers import sanitize
+
+  sanitzed = sanitize(unsanitized, 'xss_protection')
+
+The sanitize function is also available as a method of the :class:`kotti.views.util.TemplateAPI`.
+This is just a convenience wrapper to ease usage in templates::
+
+  ${api.sanitize(context.foo, 'minimal_html')}
+
+Sanitize on write (implicit sanitization)
+-----------------------------------------
+
+The second setting related to sanitization is ``kotti.sanitize_on_write``.
+It defines *what* is filtered *how* when values are assigned to object attributes.
+
+This setting takes a list of ``dotted_path:sanitizer_name(s)`` pairs.
+``dotted_path`` is a dotted path to a resource class attribute that will be sanitized implicitly with the respective sanitizer(s) upon write access.
+``sanitizer_name(s)`` is a comma separated list of available sanitizer names as configured above.
+
+Kotti will setup :ref:`listeners <events>` for the :class:`kotti.events.ObjectInsert` and :class:`kotti.events.ObjectUpdate` events for the given classes and attach a function that filters the respective attributes with the specified sanitizer.
+
+This means that *any* write access to configured attributes through your application (also within correctly setup command line scripts) will be sanitized *implicitly*.
+
+The default configuration is::
+
+  kotti.sanitize_on_write =
+      kotti.resources.Document.body: xss_protection
+      kotti.resources.Content.title: no_html
+
+You can also use multiple sanitizers::
+
+  kotti.sanitize_on_write =
+      kotti.resources.Document.body: xss_protection, some_other_sanitizer
+
+Implementing a custom sanitizer
+-------------------------------
+
+A sanitizer is just a function that takes and returns a string.
+It can be as simple as::
+
+  def no_dogs_allowed(html):
+      return html.replace('dogs', 'cats')
+
+  no_dogs_allowed('<p>I love dogs.</p>')
+  ... '<p>I love cats.</p>'
+
+You can also look at :mod:`kotti.sanitizers` for examples.
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 1e925cc2c..c402bf8fd 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -77,6 +77,10 @@ kotti.max_file_size           Max size for file uploads, default: ```10`` (MB)
 
 kotti.depot.*.*               Configure the blob storage. More details below
 
+kotti.sanitizers              Configure available :ref:`sanitizers`.
+kotti.sanitize_on_write       Configure :ref:`sanitizers` to be used on write
+                              access to resource objects.
+
 pyramid.default_locale_name   Set the user interface language, default ``en``
 ============================  ==================================================
 
@@ -312,42 +316,29 @@ The default configuration here is:
 Blob storage configuration
 --------------------------
 
-By default, Kotti will store blob data (files uploaded in File and Image
-instances) in the database. Internally, Kotti integrates with :app:`filedepot`,
-so it is possible to use any :app:``filedepot`` compatible storage, including those
-provided by :app:``filedepot`` itself:
-
-- :class:``depot.io.local.LocalFileStorage``
-- :class:``depot.io.awss3.S3Storage``
-- :class:``depot.io.gridfs.GridFSStorage``
-
-The default storage for :app:``Kotti`` is
-:class:``~kotti.filedepot.DBFileStorage``. The benefit of storing files in
-``DBFileStorage`` is having *all* content in a single place (the DB) which
-makes backups, exporting and importing of your site's data easy, as long as you
-don't have too many or too large files. The downsides of this approach appear
-when your database server resides on a different host (network performance
-becomes a greater issue) or your DB dumps become too large to be handled
-efficiently.
-
-To configure a depot, several ``kotti.depot.*.*`` lines need to be added. The
-number in the first position is used to group backend configuration and to
-order the file storages in the configuration of :app:``filedepot``.  The depot
-configured with number 0 will be the default depot, where all new blob data
-will be saved.  There are 2 options that are required for every storage
-configuration: ``name`` and ``backend``. The ``name`` is a unique string that
-will be used to identify the path of saved files (it is recorded with each blob
-info), so once configured for a particular storage, it should never change. The
-``backend`` should point to a dotted path for the storage class. Then, any
-number of keyword arguments can be added, and they will be passed to the
-backend class on initialization.
+By default, Kotti will store blob data (files uploaded in File and Image instances) in the database.
+Internally, Kotti integrates with :app:`filedepot`, so it is possible to use any :app:`filedepot` compatible storage, including those provided by :app:`filedepot` itself:
+
+- :class:`depot.io.local.LocalFileStorage`
+- :class:`depot.io.awss3.S3Storage`
+- :class:`depot.io.gridfs.GridFSStorage`
+
+The default storage for :app:`Kotti` is :class:`~kotti.filedepot.DBFileStorage`.
+The benefit of storing files in ``DBFileStorage`` is having *all* content in a single place (the DB) which makes backups, exporting and importing of your site's data easy, as long as you don't have too many or too large files.
+The downsides of this approach appear when your database server resides on a different host (network performance becomes a greater issue) or your DB dumps become too large to be handled efficiently.
+
+To configure a depot, several ``kotti.depot.*.*`` lines need to be added.
+The number in the first position is used to group backend configuration and to order the file storages in the configuration of :app:`filedepot`.
+The depot configured with number 0 will be the default depot, where all new blob data will be saved.
+There are 2 options that are required for every storage configuration: ``name`` and ``backend``.
+The ``name`` is a unique string that will be used to identify the path of saved files (it is recorded with each blob info), so once configured for a particular storage, it should never change.
+The ``backend`` should point to a dotted path for the storage class.
+Then, any number of keyword arguments can be added, and they will be passed to the backend class on initialization.
 
 Example of a possible configurationi that stores blob data on the disk, in
-``/var/local/files`` using the :app:``filedepot``
-:class:``depot.io.local.LocalFileStorage`` provided backend. Kotti's default
-backend, ``DBFileStorage`` has been moved to position **1** and all data stored
-there will continue to be available. See :ref:`blobs` to see how to migrate
-blob data between storages.
+``/var/local/files`` using the :app:`filedepot` :class:`depot.io.local.LocalFileStorage` provided backend.
+Kotti's default backend, ``DBFileStorage`` has been moved to position **1** and all data stored there will continue to be available.
+See :ref:`blobs` to see how to migrate blob data between storages.
 
 .. code-block:: ini
 

From bba79a745b2a4f2a72fc35491cd3ab99886f1d89 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Apr 2015 14:21:15 +0200
Subject: [PATCH 181/600] Add requirements.

---
 kotti/scaffolds/package/requirements.txt | 2 ++
 kotti/scaffolds/package/setup.py_tmpl    | 2 +-
 requirements.txt                         | 2 ++
 setup.py                                 | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 12bebae57..b7dc53970 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -14,6 +14,8 @@ Unidecode==0.04.17
 WebOb==1.4
 alembic==0.6.7
 argparse==1.3.0
+bleach==1.4.1
+bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
diff --git a/kotti/scaffolds/package/setup.py_tmpl b/kotti/scaffolds/package/setup.py_tmpl
index bf1e71483..1728b4d2e 100644
--- a/kotti/scaffolds/package/setup.py_tmpl
+++ b/kotti/scaffolds/package/setup.py_tmpl
@@ -16,7 +16,7 @@ except IOError:
 version = '0.1dev'
 
 install_requires = [
-    'Kotti>=0.10b1',
+    'Kotti>=1.0.0',
 ]
 
 
diff --git a/requirements.txt b/requirements.txt
index 12bebae57..b7dc53970 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,8 @@ Unidecode==0.04.17
 WebOb==1.4
 alembic==0.6.7
 argparse==1.3.0
+bleach==1.4.1
+bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
diff --git a/setup.py b/setup.py
index 6c53e9a1c..6369ce9c8 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,8 @@
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'Pillow',  # dependency of plone.scale
     'alembic',
+    'bleach',
+    'bleach-whitelist',
     'colander>=0.9.3',
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
     'docopt',

From 0a28bc653443001309e2295bbf59b484f6866049 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Apr 2015 17:04:59 +0200
Subject: [PATCH 182/600] Add sanitizers.  See :ref:`sanitizers` and
 :mod:`kotti.sanitizers` for details.

---
 CHANGES.txt                    |   6 ++
 kotti/__init__.py              |  11 +++
 kotti/sanitizers.py            | 158 +++++++++++++++++++++++++++++++++
 kotti/tests/test_sanitizers.py | 127 ++++++++++++++++++++++++++
 kotti/views/util.py            |  25 ++++--
 5 files changed, 322 insertions(+), 5 deletions(-)
 create mode 100644 kotti/sanitizers.py
 create mode 100644 kotti/tests/test_sanitizers.py

diff --git a/CHANGES.txt b/CHANGES.txt
index ec367a7fc..50cce29e8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,12 @@
 Change History
 ==============
 
+1.1.0-alpha.2 - unreleased
+--------------------------
+
+- Add sanitizers.  See :ref:`sanitizers` and :mod:`kotti.sanitizers` for
+  details.
+
 1.1.0-alpha.1 - 2015-03-19
 --------------------------
 
diff --git a/kotti/__init__.py b/kotti/__init__.py
index 47641e7be..ba28ad319 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -61,6 +61,7 @@ def none_factory(**kwargs):  # pragma: no cover
         'kotti',
         'kotti.filedepot',
         'kotti.events',
+        'kotti.sanitizers',
         'kotti.views',
         'kotti.views.cache',
         'kotti.views.view',
@@ -112,6 +113,16 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.register.group': '',
     'kotti.register.role': '',
     'pyramid_deform.template_search_path': 'kotti:templates/deform',
+    'kotti.sanitizers': ' '.join([
+        'xss_protection:kotti.sanitizers.xss_protection',
+        'minimal_html:kotti.sanitizers.minimal_html',
+        'no_html:kotti.sanitizers.no_html',
+        ]),
+    'kotti.sanitize_on_write': ' '.join([
+        'kotti.resources.Document.body:xss_protection',
+        'kotti.resources.Content.title:no_html',
+        'kotti.resources.Content.description:no_html',
+        ]),
     }
 
 conf_dotted = set([
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
new file mode 100644
index 000000000..896219b0c
--- /dev/null
+++ b/kotti/sanitizers.py
@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+
+"""
+For a high level introduction and available configuration options
+see :ref:`sanitizers`.
+"""
+
+from bleach import clean
+from bleach_whitelist import all_styles
+from bleach_whitelist import generally_xss_safe
+from bleach_whitelist import markdown_attrs
+from bleach_whitelist import markdown_tags
+from bleach_whitelist import print_attrs
+from bleach_whitelist import print_tags
+from pyramid.util import DottedNameResolver
+
+from kotti import get_settings
+from kotti.events import objectevent_listeners
+from kotti.events import ObjectInsert
+from kotti.events import ObjectUpdate
+
+
+def sanitize(html, sanitizer):
+    """ Sanitize HTML
+
+    :param html: HTML to be sanitized
+    :type html: basestring
+
+    :param sanitizer: name of the sanitizer to use
+    :type sanitizer: str
+
+    :result: sanitized HTML
+    :rtype: unicode
+    """
+
+    sanitized = get_settings()['kotti.sanitizers'][sanitizer](html)
+
+    return sanitized
+
+
+def xss_protection(html):
+    """ Sanitizer that removes tags that are not considered XSS safe.  See
+    ``bleach_whitelist.generally_xss_unsafe`` for a complete list of tags that
+    are removed.  Attributes and styles are left untouched.
+
+    :param html: HTML to be sanitized
+    :type html: basestring
+
+    :result: sanitized HTML
+    :rtype: unicode
+    """
+
+    sanitized = clean(
+        html,
+        tags=generally_xss_safe,
+        attributes=lambda self, key, value: True,
+        styles=all_styles,
+        strip=True,
+        strip_comments=True)
+
+    return sanitized
+
+
+def minimal_html(html):
+    """ Sanitizer that only leaves a basic set of tags and attributes.  See
+    ``bleach_whitelist.markdown_tags``, ``bleach_whitelist.print_tags``,
+    ``bleach_whitelist.markdown_attrs``, ``bleach_whitelist.print_attrs`` for a
+    complete list of tags and attributes that are allowed.  All styles are
+    completely removed.
+
+    :param html: HTML to be sanitized
+    :type html: basestring
+
+    :result: sanitized HTML
+    :rtype: unicode
+    """
+
+    attributes = dict(zip(
+        markdown_attrs.keys() + print_attrs.keys(),
+        markdown_attrs.values() + print_attrs.values()))
+
+    sanitized = clean(
+        html,
+        tags=markdown_tags + print_tags,
+        attributes=attributes,
+        styles=[],
+        strip=True,
+        strip_comments=True)
+
+    return sanitized
+
+
+def no_html(html):
+    """ Sanitizer that removes **all** tags.
+
+    :param html: HTML to be sanitized
+    :type html: basestring
+
+    :result: plain text
+    :rtype: unicode
+    """
+
+    sanitized = clean(
+        html,
+        tags=[],
+        attributes={},
+        styles=[],
+        strip=True,
+        strip_comments=True)
+
+    return sanitized
+
+
+def _setup_sanitizers(settings):
+
+    # step 1: resolve sanitizer functions and make ``kotti.sanitizers`` a
+    # dictionary containing resolved functions
+
+    if not isinstance(settings['kotti.sanitizers'], basestring):
+        return
+
+    sanitizers = {}
+
+    for s in settings['kotti.sanitizers'].split():
+        name, dottedname = s.split(':')
+        sanitizers[name.strip()] = DottedNameResolver(None).resolve(dottedname)
+
+    settings['kotti.sanitizers'] = sanitizers
+
+
+def _setup_listeners(settings):
+
+    # step 2: setup listeners
+
+    for s in settings['kotti.sanitize_on_write'].split():
+        dotted, sanitizers = s.split(':')
+
+        classname, attributename = dotted.rsplit('.', 1)
+        _class = DottedNameResolver(None).resolve(classname)
+
+        def _create_handler(attributename, sanitizers):
+            def handler(event):
+                value = getattr(event.object, attributename)
+                for sanitizer_name in sanitizers.split(','):
+                    value = settings['kotti.sanitizers'][sanitizer_name](value)
+                setattr(event.object, attributename, value)
+            return handler
+
+        objectevent_listeners[(ObjectInsert, _class)].append(
+            _create_handler(attributename, sanitizers))
+        objectevent_listeners[(ObjectUpdate, _class)].append(
+            _create_handler(attributename, sanitizers))
+
+
+def includeme(config):
+
+    _setup_sanitizers(config.registry.settings)
+    _setup_listeners(config.registry.settings)
diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
new file mode 100644
index 000000000..fb0e5f414
--- /dev/null
+++ b/kotti/tests/test_sanitizers.py
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+
+unsanitized = u'''
+<h1>Title</h1>
+<div class="teaser umlaut">Descrüptiön</div>
+<p>
+  Paragraph with
+  <a href="internal.html" target="_blank">internal</a> and
+  <a href="http://external.com/" target="_blank">external</a> links.
+</p>
+<marquee>Fancy marquee!</marquee>
+<b SIZE=17 style="color: red">IMPORTANT!</b>
+<script>
+  alert('XSS!')
+</script>
+<p>Unclosed paragraph
+'''
+
+
+def _verify_no_html(sanitized):
+    assert u'<' not in sanitized
+    assert u'external links' in sanitized
+
+
+def test_no_html():
+
+    from kotti.sanitizers import no_html
+
+    _verify_no_html(no_html(unsanitized))
+
+
+def _verify_minimal_html(sanitized):
+
+    from bleach_whitelist import all_tags
+    from bleach_whitelist import markdown_tags
+    from bleach_whitelist import print_tags
+
+    for tag in set(all_tags) - set(markdown_tags) - set(print_tags):
+        assert u'<{}'.format(tag) not in sanitized
+
+    assert u'style=""' in sanitized
+    assert u'<a href="http://external.com/">' in sanitized
+    assert u'size' not in sanitized.lower()
+
+
+def test_minmal_html():
+
+    from kotti.sanitizers import minimal_html
+
+    _verify_minimal_html(minimal_html(unsanitized))
+
+
+def _verify_xss_protection(sanitized):
+
+    assert u'<script>' not in sanitized
+    assert u'<h1>Title</h1>' in sanitized
+    assert u'<a href="internal.html" target="_blank">internal</a>' in sanitized
+    assert u'b size="17"' in sanitized
+    assert u'<p>Unclosed paragraph\n</p>' in sanitized
+
+
+def test_xss_protection():
+
+    from kotti.sanitizers import xss_protection
+
+    _verify_xss_protection(xss_protection(unsanitized))
+
+
+def test_default_config(unresolved_settings):
+
+    assert u'kotti.sanitizers' in unresolved_settings
+    assert u'kotti.sanitize_on_write' in unresolved_settings
+
+    assert unresolved_settings[u'kotti.sanitizers'] == u'xss_protection:kotti.sanitizers.xss_protection minimal_html:kotti.sanitizers.minimal_html no_html:kotti.sanitizers.no_html'  # noqa
+    assert unresolved_settings[u'kotti.sanitize_on_write'] == u'kotti.resources.Document.body:xss_protection kotti.resources.Content.title:no_html kotti.resources.Content.description:no_html'  # noqa
+
+
+def test_setup_sanitizers(unresolved_settings):
+    from kotti.sanitizers import _setup_sanitizers
+    from kotti.sanitizers import minimal_html
+    from kotti.sanitizers import no_html
+    from kotti.sanitizers import xss_protection
+
+    _setup_sanitizers(unresolved_settings)
+
+    settings = unresolved_settings[u'kotti.sanitizers']
+
+    assert u'minimal_html' in settings
+    assert u'no_html' in settings
+    assert u'xss_protection' in settings
+
+    assert settings[u'minimal_html'] == minimal_html
+    assert settings[u'no_html'] == no_html
+    assert settings[u'xss_protection'] == xss_protection
+
+
+def test_listeners(app, root, db_session):
+
+    from kotti.resources import Document
+
+    root[u'd'] = doc = Document(
+        name=u'test',
+        title=u'<h1>Title</h1>',
+        description=unsanitized,
+        body=unsanitized)
+
+    db_session.flush()
+
+    assert doc.title == u'Title'
+    _verify_no_html(doc.description)
+    _verify_xss_protection(doc.body)
+
+
+def test_sanitize(app, dummy_request):
+
+    from kotti.sanitizers import sanitize
+    from kotti.resources import Document
+    from kotti.views.util import TemplateAPI
+
+    _verify_no_html(sanitize(unsanitized, 'no_html'))
+    _verify_minimal_html(sanitize(unsanitized, 'minimal_html'))
+    _verify_xss_protection(sanitize(unsanitized, 'xss_protection'))
+
+    api = TemplateAPI(Document(), dummy_request)
+    _verify_no_html(api.sanitize(unsanitized, 'no_html'))
+    _verify_minimal_html(api.sanitize(unsanitized, 'minimal_html'))
+    _verify_xss_protection(api.sanitize(unsanitized, 'xss_protection'))
diff --git a/kotti/views/util.py b/kotti/views/util.py
index f7f454cba..661f1b7bc 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -28,6 +28,7 @@
 from kotti.resources import Document
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
+from kotti.sanitizers import sanitize
 from kotti.security import has_permission
 from kotti.security import view_permitted
 from kotti.util import render_view
@@ -109,14 +110,13 @@ def __getattr__(self, name):
 
 
 class TemplateAPI(object):
-    """This implements the 'api' object that's passed to all
-    templates.
+    """This implements the ``api`` object that's passed to all templates.
 
-    Use dict-access as a shortcut to retrieve template macros from
-    templates.
+    Use dict-access as a shortcut to retrieve template macros from templates.
     """
+
     # Instead of overriding these, consider using the
-    # 'kotti.overrides' variable.
+    # ``kotti.overrides`` variable.
     BARE_MASTER = 'kotti:templates/master-bare.pt'
     VIEW_MASTER = 'kotti:templates/view/master.pt'
     EDIT_MASTER = 'kotti:templates/edit/master.pt'
@@ -345,6 +345,21 @@ def site_setup_links(self):
         return [l for l in CONTROL_PANEL_LINKS
                 if l.visible(self.root, self.request)]
 
+    def sanitize(self, html, sanitizer='default'):
+        """ Convenience wrapper for :func:`kotti.sanitizers.sanitize`.
+
+        :param html: HTML to be sanitized
+        :type html: unicode
+
+        :param sanitizer: name of the sanitizer to use.
+        :type sanitizer: str
+
+        :result: sanitized HTML
+        :rtype: unicode
+        """
+
+        return sanitize(html, sanitizer)
+
 
 class NodesTree(object):
     def __init__(self, node, request, item_mapping, item_to_children,

From 4fa93dc265787e597c97bad5000160951aa1f07b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Apr 2015 17:08:43 +0200
Subject: [PATCH 183/600] Move changelog entry to right position.

---
 CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 50cce29e8..1ade6c2c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,8 +4,10 @@ Change History
 1.1.0-alpha.2 - unreleased
 --------------------------
 
+- Add ``target`` option to ``kotti.util.Link``. See #405.
+
 - Add sanitizers.  See :ref:`sanitizers` and :mod:`kotti.sanitizers` for
-  details.
+  details.  This fixes #296.
 
 1.1.0-alpha.1 - 2015-03-19
 --------------------------
@@ -60,8 +62,6 @@ Change History
 - Change ``height`` property on ``body``'s widget (``RichTextField``) for
   improved usability. See #403.
 
-- Add ``target`` option to ``kotti.util.Link``. See #405.
-
 1.0.0 - 2015-01-20
 ------------------
 

From 116e2786abf1a83e324a3e7fbf49ff204dc8dcd7 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Apr 2015 17:12:49 +0200
Subject: [PATCH 184/600] Remove erroneous whitespaces from docs.

---
 docs/developing/advanced/sanitizers.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/developing/advanced/sanitizers.rst b/docs/developing/advanced/sanitizers.rst
index c549bb8d0..f20ada093 100644
--- a/docs/developing/advanced/sanitizers.rst
+++ b/docs/developing/advanced/sanitizers.rst
@@ -13,9 +13,9 @@ This setting takes a list of strings, with each specifying a ``name:callable`` p
 The default configuration is::
 
   kotti.sanitizers =
-      xss_protection: kotti.sanitizers.xss_protection
-      minimal_html: kotti.sanitizers.minimal_html
-      no_html: kotti.sanitizers.no_html
+      xss_protection:kotti.sanitizers.xss_protection
+      minimal_html:kotti.sanitizers.minimal_html
+      no_html:kotti.sanitizers.no_html
 
 For thorough explaination of the included sanitizers see :mod:`kotti.sanitizers`.
 
@@ -50,13 +50,13 @@ This means that *any* write access to configured attributes through your applica
 The default configuration is::
 
   kotti.sanitize_on_write =
-      kotti.resources.Document.body: xss_protection
-      kotti.resources.Content.title: no_html
+      kotti.resources.Document.body:xss_protection
+      kotti.resources.Content.title:no_html
 
 You can also use multiple sanitizers::
 
   kotti.sanitize_on_write =
-      kotti.resources.Document.body: xss_protection, some_other_sanitizer
+      kotti.resources.Document.body:xss_protection,some_other_sanitizer
 
 Implementing a custom sanitizer
 -------------------------------

From 8a38d52e3abb8cef13822e670cac86b2a0d4b40b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Apr 2015 17:42:54 +0200
Subject: [PATCH 185/600] Fix test for Python 2.6.

---
 kotti/tests/test_sanitizers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
index fb0e5f414..26386dad5 100644
--- a/kotti/tests/test_sanitizers.py
+++ b/kotti/tests/test_sanitizers.py
@@ -36,7 +36,7 @@ def _verify_minimal_html(sanitized):
     from bleach_whitelist import print_tags
 
     for tag in set(all_tags) - set(markdown_tags) - set(print_tags):
-        assert u'<{}'.format(tag) not in sanitized
+        assert u'<{0}'.format(tag) not in sanitized
 
     assert u'style=""' in sanitized
     assert u'<a href="http://external.com/">' in sanitized

From 3ffd624bf590d694c3ce6c582d7bb965aab9880c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Apr 2015 20:57:20 +0200
Subject: [PATCH 186/600] Upgrade Pillow, pytz and zope.sqlalchemy to their
 respective latest version.

---
 kotti/scaffolds/package/requirements.txt | 6 +++---
 requirements.txt                         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index b7dc53970..8cf4d647e 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -7,7 +7,7 @@ FormEncode==1.3.0
 Mako==1.0.1
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==2.7.0
+Pillow==2.8.1
 Pygments==2.0.2
 SQLAlchemy==0.9.9
 Unidecode==0.04.17
@@ -52,7 +52,7 @@ pyramid_mailer==0.14
 pyramid_mako==1.0.2
 pyramid_tm==0.11
 pyramid_zcml==1.0.0
-pytz==2014.10
+pytz==2015.2
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
@@ -73,4 +73,4 @@ zope.event==4.0.3
 zope.i18nmessageid==4.0.3
 zope.interface==4.1.2
 zope.schema==4.4.2
-zope.sqlalchemy==0.7.5
+zope.sqlalchemy==0.7.6
diff --git a/requirements.txt b/requirements.txt
index b7dc53970..8cf4d647e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ FormEncode==1.3.0
 Mako==1.0.1
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==2.7.0
+Pillow==2.8.1
 Pygments==2.0.2
 SQLAlchemy==0.9.9
 Unidecode==0.04.17
@@ -52,7 +52,7 @@ pyramid_mailer==0.14
 pyramid_mako==1.0.2
 pyramid_tm==0.11
 pyramid_zcml==1.0.0
-pytz==2014.10
+pytz==2015.2
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
@@ -73,4 +73,4 @@ zope.event==4.0.3
 zope.i18nmessageid==4.0.3
 zope.interface==4.1.2
 zope.schema==4.4.2
-zope.sqlalchemy==0.7.5
+zope.sqlalchemy==0.7.6

From 01111a143634c77062536de4d8217fc8ac2b2b78 Mon Sep 17 00:00:00 2001
From: majortom64 <majortom64@users.noreply.github.com>
Date: Wed, 8 Apr 2015 02:43:02 -0500
Subject: [PATCH 187/600] Update and rename close-for-anonymous.rst to
 close-to-anonymous.rst

Minor style change. Use the more common English Syntax.
---
 .../{close-for-anonymous.rst => close-to-anonymous.rst}       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename docs/developing/advanced/{close-for-anonymous.rst => close-to-anonymous.rst} (92%)

diff --git a/docs/developing/advanced/close-for-anonymous.rst b/docs/developing/advanced/close-to-anonymous.rst
similarity index 92%
rename from docs/developing/advanced/close-for-anonymous.rst
rename to docs/developing/advanced/close-to-anonymous.rst
index bd91f79f7..854f5682b 100644
--- a/docs/developing/advanced/close-for-anonymous.rst
+++ b/docs/developing/advanced/close-to-anonymous.rst
@@ -1,6 +1,6 @@
-.. _close-for-anonymous:
+.. _close-to-anonymous:
 
-Close your site for anonymous users
+Close your site to anonymous users
 ===================================
 
 This recipe describes how to configure Kotti to require users to log

From d051753e3b7047846d1851d10a20911854e6645e Mon Sep 17 00:00:00 2001
From: majortom64 <majortom64@users.noreply.github.com>
Date: Wed, 8 Apr 2015 02:49:23 -0500
Subject: [PATCH 188/600] Update index.rst

Harmonize with close-to-anonymous file name change.
---
 docs/developing/advanced/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/advanced/index.rst b/docs/developing/advanced/index.rst
index 9d1f5686b..4236a591f 100644
--- a/docs/developing/advanced/index.rst
+++ b/docs/developing/advanced/index.rst
@@ -7,7 +7,7 @@ Advanced Topics
     :maxdepth: 1
 
     as-a-library
-    close-for-anonymous
+    close-to-anonymous
     default-views
     events
     frontpage-different-template

From 44a6c7a7ad5d234cefe1f43893f2dc04916ef75a Mon Sep 17 00:00:00 2001
From: cruxlog <afd8856@gmail.com>
Date: Wed, 8 Apr 2015 12:19:30 +0300
Subject: [PATCH 189/600] Fix wording in sanitizers.rst

Maybe this works better
---
 docs/developing/advanced/sanitizers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/advanced/sanitizers.rst b/docs/developing/advanced/sanitizers.rst
index f20ada093..a14b4117f 100644
--- a/docs/developing/advanced/sanitizers.rst
+++ b/docs/developing/advanced/sanitizers.rst
@@ -37,7 +37,7 @@ Sanitize on write (implicit sanitization)
 -----------------------------------------
 
 The second setting related to sanitization is ``kotti.sanitize_on_write``.
-It defines *what* is filtered *how* when values are assigned to object attributes.
+It defines, for the specified resource classes, the attributes that are sanitized and the sanitizers that will be used when the attributes are mutated and flushed.
 
 This setting takes a list of ``dotted_path:sanitizer_name(s)`` pairs.
 ``dotted_path`` is a dotted path to a resource class attribute that will be sanitized implicitly with the respective sanitizer(s) upon write access.

From fba3440e9f69a73c9461e5a8f87ef47315a947b4 Mon Sep 17 00:00:00 2001
From: cruxlog <afd8856@gmail.com>
Date: Wed, 8 Apr 2015 12:23:21 +0300
Subject: [PATCH 190/600] Speed up Kotti startup

I've noticed this when opening pshell with an sqlite database, by querying for Node with a bigger set of data, it's quite slow. This will speed it up.
---
 kotti/populate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/populate.py b/kotti/populate.py
index a8807698e..a1919d7ad 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -42,7 +42,7 @@ def populate():
     lrm.locale_name = get_settings()['pyramid.default_locale_name']
     localizer = lrm.localizer
 
-    if DBSession.query(Node).count() == 0:
+    if DBSession.query(Node.id).count() == 0:
         localized_root_attrs = dict(
             [(k, localizer.translate(v)) for k, v in _ROOT_ATTRS.iteritems()])
         root = Document(**localized_root_attrs)

From 28f0bd1b0015d248a862b899901cf4357d24d23e Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Fri, 10 Apr 2015 14:51:28 +0300
Subject: [PATCH 191/600] Added a test for the default_actions

---
 kotti/tests/test_util_views.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 586775d70..c0e79d3c4 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -171,6 +171,13 @@ def permitted(self, context, request):
         api = self.make()
         assert api.edit_links == [open_link]
 
+    def test_default_actions(self):
+        from kotti.resources import default_actions, Document
+        from kotti.util import Link
+
+        default_actions.children.append(Link('test', u'Test'))
+        assert Document().type_info.edit_links[-1].children[-1].name == 'test'
+
     def test_find_edit_view_not_permitted(self, db_session):
         with patch('kotti.views.util.view_permitted', return_value=False):
             api = self.make()

From 71fd63547ba50b2fb9699eb4699f6a040d480d35 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu@pixelblaster.ro>
Date: Fri, 10 Apr 2015 14:58:28 +0300
Subject: [PATCH 192/600] Added changelog entry about default_actions

---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1ade6c2c9..c9d1f98e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,11 @@ Change History
 1.1.0-alpha.2 - unreleased
 --------------------------
 
+- Separate the default actions to a ``kotti.resources.default_actions``
+  variable, to allows easier customization of default actions of all
+  content types. This is a ``LinkParent``, you can append new
+  ``kotti.util.Link`` objects to its ``children``.
+
 - Add ``target`` option to ``kotti.util.Link``. See #405.
 
 - Add sanitizers.  See :ref:`sanitizers` and :mod:`kotti.sanitizers` for

From 45384d07e43b395836db0b8ca31036b2fe4f1b7d Mon Sep 17 00:00:00 2001
From: Cruxlog <cruxlog@pixelblaster.ro>
Date: Fri, 10 Apr 2015 16:32:21 +0300
Subject: [PATCH 193/600] Added document on how to add links to the Kotti
 interface

---
 .../advanced/add-to-edit-interface.rst        | 72 +++++++++++++++++++
 docs/developing/advanced/index.rst            |  1 +
 2 files changed, 73 insertions(+)
 create mode 100644 docs/developing/advanced/add-to-edit-interface.rst

diff --git a/docs/developing/advanced/add-to-edit-interface.rst b/docs/developing/advanced/add-to-edit-interface.rst
new file mode 100644
index 000000000..e4eaf28be
--- /dev/null
+++ b/docs/developing/advanced/add-to-edit-interface.rst
@@ -0,0 +1,72 @@
+.. _add-to-edit-interface:
+
+Adding links and actions to the edit interface
+==============================================
+
+This document covers how to customize the available links and actions of the edit interface (the extra tabs and menus that appear after you log in).
+
+The basic building block is the link, ``kotti.util.Link``. Instantiate it as:
+
+.. code-block:: python
+
+    link = Link('name', _(u'Title'))
+
+The name refers to a view name available on the context.
+
+There's also:
+
+    * ``kotti.util.LinkParent``, which allows grouping of links
+    * ``kotti.util.LinkRenderer``, which, instead of generating a simple link, allows you to customize how it's rendered (you can insert anything there, even another submenu based on a ``LinkParent``).
+    * ``kotti.util.ActionButton``, very similar to a simple link, but generates a button instead.
+
+Adding a new option to the Administration menu
+----------------------------------------------
+
+Adding a new link as an option in the *Administration* menu, in the **Site Setup** section is easy. In your ``kotti_configure`` function, add:
+
+.. code-block:: python
+
+    from kotti.util import Link
+    from kotti.views.site_setup import CONTROL_PANEL_LINKS
+
+    def kotti_configure(settings):
+        link = Link('name', _(u'Title'))
+        CONTROL_PANEL_LINKS.append(link)
+
+Make a new section in the actions menu
+--------------------------------------
+The **Set default view** section looks really nice. To add your own separated section in the *Action* menu and make that available to all content types:
+
+.. code-block:: python
+
+    from kotti.util import LinkRenderer
+    from kotti.resources import default_actions
+
+    def kotti_configure(settings):
+        default_actions.children.append(LinkRenderer("my-custom-submenu"))
+
+So far we've added a ``LinkRenderer`` to the ``default_actions`` which are used by all content inheriting ``Content``. This LinkRenderer will render a view and insert its result in the menu.
+
+.. code-block:: python
+
+    @view_config(
+        name="my-custom-submenu", permission="edit",
+        renderer="mypackage:templates/edit/my-custom-submenu.pt")
+    def my_custom_submenu(context, request):
+        return {}
+
+And the template:
+
+.. code-block:: html
+
+    <tal:menu i18n:domain="mypackage">
+        <li class="divider"></li>
+        <li role="presentation" class="dropdown-header" i18n:translate="">
+            My own actions
+        </li>
+        <li>
+            <a i18n:translate="" href="${request.resource_url(context, 'someview')}">
+                View title here
+            </a>
+        </li>
+    </tal:menu
diff --git a/docs/developing/advanced/index.rst b/docs/developing/advanced/index.rst
index 4236a591f..c45af45b2 100644
--- a/docs/developing/advanced/index.rst
+++ b/docs/developing/advanced/index.rst
@@ -9,6 +9,7 @@ Advanced Topics
     as-a-library
     close-to-anonymous
     default-views
+    add-to-edit-interface
     events
     frontpage-different-template
     images

From da8ddf759f753c454bcfd5d1bab58e4f32a92869 Mon Sep 17 00:00:00 2001
From: Cruxlog <cruxlog@pixelblaster.ro>
Date: Fri, 10 Apr 2015 16:44:13 +0300
Subject: [PATCH 194/600] Use default_actions as list, not as LinkParent

---
 docs/developing/advanced/add-to-edit-interface.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/advanced/add-to-edit-interface.rst b/docs/developing/advanced/add-to-edit-interface.rst
index e4eaf28be..e06387cb2 100644
--- a/docs/developing/advanced/add-to-edit-interface.rst
+++ b/docs/developing/advanced/add-to-edit-interface.rst
@@ -43,7 +43,7 @@ The **Set default view** section looks really nice. To add your own separated se
     from kotti.resources import default_actions
 
     def kotti_configure(settings):
-        default_actions.children.append(LinkRenderer("my-custom-submenu"))
+        default_actions.append(LinkRenderer("my-custom-submenu"))
 
 So far we've added a ``LinkRenderer`` to the ``default_actions`` which are used by all content inheriting ``Content``. This LinkRenderer will render a view and insert its result in the menu.
 

From 79bd645d438174a8c58b31a9d8e7445c7f15a7cb Mon Sep 17 00:00:00 2001
From: Cruxlog <cruxlog@pixelblaster.ro>
Date: Fri, 10 Apr 2015 16:46:13 +0300
Subject: [PATCH 195/600] Simplify default_actions, use a list instead of the
 LinkParent

---
 kotti/resources.py             | 6 +++---
 kotti/tests/test_util_views.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index d6f993ff7..bf829b45b 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -495,14 +495,14 @@ def _not_root(context, request):
     return not context is get_root()
 
 
-default_actions = LinkParent(title=_(u'Actions'), children=[
+default_actions = [
     Link('copy', title=_(u'Copy')),
     Link('cut', title=_(u'Cut'), predicate=_not_root),
     Link('paste', title=_(u'Paste'), predicate=get_paste_items),
     Link('rename', title=_(u'Rename'), predicate=_not_root),
     Link('delete', title=_(u'Delete'), predicate=_not_root),
     LinkRenderer('default-view-selector'),
-])
+]
 
 
 default_type_info = TypeInfo(
@@ -514,7 +514,7 @@ def _not_root(context, request):
         Link('contents', title=_(u'Contents')),
         Link('edit', title=_(u'Edit')),
         Link('share', title=_(u'Share')),
-        default_actions,
+        LinkParent(title=_(u'Actions'), children=default_actions),
         ],
     selectable_default_views=[
         ("folder_view", _(u"Folder view")),
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index c0e79d3c4..c67d9ee80 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -175,7 +175,7 @@ def test_default_actions(self):
         from kotti.resources import default_actions, Document
         from kotti.util import Link
 
-        default_actions.children.append(Link('test', u'Test'))
+        default_actions.append(Link('test', u'Test'))
         assert Document().type_info.edit_links[-1].children[-1].name == 'test'
 
     def test_find_edit_view_not_permitted(self, db_session):

From 2ec084f4d663b88b17906942c99b5acd4911e349 Mon Sep 17 00:00:00 2001
From: Cruxlog <cruxlog@pixelblaster.ro>
Date: Fri, 10 Apr 2015 16:48:00 +0300
Subject: [PATCH 196/600] Better highlight in add edit links documentation

---
 docs/developing/advanced/add-to-edit-interface.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developing/advanced/add-to-edit-interface.rst b/docs/developing/advanced/add-to-edit-interface.rst
index e06387cb2..0a126060a 100644
--- a/docs/developing/advanced/add-to-edit-interface.rst
+++ b/docs/developing/advanced/add-to-edit-interface.rst
@@ -22,7 +22,7 @@ There's also:
 Adding a new option to the Administration menu
 ----------------------------------------------
 
-Adding a new link as an option in the *Administration* menu, in the **Site Setup** section is easy. In your ``kotti_configure`` function, add:
+Adding a new link as an option in the **Administration** menu, in the *Site Setup* section is easy. In your ``kotti_configure`` function, add:
 
 .. code-block:: python
 
@@ -35,7 +35,7 @@ Adding a new link as an option in the *Administration* menu, in the **Site Setup
 
 Make a new section in the actions menu
 --------------------------------------
-The **Set default view** section looks really nice. To add your own separated section in the *Action* menu and make that available to all content types:
+The *Set default view* section looks really nice. To add your own separated section in the **Action** menu and make that available to all content types:
 
 .. code-block:: python
 

From 6d846a4544da96bea9f6493e1d2dd32c07168fc3 Mon Sep 17 00:00:00 2001
From: cruxlog <afd8856@gmail.com>
Date: Thu, 16 Apr 2015 10:52:15 +0300
Subject: [PATCH 197/600] Changelog entry on default actions and new doc

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1ade6c2c9..80688981c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,15 @@ Change History
 
 - Add sanitizers.  See :ref:`sanitizers` and :mod:`kotti.sanitizers` for
   details.  This fixes #296.
+  
+- Added new document on how to customize the edit interface. 
+  See :ref:`add-to-edit-interface`.
+  
+- Make it easier to customize default actions by separating them to a new 
+  ``kotti.resources.default_actions`` variable. Before, to customize them, you'd
+  have to change ``Content.type_info.edit_links[3].children``, now you can mutate
+  ``default_actions`` directly. See :ref:`add-to-edit-interface` for details.
+  
 
 1.1.0-alpha.1 - 2015-03-19
 --------------------------

From f63c39f879aaf398702c2bb265b9b8e65eff2eae Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 14:03:59 +0200
Subject: [PATCH 198/600] Upgrade ``WebOb``, ``html2text``, ``pyramid`` and
 ``xlwt`` to their latest stable versions.

---
 CHANGES.txt                              | 12 +++++++-----
 kotti/scaffolds/package/requirements.txt |  8 ++++----
 requirements.txt                         |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d546d6d07..a60fa2e27 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,15 +13,17 @@ Change History
 
 - Add sanitizers.  See :ref:`sanitizers` and :mod:`kotti.sanitizers` for
   details.  This fixes #296.
-  
-- Added new document on how to customize the edit interface. 
+
+- Added new document on how to customize the edit interface.
   See :ref:`add-to-edit-interface`.
-  
-- Make it easier to customize default actions by separating them to a new 
+
+- Make it easier to customize default actions by separating them to a new
   ``kotti.resources.default_actions`` variable. Before, to customize them, you'd
   have to change ``Content.type_info.edit_links[3].children``, now you can mutate
   ``default_actions`` directly. See :ref:`add-to-edit-interface` for details.
-  
+
+- Upgrade ``WebOb``, ``html2text``, ``pyramid`` and ``xlwt`` to their latest
+  stable versions.
 
 1.1.0-alpha.1 - 2015-03-19
 --------------------------
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 8cf4d647e..72f0a19c5 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -11,7 +11,7 @@ Pillow==2.8.1
 Pygments==2.0.2
 SQLAlchemy==0.9.9
 Unidecode==0.04.17
-WebOb==1.4
+WebOb==1.4.1
 alembic==0.6.7
 argparse==1.3.0
 bleach==1.4.1
@@ -20,7 +20,7 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-html2text==2015.2.18
+html2text==2015.4.14
 js.angular==1.1.4
 js.bootstrap==3.3.1
 js.chosen==0.9.14
@@ -43,7 +43,7 @@ peppercorn==0.5
 plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
-pyramid==1.5.4
+pyramid==1.5.6
 pyramid_beaker==0.8
 pyramid_chameleon==0.3
 pyramid_debugtoolbar==2.3
@@ -65,7 +65,7 @@ venusian==1.0
 waitress==0.8.9
 wsgiref==0.1.2
 xlrd==0.9.3
-xlwt==0.7.5
+xlwt==1.0.0
 zope.component==4.2.1
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
diff --git a/requirements.txt b/requirements.txt
index 8cf4d647e..72f0a19c5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ Pillow==2.8.1
 Pygments==2.0.2
 SQLAlchemy==0.9.9
 Unidecode==0.04.17
-WebOb==1.4
+WebOb==1.4.1
 alembic==0.6.7
 argparse==1.3.0
 bleach==1.4.1
@@ -20,7 +20,7 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-html2text==2015.2.18
+html2text==2015.4.14
 js.angular==1.1.4
 js.bootstrap==3.3.1
 js.chosen==0.9.14
@@ -43,7 +43,7 @@ peppercorn==0.5
 plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
-pyramid==1.5.4
+pyramid==1.5.6
 pyramid_beaker==0.8
 pyramid_chameleon==0.3
 pyramid_debugtoolbar==2.3
@@ -65,7 +65,7 @@ venusian==1.0
 waitress==0.8.9
 wsgiref==0.1.2
 xlrd==0.9.3
-xlwt==0.7.5
+xlwt==1.0.0
 zope.component==4.2.1
 zope.configuration==4.0.3
 zope.deprecation==4.1.2

From 9b3d8b5b608a46833f18784b509368c8bb25bf4e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 14:19:22 +0200
Subject: [PATCH 199/600] Bump version.

---
 CHANGES.txt                              | 4 ++--
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a60fa2e27..d32f3286e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-1.1.0-alpha.2 - unreleased
---------------------------
+1.1.0 2015-04-16
+----------------
 
 - Separate the default actions to a ``kotti.resources.default_actions``
   variable, to allows easier customization of default actions of all
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 72f0a19c5..02cc6314a 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.0-alpha.1
+Kotti==1.1.0
 filedepot==0.0.3
 Babel==1.3
 Beaker==1.6.5.post1
diff --git a/requirements.txt b/requirements.txt
index 72f0a19c5..02cc6314a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.0-alpha.1
+Kotti==1.1.0
 filedepot==0.0.3
 Babel==1.3
 Beaker==1.6.5.post1
diff --git a/setup.py b/setup.py
index 6369ce9c8..87bd20ad1 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.0-alpha.2.dev',
+      version='1.1.0',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 084cec2b28ed8e06c762140586836597d6056d7a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 15:21:54 +0200
Subject: [PATCH 200/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d32f3286e..b697301c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1.1-dev - unreleased
+----------------------
+
+- No changes yet.
+
 1.1.0 2015-04-16
 ----------------
 
diff --git a/setup.py b/setup.py
index 87bd20ad1..49c2ee46a 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.0',
+      version='1.1.1-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From ea1df8ea88ea9d9b651e8c43bae6bd7fd44dcb03 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 15:22:24 +0200
Subject: [PATCH 201/600] Remove Sphinx references from the changelog as they
 break rendering on PyPI.

---
 CHANGES.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b697301c1..fb476eb2a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,16 +16,17 @@ Change History
 
 - Add ``target`` option to ``kotti.util.Link``. See #405.
 
-- Add sanitizers.  See :ref:`sanitizers` and :mod:`kotti.sanitizers` for
-  details.  This fixes #296.
+- Add sanitizers.  See ``docs/development/advanced/sanitizers`` and
+  ``kotti.sanitizers`` for details.  This fixes #296.
 
 - Added new document on how to customize the edit interface.
-  See :ref:`add-to-edit-interface`.
+  See ``docs/development/advanced/add-to-edit-interface``.
 
 - Make it easier to customize default actions by separating them to a new
-  ``kotti.resources.default_actions`` variable. Before, to customize them, you'd
-  have to change ``Content.type_info.edit_links[3].children``, now you can mutate
-  ``default_actions`` directly. See :ref:`add-to-edit-interface` for details.
+  ``kotti.resources.default_actions`` variable. Before, to customize them,
+  you'd have to change ``Content.type_info.edit_links[3].children``, now you
+  can mutate ``default_actions`` directly. See
+  ``docs/development/advanced/add-to-edit-interface`` for details.
 
 - Upgrade ``WebOb``, ``html2text``, ``pyramid`` and ``xlwt`` to their latest
   stable versions.

From 4691b9dda61a43c9082155a4af3925b160033abe Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 16:09:04 +0200
Subject: [PATCH 202/600] Make PEP8 even happier.

---
 kotti/populate.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/kotti/populate.py b/kotti/populate.py
index a1919d7ad..a168a9371 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -79,8 +79,8 @@ def populate():
     <div class="col-md-4">
         <h2>Configure</h2>
         <p>
-            Find out how to configure your Kotti's title and many other settings using a
-            simple text file in your file system.
+            Find out how to configure your Kotti's title and many other
+            settings using a simple text file in your file system.
         </p>
         <p>
             <a class="btn btn-info"
@@ -92,7 +92,8 @@ def populate():
     <div class="col-md-4">
         <h2>Add-ons</h2>
         <p>
-            A number of add-ons allow you to extend the functionality of your Kotti site.
+            A number of add-ons allow you to extend the functionality of your
+            Kotti site.
         </p>
         <p>
             <a class="btn btn-info"
@@ -104,8 +105,9 @@ def populate():
     <div class="col-md-4">
         <h2>Documentation</h2>
         <p>
-            Wonder what more you can do with Kotti?  What license it has?  Read the
-            manual for more information.
+            Wonder what more you can do with Kotti?
+            What license it has?
+            Read the manual for more information.
         </p>
         <p>
             <a class="btn btn-info"
@@ -119,7 +121,7 @@ def populate():
 
 _ABOUT_ATTRS = dict(
     title=_(u'About'),
-    description=_(u'Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products.'),
+    description=_(u'Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products.'),  # noqa
     body=_(u"""
 <p>
   <img alt="five colorful Extra EA300 airplanes flying in formation"
@@ -140,11 +142,11 @@ def populate():
 </address>
 
 <p><small style="font-size: smaller">
-  <em>Photo credit:</em> "Northern Lights Formation" by FlugKerl2.
-  <a href="http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg">
-  Copyright info</a>.
-  Originally published in the
-  <a href="http://en.wikipedia.org/wiki/Extra_EA-300"> Extra EA-300</a>
-  article.
+<em>Photo credit:</em> "Northern Lights Formation" by FlugKerl2.
+<a href="http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg">
+Copyright info</a>.
+Originally published in the
+<a href="http://en.wikipedia.org/wiki/Extra_EA-300"> Extra EA-300</a>
+article.
 </small></p>
 """))

From 727183f194364e663ead439ad42613d9ec99812c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 16:09:15 +0200
Subject: [PATCH 203/600] Add codeclimate badge.

---
 README.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.rst b/README.rst
index 458f17dac..734784d8e 100644
--- a/README.rst
+++ b/README.rst
@@ -97,6 +97,7 @@ Development
 |build status master|_
 |coveralls|_
 |codacy|_
+|codeclimate|_
 
 .. requirements need to be upgraded before we shoff off
    |requires.io|_
@@ -130,5 +131,8 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. _codacy: https://www.codacy.com/public/disko/Kotti
 .. _high quality coding standards: https://www.codacy.com/public/disko/Kotti
 
+.. |codeclimate| image:: https://img.shields.io/codeclimate/github/Kotti/Kotti.svg?style=flat-square
+.. _codeclimate: https://codeclimate.com/github/Kotti/Kotti
+
 .. _contribution guidelines: http://kotti.readthedocs.org/en/latest/contributing.html
 .. _Github repository: https://github.com/Kotti/Kotti

From 0f3343fab58a6c7dc1fded0419d90d33693cb799 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 16:17:12 +0200
Subject: [PATCH 204/600] Fix PEP8 issues.

---
 kotti/resources.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index bf829b45b..a6fe04acc 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -102,7 +102,7 @@ def __getitem__(self, path):
 
         # Optimization: don't query children if self._children already there:
         if '_children' in self.__dict__:
-            first, rest = path[0], path[1:]
+            rest = path[1:]
             try:
                 [child] = filter(lambda ch: ch.name == path[0], self._children)
             except ValueError:
@@ -492,7 +492,7 @@ def _tag_find_or_create(cls, title):
 
 
 def _not_root(context, request):
-    return not context is get_root()
+    return context is not get_root()
 
 
 default_actions = [
@@ -725,9 +725,9 @@ def _save_data(cls, target, value, oldvalue, initiator):
 
         if isinstance(value, bytes):
             value = _to_fieldstorage(fp=StringIO(value),
-                                    filename=target.filename,
-                                    mimetype=target.mimetype,
-                                    size=len(value))
+                                     filename=target.filename,
+                                     mimetype=target.mimetype,
+                                     size=len(value))
 
         newvalue = _SQLAMutationTracker._field_set(
             target, value, oldvalue, initiator)
@@ -785,7 +785,8 @@ def default_get_root(request=None):
             with Kotti's :func:`default populator <kotti.populate.populate>`
             this will be an instance of :class:`~kotti.resources.Document`.
     """
-    return DBSession.query(Node).filter(Node.parent_id == None).one()
+
+    return DBSession.query(Node).filter(Node.parent_id == None).one()  # noqa
 
 
 def _adjust_for_engine(engine):

From 4be0c87a632c1be98230e32c048183fb4914591d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 16:17:31 +0200
Subject: [PATCH 205/600] Remove duplicate code.

---
 kotti/resources.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index a6fe04acc..d06275a61 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -755,8 +755,6 @@ class Image(File):
         name=u'Image',
         title=_(u'Image'),
         add_view=u'add_image',
-        addable_to=[u'Document'],
-        selectable_default_views=[],
         uploadable_mimetypes=['image/*', ],
         )
 

From a51af7255cca1f49d5cc6298877d816405bcc9e3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 16 Apr 2015 16:34:39 +0200
Subject: [PATCH 206/600] More PEP8.

---
 kotti/testing.py    | 2 +-
 kotti/util.py       | 2 +-
 kotti/views/util.py | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/kotti/testing.py b/kotti/testing.py
index 41122da85..9181ecc40 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -298,7 +298,7 @@ def registerDummyMailer():
 
 
 # set up deprecation warnings
-from zope.deprecation.deprecation import deprecated
+from zope.deprecation.deprecation import deprecated  # noqa
 for item in UnitTestBase, EventTestBase, FunctionalTestBase, _initTestingDB:
     name = getattr(item, '__name__', item)
     deprecated(name, 'Unittest-style tests are deprecated as of Kotti 0.7. '
diff --git a/kotti/util.py b/kotti/util.py
index c5f295026..dbaf82122 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -109,7 +109,7 @@ def selected(self, context, request):
 
         # insert view markers @@ in last component of the path
         path = parsed.path.split('/')
-        if not '@@' in path[-1]:
+        if '@@' not in path[-1]:
             path[-1] = '@@' + path[-1]
         path = '/'.join(path)
         url = urlunparse((parsed[0], parsed[1], path, '', '', ''))
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 661f1b7bc..5a45b648f 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -452,7 +452,7 @@ def default_search_content(search_term, request=None):
 
     for results_set in [content_with_tags([searchstring]),
                         document_results.all()]:
-        [results.append(c) for c in results_set if not c in results]
+        [results.append(c) for c in results_set if c not in results]
 
     result_dicts = []
 
@@ -488,10 +488,8 @@ def search_content_for_tags(tags, request=None):
     return result_dicts
 
 
-from kotti.util import (
-    get_localizer_for_locale_name,
-    translate,
-    )
+from kotti.util import get_localizer_for_locale_name  # noqa
+from kotti.util import translate  # noqa
 
 for obj in (render_view, get_localizer_for_locale_name, translate,
             TemplateStructure):

From f53fecf20c1063230853660c8e45f88fd170341e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 20 Apr 2015 13:06:17 +0200
Subject: [PATCH 207/600] Remove xlrd and xlwt dependencies.

---
 kotti/scaffolds/package/requirements.txt | 2 --
 requirements.txt                         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 02cc6314a..51b257cca 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -64,8 +64,6 @@ usersettings==1.0.7
 venusian==1.0
 waitress==0.8.9
 wsgiref==0.1.2
-xlrd==0.9.3
-xlwt==1.0.0
 zope.component==4.2.1
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
diff --git a/requirements.txt b/requirements.txt
index 02cc6314a..51b257cca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -64,8 +64,6 @@ usersettings==1.0.7
 venusian==1.0
 waitress==0.8.9
 wsgiref==0.1.2
-xlrd==0.9.3
-xlwt==1.0.0
 zope.component==4.2.1
 zope.configuration==4.0.3
 zope.deprecation==4.1.2

From 75584d8e08adf3bd9acc7174bbd65bc314039969 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 21 Apr 2015 09:28:49 +0200
Subject: [PATCH 208/600] Upgrade js.bootstrap to 3.3.2.

---
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 51b257cca..5bc165657 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -22,7 +22,7 @@ docopt==0.6.2
 fanstatic==1.0a5
 html2text==2015.4.14
 js.angular==1.1.4
-js.bootstrap==3.3.1
+js.bootstrap==3.3.2
 js.chosen==0.9.14
 js.deform==2.0a2-3
 js.fineuploader==3.3.0
diff --git a/requirements.txt b/requirements.txt
index 51b257cca..5bc165657 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,7 @@ docopt==0.6.2
 fanstatic==1.0a5
 html2text==2015.4.14
 js.angular==1.1.4
-js.bootstrap==3.3.1
+js.bootstrap==3.3.2
 js.chosen==0.9.14
 js.deform==2.0a2-3
 js.fineuploader==3.3.0
diff --git a/setup.py b/setup.py
index 49c2ee46a..863a33e81 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
     'formencode',
     'html2text',
     'js.angular',
-    'js.bootstrap>=2.1.5',
+    'js.bootstrap>=3.0.0',
     'js.deform>=2.0a2-2',
     'js.fineuploader',
     'js.html5shiv',

From a1748328c3b694d03a279ff9ae571c4aaa0ec2a5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 21 Apr 2015 10:52:51 +0200
Subject: [PATCH 209/600] Pinned missing requirements that are installed when
 running ``python setup.py [develop|install]``.  Also normalized package names
 to match the output of pip freeze.

---
 requirements.txt | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 5bc165657..507be3ae8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 Kotti==1.1.0
-filedepot==0.0.3
 Babel==1.3
-Beaker==1.6.5.post1
+Beaker==1.7.0dev
 Chameleon==2.22
 FormEncode==1.3.0
 Mako==1.0.1
@@ -13,51 +12,56 @@ SQLAlchemy==0.9.9
 Unidecode==0.04.17
 WebOb==1.4.1
 alembic==0.6.7
-argparse==1.3.0
+appdirs==1.4.0
 bleach==1.4.1
 bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
+filedepot==0.0.3
 html2text==2015.4.14
+html5lib==1.0b3
+iso8601==0.1.10
 js.angular==1.1.4
 js.bootstrap==3.3.2
-js.chosen==0.9.14
 js.deform==2.0a2-3
 js.fineuploader==3.3.0
 js.html5shiv==3.6.2-1
 js.jquery==1.9.1
-js.jquery_form==3.09
-js.jquery_maskedinput==1.3.1
-js.jquery_maskmoney==1.4.1
-js.jquery_sortable==0.9.12
-js.jquery_tablednd==0.4
-js.jquery_timepicker_addon==1.3-1
+js.jquery-form==3.09
+js.jquery-maskedinput==1.3.1
+js.jquery-maskmoney==1.4.1
+js.jquery-sortable==0.9.12
+js.jquery-tablednd==0.4
+js.jquery-timepicker-addon==1.3-1
 js.jqueryui==1.10.3
-js.jqueryui_tagit==2.0.24-2
+js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
-kotti_tinymce==0.5.1
+js.select2==3.4.1
+js.tinymce==4.1.5
+kotti-tinymce==0.5.1
 lingua==3.9
 peppercorn==0.5
 plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
 pyramid==1.5.6
-pyramid_beaker==0.8
-pyramid_chameleon==0.3
-pyramid_debugtoolbar==2.3
-pyramid_deform==0.2
-pyramid_mailer==0.14
-pyramid_mako==1.0.2
-pyramid_tm==0.11
-pyramid_zcml==1.0.0
+pyramid-beaker==0.8
+pyramid-chameleon==0.3
+pyramid-debugtoolbar==2.3
+pyramid-deform==0.2
+pyramid-mailer==0.14
+pyramid-mako==1.0.2
+pyramid-tm==0.11
+pyramid-zcml==1.0.0
 pytz==2015.2
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
-repoze.zcml==0.4
+repoze.zcml==1.0b1
 shutilwhich==1.0.1
+six==1.9.0
 transaction==1.4.3
 translationstring==1.3
 usersettings==1.0.7

From bfbc98923afe86d87d99cc65655be39b94718dc5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 21 Apr 2015 11:11:03 +0200
Subject: [PATCH 210/600] Also update the scaffold's requirements.

---
 kotti/scaffolds/package/requirements.txt | 46 +++++++++++++-----------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 5bc165657..507be3ae8 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,7 +1,6 @@
 Kotti==1.1.0
-filedepot==0.0.3
 Babel==1.3
-Beaker==1.6.5.post1
+Beaker==1.7.0dev
 Chameleon==2.22
 FormEncode==1.3.0
 Mako==1.0.1
@@ -13,51 +12,56 @@ SQLAlchemy==0.9.9
 Unidecode==0.04.17
 WebOb==1.4.1
 alembic==0.6.7
-argparse==1.3.0
+appdirs==1.4.0
 bleach==1.4.1
 bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
+filedepot==0.0.3
 html2text==2015.4.14
+html5lib==1.0b3
+iso8601==0.1.10
 js.angular==1.1.4
 js.bootstrap==3.3.2
-js.chosen==0.9.14
 js.deform==2.0a2-3
 js.fineuploader==3.3.0
 js.html5shiv==3.6.2-1
 js.jquery==1.9.1
-js.jquery_form==3.09
-js.jquery_maskedinput==1.3.1
-js.jquery_maskmoney==1.4.1
-js.jquery_sortable==0.9.12
-js.jquery_tablednd==0.4
-js.jquery_timepicker_addon==1.3-1
+js.jquery-form==3.09
+js.jquery-maskedinput==1.3.1
+js.jquery-maskmoney==1.4.1
+js.jquery-sortable==0.9.12
+js.jquery-tablednd==0.4
+js.jquery-timepicker-addon==1.3-1
 js.jqueryui==1.10.3
-js.jqueryui_tagit==2.0.24-2
+js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
-kotti_tinymce==0.5.1
+js.select2==3.4.1
+js.tinymce==4.1.5
+kotti-tinymce==0.5.1
 lingua==3.9
 peppercorn==0.5
 plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
 pyramid==1.5.6
-pyramid_beaker==0.8
-pyramid_chameleon==0.3
-pyramid_debugtoolbar==2.3
-pyramid_deform==0.2
-pyramid_mailer==0.14
-pyramid_mako==1.0.2
-pyramid_tm==0.11
-pyramid_zcml==1.0.0
+pyramid-beaker==0.8
+pyramid-chameleon==0.3
+pyramid-debugtoolbar==2.3
+pyramid-deform==0.2
+pyramid-mailer==0.14
+pyramid-mako==1.0.2
+pyramid-tm==0.11
+pyramid-zcml==1.0.0
 pytz==2015.2
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
-repoze.zcml==0.4
+repoze.zcml==1.0b1
 shutilwhich==1.0.1
+six==1.9.0
 transaction==1.4.3
 translationstring==1.3
 usersettings==1.0.7

From 6ea1d42945d3eb106b24bcdfeb9556a7100c0cab Mon Sep 17 00:00:00 2001
From: Adam Forsythe-Cheasley <adam@netsight.co.uk>
Date: Thu, 23 Apr 2015 16:56:46 +0100
Subject: [PATCH 211/600] Remove the word 'anyway' from this sentence.

Including the word made the sentence a little odd to read.
---
 docs/developing/advanced/as-a-library.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/advanced/as-a-library.rst b/docs/developing/advanced/as-a-library.rst
index 65f023bf6..be1abaea7 100644
--- a/docs/developing/advanced/as-a-library.rst
+++ b/docs/developing/advanced/as-a-library.rst
@@ -7,7 +7,7 @@ Instead of taking control of your application, and delegating to your
 extension, you may use Kotti in applications where you define the
 ``main`` *entry point* yourself.
 
-You'll anyway still need to call ``kotti.base_configure`` from your
+You'll still need to call ``kotti.base_configure`` from your
 code to set up essential parts of Kotti:
 
 .. code-block:: python

From f3bbf945ae1a421e8d7651fffe85ca5cc98bb690 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Fri, 24 Apr 2015 18:42:46 +0200
Subject: [PATCH 212/600] Fix scaffold's README file. See #417

---
 CHANGES.txt                             | 2 +-
 kotti/scaffolds/package/README.rst_tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fb476eb2a..cef38bc06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.1.1-dev - unreleased
 ----------------------
 
-- No changes yet.
+- Update scaffold's README file. See #417.
 
 1.1.0 2015-04-16
 ----------------
diff --git a/kotti/scaffolds/package/README.rst_tmpl b/kotti/scaffolds/package/README.rst_tmpl
index 523912d65..572154b5c 100644
--- a/kotti/scaffolds/package/README.rst_tmpl
+++ b/kotti/scaffolds/package/README.rst_tmpl
@@ -27,7 +27,7 @@ Database upgrade
 If you are upgrading from a previous version you might have to migrate your
 database.  The migration is performed with `alembic`_ and Kotti's console script
 ``kotti-migrate``. To migrate, run
-``kotti-migrate upgrade_all --scripts={{package}}:alembic``.
+``kotti-migrate upgrade --scripts={{package}}:alembic``.
 
 For integration of alembic in your environment please refer to the
 `alembic documentation`_. If you have problems with the upgrade,

From 763ff45c54536590c844f9054aa521831cf32cfc Mon Sep 17 00:00:00 2001
From: Matt Russell <mgrbyte@users.noreply.github.com>
Date: Tue, 28 Apr 2015 14:07:05 +0100
Subject: [PATCH 213/600] Fix typo in docstring

---
 kotti/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index f7a1d17ad..0d514fd3b 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -63,7 +63,7 @@ def restore():
 def custom_settings():
     """ This is a dummy fixture meant to be overriden in add on package's
     ``conftest.py``.  It can be used to inject arbitrary settings for third
-    party test suites.  The defefault settings dictionary will be updated
+    party test suites.  The default settings dictionary will be updated
     with the dictionary returned by this fixture.
 
     This is also a good place to import your add on's ``resources`` module to

From 1eb8f41e2b5a5db597f69f968f03138db3f8d203 Mon Sep 17 00:00:00 2001
From: Adam Forsythe-Cheasley <adam@netsight.co.uk>
Date: Wed, 29 Apr 2015 12:59:35 +0100
Subject: [PATCH 214/600] A message when no search results are returned

---
 kotti/templates/view/search-results.pt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kotti/templates/view/search-results.pt b/kotti/templates/view/search-results.pt
index 3ab731144..3cb6733f0 100644
--- a/kotti/templates/view/search-results.pt
+++ b/kotti/templates/view/search-results.pt
@@ -18,6 +18,8 @@
         </dd>
       </tal:repeat>
     </dl>
+    
+    <p tal:condition="not:results">No results were found.</p>
 
   </div>
 </html>

From db2a79f4a75dfe60beada557555c1328c7013ac8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 5 May 2015 09:26:10 +0200
Subject: [PATCH 215/600] Upgrade requirements.

---
 kotti/scaffolds/package/requirements.txt | 16 ++++++++--------
 requirements.txt                         | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 507be3ae8..c7714b421 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,6 +1,6 @@
 Kotti==1.1.0
 Babel==1.3
-Beaker==1.7.0dev
+Beaker==1.7.0
 Chameleon==2.22
 FormEncode==1.3.0
 Mako==1.0.1
@@ -19,12 +19,12 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-filedepot==0.0.3
+filedepot==0.0.4
 html2text==2015.4.14
-html5lib==1.0b3
+html5lib==1.0b6
 iso8601==0.1.10
 js.angular==1.1.4
-js.bootstrap==3.3.2
+js.bootstrap==3.3.4
 js.deform==2.0a2-3
 js.fineuploader==3.3.0
 js.html5shiv==3.6.2-1
@@ -34,19 +34,19 @@ js.jquery-maskedinput==1.3.1
 js.jquery-maskmoney==1.4.1
 js.jquery-sortable==0.9.12
 js.jquery-tablednd==0.4
-js.jquery-timepicker-addon==1.3-1
+js.jquery-timepicker-addon==1.5.3
 js.jqueryui==1.10.3
 js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
 kotti-tinymce==0.5.1
-lingua==3.9
+lingua==3.10
 peppercorn==0.5
 plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
-pyramid==1.5.6
+pyramid==1.5.7
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-debugtoolbar==2.3
@@ -60,7 +60,7 @@ repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
 repoze.zcml==1.0b1
-shutilwhich==1.0.1
+shutilwhich==1.1.0
 six==1.9.0
 transaction==1.4.3
 translationstring==1.3
diff --git a/requirements.txt b/requirements.txt
index 507be3ae8..c7714b421 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 Kotti==1.1.0
 Babel==1.3
-Beaker==1.7.0dev
+Beaker==1.7.0
 Chameleon==2.22
 FormEncode==1.3.0
 Mako==1.0.1
@@ -19,12 +19,12 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-filedepot==0.0.3
+filedepot==0.0.4
 html2text==2015.4.14
-html5lib==1.0b3
+html5lib==1.0b6
 iso8601==0.1.10
 js.angular==1.1.4
-js.bootstrap==3.3.2
+js.bootstrap==3.3.4
 js.deform==2.0a2-3
 js.fineuploader==3.3.0
 js.html5shiv==3.6.2-1
@@ -34,19 +34,19 @@ js.jquery-maskedinput==1.3.1
 js.jquery-maskmoney==1.4.1
 js.jquery-sortable==0.9.12
 js.jquery-tablednd==0.4
-js.jquery-timepicker-addon==1.3-1
+js.jquery-timepicker-addon==1.5.3
 js.jqueryui==1.10.3
 js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
 kotti-tinymce==0.5.1
-lingua==3.9
+lingua==3.10
 peppercorn==0.5
 plone.scale==1.3.5
 polib==1.0.6
 py-bcrypt==0.4
-pyramid==1.5.6
+pyramid==1.5.7
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-debugtoolbar==2.3
@@ -60,7 +60,7 @@ repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
 repoze.zcml==1.0b1
-shutilwhich==1.0.1
+shutilwhich==1.1.0
 six==1.9.0
 transaction==1.4.3
 translationstring==1.3

From 9f5d0d61a1bdb26f04638f9cab63b9a5f98bd655 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 11 May 2015 16:12:54 +0200
Subject: [PATCH 216/600] Fix regression introduced in
 c7ade7bab05e53d73f8089871afe1337071c0458.  This fixes #425.

---
 kotti/static/upload.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/static/upload.js b/kotti/static/upload.js
index 0d4385485..297f14f24 100644
--- a/kotti/static/upload.js
+++ b/kotti/static/upload.js
@@ -69,10 +69,10 @@ function UploadController($scope, $http, $log) {
                 $scope.apply(function () {
                     var file = $scope.uploader.getFile(id);
                     $http.get(
-                        $scope.endpoints.contentTypes,
+                        $scope.endpoints.content_types,
                         {params: {mimetype: file.type}}
                     ).success(function (data, status, headers, config) {
-                        var contentTypes = data.contentTypes,
+                        var contentTypes = data.content_types,
                             file = {
                                 id: id,
                                 name: name,
@@ -103,7 +103,7 @@ function UploadController($scope, $http, $log) {
                 $scope.apply(function () {
                     $scope.files[id].status = 'uploading';
                     $scope.uploader.setParams({
-                        contentType: $scope.files[id].desiredType.name
+                        content_type: $scope.files[id].desiredType.name
                     }, id);
                     $scope.numFilesWaiting -= 1;
                 });

From 87026db161f7575e1096ea64109773662d3c5414 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 11 May 2015 16:34:51 +0200
Subject: [PATCH 217/600] Bump version.

---
 CHANGES.txt                              | 5 +++--
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cef38bc06..a7d753814 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,11 @@
 Change History
 ==============
 
-1.1.1-dev - unreleased
-----------------------
+1.1.1 2015-05-11
+----------------
 
 - Update scaffold's README file. See #417.
+- Fix broken multifile upload.  See #425.
 
 1.1.0 2015-04-16
 ----------------
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index c7714b421..eda165592 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.0
+Kotti==1.1.1
 Babel==1.3
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/requirements.txt b/requirements.txt
index c7714b421..eda165592 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.0
+Kotti==1.1.1
 Babel==1.3
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/setup.py b/setup.py
index 863a33e81..14f50b780 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.1-dev',
+      version='1.1.1',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From bb0c0dd9beb6a3082ef077fb32390bdaa245d87a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 11 May 2015 16:36:52 +0200
Subject: [PATCH 218/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a7d753814..70a006100 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1.2 - unreleased
+------------------
+
+- No changes yet.
+
 1.1.1 2015-05-11
 ----------------
 
diff --git a/setup.py b/setup.py
index 14f50b780..98be7b7bb 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.1',
+      version='1.1.2-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From b181db64837f20312728d6017e51a89afd3ce809 Mon Sep 17 00:00:00 2001
From: "G.Tjebbes" <g.t@majerti.fr>
Date: Mon, 11 May 2015 17:53:46 +0200
Subject: [PATCH 219/600] Fix #423 : Mysql error on adding path column

---
 .../versions/1063d7178fa_add_node_path_column.py       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
index 96ab3a3a3..0695e0339 100644
--- a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
+++ b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
@@ -16,8 +16,14 @@
 
 
 def upgrade():
-    op.add_column('nodes',
-                  sa.Column('path', sa.Unicode(1000), index=True))
+    from alembic.context import get_bind
+
+    conn = get_bind()
+    if conn.engine.dialect.name == 'mysql':
+        op.add_column('nodes', sa.Column('path', sa.Unicode(1000)))
+    else:
+        op.add_column('nodes', sa.Column('path', sa.Unicode(1000), index=True))
+
 
     from kotti import DBSession
     from kotti.resources import Node

From f89b22ef635e6db1baf2737f2b5543e3190af9ee Mon Sep 17 00:00:00 2001
From: "G.Tjebbes" <g.t@majerti.fr>
Date: Mon, 11 May 2015 17:59:06 +0200
Subject: [PATCH 220/600] Fix #424 : mysql doesn't support the || syntax

We use concat for string concatenation in case of mysql dialect
---
 .../559ce6eb0949_update_node_path_column.py        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
index ae1cd05e9..369b3f32a 100644
--- a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -14,9 +14,17 @@
 def upgrade():
 
     from kotti.resources import DBSession
-    DBSession.execute(
-        "update nodes set path = path || '/' where path not like '%/'"
-    )
+
+    from alembic.context import get_bind
+
+    conn = get_bind()
+
+    if conn.engine.dialect.name == 'mysql':
+        update = "update nodes set path = concat(path, '/') where path not \
+like '%/'"
+    else:
+        update = "update nodes set path = path || '/' where path not like '%/'"
+    DBSession.execute(update)
 
 
 def downgrade():

From 5bede0846dfda4a8a9c85db16971915c3f20d552 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 15 May 2015 12:08:54 +0200
Subject: [PATCH 221/600] Replace mutable default arguments with None.  See
 https://www.quantifiedcode.com/app/pattern/3P0qV6OB.

---
 kotti/fanstatic.py          |  5 ++++-
 kotti/message.py            |  5 ++++-
 kotti/tests/test_message.py | 10 ++++++++++
 kotti/tests/test_static.py  | 39 +++++++++++++++++++------------------
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/kotti/fanstatic.py b/kotti/fanstatic.py
index dc51b66ee..9740738fa 100644
--- a/kotti/fanstatic.py
+++ b/kotti/fanstatic.py
@@ -66,7 +66,10 @@ class NeededGroup(object):
     """A collection of fanstatic resources that supports
        dynamic appending of resources after initialization"""
 
-    def __init__(self, resources=[]):
+    def __init__(self, resources=None):
+
+        if resources is None:
+            resources = []
 
         if not isinstance(resources, list):
             raise ValueError(
diff --git a/kotti/message.py b/kotti/message.py
index d9015497a..22b822353 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -75,7 +75,7 @@ def validate_token(user, token, valid_hrs=24):
     return False
 
 
-def send_email(request, recipients, template_name, template_vars={}):
+def send_email(request, recipients, template_name, template_vars=None):
     """ General email sender.
 
     :param request: current request.
@@ -93,6 +93,9 @@ def send_email(request, recipients, template_name, template_vars={}):
     :type template_vars: dict
     """
 
+    if template_vars is None:
+        template_vars = {}
+
     text = render(template_name, template_vars, request)
     subject, htmlbody = text.strip().split('\n', 1)
     subject = subject.replace('Subject:', '', 1).strip()
diff --git a/kotti/tests/test_message.py b/kotti/tests/test_message.py
index 3a7a325bf..571276740 100644
--- a/kotti/tests/test_message.py
+++ b/kotti/tests/test_message.py
@@ -1,4 +1,7 @@
+# -*- coding: utf-8 -*-
+
 from mock import patch
+from pytest import raises
 
 from kotti.testing import Dummy
 from kotti.testing import DummyRequest
@@ -37,6 +40,13 @@ def test_send_email(self, dummy_request):
         assert [u'"John Doe" <joedoe@foo.com>'] == message.recipients
         assert 'Reset your password' in message.subject
 
+    def test_send_email_without_template_vars(self, dummy_request):
+        from kotti.message import send_email
+        with raises(NameError):
+            send_email(dummy_request,
+                       [u'"John Doe" <joedoe@foo.com>'],
+                       'kotti:templates/email-reset-password.pt')
+
 
 class TestSendSetPassword:
     def setup_method(self, method):
diff --git a/kotti/tests/test_static.py b/kotti/tests/test_static.py
index 286a29ebd..1b7bd3539 100644
--- a/kotti/tests/test_static.py
+++ b/kotti/tests/test_static.py
@@ -1,32 +1,33 @@
 from pytest import raises
 
 
-class TestStatic:
+def test_needed_group():
 
-    def test_NeededGroup(self):
+    from js.deform import deform_js
+    from kotti.fanstatic import contents_view_js
+    from kotti.fanstatic import NeededGroup
 
-        from js.deform import deform_js
-        from kotti.fanstatic import contents_view_js
-        from kotti.fanstatic import NeededGroup
+    def NeededGroupFactory(resources):
+        return NeededGroup(resources)
 
-        def NeededGroupFactory(resources):
-            return NeededGroup(resources)
+    with raises(ValueError):
+        NeededGroupFactory("foo")
+    with raises(ValueError):
+        NeededGroupFactory(["foo", "bar"])
 
-        with raises(ValueError):
-            NeededGroupFactory("foo")
-        with raises(ValueError):
-            NeededGroupFactory(["foo", "bar"])
+    needed = NeededGroup([deform_js, ])
 
-        needed = NeededGroup([deform_js, ])
+    assert needed.resources == [deform_js, ]
 
-        assert needed.resources == [deform_js, ]
+    needed.add(contents_view_js)
 
-        needed.add(contents_view_js)
+    assert needed.resources == [deform_js, contents_view_js]
 
-        assert needed.resources == [deform_js, contents_view_js]
+    def needed_group_adder(resource):
+        needed.add(resource)
 
-        def needed_group_adder(resource):
-            needed.add(resource)
+    with raises(ValueError):
+        needed_group_adder(42)
 
-        with raises(ValueError):
-            needed_group_adder(42)
+    needed = NeededGroup()
+    assert needed.resources == []

From e6f3fab3171fa4f3116db19cc946643ef516def7 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 15 May 2015 12:20:37 +0200
Subject: [PATCH 222/600] Don't assign to built-in function (code style, see
 https://www.quantifiedcode.com/app/pattern/2mnEGvCT).

---
 kotti/tests/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 0d514fd3b..7ff2312d8 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -305,15 +305,15 @@ def get(self, id):
         return f
 
     def create(self, content, filename=None, content_type=None):
-        id = max(self._storage) + 1
+        _id = max(self._storage) + 1
         filename = filename or getattr(content, 'filename', None)
         content_type = content_type or getattr(content, 'type', None)
         if not isinstance(content, str):
             content = content.file.read()
-        self._storage[id] = {'content': content,
-                             'filename': filename,
-                             'content_type': content_type}
-        return id
+        self._storage[_id] = {'content': content,
+                              'filename': filename,
+                              'content_type': content_type}
+        return _id
 
     def delete(self, id):
         del self._storage[int(id)]

From e973cbb9fc52daa94bd1b13940ec79a9afd3d1a6 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 15 May 2015 12:23:14 +0200
Subject: [PATCH 223/600] Explicitly number replacement fields in format string
 (code style, see https://www.quantifiedcode.com/app/pattern/3aSZNLMu).

---
 kotti/scaffolds/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/scaffolds/__init__.py b/kotti/scaffolds/__init__.py
index 819b379cb..0db4ea03c 100644
--- a/kotti/scaffolds/__init__.py
+++ b/kotti/scaffolds/__init__.py
@@ -40,7 +40,7 @@ def _get(self, key, caption):  # pragma: no cover
             return env
 
         s = self._settings
-        s[key] = raw_input(u'{} [{}]: '.format(caption, s[key])) or s[key]
+        s[key] = raw_input(u'{0} [{1}]: '.format(caption, s[key])) or s[key]
 
         try:
             s.save_settings()

From 4c178a2a616fff55f7c4558dfa24cc68ca52f109 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 15 May 2015 13:20:24 +0200
Subject: [PATCH 224/600] Replace old-style string formatting with ``format()``
 (code style, see https://www.quantifiedcode.com/app/pattern/4ACGxFj1).

---
 kotti/message.py                  | 27 ++++++---------------------
 kotti/resources.py                |  6 +++---
 kotti/scaffolds/__init__.py       |  8 ++++----
 kotti/security.py                 |  2 +-
 kotti/tests/test_file.py          |  2 +-
 kotti/tests/test_upload.py        | 18 +++++++++---------
 kotti/util.py                     |  4 ++--
 kotti/views/cache.py              |  2 +-
 kotti/views/edit/default_views.py |  5 +++--
 kotti/views/file.py               |  4 ++--
 kotti/views/image.py              |  7 ++++---
 kotti/views/users.py              | 16 ++++++++--------
 kotti/views/util.py               | 11 ++++++-----
 kotti/views/view.py               |  7 +++++--
 14 files changed, 55 insertions(+), 64 deletions(-)

diff --git a/kotti/message.py b/kotti/message.py
index 22b822353..270ada6e5 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -10,19 +10,6 @@
 from kotti import get_settings
 
 
-SET_PASSWORD_SUBJECT = u"Your registration for %(site_title)s"
-SET_PASSWORD_BODY = u"""Hello, %(user_title)s!
-
-You've just been invited to join %(site_title)s.  Click here to set
-your password and log in: %(url)s.
-"""
-
-RESET_PASSWORD_SUBJECT = u"Reset your password for %(site_title)s."
-RESET_PASSWORD_BODY = u"""Hello, %(user_title)s!
-
-Click this link to reset your password at %(site_title)s: %(url)s.
-"""
-
 _inject_mailer = []
 
 
@@ -37,8 +24,8 @@ def make_token(user, seconds=None):
     secret = get_settings()['kotti.secret2']
     if seconds is None:
         seconds = time.time()
-    token = '%s:%s:%s' % (user.name, secret, seconds)
-    return '%s:%s' % (hashlib.sha224(token).hexdigest(), seconds)
+    token = '{0}:{1}:{2}'.format(user.name, secret, seconds)
+    return '{0}:{1}'.format(hashlib.sha224(token).hexdigest(), seconds)
 
 
 def validate_token(user, token, valid_hrs=24):
@@ -122,14 +109,12 @@ def email_set_password(user, request,
     set_password_query = {'token': token, 'email': user.email}
     if add_query:
         set_password_query.update(add_query)
-    url = '%s/@@set-password?%s' % (
+    url = '{0}/@@set-password?{1}'.format(
         request.application_url,
-        urllib.urlencode(set_password_query),
-        )
+        urllib.urlencode(set_password_query))
     variables = dict(
         user_title=user.title,
         site_title=site_title,
-        url=url,
-        )
-    recipients = [u'"%s" <%s>' % (user.title, user.email)]  # XXX naive?
+        url=url)
+    recipients = [u'"{0}" <{1}>'.format(user.title, user.email)]  # XXX naive?
     send_email(request, recipients, template_name, variables)
diff --git a/kotti/resources.py b/kotti/resources.py
index d06275a61..2fd590860 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -285,7 +285,7 @@ def __parent__(self, value):
         self.parent = value
 
     def __repr__(self):
-        return '<%s %s at %s>' % (
+        return u'<{0} {1} at {2}>'.format(
             self.__class__.__name__, self.id, resource_path(self))
 
     def __eq__(self, other):
@@ -436,7 +436,7 @@ class Tag(Base):
     title = Column(Unicode(100), unique=True, nullable=False)
 
     def __repr__(self):
-        return "<Tag ('%s')>" % self.title
+        return u"<Tag ('{0}')>".format(self.title)
 
     @property
     def items(self):
@@ -697,7 +697,7 @@ def from_field_storage(cls, fs):
         """
 
         if not cls.type_info.is_uploadable_mimetype(fs.type):
-            raise ValueError("Unsupported MIME type: %s" % fs.type)
+            raise ValueError(u"Unsupported MIME type: {0}".format(fs.type))
 
         return cls(data=fs)
 
diff --git a/kotti/scaffolds/__init__.py b/kotti/scaffolds/__init__.py
index 0db4ea03c..ac987f884 100644
--- a/kotti/scaffolds/__init__.py
+++ b/kotti/scaffolds/__init__.py
@@ -79,8 +79,8 @@ def post(self, command, output_dir, vars):  # pragma: no cover
 
         separator = "=" * 79
         msg = dedent(
-            """
-            %(separator)s
+            u"""
+            {0}
             Welcome to Kotti!
 
             Documentation: http://kotti.readthedocs.org/
@@ -88,8 +88,8 @@ def post(self, command, output_dir, vars):  # pragma: no cover
             Issues:        https://github.com/Kotti/Kotti/issues?state=open
             IRC:           irc://irc.freenode.net/#kotti
             Mailing List:  https://groups.google.com/group/kotti
-            %(separator)s
-        """ % {'separator': separator})
+            {0}
+        """.format(separator))
 
         self.out(msg)
 
diff --git a/kotti/security.py b/kotti/security.py
index 3b39f4fd8..9d49e5921 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -115,7 +115,7 @@ def __init__(self, name, password=None, active=True, confirm_token=None,
         self.last_login_date = None
 
     def __repr__(self):  # pragma: no cover
-        return '<Principal %r>' % self.name
+        return u'<Principal {0!r}>'.format(self.name)
 
 
 class AbstractPrincipals(object):
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index d4218377b..adce6c986 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -18,7 +18,7 @@ def _create_file(self, config):
 
     def _test_common_headers(self, headers):
         for name in ('Content-Disposition', 'Content-Length', 'Content-Type'):
-            assert type(headers[name]) == str
+            assert isinstance(headers[name], basestring)
         assert headers["Content-Length"] == "13"
         assert headers["Content-Type"] == "image/png"
 
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index c3d230c2a..cdc68fd12 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -18,18 +18,18 @@ def test_upload_anonymous(root, dummy_request, browser):
 
     link = browser.getLink
 
-    browser.open('%s/' % BASE_URL)
+    browser.open(u'{0}/'.format(BASE_URL))
 
     # There must be no Upload Link for anonymous users
     with raises(LinkNotFoundError):
         link('Upload Content').click()
 
     # Upload views must redirect to login for anonymous users
-    browser.open('%s/upload' % BASE_URL)
-    assert browser.url.startswith('%s/@@login' % BASE_URL)
+    browser.open(u'{0}/upload'.format(BASE_URL))
+    assert browser.url.startswith(u'{0}/@@login'.format(BASE_URL))
 
-    browser.open('%s/content_types' % BASE_URL)
-    assert browser.url.startswith('%s/@@login' % BASE_URL)
+    browser.open(u'{0}/content_types'.format(BASE_URL))
+    assert browser.url.startswith(u'{0}/@@login'.format(BASE_URL))
 
     # import pdb; pdb.set_trace()
 
@@ -39,14 +39,14 @@ def test_upload_authenticated_wo_mimetype(root, dummy_request, browser):
 
     # cannot call content_types without mimetype
     with raises(KeyError):
-        browser.open('%s/content_types' % BASE_URL)
+        browser.open(u'{0}/content_types'.format(BASE_URL))
 
 
 @user('admin')
 def test_upload_authenticated_text(root, dummy_request, browser):
 
     # get possible content types for text/plain
-    browser.open('%s/content_types?mimetype=text/plain' % BASE_URL)
+    browser.open(u'{0}/content_types?mimetype=text/plain'.format(BASE_URL))
     j = json.loads(browser.contents)
     assert 'content_types' in j
 
@@ -62,7 +62,7 @@ def test_upload_authenticated_image(root, dummy_request, browser):
     link = browser.getLink
 
     # get possible content types for image/png
-    browser.open('%s/content_types?mimetype=image/png' % BASE_URL)
+    browser.open(u'{0}/content_types?mimetype=image/png'.format(BASE_URL))
     j = json.loads(browser.contents)
     assert 'content_types' in j
 
@@ -75,6 +75,6 @@ def test_upload_authenticated_image(root, dummy_request, browser):
     assert types[1]['name'] == u'File'
 
     # Open the upload 'form'
-    browser.open('%s/' % BASE_URL)
+    browser.open(u'{0}/'.format(BASE_URL))
     link('Upload Content').click()
     assert 'Select file(s) to upload' in browser.contents
diff --git a/kotti/util.py b/kotti/util.py
index dbaf82122..10ab738d2 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -190,7 +190,7 @@ def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)
 
     def __repr__(self):
-        return "Link(%r, %r)" % (self.name, self.title)
+        return u'Link({0}, {1})'.format(self.name, self.title)
 
 
 class ActionButton(Link):
@@ -230,7 +230,7 @@ def replacement(*args, **kwargs):
                 key = compute_key(*args, **kwargs)
             except DontCache:
                 return func(*args, **kwargs)
-            key = '%s.%s:%s' % (func.__module__, func.__name__, key)
+            key = u'{0}.{1}:{2}'.format(func.__module__, func.__name__, key)
             cached_value = cache.get(key, marker)
             if cached_value is marker:
                 cached_value = cache[key] = func(*args, **kwargs)
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index 850378bbd..ee159acc8 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -48,7 +48,7 @@ def set_max_age(response, delta, cache_ctrl=None):
         if value is None:
             cache_control_header.append(key)
         else:
-            cache_control_header.append('%s=%s' % (key, value))
+            cache_control_header.append(u'{0}={1}'.format(key, value))
     cache_control_header = ','.join(cache_control_header)
     response.headers['cache-control'] = cache_control_header
 
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index fceae01ec..77a0733de 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -68,8 +68,9 @@ def default_view_selector(self):
                     "is_current": name == self.context.default_view,
                 })
             else:
-                warnings.warn("No view called %r is registered for %r." %
-                              (name, self.context))
+                warnings.warn(
+                    u"No view called '{0}' is registered for {1!r}.".format(
+                        name, self.context))
 
         return {
             "selectable_default_views": [
diff --git a/kotti/views/file.py b/kotti/views/file.py
index c0b66366d..242d6a6fb 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -68,8 +68,8 @@ def __init__(self, data, request=None, disposition='attachment',
         if cache_max_age is not None:
             self.cache_expires = cache_max_age
 
-        disp = '%s;filename="%s"' % (disposition,
-                                     data.filename.encode('ascii', 'ignore'))
+        disp = u'{0};filename="{1}"'.format(
+            disposition, data.filename.encode('ascii', 'ignore'))
         self.headerlist.append(('Content-Disposition', disp))
 
 
diff --git a/kotti/views/image.py b/kotti/views/image.py
index 3a8070f07..dc3e653d4 100644
--- a/kotti/views/image.py
+++ b/kotti/views/image.py
@@ -97,9 +97,10 @@ def image(self, subpath=None):
                                          height=height,
                                          direction="thumb")
         res = Response(
-            headerlist=[('Content-Disposition', '%s;filename="%s"' % (
-                disposition,
-                self.context.filename.encode('ascii', 'ignore'))),
+            headerlist=[
+                ('Content-Disposition', '{0};filename="{1}"'.format(
+                    disposition,
+                    self.context.filename.encode('ascii', 'ignore'))),
                 ('Content-Length', str(len(image))),
                 ('Content-Type', str(self.context.mimetype)),
             ],
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 51c966239..886ab3e2f 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -47,7 +47,7 @@ def roles_form_handler(context, request, available_role_names, groups_lister):
                 if role_name not in available_role_names:
                     raise Forbidden()
                 new_value = bool(request.params.get(
-                    'role::%s::%s' % (principal_name, role_name)))
+                    u'role::{0}::{1}'.format(principal_name, role_name)))
                 if principal_name not in p_to_r:
                     p_to_r[principal_name] = set()
                 if new_value:
@@ -88,7 +88,7 @@ def search_principals(request, context=None, ignore=None, extra=()):
             ignore.add(principal_name)
 
     if 'search' in request.POST:
-        query = '*%s*' % request.params['query']
+        query = u'*{0}*'.format(request.params['query'])
         found = False
         for p in principals.search(name=query, title=query, email=query):
             found = True
@@ -248,7 +248,7 @@ def principal_schema(base=PrincipalFull()):
         all_groups = []
         for p in principals.search(name=u'group:*'):
             value = p.name.split(u'group:')[1]
-            label = u"%s, %s" % (p.title, value)
+            label = u"{0}, {1}".format(p.title, value)
             all_groups.append(dict(value=value, label=label))
         schema['groups']['group'].widget.values = all_groups
         schema['roles'].widget.values = [
@@ -290,7 +290,7 @@ def _massage_groups_in(appstruct):
     """
     groups = appstruct.get('groups', [])
     all_groups = list(appstruct.get('roles', [])) + [
-        u'group:%s' % g for g in groups if g]
+        u'group:{0}'.format(g) for g in groups if g]
     if 'roles' in appstruct:
         del appstruct['roles']
     appstruct['groups'] = all_groups
@@ -355,7 +355,7 @@ def schema_factory(self):
         return schema
 
     def add_group_success(self, appstruct):
-        appstruct['name'] = u'group:%s' % appstruct['name'].lower()
+        appstruct['name'] = u'group:{0}'.format(appstruct['name'].lower())
         return self.add_user_success(appstruct)
 
 
@@ -463,12 +463,12 @@ def save_success(self, appstruct):
 
     def cancel_success(self, appstruct):
         self.request.session.flash(_(u'No changes were made.'), 'info')
-        location = "%s/@@setup-users" % self.request.application_url
+        location = u'{0}/@@setup-users'.format(self.request.application_url)
         return HTTPFound(location=location)
     cancel_failure = cancel_success
 
     def delete_success(self, appstruct):
-        location = "%s/@@delete-user?name=%s" % (
+        location = u'{0}/@@delete-user?name={1}'.format(
             self.request.application_url, self.request.params['name'])
         return HTTPFound(location=location)
 
@@ -543,7 +543,7 @@ def user_delete(context, request):
                     _(u'${principal_type} ${title} was deleted.',
                       mapping=dict(principal_type=principal_type,
                                    title=principal.title)), 'info')
-                location = "%s/@@setup-users" % request.application_url
+                location = u'{0}/@@setup-users'.format(request.application_url)
                 return HTTPFound(location=location)
 
             api = template_api(
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 5a45b648f..db43842b0 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -44,7 +44,8 @@ def __init__(self, val, config):
             raise ValueError("Only boolean values supported")
 
     def text(self):
-        return "if_setting_has_value = %s == %s" % (self.name, self.value)
+        return u'if_setting_has_value = {0} == {1}'.format(
+            self.name, self.value)
 
     phash = text
 
@@ -57,7 +58,7 @@ def __init__(self, val, config):
         self.val = val
 
     def text(self):
-        return "root_only = %s" % self.val
+        return u'root_only = {0}'.format(self.val)
 
     phash = text
 
@@ -181,7 +182,7 @@ def page_title(self):
         if view_title:
             view_title += u' '
         view_title += self.context.title
-        return u'%s - %s' % (view_title, self.site_title)
+        return u'{0} - {1}'.format(view_title, self.site_title)
 
     def url(self, context=None, *elements, **kwargs):
         """
@@ -291,7 +292,7 @@ def avatar_url(self, user=None, size="14", default_image='identicon'):
             email = user.name
         h = hashlib.md5(email).hexdigest()
         query = {'default': default_image, 'size': str(size)}
-        url = 'https://secure.gravatar.com/avatar/%s?%s' % (
+        url = u'https://secure.gravatar.com/avatar/{0}?{1}'.format(
             h, urllib.urlencode(query))
         return url
 
@@ -433,7 +434,7 @@ def search_content(search_term, request=None):
 
 def default_search_content(search_term, request=None):
 
-    searchstring = u'%%%s%%' % search_term
+    searchstring = u'%{0}%'.format(search_term)
 
     # generic_filter can be applied to all Node (and subclassed) objects
     generic_filter = or_(Content.name.like(searchstring),
diff --git a/kotti/views/view.py b/kotti/views/view.py
index 7737b33c1..d166bc3f5 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import warnings
 
 from pyramid.exceptions import NotFound
@@ -23,8 +25,9 @@ def view_content_default(context, request):
     view_name = context.default_view or 'view'
     response = render_view_to_response(context, request, name=view_name)
     if response is None:  # pragma: no coverage
-        warnings.warn("Failed to look up default view called %r for %r." %
-                      (view_name, context))
+        warnings.warn(
+            u'Failed to look up default view called {0!r} for {1!r}.'.format(
+                view_name, context))
         raise NotFound()
     return response
 

From 2d08aba8c453ab01f05fc15846cd5282f289a8e5 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Mon, 18 May 2015 10:21:32 +0200
Subject: [PATCH 225/600] enlarge title and name column (#427). Notes: hangs on
 /add_document

---
 .../37a05f6246af_enlarged_name_title.py       | 36 +++++++++++++++++++
 kotti/resources.py                            |  4 +--
 kotti/tests/test_util.py                      | 19 ++++++++--
 kotti/util.py                                 | 10 ++++--
 4 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 kotti/alembic/versions/37a05f6246af_enlarged_name_title.py

diff --git a/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py b/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py
new file mode 100644
index 000000000..dd6e77c60
--- /dev/null
+++ b/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py
@@ -0,0 +1,36 @@
+"""Enlarged name title
+
+Revision ID: 37a05f6246af
+Revises: 413fa5fcc581
+Create Date: 2015-05-15 17:12:07.631190
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '37a05f6246af'
+down_revision = '413fa5fcc581'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.alter_column('nodes',
+                    'title',
+                    type_=sa.Unicode(250),
+                    )
+    op.alter_column('nodes',
+                    'name',
+                    type_=sa.Unicode(250),
+                    )
+
+
+def downgrade():
+    op.alter_column('nodes',
+                    'title',
+                    type_=sa.Unicode(100),
+                    )
+    op.alter_column('nodes',
+                    'name',
+                    type_=sa.Unicode(50),
+                    )
diff --git a/kotti/resources.py b/kotti/resources.py
index d06275a61..f3fa5afa9 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -231,10 +231,10 @@ class Node(Base, ContainerMixin, PersistentACLMixin):
     _acl = Column(MutationList.as_mutable(ACLType))
     #: Name of the node as used in the URL
     #: (:class:`sqlalchemy.types.Unicode`)
-    name = Column(Unicode(50), nullable=False)
+    name = Column(Unicode(250), nullable=False)
     #: Title of the node, e.g. as shown in search results
     #: (:class:`sqlalchemy.types.Unicode`)
-    title = Column(Unicode(100))
+    title = Column(Unicode(250))
     #: Annotations can be used to store arbitrary data in a nested dictionary
     #: (:class:`kotti.sqla.NestedMustationDict`)
     annotations = Column(NestedMutationDict.as_mutable(JsonType))
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index b2f9b653e..e178b5ca5 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -61,16 +61,31 @@ def setUp(self):
         settings['kotti.url_normalizer'] = [url_normalizer]
         settings['kotti.url_normalizer.map_non_ascii_characters'] = False
 
-    def test_max_length(self):
+    def test_max_length_40(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 50)) == 40
+        assert len(title_to_name(u'a' * 50)) == 50
+
+    def test_max_length_250(self):
+        self.setUp()
+        from kotti.util import title_to_name
+        assert len(title_to_name(u'a' * 250)) == 250
+
+    def test_max_length_255(self):
+        self.setUp()
+        from kotti.util import title_to_name
+        assert len(title_to_name(u'a' * 255)) == 250
 
     def test_normal(self):
         self.setUp()
         from kotti.util import title_to_name
         assert title_to_name(u'Foo Bar') == u'foo-bar'
 
+    def test_max_length_40_no_default(self):
+        self.setUp()
+        from kotti.util import title_to_name
+        assert len(title_to_name(u'a' * 50), max_length=40) == 40
+
     def test_numbering(self):
         self.setUp()
         from kotti.util import title_to_name
diff --git a/kotti/util.py b/kotti/util.py
index dbaf82122..871ccb9a8 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -331,7 +331,13 @@ def disambiguate_name(name):
     return u'-'.join(parts)
 
 
-def title_to_name(title, blacklist=()):
+def title_to_name(title, blacklist=(), max_length=None):
+    """ If max_length is None, fallback to the ``name`` column
+        size (:class:`kotti.resources.Node`)
+    """
+    if max_length is not None:
+        from kotti.resources import Node
+        max_length = Node.name.property.columns[0].type.length
     request = get_current_request()
     if request is not None:
         locale_name = get_locale_name(request)
@@ -339,7 +345,7 @@ def title_to_name(title, blacklist=()):
         locale_name = 'en'
     from kotti import get_settings
     urlnormalizer = get_settings()['kotti.url_normalizer'][0]
-    name = unicode(urlnormalizer(title, locale_name, max_length=40))
+    name = unicode(urlnormalizer(title, locale_name, max_length=max_length))
     if name not in blacklist:
         return name
     name += u'-1'

From 5c4834ed537a8c0546b05b3ca7657bfd6efc63e2 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Mon, 18 May 2015 12:16:45 +0200
Subject: [PATCH 226/600] fix bad condition (no more hangs on /add_document)

---
 kotti/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/util.py b/kotti/util.py
index 871ccb9a8..0663308ba 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -335,7 +335,7 @@ def title_to_name(title, blacklist=(), max_length=None):
     """ If max_length is None, fallback to the ``name`` column
         size (:class:`kotti.resources.Node`)
     """
-    if max_length is not None:
+    if max_length is None:
         from kotti.resources import Node
         max_length = Node.name.property.columns[0].type.length
     request = get_current_request()

From dd01c0bb4a0f968e1d5251ca9fbb13918036f84a Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Mon, 18 May 2015 12:17:17 +0200
Subject: [PATCH 227/600] fix test

---
 kotti/tests/test_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index e178b5ca5..cc687c2d3 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -84,7 +84,7 @@ def test_normal(self):
     def test_max_length_40_no_default(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 50), max_length=40) == 40
+        assert len(title_to_name(u'a' * 50, max_length=40)) == 40
 
     def test_numbering(self):
         self.setUp()

From 1849fda3b883aa2716396fb2d43f4fcb3d691860 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Mon, 18 May 2015 12:32:38 +0200
Subject: [PATCH 228/600] enlarged path column (up to 2000)

---
 .../alembic/versions/37a05f6246af_enlarged_name_title.py  | 8 ++++++++
 kotti/resources.py                                        | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py b/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py
index dd6e77c60..b8b61bc98 100644
--- a/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py
+++ b/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py
@@ -23,6 +23,10 @@ def upgrade():
                     'name',
                     type_=sa.Unicode(250),
                     )
+    op.alter_column('nodes',
+                    'path',
+                    type_=sa.Unicode(2000),
+                    )
 
 
 def downgrade():
@@ -34,3 +38,7 @@ def downgrade():
                     'name',
                     type_=sa.Unicode(50),
                     )
+    op.alter_column('nodes',
+                    'path',
+                    type_=sa.Unicode(1000),
+                    )
diff --git a/kotti/resources.py b/kotti/resources.py
index f3fa5afa9..ad5262458 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -240,7 +240,7 @@ class Node(Base, ContainerMixin, PersistentACLMixin):
     annotations = Column(NestedMutationDict.as_mutable(JsonType))
     #: The path can be used to efficiently filter for child objects
     #: (:class:`sqlalchemy.types.Unicode`).
-    path = Column(Unicode(1000), index=True)
+    path = Column(Unicode(2000), index=True)
 
     parent = relation(
         'Node',

From ec4eb918c7f58dd32fd1d961ce1cbe7757931c23 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Mon, 18 May 2015 12:33:18 +0200
Subject: [PATCH 229/600] renamed alembic migration step

---
 ...ged_name_title.py => 37a05f6246af_enlarged_name_title_path.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename kotti/alembic/versions/{37a05f6246af_enlarged_name_title.py => 37a05f6246af_enlarged_name_title_path.py} (100%)

diff --git a/kotti/alembic/versions/37a05f6246af_enlarged_name_title.py b/kotti/alembic/versions/37a05f6246af_enlarged_name_title_path.py
similarity index 100%
rename from kotti/alembic/versions/37a05f6246af_enlarged_name_title.py
rename to kotti/alembic/versions/37a05f6246af_enlarged_name_title_path.py

From a42084426cc8acb2d6496278557a91d5006ae0d9 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 18 May 2015 17:09:09 +0200
Subject: [PATCH 230/600] Remove some changes from
 4c178a2a616fff55f7c4558dfa24cc68ca52f109 that break WebOb's headers (need to
 be str, not unicode).

---
 kotti/tests/test_file.py | 2 +-
 kotti/views/cache.py     | 2 +-
 kotti/views/file.py      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index adce6c986..c03349d25 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -18,7 +18,7 @@ def _create_file(self, config):
 
     def _test_common_headers(self, headers):
         for name in ('Content-Disposition', 'Content-Length', 'Content-Type'):
-            assert isinstance(headers[name], basestring)
+            assert isinstance(headers[name], str)
         assert headers["Content-Length"] == "13"
         assert headers["Content-Type"] == "image/png"
 
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index ee159acc8..e3204b8d5 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -48,7 +48,7 @@ def set_max_age(response, delta, cache_ctrl=None):
         if value is None:
             cache_control_header.append(key)
         else:
-            cache_control_header.append(u'{0}={1}'.format(key, value))
+            cache_control_header.append('{0}={1}'.format(key, value))
     cache_control_header = ','.join(cache_control_header)
     response.headers['cache-control'] = cache_control_header
 
diff --git a/kotti/views/file.py b/kotti/views/file.py
index 242d6a6fb..16d38416c 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -68,7 +68,7 @@ def __init__(self, data, request=None, disposition='attachment',
         if cache_max_age is not None:
             self.cache_expires = cache_max_age
 
-        disp = u'{0};filename="{1}"'.format(
+        disp = '{0};filename="{1}"'.format(
             disposition, data.filename.encode('ascii', 'ignore'))
         self.headerlist.append(('Content-Disposition', disp))
 

From d010e15182a90aaca63f4a30a3f84efc526bfa7c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 18 May 2015 17:23:59 +0200
Subject: [PATCH 231/600] Use latest ``kotti_tinymce`` in ``requirements.txt``,
 don't require it at all in setup.py.

---
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index eda165592..24a110090 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -40,7 +40,7 @@ js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
-kotti-tinymce==0.5.1
+kotti-tinymce==0.5.2
 lingua==3.10
 peppercorn==0.5
 plone.scale==1.3.5
diff --git a/requirements.txt b/requirements.txt
index eda165592..24a110090 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,7 +40,7 @@ js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
-kotti-tinymce==0.5.1
+kotti-tinymce==0.5.2
 lingua==3.10
 peppercorn==0.5
 plone.scale==1.3.5
diff --git a/setup.py b/setup.py
index 98be7b7bb..61ef698cf 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,6 @@
     'js.jquery_timepicker_addon',
     'js.jqueryui>=1.8.24',
     'js.jqueryui_tagit',
-    'kotti_tinymce>=0.5dev',
     'lingua>=1.3',
     'plone.scale',  # needed for image resizing capabilities
     'py_bcrypt',

From 300ec2aad1135992e3a49d0f25b0bb6f08f4015d Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Tue, 19 May 2015 12:12:17 +0200
Subject: [PATCH 232/600] Changed max_length fallback value accordingly to
 https://github.com/Kotti/Kotti/pull/428#discussion_r30580591

---
 kotti/tests/test_util.py | 4 ++--
 kotti/util.py            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index cc687c2d3..af215c305 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -69,12 +69,12 @@ def test_max_length_40(self):
     def test_max_length_250(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 250)) == 250
+        assert len(title_to_name(u'a' * 250)) == 240
 
     def test_max_length_255(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 255)) == 250
+        assert len(title_to_name(u'a' * 255)) == 240
 
     def test_normal(self):
         self.setUp()
diff --git a/kotti/util.py b/kotti/util.py
index 0663308ba..4cad64e2f 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -337,7 +337,8 @@ def title_to_name(title, blacklist=(), max_length=None):
     """
     if max_length is None:
         from kotti.resources import Node
-        max_length = Node.name.property.columns[0].type.length
+        # See #428, #427 and #31
+        max_length = Node.name.property.columns[0].type.length - 10
     request = get_current_request()
     if request is not None:
         locale_name = get_locale_name(request)

From 0f970732298d179a7b29efd0be37a61e9da4f83b Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Tue, 19 May 2015 14:38:24 +0200
Subject: [PATCH 233/600] added validator to the title with tests (see
 https://github.com/Kotti/Kotti/pull/428#issuecomment-103407222)

---
 kotti/tests/test_functional.py | 43 ++++++++++++++++++++++++++++++++++
 kotti/views/edit/content.py    |  2 ++
 2 files changed, 45 insertions(+)

diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index a87d059ee..5a9070120 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -71,3 +71,46 @@ def test_edit_uploaded_file(self, browser, filedepot):
         browser.getControl('save').click()
         browser.getLink("Download file").click()
         assert browser.contents == 'GHI'
+
+
+class TestValidatorMaxLength:
+
+    @user('admin')
+    def test_title_max_length_document_ko(self, browser, filedepot):
+        browser.open(BASE_URL + '/@@add_document')
+        from kotti.resources import Node
+        max_length = Node.name.property.columns[0].type.length
+        browser.getControl("Title").value = '1' * (max_length + 1)  # the error
+        browser.getControl('save').click()
+        assert "Item was added" not in browser.contents
+
+    @user('admin')
+    def test_title_max_length_document_ok(self, browser):
+        browser.open(BASE_URL + '/@@add_document')
+        from kotti.resources import Node
+        max_length = Node.name.property.columns[0].type.length
+        browser.getControl("Title").value = '1' * max_length
+        browser.getControl('save').click()
+        assert "Item was added" in browser.contents
+
+    @user('admin')
+    def test_title_max_length_file_ok(self, browser):
+        browser.open(BASE_URL + '/@@add_file')
+        from kotti.resources import Node
+        max_length = Node.name.property.columns[0].type.length
+        browser.getControl("Title").value = '1' * max_length
+        file_ctrl = browser.getControl("File").mech_control
+        file_ctrl.add_file(StringIO("abc"), filename='my_image.gif')
+        browser.getControl('save').click()
+        assert "Item was added" in browser.contents
+
+    @user('admin')
+    def test_title_max_length_file_ko(self, browser):
+        browser.open(BASE_URL + '/@@add_file')
+        from kotti.resources import Node
+        max_length = Node.name.property.columns[0].type.length
+        browser.getControl("Title").value = '1' * (max_length + 1)  # the error
+        file_ctrl = browser.getControl("File").mech_control
+        file_ctrl.add_file(StringIO("abc"), filename='my_image.gif')
+        browser.getControl('save').click()
+        assert "Item was added" not in browser.contents
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 57bbab7f2..25c22906a 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -15,6 +15,7 @@
 from kotti.resources import Document
 from kotti.resources import File
 from kotti.resources import Image
+from kotti.resources import Node
 from kotti.util import _
 from kotti.util import _to_fieldstorage
 from kotti.views.form import get_appstruct
@@ -30,6 +31,7 @@ class ContentSchema(colander.MappingSchema):
     title = colander.SchemaNode(
         colander.String(),
         title=_(u'Title'),
+        validator=colander.Length(max=Node.name.property.columns[0].type.length),
         )
     description = colander.SchemaNode(
         colander.String(),

From 28a626f89982b97a7591b631266f3a009cf4b2c6 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Tue, 19 May 2015 14:39:39 +0200
Subject: [PATCH 234/600] renamed module accordingly to existing naming
 convention for alembic versions

---
 ...name_title_path.py => 37a05f6246af_enlarge_name_title_path.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename kotti/alembic/versions/{37a05f6246af_enlarged_name_title_path.py => 37a05f6246af_enlarge_name_title_path.py} (100%)

diff --git a/kotti/alembic/versions/37a05f6246af_enlarged_name_title_path.py b/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py
similarity index 100%
rename from kotti/alembic/versions/37a05f6246af_enlarged_name_title_path.py
rename to kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py

From 230423343b5053aa8fb2bc60817d9b60886a553e Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Tue, 19 May 2015 15:23:40 +0200
Subject: [PATCH 235/600] add change note for #427 and #428

---
 CHANGES.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 70a006100..f5e97de3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,16 @@ Change History
 1.1.2 - unreleased
 ------------------
 
-- No changes yet.
+- Enlarge column sizes for ``name``, ``path`` and ``title`` (see #427). 
+  Upgrading from any version older than 1.1.2 requires you to run a migration
+  script on your database. To run the migration, call::
+
+    $ bin/kotti-migrate <myconfig.ini> upgrade
+
+- Add length validator for ``title`` (fix partially #404). See #428
+
+- Remove 40 chars max length constraint for the html segment ``name``
+  (``Kotti.util.title_to_name``). See #428
 
 1.1.1 2015-05-11
 ----------------

From 2f3390b539bc2c89437146ec65ebb5ea010d4703 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Tue, 19 May 2015 17:29:11 +0200
Subject: [PATCH 236/600] fix validator (wrong property)

---
 kotti/views/edit/content.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 25c22906a..f00e5aad0 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -31,7 +31,7 @@ class ContentSchema(colander.MappingSchema):
     title = colander.SchemaNode(
         colander.String(),
         title=_(u'Title'),
-        validator=colander.Length(max=Node.name.property.columns[0].type.length),
+        validator=colander.Length(max=Node.title.property.columns[0].type.length),
         )
     description = colander.SchemaNode(
         colander.String(),

From d09f08cec1a285e2674d7b20a99213b3bb106f59 Mon Sep 17 00:00:00 2001
From: Cruxlog <cruxlog@pixelblaster.ro>
Date: Wed, 20 May 2015 16:31:06 +0300
Subject: [PATCH 237/600] Compatibility with alembic >= 0.7.6

---
 kotti/migrate.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/kotti/migrate.py b/kotti/migrate.py
index 981ea46a0..02e696ff9 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -109,17 +109,22 @@ def get_locations():
 
 
 def stamp_head(location=DEFAULT_LOCATION, revision=None):
+
+    env = PackageEnvironment(location)
+
     def do_stamp(rev, context, revision=revision):
-        current = context._current_rev()
+
         if revision is None:
             revision = context.script.get_current_head()
         elif revision == 'None':
             revision = None
-        context._update_current_rev(current, revision)
+
+        context.stamp(env.script_dir, revision)
+
         mark_changed(DBSession())
         return []
 
-    PackageEnvironment(location).run_env(do_stamp)
+    env.run_env(do_stamp)
 
 
 def stamp_heads():
@@ -138,12 +143,16 @@ def upgrade(location=DEFAULT_LOCATION):
     revision = pkg_env.script_dir.get_current_head()
     print(u'Upgrading {0}:'.format(pkg_env.location))
 
-    def upgrade(rev, context):
+    def upgrade(heads, context):
+        rev = heads[0]   # alembic supports multiple heads, we don't
+
         if rev == revision:
             print(u'  - already up to date.')
             return []
+
         print(u'  - upgrading from {0} to {1}...'.format(
             rev, revision))
+
         return context.script._upgrade_revs(revision, rev)
 
     pkg_env.run_env(

From 9e9373687df1fc55454f04e0cc342c0e786322f8 Mon Sep 17 00:00:00 2001
From: cruxlog <afd8856@gmail.com>
Date: Wed, 20 May 2015 17:25:35 +0300
Subject: [PATCH 238/600] Updated version for alembic to 0.7.6.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 24a110090..3208dc889 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ Pygments==2.0.2
 SQLAlchemy==0.9.9
 Unidecode==0.04.17
 WebOb==1.4.1
-alembic==0.6.7
+alembic==0.7.6
 appdirs==1.4.0
 bleach==1.4.1
 bleach-whitelist==0.0.7

From dfee64042b5d9fd125dd73b0dcc400beaa3f1a9f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 21 May 2015 16:44:29 +0200
Subject: [PATCH 239/600] Make a copy of selectable_default_views instead of
 having a reference when copying the parent dict.

---
 kotti/resources.py       | 10 +++++-----
 kotti/tests/test_node.py |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 2fd590860..dc2d1955e 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -10,25 +10,25 @@
 
 import os
 import warnings
-
+from copy import copy
 from fnmatch import fnmatch
 from cStringIO import StringIO
 from UserDict import DictMixin
 
-from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.sqlalchemy import _SQLAMutationTracker
-
+from depot.fields.sqlalchemy import UploadedFileField
+from kotti import _resolve_dotted
 from pyramid.traversal import resource_path
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
+from sqlalchemy import event
 from sqlalchemy import ForeignKey
 from sqlalchemy import Integer
 from sqlalchemy import String
 from sqlalchemy import Unicode
 from sqlalchemy import UnicodeText
 from sqlalchemy import UniqueConstraint
-from sqlalchemy import event
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.orderinglist import ordering_list
@@ -42,7 +42,6 @@
 from transaction import commit
 from zope.interface import implements
 
-from kotti import _resolve_dotted
 from kotti import Base
 from kotti import DBSession
 from kotti import get_settings
@@ -361,6 +360,7 @@ def copy(self, **kwargs):
         """
 
         d = self.__dict__.copy()
+        d['selectable_default_views'] = copy(self.selectable_default_views)
         d.update(kwargs)
 
         return TypeInfo(**d)
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 1c948d297..3119580d6 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -441,7 +441,11 @@ def test_copy(self, db_session, root):
 
 
 class TestTypeInfo:
+
     def test_add_selectable_default_view(self):
+
+        from kotti.resources import Content
+        from kotti.resources import Document
         from kotti.resources import TypeInfo
 
         type_info = TypeInfo(selectable_default_views=[])
@@ -450,6 +454,10 @@ def test_add_selectable_default_view(self):
             ('foo', u'Fannick'),
             ]
 
+        Document.type_info.add_selectable_default_view('one', 'two')
+        assert ('one', 'two') in Document.type_info.selectable_default_views
+        assert ('one', 'two') not in Content.type_info.selectable_default_views
+
     def test_action_links_deprecated(self, allwarnings):
         from kotti.resources import TypeInfo
         from kotti.util import LinkParent

From d221bff022a6c56bb6ed04dbd66a9926f5e1ded0 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Wed, 27 May 2015 17:12:14 +0200
Subject: [PATCH 240/600] fix italian translation (typo)

---
 CHANGES.txt                          |   2 ++
 kotti/locale/it/LC_MESSAGES/Kotti.mo | Bin 12656 -> 12657 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po |   2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f5e97de3d..a0107fd5c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,8 @@ Change History
 - Remove 40 chars max length constraint for the html segment ``name``
   (``Kotti.util.title_to_name``). See #428
 
+- Update italian translation
+
 1.1.1 2015-05-11
 ----------------
 
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index bcf8597ed2f0ba47dd35edcabb64b608f51684e9..984780a47beef16607be02b1d2fc98d1cf8a604b 100644
GIT binary patch
delta 500
zcmXZYze_?<6u|KlWT}~@DF%T*P#Ww$E1?kjF$IYdErAXS@`fOn2dzO599yHmKyY!1
z6r%os{(zPSTiesY2A94E-}E{6aPGPHoL_rvKY#n(kcgy=h#w6u;{gWo1Xr+(t9XT*
zXyY#4q2B9b1c$heADG22%;OAwxNXff7~@>D#FaR~ISFml#ACe10(LQppBTU~MsbEq
z7^WzJanui6s1KDqPd(2tM81NHSi=%F3NDuko=9lJzE|*qydkfs6a9GSDQaDg@z-z%
zH}D8`fJ@Z+I_gJmFpLiBCht+}9#98)Y!PUK9;Wdfw{V17_=hQ!y?KK)>P8G6Vig_i
ZU=Al(#Kb=9#>(I=*v>564zlLL_YVwzG;sg`

delta 498
zcmXZZze_?<6u|K_WT|ET$Vv#*&>VbE%ZQAyDM$=*33SlG1R)w~7v$mCD*XjQi<9v{
z@DJz@XlaPX{s0|naIx>vH+}9s_q=n@xo_H>G>6}AYh6TQridF2T*DLeVgdEMh(5f<
z2;Si#wo$(uU=VE#;5#Pp6Vo_D7anAm8W?7u%ZMf0EUpM>p*j|@g<0%l6hF{|6Aa-D
zSJ6k(E{0JXHc>CiJ6<?m;s)^&u3!bvu$HxC(ZCA<EjVxz-jF+FggViWv;RfSOEA74
z)3}A_r~{Ny^Q)+h+~X!bqP}DYHSZa9kY0m@7I?)tj&TpaP!s<!hI3r}s-xwL7<fwj
b8lSL>Nu1&_?&L&LShC07hkZL~-njk&tmQPq

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index 8d96ff5f0..a70a09c98 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -259,7 +259,7 @@ msgstr "Editor"
 
 #: kotti/security.py:191
 msgid "Owner"
-msgstr "Propietario"
+msgstr "Proprietario"
 
 #: kotti/security.py:192
 msgid "Admin"

From b4a277c6f07eb85d1e51cc4e4bddf39081bb6648 Mon Sep 17 00:00:00 2001
From: Davide Moro <davide.moro@gmail,.com>
Date: Fri, 29 May 2015 23:51:05 +0200
Subject: [PATCH 241/600] add simple recipe to security section (how to add a
 new role)

---
 docs/developing/basic/security.rst | 33 ++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index 9da767f68..5233373de 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -34,3 +34,36 @@ Role
     Local Roles
         Local roles are assigned to a user or group via the "Sharing" screen
         of a content object.  They apply only to this object and its children.
+
+
+How to create a new role
+------------------------
+
+Small recipe you can use if you want to create a new role:
+
+.. code-block:: python
+  
+  from kotti.security import (
+      Principal,
+      ROLES,
+      SHARING_ROLES,
+      set_roles,
+      set_sharing_roles,
+      set_user_management_roles,
+      )
+  from kotti_yourpackage import _
+  
+  
+  def add_role(role_id, role_title):
+      """ Add role in share view and user management views """
+      UPDATED_ROLES = ROLES.copy()
+      UPDATED_ROLES[role_id] = Principal(role_id,
+                                         title=role_title)
+      UPDATED_SHARING_ROLES = list(SHARING_ROLES)
+      UPDATED_SHARING_ROLES.append(role_id)
+      set_roles(UPDATED_ROLES)
+      set_sharing_roles(UPDATED_SHARING_ROLES)
+      set_user_management_roles(UPDATED_SHARING_ROLES + ['role:admin'])
+  
+  
+  add_role(u'role:customer', _(u'Customer'))

From a6fae21b882aeadbb8ad612e9db44069486b1cf7 Mon Sep 17 00:00:00 2001
From: Davide Moro <davide.moro@gmail,.com>
Date: Fri, 29 May 2015 23:52:30 +0200
Subject: [PATCH 242/600] update changes (documentation updated)

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a0107fd5c..798247a57 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,8 @@ Change History
 
 - Update italian translation
 
+- Update documentation
+
 1.1.1 2015-05-11
 ----------------
 

From 635296d54c05fdd76e1d20873d4850265592a62e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 3 Jun 2015 12:09:47 +0200
Subject: [PATCH 243/600] Fix #433  [ci skip]

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 734784d8e..3c1618c53 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,7 @@ Read Kotti's extensive `documentation <http://kotti.readthedocs.org/>`_ on `Read
 
 If you have questions or need help, you can post on our `mailing list / forum <http://groups.google.com/group/kotti>`_ or join us on IRC: `#kotti on irc.freenode.net <irc://irc.freenode.net/#kotti>`_.
 
-If you think you found a bug, open an issue on or `Github bugtracker <https://github.com/Kotti/Kotti/issues>`_.
+If you think you found a bug, open an issue on our `Github bugtracker <https://github.com/Kotti/Kotti/issues>`_.
 
 Development
 ===========

From 6a456cc02a11454aa380296ddea91041fff5c48c Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 4 Jun 2015 10:58:21 +0200
Subject: [PATCH 244/600] added add_permission test for TypeInfo. See #436

---
 kotti/tests/test_node.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 3119580d6..969224876 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -479,3 +479,13 @@ def test_action_links_deprecated(self, allwarnings):
                 edit_links=[],
                 action_links=[my_item],
                 )
+
+    def test_type_info_add_permission_default(self):
+        from kotti.resources import TypeInfo
+        type_info = TypeInfo()
+        assert type_info.add_permission == 'add'
+
+    def test_type_info_add_permission_custom(self):
+        from kotti.resources import TypeInfo
+        type_info = TypeInfo(add_permission='customadd')
+        assert type_info.add_permission == 'customadd'

From 10ff5f3f1a312a978ef83e66de0b6640d8b17360 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 4 Jun 2015 11:24:19 +0200
Subject: [PATCH 245/600] change TypeInfo (new add_permission property with
 default value 'add')

---
 kotti/resources.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kotti/resources.py b/kotti/resources.py
index a18d1ec37..fce3213f7 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -328,6 +328,7 @@ class TypeInfo(object):
             -   edit_links
             -   selectable_default_views
             -   uploadable_mimetypes
+            -   add_permission
     """
 
     addable_to = ()
@@ -350,6 +351,10 @@ def __init__(self, **kwargs):
             else:
                 raise ValueError(msg)
 
+        # default value for add_permission should be 'add'
+        if 'add_permission' not in kwargs:
+            kwargs['add_permission'] = 'add'
+
         self.__dict__.update(kwargs)
 
     def copy(self, **kwargs):

From cfe999caeae1fd5df0fb7bdfcff98123da7e0d17 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 4 Jun 2015 11:25:26 +0200
Subject: [PATCH 246/600] change view_config permission for add views. Use
 RESOURCE.type_info.add_permission instead of plain 'add'

---
 kotti/views/edit/content.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index f00e5aad0..2cfb0e33e 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -154,7 +154,7 @@ def includeme(config):
     config.add_view(
         DocumentAddForm,
         name=Document.type_info.add_view,
-        permission='add',
+        permission=Document.type_info.add_permission,
         renderer='kotti:templates/edit/node.pt',
         )
 
@@ -169,7 +169,7 @@ def includeme(config):
     config.add_view(
         FileAddForm,
         name=File.type_info.add_view,
-        permission='add',
+        permission=File.type_info.add_permission,
         renderer='kotti:templates/edit/node.pt',
         )
 
@@ -184,6 +184,6 @@ def includeme(config):
     config.add_view(
         ImageAddForm,
         name=Image.type_info.add_view,
-        permission='add',
+        permission=Image.type_info.add_permission,
         renderer='kotti:templates/edit/node.pt',
         )

From 9d3d36091421d85a64754783a0a959a4aca8b277 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 4 Jun 2015 11:32:27 +0200
Subject: [PATCH 247/600] remove add permission protection for add dropdown
 view

---
 kotti/views/edit/actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 26fc48cc9..a0a62c84b 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -459,7 +459,7 @@ def contents_buttons(context, request):
     return [button for button in buttons if button.permitted(context, request)]
 
 
-@view_config(name='add-dropdown', permission='add',
+@view_config(name='add-dropdown',
              renderer='kotti:templates/add-dropdown.pt')
 def content_type_factories(context, request):
     """

From 432f7223524b7aae2bfadd3ff48f8a0942e31243 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Thu, 4 Jun 2015 18:42:36 +0200
Subject: [PATCH 248/600] add workflow documentation (still in progress). See
 #393

---
 docs/developing/basic/security.rst | 110 ++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index 5233373de..c71e3b631 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -3,7 +3,7 @@
 Security
 ========
 
-Kotti security is based on the concepts of users, groups, roles and permissions.
+Kotti security is based on the concepts of users, groups, roles, permissions and workflow.
 
 .. image:: /_static/user-group-role-permission.svg
 
@@ -35,6 +35,12 @@ Role
         Local roles are assigned to a user or group via the "Sharing" screen
         of a content object.  They apply only to this object and its children.
 
+Workflow
+    The workflow keeps track of the current state of each object lifecycle to manage content security.
+    There is an initial state and you can move to other states thanks to transitions; on each state is defined
+    a security matrix with roles and permissions.
+    Kotti provides by default a two-state workflow (private and publish) for all objects excepts files and images.
+    Kotti's workflow implementation is based on `repoze.workflow`_.
 
 How to create a new role
 ------------------------
@@ -67,3 +73,105 @@ Small recipe you can use if you want to create a new role:
   
   
   add_role(u'role:customer', _(u'Customer'))
+
+Workflows
+---------
+
+Basically you can use an xml file (zcml) in order to describe your workflow definition.
+You can see an example here: `workflow.zcml`_.
+
+As you can see it is quite straightforward adding new states, new transitions, new permissions, etc. You can easily turn your 2-states
+website workflow into something of completely different or turn Kotti app into an intranet application.
+
+The default workflow definition is loaded from your project ``.ini`` file settings (using the ``kotti.use_workflow`` setting).
+The ``kotti.use_workflow`` setting's default value is:
+
+.. code-block:: ini
+
+    kotti.use_workflow = kotti:workflow.zcml
+
+but can change change default workflow for the whole site, register new workflows related to specific content types or disable it as well. 
+
+How to disable the default workflow
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Kotti is shipped with a simple workflow implementation based on private and public states. If your particular use case does not require workflows at all, you can disable this feature with a non true value. For example:
+
+.. code-block:: ini
+
+    kotti.use_workflow = 0
+
+How to override the Kotti's default workflow for all content types
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The default workflow is quite useful for websites, but sometimes you need something of different. Just change your workflow setting and point to your zcml file:
+
+.. code-block:: ini
+    kotti.use_workflow = kotti_yourplugin:workflow.zcml
+
+The simplest way to deal with workflow definitions is::
+
+1. create a copy of the default workflow definition
+2. customize it (change permissions, add new states, permissions, transitions, initial state and so on)
+
+If you change workflow settings, you need to reset all your content's workflow and permission settings using the ``kotti-reset-workflow`` console script.
+
+kotti-reset-workflow command usage
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you change workflow settings you'll need to update security.
+
+.. code-block:: bash
+
+    $ kotti-reset-workflow --help
+    Reset the workflow of all content objects in the database.
+    
+        This is useful when you want to migrate an existing database to
+        use a different workflow.  When run, this script will reset all
+        your content objects to use the new workflow, while trying to
+        preserve workflow state information.
+    
+        For this command to work, all currently persisted states must map
+        directly to a state in the new workflow.  As an example, if
+        there's a 'public' object in the database, the new workflow must
+        define 'public' also.
+    
+        If this is not the case, you may choose to reset all your content
+        objects to the new workflow's *initial state* by passing the
+        '--purge-existing' option.
+    
+        Usage:
+          kotti-reset-workflow <config_uri> [--purge-existing]
+    
+        Options:
+          -h --help          Show this screen.
+          --purge-existing   Reset all objects to new workflow's initial state.
+ 
+How to enable the standard workflow for images and files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Images and files are not associated with the default workflow. If you need a workflow for these items you need to attach the ``IDefaultWorkflow`` marker interface.
+
+You can add the following lines in your includeme function:
+
+.. code-block:: python
+
+    from zope.interface import implementer
+    from kotti.interfaces import IDefaultWorkflow
+    from kotti.resources import File
+    from kotti.resources import Image
+    ...
+    
+    def includeme(config):
+        ...
+        # enable workflow for images and files
+        implementer(IDefaultWorkflow)(Image)
+        implementer(IDefaultWorkflow)(File)
+        ...
+
+How to assign a different workflow to a content type
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+TODO
+
+.. _repoze.workflow: http://docs.repoze.org/workflow/
+.. _workflow.zcml: https://github.com/Kotti/Kotti/blob/master/kotti/workflow.zcml.

From 81aaf67e5e63862fc706e9bcd88ba69c48c0122b Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Fri, 5 Jun 2015 12:42:56 +0200
Subject: [PATCH 249/600] add workflow documentation

---
 docs/developing/basic/security.rst | 84 +++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index c71e3b631..6819e1015 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -171,7 +171,89 @@ You can add the following lines in your includeme function:
 How to assign a different workflow to a content type
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-TODO
+We are going to use the default workflow for standard content types and a custom workflow for content providing the pretend ``ICustomContent`` marker interface.
+The other kind of content types will still use the default workflow.
+Other developers will be able to override our custom workflow without having to touch any line of code (just a ``.ini`` configuration file)
 
+I assume you are starting with a standard Kotti package created with ``pcreate -t kotti kotti_wf``.
+
+Four steps are needed:
+
+1. create a new marker interface ICustomContent
+2. change your kotti_wf.resource (replace IDefaultWorkflow with our new ICustomContent)
+3. create the new workflow definition
+4. register your workflow definition
+
+Create a new module ``kotti_wf/interfaces.py`` with this code.
+This is **optional** but it doesn't hurt, the important thing is omitting the ``IDefaultWorkflow``
+implementer from ``kotti_wf.resurces``:
+
+.. code-block:: python
+
+    from zope.interface import Interface
+    
+    
+    class ICustomContent(Interface):
+        """ Custom content marker interface """
+
+Change your ``kotti_wf.resources`` module like so:
+
+.. code-block:: python
+
+    from kotti.resources import Content
+    from zope.interface import implements
+    
+    from kotti_wf.interfaces import ICustomContent
+    
+    
+    class CustomContent(Content):
+        """ A custom content type. """
+        
+        implements(ICustomContent)
+
+Here it is our workflow definition (or better, you can put in content_types our ``ICustomContent`` marker interface):
+
+.. code-block:: xml
+
+    <configure xmlns="http://namespaces.repoze.org/bfg"
+               xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+               i18n:domain="Kotti">
+    
+      <include package="repoze.workflow" file="meta.zcml"/>
+    
+      <workflow
+          type="security"
+          name="custom"
+          state_attr="state"
+          initial_state="private"
+          content_types="kotti_wf.resources.CustomContent"
+          permission_checker="pyramid.security.has_permission"
+          >
+    
+        <state name="private" callback="kotti.workflow.workflow_callback">
+    
+          <key name="title" value="_(u'Private')" />
+          <key name="order" value="1" />
+    
+          <key name="inherit" value="0" />
+          <key name="system.Everyone" value="" />
+          <key name="role:viewer" value="view" />
+          <key name="role:editor" value="view add edit delete state_change" />
+          <key name="role:owner" value="view add edit delete manage state_change" />
+    
+        </state>
+    
+      </workflow>
+    
+    </configure>
+
+And now you have to tell Kotti to register your new custom workflow including our ``zcml`` file:
+
+.. code-block:: ini
+    kotti.zcml_includes = kotti_wf:workflow.zcml
+
+If you are performing more complex workflow overrides you might have to write and register in your workflow definition a workflow ``elector`` or
+update your includeme function.
+    
 .. _repoze.workflow: http://docs.repoze.org/workflow/
 .. _workflow.zcml: https://github.com/Kotti/Kotti/blob/master/kotti/workflow.zcml.

From 25f11fbacfcd7c3adcea2910aca6b0b32de183af Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Fri, 5 Jun 2015 12:49:40 +0200
Subject: [PATCH 250/600] add a note about kotti-reset-workflow

---
 docs/developing/basic/security.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index 6819e1015..620eb3e9e 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -254,6 +254,8 @@ And now you have to tell Kotti to register your new custom workflow including ou
 
 If you are performing more complex workflow overrides you might have to write and register in your workflow definition a workflow ``elector`` or
 update your includeme function.
+
+If your ``CustomContent`` already exists, you need to update the workflow settings using the ``kotti-reset-workflow`` command.
     
 .. _repoze.workflow: http://docs.repoze.org/workflow/
 .. _workflow.zcml: https://github.com/Kotti/Kotti/blob/master/kotti/workflow.zcml.

From 1cbfd65f00a1342cbcb836561367f613fef29d8a Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Fri, 5 Jun 2015 15:59:57 +0200
Subject: [PATCH 251/600] add changenote

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 798247a57..8e6edf4a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,9 @@ Change History
 
 - Update documentation
 
+- Add an ``add_permission`` attribute to ``kotti.resources.TypeInfo`` with a
+  default value of ``add``. See #436
+
 1.1.1 2015-05-11
 ----------------
 

From da80f984463dd1843da60859888602fc300bc1b5 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Sat, 6 Jun 2015 00:37:55 +0200
Subject: [PATCH 252/600] fix tutorial (elector, marker interface)

---
 docs/developing/basic/security.rst | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index 620eb3e9e..ddc78e8b8 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -180,7 +180,7 @@ I assume you are starting with a standard Kotti package created with ``pcreate -
 Four steps are needed:
 
 1. create a new marker interface ICustomContent
-2. change your kotti_wf.resource (replace IDefaultWorkflow with our new ICustomContent)
+2. change your ``kotti_wf.resource`` (replace ``IDefaultWorkflow`` with our new ``ICustomContent``)
 3. create the new workflow definition
 4. register your workflow definition
 
@@ -211,7 +211,7 @@ Change your ``kotti_wf.resources`` module like so:
         
         implements(ICustomContent)
 
-Here it is our workflow definition (or better, you can put in content_types our ``ICustomContent`` marker interface):
+Here it is our "custom" workflow definition assigned to our ``ICustomContent`` marker interface:
 
 .. code-block:: xml
 
@@ -226,7 +226,7 @@ Here it is our workflow definition (or better, you can put in content_types our
           name="custom"
           state_attr="state"
           initial_state="private"
-          content_types="kotti_wf.resources.CustomContent"
+          content_types="kotti_wf.interfaces.ICustomContent"
           permission_checker="pyramid.security.has_permission"
           >
     
@@ -252,10 +252,17 @@ And now you have to tell Kotti to register your new custom workflow including ou
 .. code-block:: ini
     kotti.zcml_includes = kotti_wf:workflow.zcml
 
-If you are performing more complex workflow overrides you might have to write and register in your workflow definition a workflow ``elector`` or
-update your includeme function.
+Special cases:
 
-If your ``CustomContent`` already exists, you need to update the workflow settings using the ``kotti-reset-workflow`` command.
+* if you change workflow settings on a site where already
+  existed ``CustomContent`` instances, you need to update
+  the workflow settings using the ``kotti-reset-workflow`` command.
+
+* if you assign a new workflow definition to a content that already provides
+  the ``IDefaultWorkflow`` marker interface (so all content types excluded
+  files and images), you will have to create
+  and attach on your workflow definition an ``elector`` function (it is
+  just a function accepting a context that should return ``True`` or ``False``)
     
 .. _repoze.workflow: http://docs.repoze.org/workflow/
 .. _workflow.zcml: https://github.com/Kotti/Kotti/blob/master/kotti/workflow.zcml.

From aff8a7f43a52b42b0066f4add08ee8c637e3bcd4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 9 Jun 2015 11:20:17 +0200
Subject: [PATCH 253/600] Revise security docs a bit.

---
 docs/developing/basic/security.rst | 122 ++++++++++++++---------------
 1 file changed, 59 insertions(+), 63 deletions(-)

diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index ddc78e8b8..5938f03e7 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -37,9 +37,8 @@ Role
 
 Workflow
     The workflow keeps track of the current state of each object lifecycle to manage content security.
-    There is an initial state and you can move to other states thanks to transitions; on each state is defined
-    a security matrix with roles and permissions.
-    Kotti provides by default a two-state workflow (private and publish) for all objects excepts files and images.
+    There is an initial state and you can move to other states thanks to transitions; each state defines a security matrix with roles and permissions.
+    By default Kotti provides a two-state workflow (private and public) for all object types except files and images.
     Kotti's workflow implementation is based on `repoze.workflow`_.
 
 How to create a new role
@@ -48,7 +47,7 @@ How to create a new role
 Small recipe you can use if you want to create a new role:
 
 .. code-block:: python
-  
+
   from kotti.security import (
       Principal,
       ROLES,
@@ -58,8 +57,8 @@ Small recipe you can use if you want to create a new role:
       set_user_management_roles,
       )
   from kotti_yourpackage import _
-  
-  
+
+
   def add_role(role_id, role_title):
       """ Add role in share view and user management views """
       UPDATED_ROLES = ROLES.copy()
@@ -70,51 +69,53 @@ Small recipe you can use if you want to create a new role:
       set_roles(UPDATED_ROLES)
       set_sharing_roles(UPDATED_SHARING_ROLES)
       set_user_management_roles(UPDATED_SHARING_ROLES + ['role:admin'])
-  
-  
+
+
   add_role(u'role:customer', _(u'Customer'))
 
 Workflows
 ---------
 
-Basically you can use an xml file (zcml) in order to describe your workflow definition.
+You can use an XML file (zcml) in order to describe your workflow.
 You can see an example here: `workflow.zcml`_.
 
-As you can see it is quite straightforward adding new states, new transitions, new permissions, etc. You can easily turn your 2-states
-website workflow into something of completely different or turn Kotti app into an intranet application.
+As you can see it is quite straightforward to add new states, transitions, permissions, etc.
+You can easily turn the default 2-state website workflow into something completely different or turn your Kotti app into an intranet application.
 
-The default workflow definition is loaded from your project ``.ini`` file settings (using the ``kotti.use_workflow`` setting).
+The default workflow definition is loaded from your project's ``.ini`` file  (using the ``kotti.use_workflow`` setting).
 The ``kotti.use_workflow`` setting's default value is:
 
 .. code-block:: ini
 
     kotti.use_workflow = kotti:workflow.zcml
 
-but can change change default workflow for the whole site, register new workflows related to specific content types or disable it as well. 
+You can change change the default workflow for your site, register new workflows related to specific content types or disable it completely.
 
 How to disable the default workflow
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Kotti is shipped with a simple workflow implementation based on private and public states. If your particular use case does not require workflows at all, you can disable this feature with a non true value. For example:
+Kotti is shipped with a simple workflow definition based on private and public states.
+If your particular use case does not require workflows at all, you can disable this feature with a non true value. For example:
 
 .. code-block:: ini
 
     kotti.use_workflow = 0
 
-How to override the Kotti's default workflow for all content types
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+How to override the default workflow for all content types
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The default workflow is quite useful for websites, but sometimes you need something of different. Just change your workflow setting and point to your zcml file:
+The default workflow is quite useful for websites, but sometimes you need something different.
+Just point the ``kotti.use_workflow`` setting to your zcml file:
 
 .. code-block:: ini
     kotti.use_workflow = kotti_yourplugin:workflow.zcml
 
 The simplest way to deal with workflow definitions is::
 
-1. create a copy of the default workflow definition
-2. customize it (change permissions, add new states, permissions, transitions, initial state and so on)
+1. create a copy of the default workflow definition and
+2. customize it (change permissions, add new states, permissions, transitions, initial state and so on).
 
-If you change workflow settings, you need to reset all your content's workflow and permission settings using the ``kotti-reset-workflow`` console script.
+If you change workflow settings, you need to reset all your content's workflow states and thus the permissions for all objects under workflow control using the ``kotti-reset-workflow`` console script.
 
 kotti-reset-workflow command usage
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -125,31 +126,33 @@ If you change workflow settings you'll need to update security.
 
     $ kotti-reset-workflow --help
     Reset the workflow of all content objects in the database.
-    
+
         This is useful when you want to migrate an existing database to
         use a different workflow.  When run, this script will reset all
         your content objects to use the new workflow, while trying to
         preserve workflow state information.
-    
+
         For this command to work, all currently persisted states must map
         directly to a state in the new workflow.  As an example, if
         there's a 'public' object in the database, the new workflow must
         define 'public' also.
-    
+
         If this is not the case, you may choose to reset all your content
         objects to the new workflow's *initial state* by passing the
         '--purge-existing' option.
-    
+
         Usage:
           kotti-reset-workflow <config_uri> [--purge-existing]
-    
+
         Options:
           -h --help          Show this screen.
           --purge-existing   Reset all objects to new workflow's initial state.
- 
+
 How to enable the standard workflow for images and files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Images and files are not associated with the default workflow. If you need a workflow for these items you need to attach the ``IDefaultWorkflow`` marker interface.
+
+Images and files are not associated with the default workflow.
+If you need a workflow for these items you need to attach the ``IDefaultWorkflow`` marker interface.
 
 You can add the following lines in your includeme function:
 
@@ -160,7 +163,7 @@ You can add the following lines in your includeme function:
     from kotti.resources import File
     from kotti.resources import Image
     ...
-    
+
     def includeme(config):
         ...
         # enable workflow for images and files
@@ -171,28 +174,27 @@ You can add the following lines in your includeme function:
 How to assign a different workflow to a content type
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-We are going to use the default workflow for standard content types and a custom workflow for content providing the pretend ``ICustomContent`` marker interface.
-The other kind of content types will still use the default workflow.
-Other developers will be able to override our custom workflow without having to touch any line of code (just a ``.ini`` configuration file)
+We are going to use the default workflow for standard content types and a custom workflow for content types providing the ``ICustomContent`` marker interface.
+All other content types will still use the default workflow.
+Third party developers will be able to override our custom workflow without having to touch any line of code (just a ``.ini`` configuration file)
 
-I assume you are starting with a standard Kotti package created with ``pcreate -t kotti kotti_wf``.
+Let's assume you are starting with a standard Kotti package created with ``pcreate -s kotti kotti_wf``.
 
 Four steps are needed:
 
-1. create a new marker interface ICustomContent
-2. change your ``kotti_wf.resource`` (replace ``IDefaultWorkflow`` with our new ``ICustomContent``)
-3. create the new workflow definition
-4. register your workflow definition
+1. create a new marker interface ICustomContent,
+2. change ``kotti_wf.resource`` (replace ``IDefaultWorkflow`` with our new ``ICustomContent``),
+3. create the new workflow definition and
+4. register your workflow definition.
 
 Create a new module ``kotti_wf/interfaces.py`` with this code.
-This is **optional** but it doesn't hurt, the important thing is omitting the ``IDefaultWorkflow``
-implementer from ``kotti_wf.resurces``:
+This is **optional** but it doesn't hurt, the important thing is to omit the ``IDefaultWorkflow`` implementer from ``kotti_wf.resources``:
 
 .. code-block:: python
 
     from zope.interface import Interface
-    
-    
+
+
     class ICustomContent(Interface):
         """ Custom content marker interface """
 
@@ -202,25 +204,25 @@ Change your ``kotti_wf.resources`` module like so:
 
     from kotti.resources import Content
     from zope.interface import implements
-    
+
     from kotti_wf.interfaces import ICustomContent
-    
-    
+
+
     class CustomContent(Content):
         """ A custom content type. """
-        
+
         implements(ICustomContent)
 
-Here it is our "custom" workflow definition assigned to our ``ICustomContent`` marker interface:
+Here it is, our "custom" workflow definition assigned to our ``ICustomContent`` marker interface:
 
 .. code-block:: xml
 
     <configure xmlns="http://namespaces.repoze.org/bfg"
                xmlns:i18n="http://xml.zope.org/namespaces/i18n"
                i18n:domain="Kotti">
-    
+
       <include package="repoze.workflow" file="meta.zcml"/>
-    
+
       <workflow
           type="security"
           name="custom"
@@ -229,40 +231,34 @@ Here it is our "custom" workflow definition assigned to our ``ICustomContent`` m
           content_types="kotti_wf.interfaces.ICustomContent"
           permission_checker="pyramid.security.has_permission"
           >
-    
+
         <state name="private" callback="kotti.workflow.workflow_callback">
-    
+
           <key name="title" value="_(u'Private')" />
           <key name="order" value="1" />
-    
+
           <key name="inherit" value="0" />
           <key name="system.Everyone" value="" />
           <key name="role:viewer" value="view" />
           <key name="role:editor" value="view add edit delete state_change" />
           <key name="role:owner" value="view add edit delete manage state_change" />
-    
+
         </state>
-    
+
       </workflow>
-    
+
     </configure>
 
-And now you have to tell Kotti to register your new custom workflow including our ``zcml`` file:
+Last you have to tell Kotti to register your new custom workflow including our ``zcml`` file:
 
 .. code-block:: ini
     kotti.zcml_includes = kotti_wf:workflow.zcml
 
 Special cases:
 
-* if you change workflow settings on a site where already
-  existed ``CustomContent`` instances, you need to update
-  the workflow settings using the ``kotti-reset-workflow`` command.
+* if you change workflow settings on a site with existing ``CustomContent`` instances, you need to update the workflow settings using the ``kotti-reset-workflow`` command.
+
+* if you assign a new workflow definition to a content that already provides the ``IDefaultWorkflow`` marker interface (by default all content types except files and images), you will have to create and attach on your workflow definition an ``elector`` function (it is just a function accepting a context and returning ``True`` or ``False``)
 
-* if you assign a new workflow definition to a content that already provides
-  the ``IDefaultWorkflow`` marker interface (so all content types excluded
-  files and images), you will have to create
-  and attach on your workflow definition an ``elector`` function (it is
-  just a function accepting a context that should return ``True`` or ``False``)
-    
 .. _repoze.workflow: http://docs.repoze.org/workflow/
 .. _workflow.zcml: https://github.com/Kotti/Kotti/blob/master/kotti/workflow.zcml.

From 81ec8e812c47bf9bd74ed8744c03f9a003af9977 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 9 Jun 2015 11:35:38 +0200
Subject: [PATCH 254/600] Include Kotti requirements from scaffold's
 requirements.txt instead of listing them all again.

---
 kotti/scaffolds/package/requirements.txt | 79 +-----------------------
 1 file changed, 1 insertion(+), 78 deletions(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 24a110090..61fdf1c34 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,78 +1 @@
-Kotti==1.1.1
-Babel==1.3
-Beaker==1.7.0
-Chameleon==2.22
-FormEncode==1.3.0
-Mako==1.0.1
-MarkupSafe==0.23
-PasteDeploy==1.5.2
-Pillow==2.8.1
-Pygments==2.0.2
-SQLAlchemy==0.9.9
-Unidecode==0.04.17
-WebOb==1.4.1
-alembic==0.6.7
-appdirs==1.4.0
-bleach==1.4.1
-bleach-whitelist==0.0.7
-colander==1.0
-deform==2.0a2
-docopt==0.6.2
-fanstatic==1.0a5
-filedepot==0.0.4
-html2text==2015.4.14
-html5lib==1.0b6
-iso8601==0.1.10
-js.angular==1.1.4
-js.bootstrap==3.3.4
-js.deform==2.0a2-3
-js.fineuploader==3.3.0
-js.html5shiv==3.6.2-1
-js.jquery==1.9.1
-js.jquery-form==3.09
-js.jquery-maskedinput==1.3.1
-js.jquery-maskmoney==1.4.1
-js.jquery-sortable==0.9.12
-js.jquery-tablednd==0.4
-js.jquery-timepicker-addon==1.5.3
-js.jqueryui==1.10.3
-js.jqueryui-tagit==2.0.24-2
-js.modernizr==2.5.3.1
-js.select2==3.4.1
-js.tinymce==4.1.5
-kotti-tinymce==0.5.2
-lingua==3.10
-peppercorn==0.5
-plone.scale==1.3.5
-polib==1.0.6
-py-bcrypt==0.4
-pyramid==1.5.7
-pyramid-beaker==0.8
-pyramid-chameleon==0.3
-pyramid-debugtoolbar==2.3
-pyramid-deform==0.2
-pyramid-mailer==0.14
-pyramid-mako==1.0.2
-pyramid-tm==0.11
-pyramid-zcml==1.0.0
-pytz==2015.2
-repoze.lru==0.6
-repoze.sendmail==4.2
-repoze.workflow==0.6.1
-repoze.zcml==1.0b1
-shutilwhich==1.1.0
-six==1.9.0
-transaction==1.4.3
-translationstring==1.3
-usersettings==1.0.7
-venusian==1.0
-waitress==0.8.9
-wsgiref==0.1.2
-zope.component==4.2.1
-zope.configuration==4.0.3
-zope.deprecation==4.1.2
-zope.event==4.0.3
-zope.i18nmessageid==4.0.3
-zope.interface==4.1.2
-zope.schema==4.4.2
-zope.sqlalchemy==0.7.6
+-r https://raw.githubusercontent.com/Kotti/Kotti/1.1.1/requirements.txt

From d49b537bd4f4a9840a1d3d10cdf902895d6eb607 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 12 Jun 2015 16:19:16 +0200
Subject: [PATCH 255/600] Add a cancel button and trash icon to the delete item
 view. Add an icon to the delete nodes view.

---
 kotti/templates/edit/delete-nodes.pt | 70 ++++++++++++++--------------
 kotti/templates/edit/delete.pt       | 13 ++++--
 kotti/tests/browser.txt              |  4 ++
 kotti/tests/test_tags.py             |  2 +-
 kotti/views/edit/actions.py          | 20 ++++++--
 5 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/kotti/templates/edit/delete-nodes.pt b/kotti/templates/edit/delete-nodes.pt
index 174f9aeaf..1e1a05157 100644
--- a/kotti/templates/edit/delete-nodes.pt
+++ b/kotti/templates/edit/delete-nodes.pt
@@ -15,41 +15,41 @@
           Are you sure you want to delete the following items?
         </p>
 
-        <fieldset>
-          <table class="table table-condensed" tal:condition="items">
-            <thead>
-              <tr>
-                <th></th>
-                <th i18n:translate="">Title</th>
-                <th i18n:translate="">Type</th>
-                <th i18n:translate="">State</th>
-                <th i18n:translate="">Creation Date</th>
-                <th i18n:translate="">Modification Date</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr tal:repeat="item items">
-                <tal:block tal:define="url string:${request.resource_url(item)}@@contents">
-                  <td><input name="children-to-delete" type="checkbox" value="${item.id}" checked="checked" /></td>
-                  <td><a href="${url}">${item.title}</a></td>
-                  <td>${item.type_info.title}</td>
-                  <td>${item.state in states and states[item.state]['title']}</td>
-                  <td>${api.format_date(item.creation_date)}</td>
-                  <td>${api.format_date(item.modification_date)}</td>
-                </tal:block>
-              </tr>
-            </tbody>
-          </table>
-        </fieldset>
-
-        <fieldset>
-          <div class="form-actions">
-            <button type="submit" name="delete_nodes" value="delete_nodes"
-                    class="btn btn-danger" i18n:translate="">Delete</button>
-            <button type="submit" name="cancel" value="cancel"
-                    class="btn" i18n:translate="">Cancel</button>
-          </div>
-        </fieldset>
+        <table class="table table-condensed" tal:condition="items">
+          <thead>
+            <tr>
+              <th></th>
+              <th i18n:translate="">Title</th>
+              <th i18n:translate="">Type</th>
+              <th i18n:translate="">State</th>
+              <th i18n:translate="">Creation Date</th>
+              <th i18n:translate="">Modification Date</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr tal:repeat="item items">
+              <tal:block tal:define="url string:${request.resource_url(item)}@@contents">
+                <td><input name="children-to-delete" type="checkbox" value="${item.id}" checked="checked" /></td>
+                <td><a href="${url}">${item.title}</a></td>
+                <td>${item.type_info.title}</td>
+                <td>${item.state in states and states[item.state]['title']}</td>
+                <td>${api.format_date(item.creation_date)}</td>
+                <td>${api.format_date(item.modification_date)}</td>
+              </tal:block>
+            </tr>
+          </tbody>
+        </table>
+        <div class="form-actions">
+          <button type="submit" name="cancel" value="cancel"
+                  class="btn btn-default">
+            <span i18n:translate="">Cancel</span>
+          </button>
+          <button type="submit" name="delete_nodes" value="delete_nodes"
+                  class="btn btn-danger">
+            <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+            <span i18n:translate="">Delete</span>
+          </button>
+        </div>
       </form>
     </div>
 
diff --git a/kotti/templates/edit/delete.pt b/kotti/templates/edit/delete.pt
index f01ec7a85..eea435217 100644
--- a/kotti/templates/edit/delete.pt
+++ b/kotti/templates/edit/delete.pt
@@ -8,18 +8,21 @@
 
     <h1 i18n:translate="">Delete <em i18n:name="title">${context.title}</em></h1>
 
-    <!-- if submit without checkbox checked, give
-         a message that x is not deleted and redirect
-         to view -->
-
     <div class="tab-pane" id="delete" tal:condition="context is not api.root">
       <form action="${request.url}" method="post" id="form-move-2">
         <p class="lead" i18n:translate="">
           Are you sure you want to delete
           <em i18n:name="title">${context.title}</em>?
         </p>
+        <button type="submit" name="delete" value="cancel"
+                class="btn btn-default">
+          <span i18n:translate="">Cancel</span>
+        </button>
         <button type="submit" name="delete" value="delete"
-                class="btn btn-danger" i18n:translate="">Delete</button>
+                class="btn btn-danger">
+          <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+          <span i18n:translate="">Delete</span>
+        </button>
       </form>
     </div>
 
diff --git a/kotti/tests/browser.txt b/kotti/tests/browser.txt
index 61f3eeb90..4b5a316bb 100644
--- a/kotti/tests/browser.txt
+++ b/kotti/tests/browser.txt
@@ -239,6 +239,10 @@ Delete a document
 
   >>> browser.open(testing.BASE_URL + '/second-child/grandchild')
   >>> browser.getLink('Delete').click()
+  >>> ctrl("cancel").click()
+  >>> "Grandchild was deleted" in browser.contents
+  False
+  >>> browser.getLink('Delete').click()
   >>> ctrl("delete").click()
   >>> "Grandchild was deleted" in browser.contents
   True
diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index 4581b84c0..ae65d67d8 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -164,7 +164,7 @@ def test_delete_content_delete_tags_and_assignments(self, root, events):
         assert TagsToContents.query.count() == 3
 
         request = DummyRequest()
-        request.POST['delete'] = 'on'
+        request.POST['delete'] = 'delete'
         NodeActions(root[u'folder_1'], request).delete_node()
         assert Tag.query.count() == 0
         assert TagsToContents.query.count() == 0
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index a0a62c84b..eb82dcd94 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -266,13 +266,23 @@ def delete_node(self):
                  template for rendering.
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
-        if 'delete' in self.request.POST:
+
+        action = self.request.POST.get(u'delete', None)
+        if action is not None:
+
             parent = self.context.__parent__
-            self.flash(_(u'${title} was deleted.',
-                         mapping=dict(title=self.context.title)), 'success')
-            del parent[self.context.name]
-            location = resource_url(parent, self.request)
+
+            if action == u'delete':
+                location = resource_url(parent, self.request)
+                self.flash(_(u'${title} was deleted.',
+                             mapping=dict(title=self.context.title)),
+                           u'success')
+                del parent[self.context.name]
+            else:
+                location = resource_url(self.context, self.request)
+
             return HTTPFound(location=location)
+
         return {}
 
     @view_config(name='delete_nodes',

From d0cabecb07473d31e5ee1171e3fdd8e21ff97f68 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 12 Jun 2015 16:30:23 +0200
Subject: [PATCH 256/600] Add changenote.  [ci skip]

---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8e6edf4a1..3d7ec4091 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.1.2 - unreleased
 ------------------
 
-- Enlarge column sizes for ``name``, ``path`` and ``title`` (see #427). 
+- Enlarge column sizes for ``name``, ``path`` and ``title`` (see #427).
   Upgrading from any version older than 1.1.2 requires you to run a migration
   script on your database. To run the migration, call::
 
@@ -22,6 +22,8 @@ Change History
 - Add an ``add_permission`` attribute to ``kotti.resources.TypeInfo`` with a
   default value of ``add``. See #436
 
+- Add a "cancel" button to the delete node view.
+
 1.1.1 2015-05-11
 ----------------
 

From 4b9cc1129d62038999952d3a203de5bfbb9a634e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 12 Jun 2015 16:51:05 +0200
Subject: [PATCH 257/600] Bump version.

---
 CHANGES.txt                              | 2 +-
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3d7ec4091..3121919a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.1.2 - unreleased
+1.1.2 - 2015-06-12
 ------------------
 
 - Enlarge column sizes for ``name``, ``path`` and ``title`` (see #427).
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 61fdf1c34..333983cf1 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1 +1 @@
--r https://raw.githubusercontent.com/Kotti/Kotti/1.1.1/requirements.txt
+-r https://raw.githubusercontent.com/Kotti/Kotti/1.1.2/requirements.txt
diff --git a/requirements.txt b/requirements.txt
index 3208dc889..04cfd268c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.1
+Kotti==1.1.2
 Babel==1.3
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/setup.py b/setup.py
index 61ef698cf..bb3634349 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.2-dev',
+      version='1.1.2',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From f4e79c6922c77dc4f4c0ae80b99e54ab5b08599a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 12 Jun 2015 16:52:46 +0200
Subject: [PATCH 258/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3121919a5..a992604c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1.3 - unreleased
+------------------
+
+- No changes yet.
+
 1.1.2 - 2015-06-12
 ------------------
 
diff --git a/setup.py b/setup.py
index bb3634349..66ac5c763 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.2',
+      version='1.1.3-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 376d7ab45cd81b2978704a58672bfbc85d3887ad Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 15 Jun 2015 20:17:17 +0200
Subject: [PATCH 259/600] Fix error when running the first migration step for a
 package (initial revision is ``()`` with alembic >= 0.7).  Also add
 ``{{package}}:alembic`` to ``kotti.alembic_dirs`` in the scaffold.

---
 kotti/migrate.py                                   | 8 +++++---
 kotti/scaffolds/package/+package+/__init__.py_tmpl | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kotti/migrate.py b/kotti/migrate.py
index 02e696ff9..a2414ddb1 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -144,14 +144,15 @@ def upgrade(location=DEFAULT_LOCATION):
     print(u'Upgrading {0}:'.format(pkg_env.location))
 
     def upgrade(heads, context):
-        rev = heads[0]   # alembic supports multiple heads, we don't
+        # alembic supports multiple heads, we don't.
+        # initial revision is () in alembic >= 0.7
+        rev = heads[0] if heads else None
 
         if rev == revision:
             print(u'  - already up to date.')
             return []
 
-        print(u'  - upgrading from {0} to {1}...'.format(
-            rev, revision))
+        print(u'  - upgrading from {0} to {1}...'.format(rev, revision))
 
         return context.script._upgrade_revs(revision, rev)
 
@@ -181,6 +182,7 @@ def list_all():
                 ))
 
         def current_revision(rev, context):
+            rev = rev[0] if rev else None
             print(u"  - current revision: {0}".format(rev))
             return []
         pkg_env.run_env(current_revision)
diff --git a/kotti/scaffolds/package/+package+/__init__.py_tmpl b/kotti/scaffolds/package/+package+/__init__.py_tmpl
index 675f116a7..ca226d965 100644
--- a/kotti/scaffolds/package/+package+/__init__.py_tmpl
+++ b/kotti/scaffolds/package/+package+/__init__.py_tmpl
@@ -24,6 +24,7 @@ def kotti_configure(settings):
     """
 
     settings['pyramid.includes'] += ' {{package}}'
+    settings['kotti.alembic_dirs'] += ' {{package}}:alembic'
     settings['kotti.available_types'] += ' {{package}}.resources.CustomContent'
     settings['kotti.fanstatic.view_needed'] += ' {{package}}.fanstatic.css_and_js'
     File.type_info.addable_to.append('CustomContent')

From 804701870f0afa5e83337eb68bf57d240a0b7e01 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jun 2015 15:01:22 +0200
Subject: [PATCH 260/600] Add badge (and link) to quantifiedcode.  [ci skip]

---
 README.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.rst b/README.rst
index 3c1618c53..5be38acd6 100644
--- a/README.rst
+++ b/README.rst
@@ -98,6 +98,7 @@ Development
 |coveralls|_
 |codacy|_
 |codeclimate|_
+|quantifiedcode|_
 
 .. requirements need to be upgraded before we shoff off
    |requires.io|_
@@ -134,5 +135,9 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. |codeclimate| image:: https://img.shields.io/codeclimate/github/Kotti/Kotti.svg?style=flat-square
 .. _codeclimate: https://codeclimate.com/github/Kotti/Kotti
 
+.. |quantifiedcode| image:: http://www.quantifiedcode.com/api/v1/project/f2a648c15f8e42788aaa4fa12a82df93/badge.svg
+.. _quantifiedcode: http://www.quantifiedcode.com/app/project/f2a648c15f8e42788aaa4fa12a82df93
+
+
 .. _contribution guidelines: http://kotti.readthedocs.org/en/latest/contributing.html
 .. _Github repository: https://github.com/Kotti/Kotti

From 56b0bdda01add09798e05ccbabc0951f72298465 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jun 2015 16:29:51 +0200
Subject: [PATCH 261/600] Require kotti_tinymce 0.5.3

---
 CHANGES.txt      | 4 +++-
 requirements.txt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a992604c6..1f9ab8fd2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Change History
 1.1.3 - unreleased
 ------------------
 
-- No changes yet.
+- Fix a bug in kotti-migrate that prevented initial migration steps from being
+  run successfully.
+- Require kotti_tinymce 0.5.3.
 
 1.1.2 - 2015-06-12
 ------------------
diff --git a/requirements.txt b/requirements.txt
index 04cfd268c..44fd5aeb1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,7 +40,7 @@ js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
-kotti-tinymce==0.5.2
+kotti-tinymce==0.5.3
 lingua==3.10
 peppercorn==0.5
 plone.scale==1.3.5

From d51378f196b81d3ddb28eb981cb75a862512628f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jun 2015 16:33:01 +0200
Subject: [PATCH 262/600] Bump version.

---
 CHANGES.txt      | 2 +-
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1f9ab8fd2..191610966 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.1.3 - unreleased
+1.1.3 - 2015-06-17
 ------------------
 
 - Fix a bug in kotti-migrate that prevented initial migration steps from being
diff --git a/requirements.txt b/requirements.txt
index 44fd5aeb1..aafdc389a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.2
+Kotti==1.1.3
 Babel==1.3
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/setup.py b/setup.py
index 66ac5c763..4a0002785 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.3-dev',
+      version='1.1.3',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 8aa7eef6b88bfe97adc0849fa2210c0f6dd0f4b4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jun 2015 16:34:23 +0200
Subject: [PATCH 263/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 191610966..fa6887237 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1.4 - unreleased
+------------------
+
+- No changes yet.
+
 1.1.3 - 2015-06-17
 ------------------
 
diff --git a/setup.py b/setup.py
index 4a0002785..6e5e505e4 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.3',
+      version='1.1.4-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 939ba8bd1d00227a35cfb8b749e4fb16676dc2b5 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 21 Jun 2015 05:18:50 -0700
Subject: [PATCH 264/600] Generate development.ini with 0.0.0.0 as bind
 address; useful when developing on remote machines

---
 kotti/scaffolds/package/development.ini_tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/development.ini_tmpl b/kotti/scaffolds/package/development.ini_tmpl
index 49047ea6e..75f3e5dc3 100644
--- a/kotti/scaffolds/package/development.ini_tmpl
+++ b/kotti/scaffolds/package/development.ini_tmpl
@@ -30,7 +30,7 @@ pipeline =
 
 [server:main]
 use = egg:waitress#main
-host = 127.0.0.1
+host = 0.0.0.0
 port = 5000
 
 [alembic]

From 99c6a7560eb6d4b0eb927e09b26d61bdd3166316 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 21 Jun 2015 05:20:10 -0700
Subject: [PATCH 265/600] Use the add_permission in the generated scaffold

---
 kotti/scaffolds/package/+package+/views/edit.py_tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/+package+/views/edit.py_tmpl b/kotti/scaffolds/package/+package+/views/edit.py_tmpl
index 44c93dfca..f4d46bcbf 100644
--- a/kotti/scaffolds/package/+package+/views/edit.py_tmpl
+++ b/kotti/scaffolds/package/+package+/views/edit.py_tmpl
@@ -23,7 +23,8 @@ class CustomContentSchema(ContentSchema):
         title=_(u"Custom attribute"))
 
 
-@view_config(name=CustomContent.type_info.add_view, permission='add',
+@view_config(name=CustomContent.type_info.add_view, 
+             permission=CustomContent.type_info.add_permission,
              renderer='kotti:templates/edit/node.pt')
 class CustomContentAddForm(AddFormView):
     """ Form to add a new instance of CustomContent. """

From 8c1ba2df47961f6ec177463faf1890d923bbc503 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 22 Jun 2015 10:56:24 +0200
Subject: [PATCH 266/600] Upgrade upstream packages.

---
 requirements.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index aafdc389a..9a5bc253f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,10 +6,10 @@ FormEncode==1.3.0
 Mako==1.0.1
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==2.8.1
+Pillow==2.8.2
 Pygments==2.0.2
 SQLAlchemy==0.9.9
-Unidecode==0.04.17
+Unidecode==0.04.18
 WebOb==1.4.1
 alembic==0.7.6
 appdirs==1.4.0
@@ -19,8 +19,8 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-filedepot==0.0.4
-html2text==2015.4.14
+filedepot==0.0.6
+html2text==2015.6.21
 html5lib==1.0b6
 iso8601==0.1.10
 js.angular==1.1.4
@@ -49,26 +49,26 @@ py-bcrypt==0.4
 pyramid==1.5.7
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==2.3
+pyramid-debugtoolbar==2.4
 pyramid-deform==0.2
-pyramid-mailer==0.14
+pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
-pyramid-tm==0.11
+pyramid-tm==0.12
 pyramid-zcml==1.0.0
-pytz==2015.2
+pytz==2015.4
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
 repoze.zcml==1.0b1
 shutilwhich==1.1.0
 six==1.9.0
-transaction==1.4.3
+transaction==1.4.4
 translationstring==1.3
 usersettings==1.0.7
 venusian==1.0
 waitress==0.8.9
 wsgiref==0.1.2
-zope.component==4.2.1
+zope.component==4.2.2
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
 zope.event==4.0.3

From 1bdb5e6243a6fb25e0c77c16bc6a58bb3a0969d6 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Tue, 23 Jun 2015 16:49:29 +0200
Subject: [PATCH 267/600] prevent raising HTTPForbidden exception during slots
 rendering

---
 CHANGES.txt          | 2 +-
 kotti/views/slots.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fa6887237..4caf79fe6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.1.4 - unreleased
 ------------------
 
-- No changes yet.
+- Ignore HTTPForbidden exceptions during slot rendering
 
 1.1.3 - 2015-06-17
 ------------------
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index a36f1242d..61f84eb53 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -41,6 +41,7 @@ def view(request, context):
 import urllib
 
 from pyramid.exceptions import PredicateMismatch
+from pyramid.exceptions import HTTPForbidden
 from pyramid.request import Request
 from pyramid.view import render_view
 
@@ -77,7 +78,7 @@ def _render_view_on_slot_event(view_name, event, params):
 
     try:
         result = render_view(context, view_request, view_name)
-    except PredicateMismatch:
+    except (PredicateMismatch, HTTPForbidden):
         return None
     else:
         return result.decode('utf-8')

From 33b00ad3e6150457148aeb09dff2de446430fb17 Mon Sep 17 00:00:00 2001
From: davidemoro <davide.moro@gmail.com>
Date: Tue, 23 Jun 2015 17:20:32 +0200
Subject: [PATCH 268/600] add test for slot rendering with HTTPForbidden

---
 kotti/tests/test_util_views.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index c67d9ee80..285378f2e 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -282,6 +282,22 @@ def special(context, request):
         api = self.make()
         assert api.slots.right == [u"Hello world!"]
 
+    def test_assign_to_slot_forbidden(self, config, db_session,
+                                      events):
+        from kotti.views.slots import assign_slot
+        from pyramid.exceptions import HTTPForbidden
+
+        def special(context, request):
+            return Response(u"Hello world!")
+        assign_slot('special', 'right')
+
+        config.add_view(special, name='special', permission='admin')
+        # the slot rendering must not fail if a HTTPForbidden exception
+        api = self.make()
+        with patch('kotti.views.slots.render_view') as render_view:
+            render_view.side_effect = HTTPForbidden()
+            assert api.slots.right == []
+
     def test_assign_slot_bad_name(self):
         from kotti.views.slots import assign_slot
 

From 1e28995049ae4be2410b3c149ae42fb595ea72ca Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 27 Jun 2015 00:02:05 +0200
Subject: [PATCH 269/600] Add compatibility with SQLAlchemy 1.0.  Also require
 SQLAlchemy 1.0.6 now.

---
 CHANGES.txt                   |  2 +-
 kotti/resources.py            | 94 ++++++++++++++++++++---------------
 kotti/tests/test_filedepot.py |  7 +--
 requirements.txt              |  2 +-
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fa6887237..ad3ff9085 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.1.4 - unreleased
 ------------------
 
-- No changes yet.
+- Add compatibility with SQLAlchemy 1.0.  Also require SQLAlchemy 1.0.6 now.
 
 1.1.3 - 2015-06-17
 ------------------
diff --git a/kotti/resources.py b/kotti/resources.py
index fce3213f7..e771ebea4 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -645,7 +645,59 @@ def __init__(self, body=u"", mime_type='text/html', **kwargs):
         self.mime_type = mime_type
 
 
-class File(Content):
+class SaveDataMixin(object):
+    """ The classmethods must not be implemented on a class that inherits
+        from ``Base`` with ``SQLAlchemy>=1.0``, otherwise that class cannot be
+        subclassed further.
+
+        See http://stackoverflow.com/questions/30433960/how-to-use-declare-last-in-sqlalchemy-1-0  # noqa
+    """
+
+    @classmethod
+    def __declare_last__(cls):
+        """ Unconfigure the event set in _SQLAMutationTracker,
+        we have _save_data """
+
+        mapper = cls._sa_class_manager.mapper
+        args = (mapper.attrs['data'], 'set', _SQLAMutationTracker._field_set)
+        if event.contains(*args):
+            event.remove(*args)
+
+        # Declaring the event on the class attribute instead of mapper property
+        # enables proper registration on its subclasses
+        event.listen(cls.data, 'set', cls._save_data, retval=True)
+
+    @classmethod
+    def _save_data(cls, target, value, oldvalue, initiator):
+        """ Refresh metadata and save the binary data to the data field.
+
+        :param target: The File instance
+        :type target: :class:`kotti.resources.File` or subclass
+
+        :param value: The container for binary data
+        :type value: A :class:`cgi.FieldStorage` instance
+        """
+
+        if isinstance(value, bytes):
+            value = _to_fieldstorage(fp=StringIO(value),
+                                     filename=target.filename,
+                                     mimetype=target.mimetype,
+                                     size=len(value))
+
+        newvalue = _SQLAMutationTracker._field_set(
+            target, value, oldvalue, initiator)
+
+        if newvalue is None:
+            return
+
+        target.filename = newvalue.filename
+        target.mimetype = newvalue.content_type
+        target.size = newvalue.file.content_length
+
+        return newvalue
+
+
+class File(Content, SaveDataMixin):
     """File adds some attributes to :class:`~kotti.resources.Content` that are
        useful for storing binary data.
     """
@@ -706,46 +758,6 @@ def from_field_storage(cls, fs):
 
         return cls(data=fs)
 
-    @classmethod
-    def __declare_last__(cls):
-        # Unconfigure the event set in _SQLAMutationTracker, we have _save_data
-        mapper = cls._sa_class_manager.mapper
-        args = (mapper.attrs['data'], 'set', _SQLAMutationTracker._field_set)
-        if event.contains(*args):
-            event.remove(*args)
-
-        # Declaring the event on the class attribute instead of mapper property
-        # enables proper registration on its subclasses
-        event.listen(cls.data, 'set', cls._save_data, retval=True)
-
-    @classmethod
-    def _save_data(cls, target, value, oldvalue, initiator):
-        """ Refresh metadata and save the binary data to the data field.
-
-        :param target: The File instance
-        :type target: :class:`kotti.resources.File` or subclass
-        :param value: The container for binary data
-        :type value: A :class:`cgi.FieldStorage` instance
-        """
-
-        if isinstance(value, bytes):
-            value = _to_fieldstorage(fp=StringIO(value),
-                                     filename=target.filename,
-                                     mimetype=target.mimetype,
-                                     size=len(value))
-
-        newvalue = _SQLAMutationTracker._field_set(
-            target, value, oldvalue, initiator)
-
-        if newvalue is None:
-            return
-
-        target.filename = newvalue.filename
-        target.mimetype = newvalue.content_type
-        target.size = newvalue.file.content_length
-
-        return newvalue
-
 
 class Image(File):
     """Image doesn't add anything to :class:`~kotti.resources.File`, but images
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index c2079b69c..f3ba33832 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -138,7 +138,8 @@ def test_session_integration(self, db_session):
         DepotManager._default_depot = 'default'
         DepotManager._depots = {'default': DBFileStorage()}
 
-        file_id = DepotManager.get().create('content here', u'f.jpg', 'image/jpg')
+        file_id = DepotManager.get().create(
+            'content here', u'f.jpg', 'image/jpg')
         fs = DepotManager.get().get(file_id)
 
         db_session.add(fs)
@@ -185,8 +186,8 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots):
         import shutil
 
         event.listen(db_session,
-                    'before_commit',
-                    _SQLAMutationTracker._session_committed)
+                     'before_commit',
+                     _SQLAMutationTracker._session_committed)
 
         tmp_location = tempfile.mkdtemp()
 
diff --git a/requirements.txt b/requirements.txt
index 9a5bc253f..68a4724df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==2.8.2
 Pygments==2.0.2
-SQLAlchemy==0.9.9
+SQLAlchemy==1.0.6
 Unidecode==0.04.18
 WebOb==1.4.1
 alembic==0.7.6

From 049ff5033ae07a27e5413283783d0209a36e8bca Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 27 Jun 2015 00:34:02 +0200
Subject: [PATCH 270/600] Bump version.

---
 CHANGES.txt      | 2 +-
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4c1dac7a7..c40ee6361 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.1.4 - unreleased
+1.1.4 - 2015-06-27
 ------------------
 
 - Add compatibility with SQLAlchemy 1.0.  Also require SQLAlchemy 1.0.6 now.
diff --git a/requirements.txt b/requirements.txt
index 68a4724df..85169d3cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.3
+Kotti==1.1.4
 Babel==1.3
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/setup.py b/setup.py
index 6e5e505e4..060f90480 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.4-dev',
+      version='1.1.4',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 101bdccbbd8fe021ce53fbf34dc378399b38a125 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 27 Jun 2015 00:37:12 +0200
Subject: [PATCH 271/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c40ee6361..1b9a60a10 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1.5 - unreleased
+------------------
+
+- No changes yet.
+
 1.1.4 - 2015-06-27
 ------------------
 
diff --git a/setup.py b/setup.py
index 060f90480..bb4ee570e 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.4',
+      version='1.1.5-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 94fd6d5bb6eeefb8b3a3822d1694763aaa57d366 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 29 Jun 2015 10:12:24 +0200
Subject: [PATCH 272/600] Fix PEP8 error.

---
 .../versions/1063d7178fa_add_node_path_column.py       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
index 0695e0339..d9fbcb6e3 100644
--- a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
+++ b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
@@ -6,15 +6,16 @@
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '1063d7178fa'
-down_revision = '57fecf5dbd62'
-
 from alembic import op
 import sqlalchemy as sa
 from pyramid.location import lineage
 
 
+# revision identifiers, used by Alembic.
+revision = '1063d7178fa'
+down_revision = '57fecf5dbd62'
+
+
 def upgrade():
     from alembic.context import get_bind
 
@@ -24,7 +25,6 @@ def upgrade():
     else:
         op.add_column('nodes', sa.Column('path', sa.Unicode(1000), index=True))
 
-
     from kotti import DBSession
     from kotti.resources import Node
 

From 87c7ad270354e18d0156b73e94b696f64ba24554 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 29 Jun 2015 10:12:59 +0200
Subject: [PATCH 273/600] Add Changenote.

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1b9a60a10..b23ca8826 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.1.5 - unreleased
 ------------------
 
-- No changes yet.
+- Fix migration error on MySQL.
 
 1.1.4 - 2015-06-27
 ------------------

From f9b5d37b582373d532497e14c593fcb1a18bdf59 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 29 Jun 2015 12:00:41 +0200
Subject: [PATCH 274/600] Remove deprecated ``kotti.includes`` from
 ``app.ini``.  [ci skip]

---
 app.ini | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app.ini b/app.ini
index 12a836337..5cda4ca61 100644
--- a/app.ini
+++ b/app.ini
@@ -7,37 +7,26 @@ use = egg:kotti
 # kotti.site_title: your site's title
 kotti.site_title = Yet another Kotti site
 
-
 # kotti.secret: defines the initial password of the 'admin' user
 kotti.secret = qwerty
 
-
 # sqlalchemy.url: the database that you want to use, defaults to SQLite
 # see http://www.sqlalchemy.org/docs/core/engines.html#database-urls
 sqlalchemy.url = sqlite:///%(here)s/Kotti.db
 
-
 # mail.default_sender: configure the 'from' address of emails sent by Kotti
 mail.default_sender = yourname@yourhost
 
-
-# kotti.includes: include add-ons; an example:
-# kotti.includes = kotti_twitter.include_search_widget
-
-
 # kotti.configurators: another hook for add-ons
 # kotti_tinymce should always be present (unless you don't want WYSIWYG editing)
 kotti.configurators = kotti_tinymce.kotti_configure
 
-
 # kotti.asset_overrides: override Kotti's templates and resources; an example:
 # kotti.asset_overrides = mypackage:kotti-overrides/
 
-
 # pyramid.default_locale_name: set the user interface language
 pyramid.default_locale_name = en
 
-
 pyramid.includes =
   pyramid_tm
 #  pyramid_debugtoolbar

From 07929304e417357b611f18bfe1da3174781654c9 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 6 Jul 2015 09:56:10 +0200
Subject: [PATCH 275/600] Add codecov to travis (coveralls seems to be broken)

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e007eb4e2..876ece494 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
   - pip uninstall -y Kotti
   - python setup.py develop
   - python setup.py dev
-  - travis_retry pip install psycopg2 oursql python-coveralls
+  - travis_retry pip install psycopg2 oursql python-coveralls codecov
 before_script:
   - psql -c 'create database kotti_testing;' -U postgres
   - mysql -e 'create database kotti_testing;'
@@ -21,6 +21,7 @@ script:
   - py.test --runslow --tb=native --cov=kotti --cov-report=term-missing
 after_success:
   - coveralls
+  - codecov
 notifications:
   irc: "irc.freenode.org#kotti"
   email: false

From 1e6f1f385d89607dc1f00045ebc3ded11a5c0a65 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 6 Jul 2015 10:51:06 +0200
Subject: [PATCH 276/600] Upgrade Pillow.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 85169d3cb..dbb225a4c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ FormEncode==1.3.0
 Mako==1.0.1
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==2.8.2
+Pillow==2.9.0
 Pygments==2.0.2
 SQLAlchemy==1.0.6
 Unidecode==0.04.18

From 825131993e07fee8565b9984a4414223305c7f02 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 26 Aug 2015 16:57:30 +0200
Subject: [PATCH 277/600] Fix #446

---
 kotti/scaffolds/package/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 333983cf1..f1f2fa930 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1 +1 @@
--r https://raw.githubusercontent.com/Kotti/Kotti/1.1.2/requirements.txt
+-r https://raw.githubusercontent.com/Kotti/Kotti/1.1.4/requirements.txt

From 755e7bcc71929cb0117f706ce6e3218efa2063d9 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 27 Aug 2015 09:52:03 +0200
Subject: [PATCH 278/600] Upgrade requirements to their latest versions.

---
 requirements.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index dbb225a4c..4a0696471 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,17 +1,17 @@
 Kotti==1.1.4
-Babel==1.3
+Babel==2.0
 Beaker==1.7.0
 Chameleon==2.22
 FormEncode==1.3.0
-Mako==1.0.1
+Mako==1.0.2
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==2.9.0
 Pygments==2.0.2
-SQLAlchemy==1.0.6
+SQLAlchemy==1.0.8
 Unidecode==0.04.18
 WebOb==1.4.1
-alembic==0.7.6
+alembic==0.8.2
 appdirs==1.4.0
 bleach==1.4.1
 bleach-whitelist==0.0.7
@@ -21,7 +21,7 @@ docopt==0.6.2
 fanstatic==1.0a5
 filedepot==0.0.6
 html2text==2015.6.21
-html5lib==1.0b6
+html5lib==1.0b7
 iso8601==0.1.10
 js.angular==1.1.4
 js.bootstrap==3.3.4
@@ -41,15 +41,15 @@ js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
 kotti-tinymce==0.5.3
-lingua==3.10
+lingua==3.11
 peppercorn==0.5
 plone.scale==1.3.5
-polib==1.0.6
+polib==1.0.7
 py-bcrypt==0.4
 pyramid==1.5.7
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==2.4
+pyramid-debugtoolbar==2.4.1
 pyramid-deform==0.2
 pyramid-mailer==0.14.1
 pyramid-mako==1.0.2

From 791a073711377a335bb45beb2c99b4212f87c4cb Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 28 Aug 2015 16:35:50 +0200
Subject: [PATCH 279/600] Try to fix travis.

---
 kotti/tests/test_zzz_scaffolds.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index d338db322..9dbe7474b 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -48,6 +48,11 @@ def virtualenv(request):
     # chdir into the virtualenv directory
     os.chdir(virtualenv_directory)
 
+    # update setuptools in the virtualenv
+    subprocess.check_call([
+        os.path.join('bin', 'pip'),
+        'install', '-U', 'setuptools'])
+
     # install requirements.txt into the virtualenv
     subprocess.check_call([
         os.path.join('bin', 'pip'),

From a26632b6d3e5dddbe5a63a2d014bafd5f46e3c62 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 28 Aug 2015 16:58:42 +0200
Subject: [PATCH 280/600] Try to fix travis (2).

---
 kotti/tests/test_zzz_scaffolds.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index 9dbe7474b..5fd5cd7f9 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -51,7 +51,7 @@ def virtualenv(request):
     # update setuptools in the virtualenv
     subprocess.check_call([
         os.path.join('bin', 'pip'),
-        'install', '-U', 'setuptools'])
+        'install', 'setuptools>=17.1'])
 
     # install requirements.txt into the virtualenv
     subprocess.check_call([

From 401cd586abb982761ac1fec751157b23a812c0cd Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 28 Aug 2015 20:58:28 +0200
Subject: [PATCH 281/600] Try to fix travis (3).

---
 .travis.yml                       | 1 +
 kotti/tests/test_zzz_scaffolds.py | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 876ece494..5e9f44418 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
   - travis_retry pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
+  - travis_retry pip install "setuptools>=17.1"  # fix issue with mock==1.3.0
   - travis_retry pip install -e . -r requirements.txt --use-mirrors
   - pip uninstall -y Kotti
   - python setup.py develop
diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index 5fd5cd7f9..d338db322 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -48,11 +48,6 @@ def virtualenv(request):
     # chdir into the virtualenv directory
     os.chdir(virtualenv_directory)
 
-    # update setuptools in the virtualenv
-    subprocess.check_call([
-        os.path.join('bin', 'pip'),
-        'install', 'setuptools>=17.1'])
-
     # install requirements.txt into the virtualenv
     subprocess.check_call([
         os.path.join('bin', 'pip'),

From 9a41ab0f4c42bb6010e2b826efc8cd14b375b5e8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 28 Aug 2015 21:17:07 +0200
Subject: [PATCH 282/600] Try to fix travis (4).

---
 kotti/tests/test_zzz_scaffolds.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index d338db322..d6ed4e3b2 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -41,13 +41,18 @@ def virtualenv(request):
     virtualenv.logger = logger
     virtualenv.create_environment(
         virtualenv_directory,
-        site_packages=True,
-        clear=False,
+        site_packages=False,
+        clear=True,
         unzip_setuptools=True)
 
     # chdir into the virtualenv directory
     os.chdir(virtualenv_directory)
 
+    # update setuptools in the virtualenv
+    subprocess.check_call([
+        os.path.join('bin', 'pip'),
+        'install', '-U', 'setuptools>=17.1'])
+
     # install requirements.txt into the virtualenv
     subprocess.check_call([
         os.path.join('bin', 'pip'),

From ca13e775c1a3cb4abab50380020e34f8f579e867 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 4 Sep 2015 16:01:55 +0200
Subject: [PATCH 283/600] Only wrap methods that do exist on the wrapped type.

---
 CHANGES.txt              |  4 ++++
 kotti/sqla.py            | 16 +++++++++++-----
 kotti/tests/test_sqla.py |  2 ++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b23ca8826..38a7ab930 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,10 @@ Change History
 ------------------
 
 - Fix migration error on MySQL.
+- Only wrap methods that do exist on the wrapped type (in
+  ``kotti.sqla.MutationList`` / ``kotti.sqla.MutationDict``).  This
+  fixes an error that occurs when MutationLists are exposed to the UI
+  via ``colander.SequenceSchema``.
 
 1.1.4 - 2015-06-27
 ------------------
diff --git a/kotti/sqla.py b/kotti/sqla.py
index 287a37f46..7ae308102 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -71,6 +71,8 @@ def process_result_value(self, value, dialect):
 class MutationDict(Mutable):
     """http://www.sqlalchemy.org/docs/orm/extensions/mutable.html
     """
+    _wraps = dict
+
     def __init__(self, data):
         self._d = data
         super(MutationDict, self).__init__()
@@ -91,6 +93,9 @@ def __json__(self, request=None):
 
 
 class MutationList(Mutable):
+
+    _wraps = list
+
     def __init__(self, data):
         self._d = data
         super(MutationList, self).__init__()
@@ -148,11 +153,12 @@ def replacer(self, *args, **kwargs):
             ('update', True),
             ('remove', True),
             ):
-        setattr(
-            wrapper_class, methodname,
-            _make_mutable_method_wrapper(
-                wrapper_class, methodname, mutates),
-            )
+        if getattr(wrapper_class._wraps, methodname, False):
+            setattr(
+                wrapper_class, methodname,
+                _make_mutable_method_wrapper(
+                    wrapper_class, methodname, mutates),
+                )
 
 
 class NestedMixin(object):
diff --git a/kotti/tests/test_sqla.py b/kotti/tests/test_sqla.py
index e8fe0c9c4..25bd9e9ed 100644
--- a/kotti/tests/test_sqla.py
+++ b/kotti/tests/test_sqla.py
@@ -72,6 +72,7 @@ def test_dictwrapper_wraps(self):
 
         wrapper = NestedMutationDict(
             {'name': 'andy', 'age': 77, 'children': []})
+        assert getattr(wrapper, 'get', False) is not False
         changed = wrapper.changed = MagicMock()
 
         wrapper['name'] = 'randy'
@@ -89,6 +90,7 @@ def test_listwrapper_wraps(self):
 
         wrapper = NestedMutationList(
             [{'name': 'andy', 'age': 77, 'children': []}])
+        assert getattr(wrapper, 'get', False) is False
         changed = wrapper.changed = MagicMock()
 
         assert isinstance(wrapper[0], NestedMutationDict)

From b6fad7b45f4ce2be3a811e8c0b00f2ddbb681611 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 4 Sep 2015 16:09:29 +0200
Subject: [PATCH 284/600] Add comment.  [ci skip]

---
 kotti/sqla.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kotti/sqla.py b/kotti/sqla.py
index 7ae308102..90d0c362f 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -153,6 +153,7 @@ def replacer(self, *args, **kwargs):
             ('update', True),
             ('remove', True),
             ):
+        # Only wrap methods that do exist on the wrapped type!
         if getattr(wrapper_class._wraps, methodname, False):
             setattr(
                 wrapper_class, methodname,

From 427a66c84481bd376268bb3083164e9774fc1522 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 4 Sep 2015 16:25:22 +0200
Subject: [PATCH 285/600] Upgrade requirements.

---
 CHANGES.txt      | 1 +
 requirements.txt | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 38a7ab930..5774f5ec2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ Change History
   ``kotti.sqla.MutationList`` / ``kotti.sqla.MutationDict``).  This
   fixes an error that occurs when MutationLists are exposed to the UI
   via ``colander.SequenceSchema``.
+- Upgrade requirements to latest versions (``filedepot``, ``waitress``).
 
 1.1.4 - 2015-06-27
 ------------------
diff --git a/requirements.txt b/requirements.txt
index 4a0696471..2a94ff50b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-filedepot==0.0.6
+filedepot==0.1.0
 html2text==2015.6.21
 html5lib==1.0b7
 iso8601==0.1.10
@@ -66,7 +66,7 @@ transaction==1.4.4
 translationstring==1.3
 usersettings==1.0.7
 venusian==1.0
-waitress==0.8.9
+waitress==0.8.10
 wsgiref==0.1.2
 zope.component==4.2.2
 zope.configuration==4.0.3

From 9bf0c362532dcdcb8714058063b43369c1b3d06c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 4 Sep 2015 16:44:15 +0200
Subject: [PATCH 286/600] Bump version.

---
 CHANGES.txt      | 2 +-
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5774f5ec2..b2d76c7ff 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.1.5 - unreleased
+1.1.5 - 2015-09-04
 ------------------
 
 - Fix migration error on MySQL.
diff --git a/requirements.txt b/requirements.txt
index 2a94ff50b..d2b1a153f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.4
+Kotti==1.1.5
 Babel==2.0
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/setup.py b/setup.py
index bb4ee570e..580ea285c 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.5-dev',
+      version='1.1.5',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 51e8b2722a4404c113ef9fb893026b9a70911674 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 4 Sep 2015 16:48:19 +0200
Subject: [PATCH 287/600] Bump version.

---
 CHANGES.txt                              | 5 +++++
 kotti/scaffolds/package/requirements.txt | 2 +-
 setup.py                                 | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b2d76c7ff..30060b2ca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.1.6 - unreleased
+------------------
+
+- No changes yet.
+
 1.1.5 - 2015-09-04
 ------------------
 
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index f1f2fa930..5efc2fc18 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1 +1 @@
--r https://raw.githubusercontent.com/Kotti/Kotti/1.1.4/requirements.txt
+-r https://raw.githubusercontent.com/Kotti/Kotti/1.1.5/requirements.txt
diff --git a/setup.py b/setup.py
index 580ea285c..3e8d534f7 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.5',
+      version='1.1.6-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 7c013fc15263e419eb146dfb35d5ab2fb6be4777 Mon Sep 17 00:00:00 2001
From: Cruxlog <cruxlog@pixelblaster.ro>
Date: Sat, 12 Sep 2015 11:32:31 -0700
Subject: [PATCH 288/600] Fix compatibility with bowerstatic and pyramid_layout

---
 CHANGES.txt                    |  9 ++++++++-
 kotti/tests/test_cache.py      | 10 ++++++++++
 kotti/tests/test_util_views.py | 11 +++++++++++
 kotti/views/cache.py           |  6 ++++++
 kotti/views/util.py            |  2 +-
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 30060b2ca..ec50ce88d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,14 @@ Change History
 1.1.6 - unreleased
 ------------------
 
-- No changes yet.
+- Don't try to set a caching header from the NewRequest handler when Pyramid's
+  tweens didn't follow the usual chain of calls. This fixes compatibility with
+  ``bowerstatic``.
+- Don't assume ``renderer_name`` exists in a rendering event (ex.
+  BeforeRender). The official docstring of ``pyramid.interfaces.IRenderer`` is
+  a bit ambigous in regards to what the ``system`` parameter should include
+  when a renderer gets called. This fixes compatibility with
+  ``pyramid_layout``.
 
 1.1.5 - 2015-09-04
 ------------------
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index 90cfb19d6..e66b15de6 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -66,3 +66,13 @@ def test_header_set_before(self):
                 set_cache_headers(event)
 
         assert chooser.call_count == 0
+
+    def test_request_has_no_context(self):
+        from kotti.views.cache import set_cache_headers
+
+        with patch('kotti.views.cache.caching_policy_chooser') as chooser:
+            event = MagicMock()
+            event.request = {}
+            set_cache_headers(event)
+
+            assert chooser.call_count == 0
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 285378f2e..7c68ae31d 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -522,6 +522,17 @@ def test_add_renderer_globals(self, db_session):
         add_renderer_globals(event)
         assert 'api' in event
 
+    def test_add_renderer_globals_event_has_no_renderer_name(self, db_session):
+        from kotti.views.util import add_renderer_globals
+
+        request = DummyRequest()
+        event = {
+            'request': request,
+            'context': object(),
+            }
+        add_renderer_globals(event)
+        assert 'api' in event
+
 
 class TestLocalNavigationSlot:
     def test_it(self, config, root):
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index e3204b8d5..ec2ecc0cf 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -103,6 +103,12 @@ def caching_policy_chooser(context, request, response):
 @subscriber(NewResponse)
 def set_cache_headers(event):
     request, response = event.request, event.response
+
+    # this can happen if a Pyramid tween will shortcut the normal tween
+    # chain processing and return its own response early
+    if not hasattr(event.request, 'context'):
+        return
+
     context = event.request.context
 
     # If no caching policy was previously set (by setting the
diff --git a/kotti/views/util.py b/kotti/views/util.py
index db43842b0..e0ed62cd6 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -72,7 +72,7 @@ def template_api(context, request, **kwargs):
 
 
 def add_renderer_globals(event):
-    if event['renderer_name'] != 'json':
+    if event.get('renderer_name') != 'json':
         request = event['request']
         api = getattr(request, 'template_api', None)
         if api is None and request is not None:

From c5b8827ee8c2874046586a2a62c58cb24a390c42 Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <p@2015.dobrogost.net>
Date: Sun, 13 Sep 2015 22:01:15 +0200
Subject: [PATCH 289/600] Added Polish translation.

---
 kotti/locale/pl/LC_MESSAGES/Kotti.mo | Bin 0 -> 17915 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po | 983 +++++++++++++++++++++++++++
 2 files changed, 983 insertions(+)
 create mode 100644 kotti/locale/pl/LC_MESSAGES/Kotti.mo
 create mode 100644 kotti/locale/pl/LC_MESSAGES/Kotti.po

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2c4f8b3c693a24bc7a08a9929bda54a5793f7f58
GIT binary patch
literal 17915
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
Lkk+iXX2CxK1$(l<

literal 0
HcmV?d00001

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
new file mode 100644
index 000000000..7e67456a6
--- /dev/null
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -0,0 +1,983 @@
+# Polish translations for Kotti package
+# This file is distributed under the same license as the Kotti package.
+# Paweł Krajewski, 2015.
+# Piotr Dobrogost <p@2015.dobrogost.net>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: Kotti 1.1.5-dev\n"
+"POT-Creation-Date: 2015-09-13 21:09+0200\n"
+"PO-Revision-Date: 2015-09-09 12:49+0200\n"
+"Last-Translator: Piotr Dobrogost <p@2015.dobrogost.net>\n"
+"Language-Team: Polish\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Lingua 3.8\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Witaj w Kotti"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
+    
+#: kotti/populate.py:66
+#, c-format
+msgid ""
+"\n"
+"<h2>Log in</h2>\n"
+"<p>\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
+"site\n"
+"    and start changing its contents.  If you haven't chosen a password for\n"
+"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Once you're logged in, you'll see the grey editor bar below the top\n"
+"    navigation bar.  It will allow you to switch between editing and viewing "
+"the\n"
+"    current page as it will appear to your visitors.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Configure</h2>\n"
+"        <p>\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
+"basic/configuration.html\">\n"
+"               Configuration manual\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Add-ons</h2>\n"
+"        <p>\n"
+"            A number of add-ons allow you to extend the functionality of "
+"your\n"
+"            Kotti site.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
+"term=kotti\">\n"
+"                Kotti add-ons\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Documentation</h2>\n"
+"        <p>\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               Documentation\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+msgstr ""
+"\n"
+"<h2>Zaloguj się</h2>\n"
+"<p>\n"
+"    Możesz <a class=\"btn btn-success\" href=\"login\">zalogować się</a> do "
+"twojego serwisu\n"
+"    i zmieniać jego zawartość.  Jeżeli jeszcze nie ustaliłeś hasła dla\n"
+"    konta administratora, domyślnie jest to <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Po zalogowaniu zobaczysz szare menu edycyjne poniżej\n"
+"    menu nawigacyjnego. Umożliwia ono przełączanie się między edycją a "
+"wyglądem aktualnej strony widzianej z perspektywy użytkowników.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Konfiguracja</h2>\n"
+"        <p>\n"
+"            Dowiedz się jak skonfigurować tytył i inne ustawienia "
+"używając             prostego pliku tekstowego w systemie plików.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
+"basic/configuration.html\">\n"
+"               Podręcznik konfiguracji\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Wtyczki</h2>\n"
+"        <p>\n"
+"            Wtyczki pozwalają na rozszerzenie funkcjonalności twojego "
+"serwisu opartego na Kotti.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
+"term=kotti\">\n"
+"                Wtyczki do Kotti\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Dokumentacja</h2>\n"
+"        <p>\n"
+"            Zastanawiasz się co jeszcze możesz zrobić korzystając z "
+"Kotti?              Jaką ma licencję? Przeczytaj podręcznik aby dowiedzieć "
+"się więcej.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               Dokumentacja\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+
+#: kotti/populate.py:123
+msgid "About"
+msgstr "Informacje"
+
+#: kotti/populate.py:124
+msgid ""
+"Our company is the leading manufacturer of foo widgets used in a wide "
+"variety of aviation and and industrial products."
+msgstr ""
+"Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim "
+"asortymencie produktów dla lotnictwa i przemysłu."
+
+#: kotti/populate.py:125
+msgid ""
+"\n"
+"<p>\n"
+"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
+"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Our worldwide headquarters:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
+"jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
+"</small></p>\n"
+msgstr ""
+"\n"
+"<p>\n"
+"  <img alt=\"pięć barwnych samolotów Extra EA300 lecących w szyku\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
+"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Nasza siedziba:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"  <em>Zdjęcie:</em> \"Northern Lights Formation\" autorstwa FlugKerl2.\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
+"jpg\">\n"
+"  Prawa autorskie</a>.\n"
+"  Oryginalnie opublikowane w artykule\n"
+"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
+"</small></p>\n"
+
+#: kotti/resources.py:504 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: kotti/resources.py:505 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Wytnij"
+
+#: kotti/resources.py:506 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Wklej"
+
+#: kotti/resources.py:507 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Zmień nazwę"
+
+#: kotti/resources.py:508 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Usuń"
+
+#: kotti/resources.py:635 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Plik"
+
+#: kotti/resources.py:773 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Obraz"
+
+#: kotti/resources.py:525
+msgid "Folder view"
+msgstr "Widok katalogów"
+
+#: kotti/resources.py:519 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Zawartość"
+
+#: kotti/resources.py:520 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Edytuj"
+
+#: kotti/resources.py:521
+msgid "Share"
+msgstr "Udostępnij"
+
+#: kotti/resources.py:522 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Akcje"
+
+#: kotti/security.py:189
+msgid "Viewer"
+msgstr "Czytelnik"
+
+#: kotti/security.py:190
+msgid "Editor"
+msgstr "Edytor"
+
+#: kotti/security.py:191
+msgid "Owner"
+msgstr "Właściciel"
+
+#: kotti/security.py:192
+msgid "Admin"
+msgstr "Administrator"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Dodaj"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Dołącz treści"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Ustaw domyślny widok"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Widok"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Nawigacja"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Ustawienia"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Ustawienia strony"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Wyloguj się"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Zresetuj swoje hasło do ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Witaj, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Kliknij na link, aby zresetować hasło do ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Rejestracja na ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Rejestrujesz się na ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
+
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Brak dostępu"
+
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Logowanie"
+
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Nazwa użytkownika lub email"
+
+#: kotti/templates/login.pt:25 kotti/views/login.py:212
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "Hasło"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Zaloguj się"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Zapomniałeś hasła?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Reset hasła"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid ""
+"Fill out your username or email and click ${reset_password} below to receive "
+"an email with a link to reset your password."
+msgstr ""
+"Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} "
+"poniżej, aby otrzymać email z linkiem do zresetowania hasła."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "Nie jesteś jeszcze zarejestrowany?"
+
+#: kotti/templates/login.pt:82
+msgid "Register for an account on this site."
+msgstr "Zarejestruj się na stronie."
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Zrób ${state}"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Jesteś tutaj:"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Zmień stan publikacji"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr ""
+"Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub "
+"zarządzać nim."
+
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "Tytuł"
+
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "Stan"
+
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+msgid "Creation Date"
+msgstr "Data utworzenia"
+
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Data modyfikacji"
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Załącz potomka"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid ""
+"If checked, this will attempt to modify the status of all children in any "
+"selected documents and their subdocuments."
+msgstr ""
+"Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych "
+"dokumentów, oraz ich poddokumenty."
+
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Zmień stan na"
+
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Bez zmian"
+
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "Zapisz zmiany"
+
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Brak elementów potomnych."
+
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Widoczność"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Widoczny"
+
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Ukryty"
+
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
+
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Usuń ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Nawigacja strony"
+
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid ""
+"Each content item has a name, which is used to create the url, and a title. "
+"Read the user manual about proper formatting of name and title if needed. "
+"You can change both below."
+msgstr ""
+"Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. "
+"W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu "
+"nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
+
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Nowa nazwa"
+
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Nowy tytuł"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Zmień nazwę ${title}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Udostępnij ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "Szukaj użytkowników i grup"
+
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "Szukaj"
+
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Przypisz lokalne role"
+
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "Nazwa"
+
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "Użytkownik"
+
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
+msgid "Group"
+msgstr "Grupa"
+
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Załącz zawartość z lokalnego pliku(ów)"
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+msgid "Filename"
+msgstr "Nazwa pliku"
+
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr "Rozmiar"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr "Status"
+
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr "Postęp"
+
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr "Wybierz plik(i) do przesłania..."
+
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr "Prześlij ${number} plików."
+
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr "Zignoruj wszystkie błędy"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Powrót do zarządzania użytkownikami"
+
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#, python-format
+msgid "Edit ${title}"
+msgstr "Edycja ${title}"
+
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Szukaj użytkownika(ów) / grupę(y)"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Dodaj użytkownika"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Dodaj grupę"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Znajdź użytkowników lub grupy"
+
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "Użytkownik- / nazwa grupy"
+
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Zostaw puste, aby znaleźć wszystko."
+
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Przypisz globalne role"
+
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Dodaj nowego użytkownika"
+
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Dodaj nową grupę"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Wyniki wyszukania"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Szukaj..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Otagowane z:"
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Witaj, ${user}! Jesteś zalogowany."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Witaj, nie jesteś zalogowany."
+
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Twoje zmiany zostały zapisane."
+
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "Element został dodany."
+
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maksymalny rozmiar pliku: ${size}MB"
+
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Zapisz"
+
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Dodaj ${type} do ${title}."
+
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "Dodaj ${type}."
+
+#: kotti/views/login.py:237
+msgid "You have reset your password."
+msgstr "Zresetowałeś swoje hasło."
+
+#: kotti/views/login.py:199
+msgid "You have been logged out."
+msgstr "Zostałeś wylogowany."
+
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Imię i nazwisko"
+
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+msgid "Email"
+msgstr ""
+
+#: kotti/views/login.py:108
+msgid ""
+"Congratulations! You are successfully registered. You should be receiving an "
+"email with a link to set your password. Doing so will activate your account."
+msgstr ""
+"Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do "
+"ustawienia swego hasła. Robiąc to aktywujesz konto."
+
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "Zarejestruj - ${title}"
+
+#: kotti/views/login.py:163
+msgid "Login failed."
+msgstr "Nie udało się zalogować."
+
+#: kotti/views/login.py:285
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Resetowanie hasła - ${title}."
+
+#: kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Witaj, ${user}!"
+
+#: kotti/views/login.py:172
+msgid ""
+"You should be receiving an email with a link to reset your password. Doing "
+"so will activate your account."
+msgstr ""
+"Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło "
+"aktywujesz swoje konto."
+
+#: kotti/views/login.py:177
+msgid "That username or email is not known by this system."
+msgstr "Nieznana nazwa użytkownika lub email."
+
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Zarejestruj"
+
+#: kotti/views/login.py:89 kotti/views/login.py:256
+msgid "There was an error."
+msgstr "Wystąpił błąd."
+
+#: kotti/views/login.py:249
+msgid "Submit"
+msgstr "Zatwierdź"
+
+#: kotti/views/login.py:278
+msgid "Your password reset token may have expired."
+msgstr "Twój token do resetu hasła mógł stracić ważność."
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Zarządzanie użytkownikami"
+
+#: kotti/views/users.py:267
+msgid ""
+"Leave this empty and tick the 'Send password registration' box below to have "
+"the user set their own password."
+msgstr ""
+"Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby "
+"użytkownik sam ustawił sobie hasło."
+
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Moje ustawienia - ${title}"
+
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Niepoprawna wartość"
+
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Użytkownik z takim imieniem już istnieje."
+
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Użytkownik z takim adresem email już istnieje."
+
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Nie ma takiej grupy: ${group}"
+
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Aktywne"
+
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Odznacz, aby dezaktywować konto."
+
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Globalne role"
+
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Grupy"
+
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Dodaj użytkownika"
+
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} został dodany."
+
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Dodaj grupę"
+
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "Nie wykonano żadnych zmian."
+
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "Nie przekazano nazwy."
+
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "Nie znaleziono użytkowników ani grup."
+
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Edycja ${principal_type} ${title}"
+
+#: kotti/views/users.py:533
+msgid "User was not found."
+msgstr "Użytkownik nie został odnaleziony."
+
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "Wyślij link do rejestracji na email."
+
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} został usunięty."
+
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Usuń ${principal_type} ${title}"
+
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} został skopiowany."
+
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} został wycięty."
+
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} został przeniesiony."
+
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} został wklejony."
+
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "Nie można wkleić. Element już nie istnieje."
+
+#: kotti/views/edit/actions.py:225
+#, python-format
+msgid "${title} is now visible in the navigation."
+msgstr "${title} jest teraz widoczny w nawigacji."
+
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} nie jest już widoczny w nawigacji."
+
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} został usunięty."
+
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "Nic nie zostało usunięte"
+
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Nazwa i tytuł są obowiązkowe."
+
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "Zmieniono nazwę elementu."
+
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "W górę"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "W dół"
+
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Pokaż"
+
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Ukryj"
+
+#: kotti/views/edit/actions.py:507
+msgid "You have to select items to perform an action."
+msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
+
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Zmień stan"
+
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Opis"
+
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tagi"
+
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Treść"
+
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Zresetowano widok na domyślny."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Domyślny widok"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Ustawiono domyślny widok."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Domyślny widok nie mógł zostać ustawiony."

From b14133cfcd1106173a9eb44c21b79a5c452448a6 Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <pd@dev.dobrogost.net>
Date: Mon, 14 Sep 2015 14:50:41 +0200
Subject: [PATCH 290/600] Added '--statistics' option to invocation of `msgfmt`
 to bring attention to possible fuzzy translations; see
 https://github.com/wichert/lingua/issues/59 Additionally now we print file
 being currently compiled so that we know which statistic is for which
 language. Added '--no-wrap' option to invocation of `msgmerge` to avoid
 wrapping original msgids. Wrapping needlessly "mangles" original msgids.
 Please note that both options were lost during migration to lingua 3.6.1 in
 commit https://github.com/Kotti/Kotti/commit/285bad5

---
 i18n.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i18n.sh b/i18n.sh
index f8f6a4800..9c20a61c7 100755
--- a/i18n.sh
+++ b/i18n.sh
@@ -30,12 +30,13 @@ if [ $# -eq 0 ]; then
 
     echo "Update translations"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/$DOMAIN.po; do
-        msgmerge -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
+        msgmerge --no-wrap -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
     done
 
     echo "Compile message catalogs"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/*.po; do
-        msgfmt -o "${po%.*}.mo" "$po"
+        echo "Compiling file $po..."
+        msgfmt --statistics -o "${po%.*}.mo" "$po"
     done
 
 # first argument represents language identifier, create catalog

From 82015ecbf6b534de5d82bd3e0b711e9eca0f10f6 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 31 Aug 2015 10:35:18 +0200
Subject: [PATCH 291/600] Add caching for default root node getter.

---
 kotti/resources.py | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index e771ebea4..21871ce8f 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -18,6 +18,7 @@
 from depot.fields.sqlalchemy import _SQLAMutationTracker
 from depot.fields.sqlalchemy import UploadedFileField
 from kotti import _resolve_dotted
+from pyramid.decorator import reify
 from pyramid.traversal import resource_path
 from sqlalchemy import Boolean
 from sqlalchemy import Column
@@ -789,19 +790,41 @@ def get_root(request=None):
     return get_settings()['kotti.root_factory'][0](request)
 
 
-def default_get_root(request=None):
-    """Default implementation for :func:`~kotti.resources.get_root`.
+class DefaultRootCache(object):
+    """ Default implementation for :func:`~kotti.resources.get_root` """
 
-    :param request: Current request (optional)
-    :type request: :class:`kotti.request.Request`
+    @reify
+    def root_id(self):
+        """ Query for the one node without a parent and return its id.
+        :result: The root node's id.
+        :rtype: int
+        """
 
-    :result: Node in the object tree that has no parent.
-    :rtype: :class:`~kotti.resources.Node` or descendant; in a fresh Kotti site
-            with Kotti's :func:`default populator <kotti.populate.populate>`
-            this will be an instance of :class:`~kotti.resources.Document`.
-    """
+        return Node.query.filter(Node.parent_id == None).one().id  # noqa
+
+    def get_root(self):
+        """ Query for the root node by its id.  This enables SQLAlchemy's
+        session cache (query is executed only once per session).
+        :result: The root node.
+        :rtype: :class:`Node`.
+        """
+
+        return Node.query.get(self.root_id)
+
+    def __call__(self, request=None):
+        """ Default implementation for :func:`~kotti.resources.get_root`
+        :param request: Current request (optional)
+        :type request: :class:`kotti.request.Request`
+        :result: Node in the object tree that has no parent.
+        :rtype: :class:`~kotti.resources.Node` or descendant;
+                in a fresh Kotti site with Kotti's
+                :func:`default populator <kotti.populate.populate>` this will
+                be an instance of :class:`~kotti.resources.Document`.
+        """
+
+        return self.get_root()
 
-    return DBSession.query(Node).filter(Node.parent_id == None).one()  # noqa
+default_get_root = DefaultRootCache()
 
 
 def _adjust_for_engine(engine):

From 549c3a01458eb471ca07009c5a27472ae2a9df3a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 31 Aug 2015 10:41:26 +0200
Subject: [PATCH 292/600] Use eager / joined loading for local_groups.  Use the
 (already loaded) ``Node.local_groups`` relationship instead of DB queries
 where possible.

---
 kotti/resources.py |  1 +
 kotti/security.py  | 41 +++++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index 21871ce8f..fe5b5eb63 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -257,6 +257,7 @@ class Node(Base, ContainerMixin, PersistentACLMixin):
         LocalGroup,
         backref=backref('node'),
         cascade='all',
+        lazy='joined',
         )
 
     def __init__(self, name=None, parent=None, title=u"", annotations=None,
diff --git a/kotti/security.py b/kotti/security.py
index 9d49e5921..d2b9217cb 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -269,14 +269,14 @@ def list_groups_raw(name, context):
     Only groups defined in context will be considered, therefore no
     global or inherited groups are returned.
     """
-    from kotti.resources import LocalGroup
+
     from kotti.resources import Node
 
     if isinstance(context, Node):
         return set(
-            r[0] for r in DBSession.query(LocalGroup.group_name).filter(
-                LocalGroup.node_id == context.id).filter(
-                LocalGroup.principal_name == name).all())
+            r.group_name for r in context.local_groups
+            if r.principal_name == name
+        )
     return set()
 
 
@@ -294,7 +294,7 @@ def _cachekey_list_groups_ext(name, context=None, _seen=None, _inherited=None):
         raise DontCache
     else:
         context_id = getattr(context, 'id', id(context))
-        return (name, context_id)
+        return (unicode(name), context_id)
 
 
 @request_cache(_cachekey_list_groups_ext)
@@ -339,14 +339,19 @@ def set_groups(name, context, groups_to_set=()):
     """Set the list of groups for principal with given ``name`` and in
     given ``context``.
     """
-    name = unicode(name)
+
     from kotti.resources import LocalGroup
-    DBSession.query(LocalGroup).filter(
-        LocalGroup.node_id == context.id).filter(
-        LocalGroup.principal_name == name).delete()
 
-    for group_name in groups_to_set:
-        DBSession.add(LocalGroup(context, name, unicode(group_name)))
+    name = unicode(name)
+    context.local_groups = [
+        # keep groups for "other" principals
+        lg for lg in context.local_groups
+        if lg.principal_name != name
+    ] + [
+        # reset groups for given principal
+        LocalGroup(context, name, unicode(group_name))
+        for group_name in groups_to_set
+    ]
 
 
 def list_groups_callback(name, request):
@@ -396,19 +401,19 @@ def principals_with_local_roles(context, inherit=True):
     """Return a list of principal names that have local roles in the
     context.
     """
-    from resources import LocalGroup
+
     principals = set()
     items = [context]
+
     if inherit:
         items = lineage(context)
+
     for item in items:
         principals.update(
-            r[0] for r in
-            DBSession.query(LocalGroup.principal_name).filter(
-                LocalGroup.node_id == item.id).group_by(
-                LocalGroup.principal_name).all()
-            if not r[0].startswith('role:')
-            )
+            r.principal_name for r in item.local_groups
+            if not r.principal_name.startswith('role:')
+        )
+
     return list(principals)
 
 

From 26f3772323fe690eb8d15bc277676fe5fe27ac4d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 31 Aug 2015 10:42:21 +0200
Subject: [PATCH 293/600] Don't query the ``principals`` table for roles
 (they're not stored there as separate records).

---
 kotti/security.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kotti/security.py b/kotti/security.py
index d2b9217cb..0d96de903 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -447,9 +447,13 @@ class Principals(DictMixin):
     """
     factory = Principal
 
-    @request_cache(lambda self, name: name)
+    @request_cache(lambda self, name: unicode(name))
     def __getitem__(self, name):
         name = unicode(name)
+        # avoid calls to the DB for roles
+        # (they're not stored in the ``principals`` table)
+        if name.startswith('role:'):
+            raise KeyError(name)
         try:
             return DBSession.query(
                 self.factory).filter(self.factory.name == name).one()

From 1efb1345e7a9412c6a0e746ca864de8b99c9b30a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 31 Aug 2015 12:42:53 +0200
Subject: [PATCH 294/600] Add "missing" foreign key indices (with corresponding
 migration step).

---
 .../4a3de0d0804a_add_foreignkey_indices.py    | 28 +++++++++++++++++++
 kotti/resources.py                            |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py

diff --git a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
new file mode 100644
index 000000000..934d2cb50
--- /dev/null
+++ b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
@@ -0,0 +1,28 @@
+"""Add ForeignKey indices
+
+Revision ID: 4a3de0d0804a
+Revises: 37a05f6246af
+Create Date: 2015-08-31 12:37:26.493958
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = '4a3de0d0804a'
+down_revision = '37a05f6246af'
+
+
+def upgrade():
+    op.create_index(
+        'ix_nodes_parent_id', 'nodes', 'parent_id')
+    op.create_index(
+        'ix_local_groups_node_id', 'local_groups', 'node_id')
+    op.create_index(
+        'ix_local_groups_principal_name', 'local_groups', 'principal_name')
+
+
+def downgrade():
+    op.drop_index('ix_nodes_parent_id', 'nodes')
+    op.drop_index('ix_local_groups_node_id', 'local_groups')
+    op.drop_index('ix_local_groups_principal_name', 'local_groups')
diff --git a/kotti/resources.py b/kotti/resources.py
index fe5b5eb63..517792cf5 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -180,10 +180,10 @@ class LocalGroup(Base):
     id = Column(Integer(), primary_key=True)
     #: ID of the node for this assignment
     #: (:class:`sqlalchemy.types.Integer`)
-    node_id = Column(ForeignKey('nodes.id'))
+    node_id = Column(ForeignKey('nodes.id'), index=True)
     #: Name of the principal (user or group)
     #: (:class:`sqlalchemy.types.Unicode`)
-    principal_name = Column(Unicode(100))
+    principal_name = Column(Unicode(100), index=True)
     #: Name of the assigned group or role
     #: (:class:`sqlalchemy.types.Unicode`)
     group_name = Column(Unicode(100))
@@ -224,7 +224,7 @@ class Node(Base, ContainerMixin, PersistentACLMixin):
     type = Column(String(30), nullable=False)
     #: ID of the node's parent
     #: (:class:`sqlalchemy.types.Integer`)
-    parent_id = Column(ForeignKey('nodes.id'))
+    parent_id = Column(ForeignKey('nodes.id'), index=True)
     #: Position of the node within its container / parent
     #: (:class:`sqlalchemy.types.Integer`)
     position = Column(Integer())

From cf24800648bd01e5aae270e5cd9290eb20ddb5ec Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 31 Aug 2015 12:45:31 +0200
Subject: [PATCH 295/600] Add changenotes.

---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ec50ce88d..a5eb0aa1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,11 @@ Change History
   a bit ambigous in regards to what the ``system`` parameter should include
   when a renderer gets called. This fixes compatibility with
   ``pyramid_layout``.
+- Add "missing" foreign key indices (with corresponding migration step).
+- Greatly reduce the number of queries that are sent to the DB:
+  - Add caching for the root node.
+  - Use eager / joined loading for local_groups.
+  - Don't query principals for roles
 
 1.1.5 - 2015-09-04
 ------------------

From eb9b2e1dbf8e5d60bda6f518166c7397c6333733 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 31 Aug 2015 12:48:02 +0200
Subject: [PATCH 296/600] Fix migration step (culumns must be a list of column
 names).

---
 .../alembic/versions/4a3de0d0804a_add_foreignkey_indices.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
index 934d2cb50..39a30fedf 100644
--- a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
+++ b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
@@ -15,11 +15,11 @@
 
 def upgrade():
     op.create_index(
-        'ix_nodes_parent_id', 'nodes', 'parent_id')
+        'ix_nodes_parent_id', 'nodes', ['parent_id', ])
     op.create_index(
-        'ix_local_groups_node_id', 'local_groups', 'node_id')
+        'ix_local_groups_node_id', 'local_groups', ['node_id', ])
     op.create_index(
-        'ix_local_groups_principal_name', 'local_groups', 'principal_name')
+        'ix_local_groups_principal_name', 'local_groups', ['principal_name', ])
 
 
 def downgrade():

From f3e47c78a5fed698a0bb9a337a14b9b7a944bdb6 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 24 Sep 2015 09:21:11 +0200
Subject: [PATCH 297/600] Upgrade requirements to their latest respective
 version.

---
 requirements.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index d2b1a153f..d104568cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,15 +13,15 @@ Unidecode==0.04.18
 WebOb==1.4.1
 alembic==0.8.2
 appdirs==1.4.0
-bleach==1.4.1
+bleach==1.4.2
 bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-filedepot==0.1.0
+filedepot==0.1.1
 html2text==2015.6.21
-html5lib==1.0b7
+html5lib==1.0b8
 iso8601==0.1.10
 js.angular==1.1.4
 js.bootstrap==3.3.4
@@ -40,7 +40,7 @@ js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
-kotti-tinymce==0.5.3
+kotti-tinymce==0.5.4
 lingua==3.11
 peppercorn==0.5
 plone.scale==1.3.5
@@ -55,7 +55,7 @@ pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
 pyramid-tm==0.12
 pyramid-zcml==1.0.0
-pytz==2015.4
+pytz==2015.6
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1

From ad6ce16f67a9b818de3739abc8ca1813e0eed9f2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 02:29:55 +0200
Subject: [PATCH 298/600] Order conf_defaults and conf_dotted alphabetically.

---
 kotti/__init__.py | 80 +++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index ba28ad319..a272e6560 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -54,9 +54,15 @@ def none_factory(**kwargs):  # pragma: no cover
 
 # All of these can be set by passing them in the Paste Deploy settings:
 conf_defaults = {
-    'kotti.templates.api': 'kotti.views.util.TemplateAPI',
-    'kotti.configurators': '',
-    'pyramid.includes': '',
+    'kotti.alembic_dirs': 'kotti:alembic',
+    'kotti.asset_overrides': '',
+    'kotti.authn_policy_factory': 'kotti.authtkt_factory',
+    'kotti.authz_policy_factory': 'kotti.acl_factory',
+    'kotti.available_types': ' '.join([
+        'kotti.resources.Document',
+        'kotti.resources.File',
+        'kotti.resources.Image',
+        ]),
     'kotti.base_includes': ' '.join([
         'kotti',
         'kotti.filedepot',
@@ -76,43 +82,23 @@ def none_factory(**kwargs):  # pragma: no cover
         'kotti.views.navigation',
         'kotti.views.users',
         ]),
-    'kotti.zcml_includes': ' '.join([
-        ]),
-    'kotti.asset_overrides': '',
-    'kotti.use_tables': '',
-    'kotti.request_factory': 'kotti.request.Request',
-    'kotti.root_factory': 'kotti.resources.default_get_root',
-    'kotti.populators': 'kotti.populate.populate',
-    'kotti.available_types': ' '.join([
-        'kotti.resources.Document',
-        'kotti.resources.File',
-        'kotti.resources.Image',
-        ]),
-    'kotti.search_content': 'kotti.views.util.default_search_content',
-    'kotti.authn_policy_factory': 'kotti.authtkt_factory',
-    'kotti.authz_policy_factory': 'kotti.acl_factory',
-    'kotti.session_factory': 'kotti.beaker_session_factory',
-    'kotti.principals_factory': 'kotti.security.principals_factory',
     'kotti.caching_policy_chooser': (
         'kotti.views.cache.default_caching_policy_chooser'),
-    'kotti.url_normalizer': 'kotti.url_normalizer.url_normalizer',
-    'kotti.url_normalizer.map_non_ascii_characters': True,
-    'kotti.use_workflow': 'kotti:workflow.zcml',
+    'kotti.configurators': '',
     'kotti.date_format': 'medium',
     'kotti.datetime_format': 'medium',
-    'kotti.time_format': 'medium',
-    'kotti.max_file_size': '10',
-    'kotti.depot.0.name': 'dbfiles',
     'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
+    'kotti.depot.0.name': 'dbfiles',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
-    'kotti.static.edit_needed': '',  # BBB
-    'kotti.static.view_needed': '',  # BBB
-    'kotti.alembic_dirs': 'kotti:alembic',
+    'kotti.max_file_size': '10',
+    'kotti.populators': 'kotti.populate.populate',
+    'kotti.principals_factory': 'kotti.security.principals_factory',
     'kotti.register': 'False',
     'kotti.register.group': '',
     'kotti.register.role': '',
-    'pyramid_deform.template_search_path': 'kotti:templates/deform',
+    'kotti.request_factory': 'kotti.request.Request',
+    'kotti.root_factory': 'kotti.resources.default_get_root',
     'kotti.sanitizers': ' '.join([
         'xss_protection:kotti.sanitizers.xss_protection',
         'minimal_html:kotti.sanitizers.minimal_html',
@@ -123,24 +109,38 @@ def none_factory(**kwargs):  # pragma: no cover
         'kotti.resources.Content.title:no_html',
         'kotti.resources.Content.description:no_html',
         ]),
+    'kotti.search_content': 'kotti.views.util.default_search_content',
+    'kotti.session_factory': 'kotti.beaker_session_factory',
+    'kotti.static.edit_needed': '',  # BBB
+    'kotti.static.view_needed': '',  # BBB
+    'kotti.templates.api': 'kotti.views.util.TemplateAPI',
+    'kotti.time_format': 'medium',
+    'kotti.url_normalizer': 'kotti.url_normalizer.url_normalizer',
+    'kotti.url_normalizer.map_non_ascii_characters': True,
+    'kotti.use_tables': '',
+    'kotti.use_workflow': 'kotti:workflow.zcml',
+    'kotti.zcml_includes': ' '.join([
+        ]),
+    'pyramid.includes': '',
+    'pyramid_deform.template_search_path': 'kotti:templates/deform',
     }
 
 conf_dotted = set([
-    'kotti.templates.api',
-    'kotti.configurators',
-    'kotti.base_includes',
-    'kotti.request_factory',
-    'kotti.root_factory',
-    'kotti.populators',
-    'kotti.available_types',
-    'kotti.search_content',
     'kotti.authn_policy_factory',
     'kotti.authz_policy_factory',
-    'kotti.session_factory',
-    'kotti.principals_factory',
+    'kotti.available_types',
+    'kotti.base_includes',
     'kotti.caching_policy_chooser',
+    'kotti.configurators',
     'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed',
+    'kotti.populators',
+    'kotti.principals_factory',
+    'kotti.request_factory',
+    'kotti.root_factory',
+    'kotti.search_content',
+    'kotti.session_factory',
+    'kotti.templates.api',
     'kotti.url_normalizer',
     ])
 

From b1f0094802568ae6dd53d01252f0bf851f1e76cd Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 07:27:28 +0200
Subject: [PATCH 299/600] Add ``kotti.modification_date_excludes``
 configuration option.

---
 CHANGES.txt                             |   4 +
 docs/developing/basic/configuration.rst | 102 ++++++++++++------------
 docs/developing/basic/security.rst      |   4 +-
 kotti/__init__.py                       |   4 +
 kotti/events.py                         |  11 ++-
 kotti/tests/test_events.py              |  31 +++++++
 requirements.txt                        |   1 +
 setup.py                                |   5 +-
 8 files changed, 108 insertions(+), 54 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ec50ce88d..79b821541 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,10 @@ Change History
   a bit ambigous in regards to what the ``system`` parameter should include
   when a renderer gets called. This fixes compatibility with
   ``pyramid_layout``.
+- Add a ``kotti.modification_date_excludes`` configuration option.
+  It takes a list of attributes in dotted name notation that should not trigger
+  an update of ``modification_date`` on change.  Defaults to
+  ``kotti.resources.Node.position``.
 
 1.1.5 - 2015-09-04
 ------------------
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index c402bf8fd..55252b84c 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -37,52 +37,54 @@ Overview of settings
 This table provides an overview of available settings.
 All these settings must go into the ``[app:kotti]`` section of your Paste Deploy configuration file.
 
-============================  ==================================================
-Setting                       Description
-============================  ==================================================
-**kotti.site_title**          The title of your site
-**kotti.secret**              Secret token used for the initial admin password
-kotti.secret2                 Secret token used for email password reset token
-
-**sqlalchemy.url**            `SQLAlchemy database URL`_
-**mail.default_sender**       Sender address for outgoing email
-mail.host                     Email host to send from
-
-pyramid.includes              List of Python configuration hooks
-kotti.available_types         List of active content types
-kotti.base_includes           List of base Python configuration hooks
-kotti.zcml_includes           List of packages to include the ZCML from
-kotti.configurators           List of advanced functions for config
-kotti.request_factory         Override Kotti's default request factory
-kotti.root_factory            Override Kotti's default Pyramid *root factory*
-kotti.populators              List of functions to fill initial database
-kotti.search_content          Override Kotti's default search function
-
-kotti.asset_overrides         Override Kotti's templates
-kotti.templates.api           Override ``api`` object available in templates
-kotti.fanstatic.view_needed   List of static resources used for public interface
-kotti.fanstatic.edit_needed   List of static resources used for edit interface
-
-kotti.authn_policy_factory    Component used for authentication
-kotti.authz_policy_factory    Component used for authorization
-kotti.session_factory         Component used for sessions
-
-kotti.caching_policy_chooser  Component for choosing the cache header policy
-kotti.url_normalizer          Component used for url normalization
-
-kotti.date_format             Date format to use, default: ``medium``
-kotti.datetime_format         Datetime format to use, default: ``medium``
-kotti.time_format             Time format to use, default: ``medium``
-kotti.max_file_size           Max size for file uploads, default: ```10`` (MB)
-
-kotti.depot.*.*               Configure the blob storage. More details below
-
-kotti.sanitizers              Configure available :ref:`sanitizers`.
-kotti.sanitize_on_write       Configure :ref:`sanitizers` to be used on write
-                              access to resource objects.
-
-pyramid.default_locale_name   Set the user interface language, default ``en``
-============================  ==================================================
+================================  ==============================================
+Setting                           Description
+================================  ==============================================
+**kotti.site_title**              The title of your site
+**kotti.secret**                  Secret token used for the initial admin
+                                  password
+kotti.secret2                     Secret token used for email password reset
+                                  token
+**sqlalchemy.url**                `SQLAlchemy database URL`_
+**mail.default_sender**           Sender address for outgoing email
+mail.host                         Email host to send from
+pyramid.includes                  List of Python configuration hooks
+kotti.available_types             List of active content types
+kotti.base_includes               List of base Python configuration hooks
+kotti.zcml_includes               List of packages to include the ZCML from
+kotti.configurators               List of advanced functions for config
+kotti.request_factory             Override Kotti's default request factory
+kotti.root_factory                Override Kotti's default Pyramid
+                                  *root factory*
+kotti.populators                  List of functions to fill initial database
+kotti.search_content              Override Kotti's default search function
+kotti.asset_overrides             Override Kotti's templates
+kotti.templates.api               Override ``api`` object available in
+                                  templates
+kotti.fanstatic.view_needed       List of static resources used for public
+                                  interface
+kotti.fanstatic.edit_needed       List of static resources used for edit
+                                  interface
+kotti.authn_policy_factory        Component used for authentication
+kotti.authz_policy_factory        Component used for authorization
+kotti.session_factory             Component used for sessions
+kotti.caching_policy_chooser      Component for choosing the cache header policy
+kotti.url_normalizer              Component used for url normalization
+kotti.date_format                 Date format to use, default: ``medium``
+kotti.datetime_format             Datetime format to use, default: ``medium``
+kotti.time_format                 Time format to use, default: ``medium``
+kotti.max_file_size               Max size for file uploads,
+                                  default: ```10`` (MB)
+kotti.modification_date_excludes  List of attributes in dotted name notation
+                                  that should not trigger an update of
+                                  ``modification_date`` on change.
+kotti.depot.*.*                   Configure the blob storage. More details below
+kotti.sanitizers                  Configure available :ref:`sanitizers`.
+kotti.sanitize_on_write           Configure :ref:`sanitizers` to be used on
+                                  write access to resource objects.
+pyramid.default_locale_name       Set the user interface language,
+                                  default ``en``
+================================  ==============================================
 
 Only the settings in bold letters required.
 The rest has defaults.
@@ -317,18 +319,18 @@ Blob storage configuration
 --------------------------
 
 By default, Kotti will store blob data (files uploaded in File and Image instances) in the database.
-Internally, Kotti integrates with :app:`filedepot`, so it is possible to use any :app:`filedepot` compatible storage, including those provided by :app:`filedepot` itself:
+Internally, Kotti integrates with ``filedepot``, so it is possible to use any ``filedepot`` compatible storage, including those provided by ``filedepot`` itself:
 
 - :class:`depot.io.local.LocalFileStorage`
 - :class:`depot.io.awss3.S3Storage`
 - :class:`depot.io.gridfs.GridFSStorage`
 
-The default storage for :app:`Kotti` is :class:`~kotti.filedepot.DBFileStorage`.
+The default storage for Kotti is :class:`~kotti.filedepot.DBFileStorage`.
 The benefit of storing files in ``DBFileStorage`` is having *all* content in a single place (the DB) which makes backups, exporting and importing of your site's data easy, as long as you don't have too many or too large files.
 The downsides of this approach appear when your database server resides on a different host (network performance becomes a greater issue) or your DB dumps become too large to be handled efficiently.
 
 To configure a depot, several ``kotti.depot.*.*`` lines need to be added.
-The number in the first position is used to group backend configuration and to order the file storages in the configuration of :app:`filedepot`.
+The number in the first position is used to group backend configuration and to order the file storages in the configuration of ``filedepot``.
 The depot configured with number 0 will be the default depot, where all new blob data will be saved.
 There are 2 options that are required for every storage configuration: ``name`` and ``backend``.
 The ``name`` is a unique string that will be used to identify the path of saved files (it is recorded with each blob info), so once configured for a particular storage, it should never change.
@@ -336,7 +338,7 @@ The ``backend`` should point to a dotted path for the storage class.
 Then, any number of keyword arguments can be added, and they will be passed to the backend class on initialization.
 
 Example of a possible configurationi that stores blob data on the disk, in
-``/var/local/files`` using the :app:`filedepot` :class:`depot.io.local.LocalFileStorage` provided backend.
+``/var/local/files`` using the ``filedepot`` :class:`depot.io.local.LocalFileStorage` provided backend.
 Kotti's default backend, ``DBFileStorage`` has been moved to position **1** and all data stored there will continue to be available.
 See :ref:`blobs` to see how to migrate blob data between storages.
 
diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index 5938f03e7..f15f05d17 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -108,9 +108,10 @@ The default workflow is quite useful for websites, but sometimes you need someth
 Just point the ``kotti.use_workflow`` setting to your zcml file:
 
 .. code-block:: ini
+
     kotti.use_workflow = kotti_yourplugin:workflow.zcml
 
-The simplest way to deal with workflow definitions is::
+The simplest way to deal with workflow definitions is:
 
 1. create a copy of the default workflow definition and
 2. customize it (change permissions, add new states, permissions, transitions, initial state and so on).
@@ -252,6 +253,7 @@ Here it is, our "custom" workflow definition assigned to our ``ICustomContent``
 Last you have to tell Kotti to register your new custom workflow including our ``zcml`` file:
 
 .. code-block:: ini
+
     kotti.zcml_includes = kotti_wf:workflow.zcml
 
 Special cases:
diff --git a/kotti/__init__.py b/kotti/__init__.py
index a272e6560..fa60ed85f 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -92,6 +92,9 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
     'kotti.max_file_size': '10',
+    'kotti.modification_date_excludes': ' '.join([
+        'kotti.resources.Node.position',
+    ]),
     'kotti.populators': 'kotti.populate.populate',
     'kotti.principals_factory': 'kotti.security.principals_factory',
     'kotti.register': 'False',
@@ -134,6 +137,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.configurators',
     'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed',
+    'kotti.modification_date_excludes',
     'kotti.populators',
     'kotti.principals_factory',
     'kotti.request_factory',
diff --git a/kotti/events.py b/kotti/events.py
index 3332fb0e6..a2b29837c 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -23,11 +23,13 @@
 from sqlalchemy.orm import load_only
 import venusian
 from sqlalchemy.orm import mapper
+from sqlalchemy_utils.functions import has_changes
 from pyramid.location import lineage
 from pyramid.threadlocal import get_current_request
 from zope.deprecation.deprecation import deprecated
 
 from kotti import DBSession
+from kotti import get_settings
 from kotti.resources import Content
 from kotti.resources import LocalGroup
 from kotti.resources import Node
@@ -255,7 +257,14 @@ def set_modification_date(event):
     :type event: :class:`ObjectUpdate`
     """
 
-    event.object.modification_date = datetime.now()
+    exclude = []
+
+    for e in get_settings()['kotti.modification_date_excludes']:
+        if isinstance(event.object, e.class_):
+            exclude.append(e.key)
+
+    if has_changes(event.object, exclude=exclude):
+        event.object.modification_date = datetime.now()
 
 
 def delete_orphaned_tags(event):
diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 6b236ebad..39487c37d 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -132,3 +132,34 @@ def handler(event):
         assert (handler, dec.register, 'kotti') in dec.venusian.attached
         assert handler not in listeners[ObjectEvent]
         assert handler in objectevent_listeners[(ObjectEvent, Document)]
+
+    def test_set_modification_date(self, root, db_session, events):
+
+        from time import sleep
+        from kotti.resources import Document
+
+        # create 2 documents
+        d1 = root['d1'] = Document(title='One')
+        d2 = root['d2'] = Document(title='Two')
+        assert d1.position == 0
+        assert d2.position == 1
+        db_session.flush()
+        md1 = d1.modification_date
+        md2 = d2.modification_date
+
+        # changing positions should not update modification_date
+        sleep(1)
+        d1.position = 1
+        d2.position = 0
+        db_session.flush()
+        assert d1.position == 1
+        assert d2.position == 0
+        assert d1.modification_date == md1
+        assert d2.modification_date == md2
+
+        # changing anything else should update modification_date
+        d1.title = 'Eins'
+        d2.title = 'Zwei'
+        db_session.flush()
+        assert d1.modification_date != md1
+        assert d2.modification_date != md2
diff --git a/requirements.txt b/requirements.txt
index d104568cb..d46a51ecc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@ PasteDeploy==1.5.2
 Pillow==2.9.0
 Pygments==2.0.2
 SQLAlchemy==1.0.8
+SQLAlchemy-Utils==0.31.0
 Unidecode==0.04.18
 WebOb==1.4.1
 alembic==0.8.2
diff --git a/setup.py b/setup.py
index 3e8d534f7..9d5dbffca 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'Pillow',  # dependency of plone.scale
-    'alembic',
+    'alembic>=0.8.0',
     'bleach',
     'bleach-whitelist',
     'colander>=0.9.3',
@@ -49,7 +49,8 @@
     'pyramid_zcml',
     'repoze.lru',
     'repoze.workflow',
-    'sqlalchemy>=0.7.6',
+    'sqlalchemy>=1.0.0',
+    'sqlalchemy-utils',
     'transaction>=1.1.0',
     'unidecode',
     'usersettings',

From d2685d9edf3ce85301b543b286c6b5903b696e3e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 07:53:49 +0200
Subject: [PATCH 300/600] Prevent some SQLAlchemy warnings that have been
 present since SQLAlchemy 1.0.

---
 kotti/security.py       | 9 +++++----
 kotti/tests/test_app.py | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kotti/security.py b/kotti/security.py
index 9d49e5921..713a9146e 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -82,10 +82,6 @@ class Principal(Base):
         receiver of the email.  This attribute should be set to
         'None' once confirmation has succeeded.
     """
-    __tablename__ = 'principals'
-    __mapper_args__ = dict(
-        order_by='principals.name',
-        )
 
     id = Column(Integer, primary_key=True)
     name = Column(Unicode(100), unique=True)
@@ -98,6 +94,11 @@ class Principal(Base):
     creation_date = Column(DateTime(), nullable=False)
     last_login_date = Column(DateTime())
 
+    __tablename__ = 'principals'
+    __mapper_args__ = dict(
+        order_by=name,
+        )
+
     def __init__(self, name, password=None, active=True, confirm_token=None,
                  title=u"", email=None, groups=None):
         self.name = name
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 12dc91f88..bb6b04edd 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -8,7 +8,9 @@
 from pyramid.interfaces import IViewClassifier
 from pyramid.request import Request
 from pyramid.threadlocal import get_current_registry
+from sqlalchemy import column
 from sqlalchemy import select
+from sqlalchemy import table
 from zope.interface import implementedBy
 from zope.interface import providedBy
 
@@ -208,7 +210,8 @@ def test_stamp_heads(self, db_session, connection):
                 main({}, **settings)
 
         res = db_session.execute(select(
-            columns=['version_num'], from_obj=['kotti_alembic_version']))
+            columns=[column('version_num')],
+            from_obj=[table('kotti_alembic_version')]))
         assert tuple(res)  # a version_num should exist
 
 

From ff618ad8c43bb43226eacde498cf211bd47a1112 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 13:24:25 +0200
Subject: [PATCH 301/600] Add missing FK indices on tags_to_contents.

---
 .../alembic/versions/4a3de0d0804a_add_foreignkey_indices.py | 4 ++++
 kotti/resources.py                                          | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
index 39a30fedf..f58fad046 100644
--- a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
+++ b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
@@ -20,6 +20,10 @@ def upgrade():
         'ix_local_groups_node_id', 'local_groups', ['node_id', ])
     op.create_index(
         'ix_local_groups_principal_name', 'local_groups', ['principal_name', ])
+    op.create_index(
+        'ix_tags_to_contents_tag_id', 'tags_to_contents', ['tag_id', ])
+    op.create_index(
+        'ix_tags_to_contents_content_id', 'tags_to_contents', ['content_id', ])
 
 
 def downgrade():
diff --git a/kotti/resources.py b/kotti/resources.py
index 517792cf5..22f32febb 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -464,10 +464,12 @@ class TagsToContents(Base):
 
     #: Foreign key referencing :attr:`Tag.id`
     #: (:class:`sqlalchemy.types.Integer`)
-    tag_id = Column(Integer, ForeignKey('tags.id'), primary_key=True)
+    tag_id = Column(Integer, ForeignKey('tags.id'), primary_key=True,
+                    index=True)
     #: Foreign key referencing :attr:`Content.id`
     #: (:class:`sqlalchemy.types.Integer`)
-    content_id = Column(Integer, ForeignKey('contents.id'), primary_key=True)
+    content_id = Column(Integer, ForeignKey('contents.id'), primary_key=True,
+                        index=True)
     #: Relation that adds a ``content_tags`` :func:`sqlalchemy.orm.backref`
     #: to :class:`~kotti.resources.Tag` instances to allow easy access to all
     #: content tagged with that tag.

From 30d5003faa1abbaf7b16d774be79d4f6f20acce5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 07:53:49 +0200
Subject: [PATCH 302/600] Prevent some SQLAlchemy warnings that have been
 present since SQLAlchemy 1.0.

---
 kotti/security.py       | 9 +++++----
 kotti/tests/test_app.py | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kotti/security.py b/kotti/security.py
index 9d49e5921..713a9146e 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -82,10 +82,6 @@ class Principal(Base):
         receiver of the email.  This attribute should be set to
         'None' once confirmation has succeeded.
     """
-    __tablename__ = 'principals'
-    __mapper_args__ = dict(
-        order_by='principals.name',
-        )
 
     id = Column(Integer, primary_key=True)
     name = Column(Unicode(100), unique=True)
@@ -98,6 +94,11 @@ class Principal(Base):
     creation_date = Column(DateTime(), nullable=False)
     last_login_date = Column(DateTime())
 
+    __tablename__ = 'principals'
+    __mapper_args__ = dict(
+        order_by=name,
+        )
+
     def __init__(self, name, password=None, active=True, confirm_token=None,
                  title=u"", email=None, groups=None):
         self.name = name
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 12dc91f88..bb6b04edd 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -8,7 +8,9 @@
 from pyramid.interfaces import IViewClassifier
 from pyramid.request import Request
 from pyramid.threadlocal import get_current_registry
+from sqlalchemy import column
 from sqlalchemy import select
+from sqlalchemy import table
 from zope.interface import implementedBy
 from zope.interface import providedBy
 
@@ -208,7 +210,8 @@ def test_stamp_heads(self, db_session, connection):
                 main({}, **settings)
 
         res = db_session.execute(select(
-            columns=['version_num'], from_obj=['kotti_alembic_version']))
+            columns=[column('version_num')],
+            from_obj=[table('kotti_alembic_version')]))
         assert tuple(res)  # a version_num should exist
 
 

From 5edc8bbb04e10f5f7adc510d4126a5b5c114f15f Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <pd@dev.dobrogost.net>
Date: Mon, 14 Sep 2015 14:50:41 +0200
Subject: [PATCH 303/600] Added '--statistics' option to invocation of `msgfmt`
 to bring attention to possible fuzzy translations; see
 https://github.com/wichert/lingua/issues/59 Additionally now we print file
 being currently compiled so that we know which statistic is for which
 language. Added '--no-wrap' option to invocation of `msgmerge` to avoid
 wrapping original msgids. Wrapping needlessly "mangles" original msgids.
 Please note that both options were lost during migration to lingua 3.6.1 in
 commit https://github.com/Kotti/Kotti/commit/285bad5

---
 i18n.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i18n.sh b/i18n.sh
index f8f6a4800..9c20a61c7 100755
--- a/i18n.sh
+++ b/i18n.sh
@@ -30,12 +30,13 @@ if [ $# -eq 0 ]; then
 
     echo "Update translations"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/$DOMAIN.po; do
-        msgmerge -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
+        msgmerge --no-wrap -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
     done
 
     echo "Compile message catalogs"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/*.po; do
-        msgfmt -o "${po%.*}.mo" "$po"
+        echo "Compiling file $po..."
+        msgfmt --statistics -o "${po%.*}.mo" "$po"
     done
 
 # first argument represents language identifier, create catalog

From 47785a4cf13e34c2df36a94b1f77984a8bbeed0a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 24 Sep 2015 09:21:11 +0200
Subject: [PATCH 304/600] Upgrade requirements to their latest respective
 version.

---
 requirements.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index d2b1a153f..d104568cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,15 +13,15 @@ Unidecode==0.04.18
 WebOb==1.4.1
 alembic==0.8.2
 appdirs==1.4.0
-bleach==1.4.1
+bleach==1.4.2
 bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a5
-filedepot==0.1.0
+filedepot==0.1.1
 html2text==2015.6.21
-html5lib==1.0b7
+html5lib==1.0b8
 iso8601==0.1.10
 js.angular==1.1.4
 js.bootstrap==3.3.4
@@ -40,7 +40,7 @@ js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
-kotti-tinymce==0.5.3
+kotti-tinymce==0.5.4
 lingua==3.11
 peppercorn==0.5
 plone.scale==1.3.5
@@ -55,7 +55,7 @@ pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
 pyramid-tm==0.12
 pyramid-zcml==1.0.0
-pytz==2015.4
+pytz==2015.6
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1

From 0033fc906864509abf165abf662dfafaf5e1daa4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 02:29:55 +0200
Subject: [PATCH 305/600] Order conf_defaults and conf_dotted alphabetically.

---
 kotti/__init__.py | 80 +++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index ba28ad319..a272e6560 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -54,9 +54,15 @@ def none_factory(**kwargs):  # pragma: no cover
 
 # All of these can be set by passing them in the Paste Deploy settings:
 conf_defaults = {
-    'kotti.templates.api': 'kotti.views.util.TemplateAPI',
-    'kotti.configurators': '',
-    'pyramid.includes': '',
+    'kotti.alembic_dirs': 'kotti:alembic',
+    'kotti.asset_overrides': '',
+    'kotti.authn_policy_factory': 'kotti.authtkt_factory',
+    'kotti.authz_policy_factory': 'kotti.acl_factory',
+    'kotti.available_types': ' '.join([
+        'kotti.resources.Document',
+        'kotti.resources.File',
+        'kotti.resources.Image',
+        ]),
     'kotti.base_includes': ' '.join([
         'kotti',
         'kotti.filedepot',
@@ -76,43 +82,23 @@ def none_factory(**kwargs):  # pragma: no cover
         'kotti.views.navigation',
         'kotti.views.users',
         ]),
-    'kotti.zcml_includes': ' '.join([
-        ]),
-    'kotti.asset_overrides': '',
-    'kotti.use_tables': '',
-    'kotti.request_factory': 'kotti.request.Request',
-    'kotti.root_factory': 'kotti.resources.default_get_root',
-    'kotti.populators': 'kotti.populate.populate',
-    'kotti.available_types': ' '.join([
-        'kotti.resources.Document',
-        'kotti.resources.File',
-        'kotti.resources.Image',
-        ]),
-    'kotti.search_content': 'kotti.views.util.default_search_content',
-    'kotti.authn_policy_factory': 'kotti.authtkt_factory',
-    'kotti.authz_policy_factory': 'kotti.acl_factory',
-    'kotti.session_factory': 'kotti.beaker_session_factory',
-    'kotti.principals_factory': 'kotti.security.principals_factory',
     'kotti.caching_policy_chooser': (
         'kotti.views.cache.default_caching_policy_chooser'),
-    'kotti.url_normalizer': 'kotti.url_normalizer.url_normalizer',
-    'kotti.url_normalizer.map_non_ascii_characters': True,
-    'kotti.use_workflow': 'kotti:workflow.zcml',
+    'kotti.configurators': '',
     'kotti.date_format': 'medium',
     'kotti.datetime_format': 'medium',
-    'kotti.time_format': 'medium',
-    'kotti.max_file_size': '10',
-    'kotti.depot.0.name': 'dbfiles',
     'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
+    'kotti.depot.0.name': 'dbfiles',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
-    'kotti.static.edit_needed': '',  # BBB
-    'kotti.static.view_needed': '',  # BBB
-    'kotti.alembic_dirs': 'kotti:alembic',
+    'kotti.max_file_size': '10',
+    'kotti.populators': 'kotti.populate.populate',
+    'kotti.principals_factory': 'kotti.security.principals_factory',
     'kotti.register': 'False',
     'kotti.register.group': '',
     'kotti.register.role': '',
-    'pyramid_deform.template_search_path': 'kotti:templates/deform',
+    'kotti.request_factory': 'kotti.request.Request',
+    'kotti.root_factory': 'kotti.resources.default_get_root',
     'kotti.sanitizers': ' '.join([
         'xss_protection:kotti.sanitizers.xss_protection',
         'minimal_html:kotti.sanitizers.minimal_html',
@@ -123,24 +109,38 @@ def none_factory(**kwargs):  # pragma: no cover
         'kotti.resources.Content.title:no_html',
         'kotti.resources.Content.description:no_html',
         ]),
+    'kotti.search_content': 'kotti.views.util.default_search_content',
+    'kotti.session_factory': 'kotti.beaker_session_factory',
+    'kotti.static.edit_needed': '',  # BBB
+    'kotti.static.view_needed': '',  # BBB
+    'kotti.templates.api': 'kotti.views.util.TemplateAPI',
+    'kotti.time_format': 'medium',
+    'kotti.url_normalizer': 'kotti.url_normalizer.url_normalizer',
+    'kotti.url_normalizer.map_non_ascii_characters': True,
+    'kotti.use_tables': '',
+    'kotti.use_workflow': 'kotti:workflow.zcml',
+    'kotti.zcml_includes': ' '.join([
+        ]),
+    'pyramid.includes': '',
+    'pyramid_deform.template_search_path': 'kotti:templates/deform',
     }
 
 conf_dotted = set([
-    'kotti.templates.api',
-    'kotti.configurators',
-    'kotti.base_includes',
-    'kotti.request_factory',
-    'kotti.root_factory',
-    'kotti.populators',
-    'kotti.available_types',
-    'kotti.search_content',
     'kotti.authn_policy_factory',
     'kotti.authz_policy_factory',
-    'kotti.session_factory',
-    'kotti.principals_factory',
+    'kotti.available_types',
+    'kotti.base_includes',
     'kotti.caching_policy_chooser',
+    'kotti.configurators',
     'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed',
+    'kotti.populators',
+    'kotti.principals_factory',
+    'kotti.request_factory',
+    'kotti.root_factory',
+    'kotti.search_content',
+    'kotti.session_factory',
+    'kotti.templates.api',
     'kotti.url_normalizer',
     ])
 

From 7ebe792d180f8f942865451763a2e006035ea49e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 07:53:49 +0200
Subject: [PATCH 306/600] Prevent some SQLAlchemy warnings that have been
 present since SQLAlchemy 1.0.

---
 kotti/security.py       | 9 +++++----
 kotti/tests/test_app.py | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kotti/security.py b/kotti/security.py
index 0d96de903..08f4d431d 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -82,10 +82,6 @@ class Principal(Base):
         receiver of the email.  This attribute should be set to
         'None' once confirmation has succeeded.
     """
-    __tablename__ = 'principals'
-    __mapper_args__ = dict(
-        order_by='principals.name',
-        )
 
     id = Column(Integer, primary_key=True)
     name = Column(Unicode(100), unique=True)
@@ -98,6 +94,11 @@ class Principal(Base):
     creation_date = Column(DateTime(), nullable=False)
     last_login_date = Column(DateTime())
 
+    __tablename__ = 'principals'
+    __mapper_args__ = dict(
+        order_by=name,
+        )
+
     def __init__(self, name, password=None, active=True, confirm_token=None,
                  title=u"", email=None, groups=None):
         self.name = name
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 12dc91f88..bb6b04edd 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -8,7 +8,9 @@
 from pyramid.interfaces import IViewClassifier
 from pyramid.request import Request
 from pyramid.threadlocal import get_current_registry
+from sqlalchemy import column
 from sqlalchemy import select
+from sqlalchemy import table
 from zope.interface import implementedBy
 from zope.interface import providedBy
 
@@ -208,7 +210,8 @@ def test_stamp_heads(self, db_session, connection):
                 main({}, **settings)
 
         res = db_session.execute(select(
-            columns=['version_num'], from_obj=['kotti_alembic_version']))
+            columns=[column('version_num')],
+            from_obj=[table('kotti_alembic_version')]))
         assert tuple(res)  # a version_num should exist
 
 

From 705600f14af8203c3db790bc3746c1c013cb8216 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 07:27:28 +0200
Subject: [PATCH 307/600] Add ``kotti.modification_date_excludes``
 configuration option.

---
 CHANGES.txt                             |   4 +
 docs/developing/basic/configuration.rst | 102 ++++++++++++------------
 docs/developing/basic/security.rst      |   4 +-
 kotti/__init__.py                       |   4 +
 kotti/events.py                         |  11 ++-
 kotti/tests/test_events.py              |  31 +++++++
 requirements.txt                        |   1 +
 setup.py                                |   5 +-
 8 files changed, 108 insertions(+), 54 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a5eb0aa1d..76e456e88 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,10 @@ Change History
   - Add caching for the root node.
   - Use eager / joined loading for local_groups.
   - Don't query principals for roles
+- Add a ``kotti.modification_date_excludes`` configuration option.
+  It takes a list of attributes in dotted name notation that should not trigger
+  an update of ``modification_date`` on change.  Defaults to
+  ``kotti.resources.Node.position``.
 
 1.1.5 - 2015-09-04
 ------------------
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index c402bf8fd..55252b84c 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -37,52 +37,54 @@ Overview of settings
 This table provides an overview of available settings.
 All these settings must go into the ``[app:kotti]`` section of your Paste Deploy configuration file.
 
-============================  ==================================================
-Setting                       Description
-============================  ==================================================
-**kotti.site_title**          The title of your site
-**kotti.secret**              Secret token used for the initial admin password
-kotti.secret2                 Secret token used for email password reset token
-
-**sqlalchemy.url**            `SQLAlchemy database URL`_
-**mail.default_sender**       Sender address for outgoing email
-mail.host                     Email host to send from
-
-pyramid.includes              List of Python configuration hooks
-kotti.available_types         List of active content types
-kotti.base_includes           List of base Python configuration hooks
-kotti.zcml_includes           List of packages to include the ZCML from
-kotti.configurators           List of advanced functions for config
-kotti.request_factory         Override Kotti's default request factory
-kotti.root_factory            Override Kotti's default Pyramid *root factory*
-kotti.populators              List of functions to fill initial database
-kotti.search_content          Override Kotti's default search function
-
-kotti.asset_overrides         Override Kotti's templates
-kotti.templates.api           Override ``api`` object available in templates
-kotti.fanstatic.view_needed   List of static resources used for public interface
-kotti.fanstatic.edit_needed   List of static resources used for edit interface
-
-kotti.authn_policy_factory    Component used for authentication
-kotti.authz_policy_factory    Component used for authorization
-kotti.session_factory         Component used for sessions
-
-kotti.caching_policy_chooser  Component for choosing the cache header policy
-kotti.url_normalizer          Component used for url normalization
-
-kotti.date_format             Date format to use, default: ``medium``
-kotti.datetime_format         Datetime format to use, default: ``medium``
-kotti.time_format             Time format to use, default: ``medium``
-kotti.max_file_size           Max size for file uploads, default: ```10`` (MB)
-
-kotti.depot.*.*               Configure the blob storage. More details below
-
-kotti.sanitizers              Configure available :ref:`sanitizers`.
-kotti.sanitize_on_write       Configure :ref:`sanitizers` to be used on write
-                              access to resource objects.
-
-pyramid.default_locale_name   Set the user interface language, default ``en``
-============================  ==================================================
+================================  ==============================================
+Setting                           Description
+================================  ==============================================
+**kotti.site_title**              The title of your site
+**kotti.secret**                  Secret token used for the initial admin
+                                  password
+kotti.secret2                     Secret token used for email password reset
+                                  token
+**sqlalchemy.url**                `SQLAlchemy database URL`_
+**mail.default_sender**           Sender address for outgoing email
+mail.host                         Email host to send from
+pyramid.includes                  List of Python configuration hooks
+kotti.available_types             List of active content types
+kotti.base_includes               List of base Python configuration hooks
+kotti.zcml_includes               List of packages to include the ZCML from
+kotti.configurators               List of advanced functions for config
+kotti.request_factory             Override Kotti's default request factory
+kotti.root_factory                Override Kotti's default Pyramid
+                                  *root factory*
+kotti.populators                  List of functions to fill initial database
+kotti.search_content              Override Kotti's default search function
+kotti.asset_overrides             Override Kotti's templates
+kotti.templates.api               Override ``api`` object available in
+                                  templates
+kotti.fanstatic.view_needed       List of static resources used for public
+                                  interface
+kotti.fanstatic.edit_needed       List of static resources used for edit
+                                  interface
+kotti.authn_policy_factory        Component used for authentication
+kotti.authz_policy_factory        Component used for authorization
+kotti.session_factory             Component used for sessions
+kotti.caching_policy_chooser      Component for choosing the cache header policy
+kotti.url_normalizer              Component used for url normalization
+kotti.date_format                 Date format to use, default: ``medium``
+kotti.datetime_format             Datetime format to use, default: ``medium``
+kotti.time_format                 Time format to use, default: ``medium``
+kotti.max_file_size               Max size for file uploads,
+                                  default: ```10`` (MB)
+kotti.modification_date_excludes  List of attributes in dotted name notation
+                                  that should not trigger an update of
+                                  ``modification_date`` on change.
+kotti.depot.*.*                   Configure the blob storage. More details below
+kotti.sanitizers                  Configure available :ref:`sanitizers`.
+kotti.sanitize_on_write           Configure :ref:`sanitizers` to be used on
+                                  write access to resource objects.
+pyramid.default_locale_name       Set the user interface language,
+                                  default ``en``
+================================  ==============================================
 
 Only the settings in bold letters required.
 The rest has defaults.
@@ -317,18 +319,18 @@ Blob storage configuration
 --------------------------
 
 By default, Kotti will store blob data (files uploaded in File and Image instances) in the database.
-Internally, Kotti integrates with :app:`filedepot`, so it is possible to use any :app:`filedepot` compatible storage, including those provided by :app:`filedepot` itself:
+Internally, Kotti integrates with ``filedepot``, so it is possible to use any ``filedepot`` compatible storage, including those provided by ``filedepot`` itself:
 
 - :class:`depot.io.local.LocalFileStorage`
 - :class:`depot.io.awss3.S3Storage`
 - :class:`depot.io.gridfs.GridFSStorage`
 
-The default storage for :app:`Kotti` is :class:`~kotti.filedepot.DBFileStorage`.
+The default storage for Kotti is :class:`~kotti.filedepot.DBFileStorage`.
 The benefit of storing files in ``DBFileStorage`` is having *all* content in a single place (the DB) which makes backups, exporting and importing of your site's data easy, as long as you don't have too many or too large files.
 The downsides of this approach appear when your database server resides on a different host (network performance becomes a greater issue) or your DB dumps become too large to be handled efficiently.
 
 To configure a depot, several ``kotti.depot.*.*`` lines need to be added.
-The number in the first position is used to group backend configuration and to order the file storages in the configuration of :app:`filedepot`.
+The number in the first position is used to group backend configuration and to order the file storages in the configuration of ``filedepot``.
 The depot configured with number 0 will be the default depot, where all new blob data will be saved.
 There are 2 options that are required for every storage configuration: ``name`` and ``backend``.
 The ``name`` is a unique string that will be used to identify the path of saved files (it is recorded with each blob info), so once configured for a particular storage, it should never change.
@@ -336,7 +338,7 @@ The ``backend`` should point to a dotted path for the storage class.
 Then, any number of keyword arguments can be added, and they will be passed to the backend class on initialization.
 
 Example of a possible configurationi that stores blob data on the disk, in
-``/var/local/files`` using the :app:`filedepot` :class:`depot.io.local.LocalFileStorage` provided backend.
+``/var/local/files`` using the ``filedepot`` :class:`depot.io.local.LocalFileStorage` provided backend.
 Kotti's default backend, ``DBFileStorage`` has been moved to position **1** and all data stored there will continue to be available.
 See :ref:`blobs` to see how to migrate blob data between storages.
 
diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index 5938f03e7..f15f05d17 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -108,9 +108,10 @@ The default workflow is quite useful for websites, but sometimes you need someth
 Just point the ``kotti.use_workflow`` setting to your zcml file:
 
 .. code-block:: ini
+
     kotti.use_workflow = kotti_yourplugin:workflow.zcml
 
-The simplest way to deal with workflow definitions is::
+The simplest way to deal with workflow definitions is:
 
 1. create a copy of the default workflow definition and
 2. customize it (change permissions, add new states, permissions, transitions, initial state and so on).
@@ -252,6 +253,7 @@ Here it is, our "custom" workflow definition assigned to our ``ICustomContent``
 Last you have to tell Kotti to register your new custom workflow including our ``zcml`` file:
 
 .. code-block:: ini
+
     kotti.zcml_includes = kotti_wf:workflow.zcml
 
 Special cases:
diff --git a/kotti/__init__.py b/kotti/__init__.py
index a272e6560..fa60ed85f 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -92,6 +92,9 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
     'kotti.max_file_size': '10',
+    'kotti.modification_date_excludes': ' '.join([
+        'kotti.resources.Node.position',
+    ]),
     'kotti.populators': 'kotti.populate.populate',
     'kotti.principals_factory': 'kotti.security.principals_factory',
     'kotti.register': 'False',
@@ -134,6 +137,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.configurators',
     'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed',
+    'kotti.modification_date_excludes',
     'kotti.populators',
     'kotti.principals_factory',
     'kotti.request_factory',
diff --git a/kotti/events.py b/kotti/events.py
index 3332fb0e6..a2b29837c 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -23,11 +23,13 @@
 from sqlalchemy.orm import load_only
 import venusian
 from sqlalchemy.orm import mapper
+from sqlalchemy_utils.functions import has_changes
 from pyramid.location import lineage
 from pyramid.threadlocal import get_current_request
 from zope.deprecation.deprecation import deprecated
 
 from kotti import DBSession
+from kotti import get_settings
 from kotti.resources import Content
 from kotti.resources import LocalGroup
 from kotti.resources import Node
@@ -255,7 +257,14 @@ def set_modification_date(event):
     :type event: :class:`ObjectUpdate`
     """
 
-    event.object.modification_date = datetime.now()
+    exclude = []
+
+    for e in get_settings()['kotti.modification_date_excludes']:
+        if isinstance(event.object, e.class_):
+            exclude.append(e.key)
+
+    if has_changes(event.object, exclude=exclude):
+        event.object.modification_date = datetime.now()
 
 
 def delete_orphaned_tags(event):
diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 6b236ebad..39487c37d 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -132,3 +132,34 @@ def handler(event):
         assert (handler, dec.register, 'kotti') in dec.venusian.attached
         assert handler not in listeners[ObjectEvent]
         assert handler in objectevent_listeners[(ObjectEvent, Document)]
+
+    def test_set_modification_date(self, root, db_session, events):
+
+        from time import sleep
+        from kotti.resources import Document
+
+        # create 2 documents
+        d1 = root['d1'] = Document(title='One')
+        d2 = root['d2'] = Document(title='Two')
+        assert d1.position == 0
+        assert d2.position == 1
+        db_session.flush()
+        md1 = d1.modification_date
+        md2 = d2.modification_date
+
+        # changing positions should not update modification_date
+        sleep(1)
+        d1.position = 1
+        d2.position = 0
+        db_session.flush()
+        assert d1.position == 1
+        assert d2.position == 0
+        assert d1.modification_date == md1
+        assert d2.modification_date == md2
+
+        # changing anything else should update modification_date
+        d1.title = 'Eins'
+        d2.title = 'Zwei'
+        db_session.flush()
+        assert d1.modification_date != md1
+        assert d2.modification_date != md2
diff --git a/requirements.txt b/requirements.txt
index d104568cb..d46a51ecc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@ PasteDeploy==1.5.2
 Pillow==2.9.0
 Pygments==2.0.2
 SQLAlchemy==1.0.8
+SQLAlchemy-Utils==0.31.0
 Unidecode==0.04.18
 WebOb==1.4.1
 alembic==0.8.2
diff --git a/setup.py b/setup.py
index 3e8d534f7..9d5dbffca 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'Pillow',  # dependency of plone.scale
-    'alembic',
+    'alembic>=0.8.0',
     'bleach',
     'bleach-whitelist',
     'colander>=0.9.3',
@@ -49,7 +49,8 @@
     'pyramid_zcml',
     'repoze.lru',
     'repoze.workflow',
-    'sqlalchemy>=0.7.6',
+    'sqlalchemy>=1.0.0',
+    'sqlalchemy-utils',
     'transaction>=1.1.0',
     'unidecode',
     'usersettings',

From 2b2ad473ba00dead0e38cae94c1aa535f01b449c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 31 Aug 2015 12:45:31 +0200
Subject: [PATCH 308/600] Add changenotes.

---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 76e456e88..f6a1fa158 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,11 @@ Change History
   It takes a list of attributes in dotted name notation that should not trigger
   an update of ``modification_date`` on change.  Defaults to
   ``kotti.resources.Node.position``.
+- Add "missing" foreign key indices (with corresponding migration step).
+- Greatly reduce the number of queries that are sent to the DB:
+  - Add caching for the root node.
+  - Use eager / joined loading for local_groups.
+  - Don't query principals for roles
 
 1.1.5 - 2015-09-04
 ------------------

From 66b285fb50ac766387863c40de1eb9f43374370e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 21:12:23 +0200
Subject: [PATCH 309/600] Remove assert that fails for no reason on Postgres.

---
 kotti/tests/browser.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kotti/tests/browser.txt b/kotti/tests/browser.txt
index 4b5a316bb..5e2dcc5e6 100644
--- a/kotti/tests/browser.txt
+++ b/kotti/tests/browser.txt
@@ -544,10 +544,8 @@ Contents view change state actions
   >>> browser.getLink("Contents").click()
   >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=public' in browser.contents
   True
-  >>> browser.getLink("Make Public", index=2).click()
-  >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=private' in browser.contents
-  True
 
+  >>> browser.getLink("Make Public", index=2).click()
   >>> childs = ctrl(name='children')
   >>> childs.value = childs.options[0:3]
   >>> ctrl(name='change_state').click()

From 4b1e3ff18100fd459ad47ada6d939516f6739680 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 07:27:28 +0200
Subject: [PATCH 310/600] Add ``kotti.modification_date_excludes``
 configuration option.

---
 CHANGES.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f6a1fa158..76e456e88 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,11 +21,6 @@ Change History
   It takes a list of attributes in dotted name notation that should not trigger
   an update of ``modification_date`` on change.  Defaults to
   ``kotti.resources.Node.position``.
-- Add "missing" foreign key indices (with corresponding migration step).
-- Greatly reduce the number of queries that are sent to the DB:
-  - Add caching for the root node.
-  - Use eager / joined loading for local_groups.
-  - Don't query principals for roles
 
 1.1.5 - 2015-09-04
 ------------------

From d4c1a6272fe44890a3efcb4be63a14dd1903d6e0 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 21:21:54 +0200
Subject: [PATCH 311/600] Upgrade Babel to 2.1.1.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d46a51ecc..a5bbbdb45 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Kotti==1.1.5
-Babel==2.0
+Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.22
 FormEncode==1.3.0

From c7e41790cb308006c4ffa6dd4f288b2602da608f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 21:21:54 +0200
Subject: [PATCH 312/600] Upgrade Babel to 2.1.1.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d46a51ecc..a5bbbdb45 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Kotti==1.1.5
-Babel==2.0
+Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.22
 FormEncode==1.3.0

From 7e8f973fe442a7897249cde474ae570fb94ee2ec Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 26 Sep 2015 23:16:42 +0200
Subject: [PATCH 313/600] Revert "Remove assert that fails for no reason on
 Postgres."

This reverts commit 66b285fb50ac766387863c40de1eb9f43374370e.
---
 kotti/tests/browser.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kotti/tests/browser.txt b/kotti/tests/browser.txt
index 5e2dcc5e6..4b5a316bb 100644
--- a/kotti/tests/browser.txt
+++ b/kotti/tests/browser.txt
@@ -544,8 +544,10 @@ Contents view change state actions
   >>> browser.getLink("Contents").click()
   >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=public' in browser.contents
   True
-
   >>> browser.getLink("Make Public", index=2).click()
+  >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=private' in browser.contents
+  True
+
   >>> childs = ctrl(name='children')
   >>> childs.value = childs.options[0:3]
   >>> ctrl(name='change_state').click()

From a3e799a2bd541e6d0da8f25f44868f76aca03bd3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 00:02:17 +0200
Subject: [PATCH 314/600] Re-enable failing assert.  Fixed with
 ``reorder_on_append``.

---
 CHANGES.txt             | 20 ++++++++++----------
 kotti/resources.py      |  2 +-
 kotti/tests/browser.txt |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 76e456e88..c21751c4b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,18 @@
 Change History
 ==============
 
-1.1.6 - unreleased
+1.2.0 - unreleased
 ------------------
 
+- **Greatly** reduce the number of queries that are sent to the DB:
+  - Add caching for the root node.
+  - Use eager / joined loading for local_groups.
+  - Don't query principals for roles
+- Add "missing" foreign key indices (with corresponding migration step).
+- Add a ``kotti.modification_date_excludes`` configuration option.
+  It takes a list of attributes in dotted name notation that should not trigger
+  an update of ``modification_date`` on change.  Defaults to
+  ``kotti.resources.Node.position``.
 - Don't try to set a caching header from the NewRequest handler when Pyramid's
   tweens didn't follow the usual chain of calls. This fixes compatibility with
   ``bowerstatic``.
@@ -12,15 +21,6 @@ Change History
   a bit ambigous in regards to what the ``system`` parameter should include
   when a renderer gets called. This fixes compatibility with
   ``pyramid_layout``.
-- Add "missing" foreign key indices (with corresponding migration step).
-- Greatly reduce the number of queries that are sent to the DB:
-  - Add caching for the root node.
-  - Use eager / joined loading for local_groups.
-  - Don't query principals for roles
-- Add a ``kotti.modification_date_excludes`` configuration option.
-  It takes a list of attributes in dotted name notation that should not trigger
-  an update of ``modification_date`` on change.  Defaults to
-  ``kotti.resources.Node.position``.
 
 1.1.5 - 2015-09-04
 ------------------
diff --git a/kotti/resources.py b/kotti/resources.py
index 22f32febb..f9762e77c 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -247,7 +247,7 @@ class Node(Base, ContainerMixin, PersistentACLMixin):
         remote_side=[id],
         backref=backref(
             '_children',
-            collection_class=ordering_list('position'),
+            collection_class=ordering_list('position', reorder_on_append=True),
             order_by=[position],
             cascade='all',
         )
diff --git a/kotti/tests/browser.txt b/kotti/tests/browser.txt
index 4b5a316bb..b12023e94 100644
--- a/kotti/tests/browser.txt
+++ b/kotti/tests/browser.txt
@@ -544,7 +544,7 @@ Contents view change state actions
   >>> browser.getLink("Contents").click()
   >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=public' in browser.contents
   True
-  >>> browser.getLink("Make Public", index=2).click()
+  >>> browser.getLink("Make Public", index=3).click()
   >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=private' in browser.contents
   True
 

From 3c625f00b90f03a3fc2be5089be14211def13d8b Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Sun, 27 Sep 2015 11:53:59 +0100
Subject: [PATCH 315/600] Reorder children on append.

Leave the `reorder_on_append` flag as the default to the `_children`
backref on Node, as advised by the SQLAlchemy docs.

Call `reorder` on Node.children any time we append to it instead.
---
 kotti/resources.py          | 1 +
 kotti/views/edit/actions.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index f9762e77c..e611a6436 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -79,6 +79,7 @@ class ContainerMixin(object, DictMixin):
     def __setitem__(self, key, node):
         key = node.name = unicode(key)
         self.children.append(node)
+        self.children.reorder()
 
     def __delitem__(self, key):
         node = self[unicode(key)]
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index eb82dcd94..fe0de6c03 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -145,7 +145,7 @@ def paste_nodes(self):
                     item.__parent__.children.remove(item)
                     item.name = title_to_name(item.name,
                                               blacklist=self.context.keys())
-                    self.context.children.append(item)
+                    self.context[item.name] = item
                     if count is len(ids) - 1:
                         del self.request.session['kotti.paste']
                 elif action == 'copy':
@@ -155,7 +155,7 @@ def paste_nodes(self):
                         name = copy.title
                     name = title_to_name(name, blacklist=self.context.keys())
                     copy.name = name
-                    self.context.children.append(copy)
+                    self.context[name] = copy
                 self.flash(_(u'${title} was pasted.',
                              mapping=dict(title=item.title)), 'success')
             else:

From 9789b49503be40d5b49281629cd434f82085657f Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Sun, 27 Sep 2015 12:00:16 +0100
Subject: [PATCH 316/600] Add myself.

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 54b960800..469df72db 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -103,3 +103,4 @@ Contributors
 - Ichim Tiberiu, 2015/01/13
 - Martin Peeters, 2015/02/21
 - Davide Moro, 2015/04/02
+- Matt Russell, 2015/09/27

From c0d00f6b6e6054f4af4f76aef3bf387ee7de0875 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 13:17:28 +0200
Subject: [PATCH 317/600] Make kotti_tinymce a requirement in the scaffold. 
 Fixes #447.

---
 kotti/scaffolds/package/setup.py_tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kotti/scaffolds/package/setup.py_tmpl b/kotti/scaffolds/package/setup.py_tmpl
index 1728b4d2e..c900d1424 100644
--- a/kotti/scaffolds/package/setup.py_tmpl
+++ b/kotti/scaffolds/package/setup.py_tmpl
@@ -17,6 +17,7 @@ version = '0.1dev'
 
 install_requires = [
     'Kotti>=1.0.0',
+    'kotti_tinymce',
 ]
 
 

From 0a91971d0d4ceb143e48ac952a2b1bea8c6e0f76 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 13:21:35 +0200
Subject: [PATCH 318/600] Make scaffold use the name of project as the name of
 application.  Closes #457.

---
 kotti/scaffolds/package/development.ini_tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/scaffolds/package/development.ini_tmpl b/kotti/scaffolds/package/development.ini_tmpl
index 75f3e5dc3..dc1b70c9d 100644
--- a/kotti/scaffolds/package/development.ini_tmpl
+++ b/kotti/scaffolds/package/development.ini_tmpl
@@ -1,4 +1,4 @@
-[app:kotti]
+[app:{{project}}]
 use = egg:kotti
 
 pyramid.reload_templates = true
@@ -26,7 +26,7 @@ use = egg:fanstatic#fanstatic
 [pipeline:main]
 pipeline =
     fanstatic
-    kotti
+    {{project}}
 
 [server:main]
 use = egg:waitress#main

From e4ccb108a5f760941b5aecbd36fb8e9c63d7a183 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 13:22:14 +0200
Subject: [PATCH 319/600] Use unicode instead of strings in test (prevents
 SQLAlchemy warnings).

---
 kotti/tests/test_events.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 39487c37d..49ffb5835 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -139,8 +139,8 @@ def test_set_modification_date(self, root, db_session, events):
         from kotti.resources import Document
 
         # create 2 documents
-        d1 = root['d1'] = Document(title='One')
-        d2 = root['d2'] = Document(title='Two')
+        d1 = root['d1'] = Document(title=u'One')
+        d2 = root['d2'] = Document(title=u'Two')
         assert d1.position == 0
         assert d2.position == 1
         db_session.flush()
@@ -158,8 +158,8 @@ def test_set_modification_date(self, root, db_session, events):
         assert d2.modification_date == md2
 
         # changing anything else should update modification_date
-        d1.title = 'Eins'
-        d2.title = 'Zwei'
+        d1.title = u'Eins'
+        d2.title = u'Zwei'
         db_session.flush()
         assert d1.modification_date != md1
         assert d2.modification_date != md2

From db288f4320de39e7789c3d359377da894604f437 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 13:36:55 +0200
Subject: [PATCH 320/600] Make waitress listen on all interfaces in
 development.ini.  Resolves #371.

---
 development.ini                              | 1 -
 kotti/scaffolds/package/development.ini_tmpl | 1 -
 2 files changed, 2 deletions(-)

diff --git a/development.ini b/development.ini
index 76ed43710..655dbabd9 100644
--- a/development.ini
+++ b/development.ini
@@ -28,7 +28,6 @@ pipeline =
 
 [server:main]
 use = egg:waitress#main
-host = 127.0.0.1
 port = 5000
 
 [alembic]
diff --git a/kotti/scaffolds/package/development.ini_tmpl b/kotti/scaffolds/package/development.ini_tmpl
index dc1b70c9d..7bca90bd1 100644
--- a/kotti/scaffolds/package/development.ini_tmpl
+++ b/kotti/scaffolds/package/development.ini_tmpl
@@ -30,7 +30,6 @@ pipeline =
 
 [server:main]
 use = egg:waitress#main
-host = 0.0.0.0
 port = 5000
 
 [alembic]

From 0b2be3f9ee20713a3fad2fb0e4e23a6c3225928e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 13:43:34 +0200
Subject: [PATCH 321/600] Bump version.

---
 CHANGES.txt                              | 2 +-
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 092ca52c8..335629b0c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.2.0 - unreleased
+1.2.0 - 2015-09-27
 ------------------
 
 - **Greatly** reduce the number of queries that are sent to the DB:
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 5efc2fc18..a7f957685 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1 +1 @@
--r https://raw.githubusercontent.com/Kotti/Kotti/1.1.5/requirements.txt
+-r https://raw.githubusercontent.com/Kotti/Kotti/stable/requirements.txt
diff --git a/requirements.txt b/requirements.txt
index a5bbbdb45..7d4f440a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.5
+Kotti==1.2.0
 Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/setup.py b/setup.py
index 9d5dbffca..847fc9d81 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.6-dev',
+      version='1.2.0',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From d19dff2df058e5ca614f8d4903152381139b1e4f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 13:45:04 +0200
Subject: [PATCH 322/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 335629b0c..8ece87d52 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.2.1 - unreleased
+------------------
+
+- No changes yet.
+
 1.2.0 - 2015-09-27
 ------------------
 
diff --git a/setup.py b/setup.py
index 847fc9d81..bb502e24b 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.0',
+      version='1.2.1-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 939a94451f6f23d25652c26e053151277f84afaf Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Sep 2015 14:18:51 +0200
Subject: [PATCH 323/600] Add a test for detection of foreign key constraints
 without corresponding index.

---
 kotti/tests/test_sqla.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/kotti/tests/test_sqla.py b/kotti/tests/test_sqla.py
index 25bd9e9ed..c9736f04b 100644
--- a/kotti/tests/test_sqla.py
+++ b/kotti/tests/test_sqla.py
@@ -232,3 +232,12 @@ def test_dunder_json_recursive(self):
             'foo': [{'bar': 'baz'}],
             'bar': ['bar', 'baz'],
             }
+
+
+def test_missing_foreign_key_indices(db_session):
+    """ Test for foreign key constraints that don't have a corresponding
+    index. """
+
+    from sqlalchemy_utils.functions import non_indexed_foreign_keys
+    from kotti import metadata
+    assert non_indexed_foreign_keys(metadata) == {}

From 66a9734605a513530cf2881c9cbe7e7d65d916f0 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 28 Sep 2015 10:46:48 +0200
Subject: [PATCH 324/600] Add links to source code in API docs.

---
 docs/conf.py | 96 ++++++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 84e5c2985..44ae540c3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -11,44 +11,45 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+import os
 import pkg_resources
+from datetime import date
 
 # -- General configuration -----------------------------------------------------
 
-#needs_sphinx = '1.0'
 extensions = [
     'repoze.sphinx.autointerface',
     'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
     'sphinx.ext.graphviz',
     'sphinx.ext.inheritance_diagram',
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
     ]
 
-templates_path = ['_templates']
-source_suffix = '.rst'
-#source_encoding = 'utf-8-sig'
+copyright = u'2012-2014, Kotti developers'.format(date.today().year)
+exclude_patterns = ['_build', '_themes']
 master_doc = 'index'
 project = u'Kotti'
-copyright = u'2012-2014, Kotti developers'
-version = pkg_resources.get_distribution("Kotti").version
+pygments_style = 'sphinx'
+source_suffix = '.rst'
+templates_path = ['_templates']
+today_fmt = '%Y-%m-%d'
 # The full version, including alpha/beta/rc tags.
+version = pkg_resources.get_distribution("Kotti").version
 release = version
-#language = None
-today_fmt = '%Y-%m-%d'
-exclude_patterns = ['_build', '_themes']
-#default_role = None
-#add_function_parentheses = True
-#add_module_names = True
-#show_authors = False
-pygments_style = 'sphinx'
-#modindex_common_prefix = []
 
+# add_function_parentheses = True
+# add_module_names = True
+# default_role = None
+# language = None
+# modindex_common_prefix = []
+# show_authors = False
+# source_encoding = 'utf-8-sig'
 
 # -- Options for HTML output ---------------------------------------------------
 
 # on_rtd is whether we are on readthedocs.org
-import os
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
@@ -58,51 +59,50 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-#html_logo = None
-#html_favicon = None
-html_static_path = ['_static']
 html_last_updated_fmt = '%Y-%m-%d'
-#html_use_smartypants = True
-#html_sidebars = {}
-#html_additional_pages = {}
-#html_domain_indices = True
-#html_use_index = True
-#html_split_index = False
-#html_show_sourcelink = True
-#html_show_sphinx = True
-#html_show_copyright = True
-#html_use_opensearch = ''
-#html_file_suffix = None
+html_static_path = ['_static']
 htmlhelp_basename = 'Kottidoc'
+# html_additional_pages = {}
+# html_domain_indices = True
+# html_favicon = None
+# html_file_suffix = None
+# html_logo = None
+# html_short_title = None
+# html_show_copyright = True
+# html_show_sourcelink = True
+# html_show_sphinx = True
+# html_sidebars = {}
+# html_split_index = False
+# html_title = None
+# html_use_index = True
+# html_use_opensearch = ''
+# html_use_smartypants = True
 
 
 # -- Options for LaTeX output --------------------------------------------------
 
-#latex_paper_size = 'a4'
-#latex_font_size = '10pt'
-#latex_documents = [
-#  ('index', 'Kotti.tex', u'Kotti Documentation',
-#   u'Daniel Nouri', 'manual'),
-#]
-#latex_logo = None
-#latex_use_parts = False
-#latex_show_pagerefs = False
-#latex_show_urls = False
-#latex_preamble = ''
-#latex_appendices = []
-#latex_domain_indices = True
+# latex_appendices = []
+# latex_documents = [
+#     ('index', 'Kotti.tex', u'Kotti Documentation', u'Daniel Nouri', 'manual'),
+# ]
+# latex_domain_indices = True
+# latex_font_size = '10pt'
+# latex_logo = None
+# latex_paper_size = 'a4'
+# latex_preamble = ''
+# latex_show_pagerefs = False
+# latex_show_urls = False
+# latex_use_parts = False
 
 
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-#man_pages = [
-#    ('index', 'kotti', u'Kotti Documentation', [u'Daniel Nouri'], 1)
-#]
+# man_pages = [
+#     ('index', 'kotti', u'Kotti Documentation', [u'Daniel Nouri'], 1)
+# ]
 
 # -- Options for inheritance diagrams ------------------------------------------
 inheritance_graph_attrs = dict(

From 4f6b9d6ab9e5ebb71d0a4128df94d3bc660dfce7 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:38:55 +0100
Subject: [PATCH 325/600] Add functional browser tests for 404 errors.

---
 kotti/tests/browser-errors.txt | 45 ++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 kotti/tests/browser-errors.txt

diff --git a/kotti/tests/browser-errors.txt b/kotti/tests/browser-errors.txt
new file mode 100644
index 000000000..a28ecf618
--- /dev/null
+++ b/kotti/tests/browser-errors.txt
@@ -0,0 +1,45 @@
+Kotti HTTP Exception browser tests
+==================================
+
+Setup
+-----
+Create references to some useful tools:
+
+   >>> from kotti import testing
+   >>> tools = testing.setUpFunctional()
+   >>> browser = tools['Browser']()
+   >>> ctrl = browser.getControl
+
+Tell the zope test browser to not raise errors for HTTP exceptions:
+
+   >>> browser.raiseHttpErrors = False
+
+Open the front page:
+
+   >>> browser.open(testing.BASE_URL)
+
+
+HTTP Not Found (404)
+--------------------
+A 404 Not Found view results in a nicely formatted, albeit plain page:
+
+  >>> browser.open(testing.BASE_URL + '/non-existent')
+  >>> 'Not Found' in browser.contents
+  True
+
+The not found view renders similarly for authenticated users.
+
+After logging in:
+
+  >>> browser.open(testing.BASE_URL + '/login')
+  >>> ctrl("Username or email", index=0).value = "admin"
+  >>> ctrl("Password").value = "secret"
+  >>> ctrl(name="submit").click()
+
+We should see the error message when visiting a URL that does not exist:
+
+  >>> browser.open(testing.BASE_URL + '/non-existent')
+  >>> 'Not Found' in browser.contents
+  True
+
+

From 56be99b2102e19835edb63eaf041edb630d798ff Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:43:13 +0100
Subject: [PATCH 326/600] Handle case where context may now be a HTTPException.

---
 kotti/templates/view/master.pt | 15 +++++++++------
 kotti/views/navigation.py      |  5 +++--
 kotti/views/slots.py           |  8 +++++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/kotti/templates/view/master.pt b/kotti/templates/view/master.pt
index 870949449..58ac98ae8 100644
--- a/kotti/templates/view/master.pt
+++ b/kotti/templates/view/master.pt
@@ -3,7 +3,8 @@
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       tal:define="page_slots api.slots;
-                  dummy api.view_needed"
+                  dummy api.view_needed;
+                  has_location_context hasattr(context, '__name__')"
       metal:define-macro="main">
 
   <head>
@@ -20,7 +21,7 @@
                tal:condition="snippets"
                tal:repeat="snippet snippets"
                tal:replace="structure snippet" />
-    <script>
+    <script tal:condition="has_location_context">
       kotti_context_url = '${request.resource_url(context)}';
     </script>
   </head>
@@ -29,21 +30,23 @@
                view-${request.view_name or 'default'}
                ${api.body_css_class}">
     <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
-    <div tal:condition="request.user is not None"
+    <div tal:condition="request.user is not None and has_location_context"
          tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
 
     <div class="container">
       <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')" />
 
-      <div class="row">
+      <div class="row"
+           tal:define="n_slots_left has_location_context and int(bool(page_slots.left)) * 3 or 0;
+                       n_slots_right has_location_context and int(bool(page_slots.right)) * 3 or 0;">
         <div class="col-md-3 left-column"
              tal:condition="page_slots.left"
              tal:content="api.render_template('kotti:templates/render_column_slot.pt', slot=page_slots.left)">
         </div>
 
-        <div tal:define="span 12 - int(bool(page_slots.left)) * 3 - int(bool(page_slots.right)) * 3" class="col-md-${span}">
+        <div tal:define="span 12 - n_slots_left - n_slots_right" class="col-md-${span}">
           <div class="above-content"
-               tal:condition="page_slots.abovecontent"
+               tal:condition="has_location_context and page_slots.abovecontent"
                tal:content="api.render_template('kotti:templates/render_content_slot.pt', slot=page_slots.abovecontent)">
           </div>
 
diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index a981b6252..5c9ae3759 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -6,7 +6,7 @@
 
 from pyramid.view import view_config
 
-from kotti.interfaces import INavigationRoot
+from kotti.interfaces import INavigationRoot, INode
 from kotti.resources import get_root
 from kotti.security import has_permission
 
@@ -36,6 +36,7 @@ def render_tree_navigation(context, request):
 
 
 @view_config(name='local-navigation',
+             context=INode,
              renderer='kotti:templates/view/nav-local.pt')
 def local_navigation(context, request):
 
@@ -46,7 +47,7 @@ def ch(node):
 
     parent = context
     children = ch(context)
-    if not children and context.__parent__ is not None:
+    if not children and getattr(context, '__parent__', None) is not None:
         parent = context.__parent__
         children = ch(parent)
     if len(children) and parent != get_root() and not \
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index 61f84eb53..7ba23a36f 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -41,7 +41,8 @@ def view(request, context):
 import urllib
 
 from pyramid.exceptions import PredicateMismatch
-from pyramid.exceptions import HTTPForbidden
+from pyramid.httpexceptions import HTTPException
+from pyramid.httpexceptions import HTTPForbidden
 from pyramid.request import Request
 from pyramid.view import render_view
 
@@ -80,8 +81,9 @@ def _render_view_on_slot_event(view_name, event, params):
         result = render_view(context, view_request, view_name)
     except (PredicateMismatch, HTTPForbidden):
         return None
-    else:
-        return result.decode('utf-8')
+    if isinstance(context, HTTPException):
+        return None
+    return result.decode('utf-8')
 
 
 def assign_slot(view_name, slot, params=None):

From ec5996d7fe90f414892e47f6579b5204aec72a9e Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:45:42 +0100
Subject: [PATCH 327/600] No need for i18n msg factory.

---
 kotti/views/view.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kotti/views/view.py b/kotti/views/view.py
index d166bc3f5..dcd4c3b9d 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -7,7 +7,6 @@
 from pyramid.view import view_config
 
 from kotti.interfaces import IContent
-
 from kotti.views.util import search_content
 from kotti.views.util import search_content_for_tags
 

From 8e9be4ab53380adb7db9de4bcd08acbae9ba5392 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:46:18 +0100
Subject: [PATCH 328/600] Import does not need to be local.

---
 kotti/request.py          |  4 ++--
 kotti/views/navigation.py | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/kotti/request.py b/kotti/request.py
index a391fa264..3fbaec217 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -6,6 +6,8 @@
 from pyramid.interfaces import IRequest
 from pyramid.request import Request as BaseRequest
 
+from kotti.security import get_user
+
 
 @implementer(IRequest)
 class Request(BaseRequest):
@@ -25,8 +27,6 @@ def user(self):
                 the custom principals database defined in the
                 ``kotti.principals_factory`` setting
         """
-
-        from kotti.security import get_user
         return get_user(self)
 
     def has_permission(self, permission, context=None):
diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index 5c9ae3759..79528ee39 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -6,9 +6,11 @@
 
 from pyramid.view import view_config
 
-from kotti.interfaces import INavigationRoot, INode
+from kotti.interfaces import INavigationRoot
+from kotti.interfaces import INode
 from kotti.resources import get_root
 from kotti.security import has_permission
+from kotti.views.util import nodes_tree
 
 
 @view_config(name='render_tree_navigation', permission='view',
@@ -21,13 +23,7 @@ def render_tree_navigation(context, request):
     :result: Dictionary passed to the template for rendering.
     :rtype: dict
     """
-
-    # Import is needed in function scope to resolve circular imports caused by
-    # compatibility imports in slots.py.
-    from kotti.views.util import nodes_tree
-
     tree = nodes_tree(request)
-
     return {
         'tree': {
             'children': [tree],

From a5831200d39d4a195113f244cb7189ca918e9a38 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:46:41 +0100
Subject: [PATCH 329/600] No need to call __len__ on children.

---
 kotti/views/navigation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index 79528ee39..69632c97f 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -46,8 +46,8 @@ def ch(node):
     if not children and getattr(context, '__parent__', None) is not None:
         parent = context.__parent__
         children = ch(parent)
-    if len(children) and parent != get_root() and not \
-            INavigationRoot.providedBy(parent):
+    if children and parent != get_root() and not \
+       INavigationRoot.providedBy(parent):
         return dict(parent=parent, children=children)
     return dict(parent=None)
 

From 48b89297bc0da42e401de030dca7233315c37236 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Sat, 26 Sep 2015 17:29:21 +0100
Subject: [PATCH 330/600] Use `unuathenticated_userid` instead of
 `authenticated_userid` in `kotti.security.get_user`.

---
 development.ini               |  3 +++
 kotti/security.py             |  2 +-
 kotti/templates/editor-bar.pt | 10 ++++++----
 kotti/views/util.py           |  1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/development.ini b/development.ini
index 655dbabd9..38400420b 100644
--- a/development.ini
+++ b/development.ini
@@ -4,6 +4,9 @@ use = egg:kotti
 pyramid.reload_templates = true
 pyramid.debug_templates = true
 pyramid.debug_authorization = false
+
+# Change to false to trigger DetachedInstanceError
+# pyramid.debug_notfound = false
 pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.includes =
diff --git a/kotti/security.py b/kotti/security.py
index 08f4d431d..e12302143 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -32,7 +32,7 @@ def get_principals():
 
 @request_cache(lambda request: None)
 def get_user(request):
-    userid = request.authenticated_userid
+    userid = request.unauthenticated_userid
     return get_principals().get(userid)
 
 
diff --git a/kotti/templates/editor-bar.pt b/kotti/templates/editor-bar.pt
index 487a899ff..58469ec85 100644
--- a/kotti/templates/editor-bar.pt
+++ b/kotti/templates/editor-bar.pt
@@ -39,10 +39,12 @@
       </ul>
 
       <ul class="nav navbar-nav navbar-right">
-        <li tal:define="url api.url(context, '@@navigate')"
-            class="${url == request.url and 'active' or None} pull-right">
-          <a href="${url}" i18n:translate="">Navigate</a>
-        </li>
+        <tal:named-context condition="context/__name__|nothing">
+          <li tal:define="url api.url(context, '@@navigate')"
+              class="${url == request.url and 'active' or None} pull-right">
+            <a href="${url}" i18n:translate="">Navigate</a>
+          </li>
+        </tal:named-context>
         <li tal:condition="request.user is not None" class="dropdown pull-right">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
             ${request.user.title}
diff --git a/kotti/views/util.py b/kotti/views/util.py
index e0ed62cd6..9e53cab91 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -14,6 +14,7 @@
 from pyramid.renderers import get_renderer
 from pyramid.renderers import render
 from pyramid.settings import asbool
+
 from sqlalchemy import and_
 from sqlalchemy import not_
 from sqlalchemy import or_

From 55fdb854bcfb31ca3b36ab92bace4d4f8a2968ab Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 23:12:34 +0100
Subject: [PATCH 331/600] Add 404 template and update path to renderer.

---
 kotti/templates/http-errors/notfound.pt | 9 +++++++++
 kotti/views/view.py                     | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 kotti/templates/http-errors/notfound.pt

diff --git a/kotti/templates/http-errors/notfound.pt b/kotti/templates/http-errors/notfound.pt
new file mode 100644
index 000000000..efeade1cc
--- /dev/null
+++ b/kotti/templates/http-errors/notfound.pt
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html i18n:domain="Kotti"
+      metal:use-macro="api.macro('kotti:templates/view/master.pt')">
+
+    <div metal:fill-slot="content" class="notfound">
+      <h1 i18n:translate="">Not Found</h1>
+      <p i18n:translate="">The resource could not be found</p>
+    </div>
+</html>
diff --git a/kotti/views/view.py b/kotti/views/view.py
index dcd4c3b9d..866780768 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -3,6 +3,7 @@
 import warnings
 
 from pyramid.exceptions import NotFound
+from pyramid.view import notfound_view_config
 from pyramid.view import render_view_to_response
 from pyramid.view import view_config
 
@@ -68,5 +69,11 @@ def view(context, request):
     return {}
 
 
+@notfound_view_config(renderer='kotti:templates/http-errors/notfound.pt')
+def notfound_view(context, request):
+    request.response = context
+    return {}
+
+
 def includeme(config):
     config.scan(__name__)

From 18e4b6e3f6fb13f84f3d3adfa8fbf8cf1610aefb Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:57:49 +0100
Subject: [PATCH 332/600] Add notfound view support for testing.

---
 kotti/testing.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kotti/testing.py b/kotti/testing.py
index 9181ecc40..099b34cef 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -276,7 +276,8 @@ def setUpFunctionalStrippedDownApp(global_config=None, **settings):
     # An app that doesn't use Nodes at all
     _settings = {
         'kotti.base_includes': (
-            'kotti kotti.views kotti.views.login kotti.views.users'),
+            'kotti kotti.views kotti.views.login kotti.views.users '
+            'kotti.views.view'),
         'kotti.use_tables': 'principals',
         'kotti.populators': 'kotti.populate.populate_users',
         'pyramid.includes': 'kotti.testing.include_testing_view',

From fafd7ad2ba20b003edd906967bcec63fa2f8bf79 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:58:19 +0100
Subject: [PATCH 333/600] Raise right exception class.

---
 kotti/views/view.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/views/view.py b/kotti/views/view.py
index 866780768..d44f7fdb7 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -2,7 +2,7 @@
 
 import warnings
 
-from pyramid.exceptions import NotFound
+from pyramid.httpexceptions import HTTPNotFound
 from pyramid.view import notfound_view_config
 from pyramid.view import render_view_to_response
 from pyramid.view import view_config
@@ -28,7 +28,7 @@ def view_content_default(context, request):
         warnings.warn(
             u'Failed to look up default view called {0!r} for {1!r}.'.format(
                 view_name, context))
-        raise NotFound()
+        raise HTTPNotFound()
     return response
 
 

From 596045ee0ef4153d5f91facf76502fe7f76bf837 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 22:44:44 +0100
Subject: [PATCH 334/600] Whitespace.

---
 kotti/views/util.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kotti/views/util.py b/kotti/views/util.py
index 9e53cab91..e0ed62cd6 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -14,7 +14,6 @@
 from pyramid.renderers import get_renderer
 from pyramid.renderers import render
 from pyramid.settings import asbool
-
 from sqlalchemy import and_
 from sqlalchemy import not_
 from sqlalchemy import or_

From 33057d7ea1792624ef381df6ce1f1653119eb604 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Mon, 28 Sep 2015 23:38:39 +0100
Subject: [PATCH 335/600] Remove obsolete comment.

---
 development.ini | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/development.ini b/development.ini
index 38400420b..655dbabd9 100644
--- a/development.ini
+++ b/development.ini
@@ -4,9 +4,6 @@ use = egg:kotti
 pyramid.reload_templates = true
 pyramid.debug_templates = true
 pyramid.debug_authorization = false
-
-# Change to false to trigger DetachedInstanceError
-# pyramid.debug_notfound = false
 pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.includes =

From 3858e8b3cf642be8bd3a0ef3cbb1be93bdfda6de Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Tue, 29 Sep 2015 00:18:09 +0100
Subject: [PATCH 336/600] Solve issues with identifying context as locatable.

Fixes issues with tests failing with a dummy root context,
which is not a kotti.resources.Node.

 * Declare `kotti.resources.Node` implements `pyrmaid.interfaces.ILocation`
 * Add a Template API `is_location(context)`
 * Use the `is_location` API in master/edit/view templates to switch.

Context objects under test must implement ILocation.
---
 kotti/interfaces.py            |  3 ++-
 kotti/resources.py             | 18 ++++++------------
 kotti/templates/edit/master.pt |  2 +-
 kotti/templates/editor-bar.pt  | 10 ++++------
 kotti/templates/view/master.pt |  2 +-
 kotti/testing.py               |  3 +++
 kotti/tests/test_util_views.py | 14 +++++++++++---
 kotti/views/util.py            | 13 +++++++++++++
 8 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/kotti/interfaces.py b/kotti/interfaces.py
index 58ea0c76d..06f0f0471 100644
--- a/kotti/interfaces.py
+++ b/kotti/interfaces.py
@@ -3,9 +3,10 @@
 """
 
 from zope.interface import Interface
+from pyramid.interfaces import ILocation
 
 
-class INode(Interface):
+class INode(ILocation):
     """Marker interface for all nodes (and subclasses)"""
 
 
diff --git a/kotti/resources.py b/kotti/resources.py
index e611a6436..607a82830 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -41,7 +41,7 @@
 from sqlalchemy.sql import select
 from sqlalchemy.util import classproperty
 from transaction import commit
-from zope.interface import implements
+from zope.interface import implementer
 
 from kotti import Base
 from kotti import DBSession
@@ -202,12 +202,11 @@ def copy(self, **kwargs):
         return self.__class__(**kwargs)
 
 
+@implementer(INode)
 class Node(Base, ContainerMixin, PersistentACLMixin):
     """Basic node in the persistance hierarchy.
     """
 
-    implements(INode)
-
     __table_args__ = (
         UniqueConstraint('parent_id', 'name'),
         )
@@ -532,13 +531,12 @@ def _not_root(context, request):
     )
 
 
+@implementer(IContent)
 class Content(Node):
     """Content adds some attributes to :class:`~kotti.resources.Node` that are
        useful for content objects in a CMS.
     """
 
-    implements(IContent)
-
     @classproperty
     def __mapper_args__(cls):
         return dict(polymorphic_identity=camel_case_to_name(cls.__name__))
@@ -613,6 +611,7 @@ def copy(self, **kwargs):
         return super(Content, self).copy(**kwargs)
 
 
+@implementer(IDocument, IDefaultWorkflow)
 class Document(Content):
     """Document extends :class:`~kotti.resources.Content` with a body and its
        mime_type.  In addition Document and its descendants implement
@@ -621,8 +620,6 @@ class Document(Content):
        unmodified Kotti installations).
     """
 
-    implements(IDocument, IDefaultWorkflow)
-
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
     id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
@@ -702,13 +699,11 @@ def _save_data(cls, target, value, oldvalue, initiator):
         return newvalue
 
 
+@implementer(IFile)
 class File(Content, SaveDataMixin):
     """File adds some attributes to :class:`~kotti.resources.Content` that are
        useful for storing binary data.
     """
-
-    implements(IFile)
-
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
     id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
@@ -764,13 +759,12 @@ def from_field_storage(cls, fs):
         return cls(data=fs)
 
 
+@implementer(IImage)
 class Image(File):
     """Image doesn't add anything to :class:`~kotti.resources.File`, but images
        have different views, that e.g. support on the fly scaling.
     """
 
-    implements(IImage)
-
     id = Column(Integer(), ForeignKey('files.id'), primary_key=True)
 
     type_info = File.type_info.copy(
diff --git a/kotti/templates/edit/master.pt b/kotti/templates/edit/master.pt
index 877ab61d2..917fafef7 100644
--- a/kotti/templates/edit/master.pt
+++ b/kotti/templates/edit/master.pt
@@ -22,7 +22,7 @@
                tal:condition="snippets"
                tal:repeat="snippet snippets"
                tal:replace="structure snippet" />
-    <script>
+    <script tal:condition="api.is_location(context)">
       kotti_context_url = '${request.resource_url(context)}';
     </script>
   </head>
diff --git a/kotti/templates/editor-bar.pt b/kotti/templates/editor-bar.pt
index 58469ec85..487a899ff 100644
--- a/kotti/templates/editor-bar.pt
+++ b/kotti/templates/editor-bar.pt
@@ -39,12 +39,10 @@
       </ul>
 
       <ul class="nav navbar-nav navbar-right">
-        <tal:named-context condition="context/__name__|nothing">
-          <li tal:define="url api.url(context, '@@navigate')"
-              class="${url == request.url and 'active' or None} pull-right">
-            <a href="${url}" i18n:translate="">Navigate</a>
-          </li>
-        </tal:named-context>
+        <li tal:define="url api.url(context, '@@navigate')"
+            class="${url == request.url and 'active' or None} pull-right">
+          <a href="${url}" i18n:translate="">Navigate</a>
+        </li>
         <li tal:condition="request.user is not None" class="dropdown pull-right">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
             ${request.user.title}
diff --git a/kotti/templates/view/master.pt b/kotti/templates/view/master.pt
index 58ac98ae8..13e0eedb7 100644
--- a/kotti/templates/view/master.pt
+++ b/kotti/templates/view/master.pt
@@ -4,7 +4,7 @@
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       tal:define="page_slots api.slots;
                   dummy api.view_needed;
-                  has_location_context hasattr(context, '__name__')"
+                  has_location_context api.is_location(context);"
       metal:define-macro="main">
 
   <head>
diff --git a/kotti/testing.py b/kotti/testing.py
index 099b34cef..a1531bbd0 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -14,8 +14,10 @@
 
 from pyramid import testing
 from pyramid.events import NewResponse
+from pyramid.interfaces import ILocation
 from pyramid.security import ALL_PERMISSIONS
 from zope.deprecation.deprecation import deprecate
+from zope.interface import implementer
 import transaction
 
 
@@ -243,6 +245,7 @@ def login_testbrowser(self, login=u'admin', password=u'secret'):
         return browser
 
 
+@implementer(ILocation)
 class TestingRootFactory(dict):
     __name__ = ''  # root is required to have an empty name!
     __parent__ = None
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 7c68ae31d..7e27a93a4 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -4,8 +4,10 @@
 from mock import patch
 from mock import Mock
 from mock import MagicMock
+from pyramid.interfaces import ILocation
 from pyramid.request import Response
 from pytest import raises
+from zope.interface import implementer
 
 from kotti.testing import Dummy
 from kotti.testing import DummyRequest
@@ -36,7 +38,13 @@ def create_contents(root):
     return a, aa, ab, ac, aca, acb
 
 
+@implementer(ILocation)
+class MockContext(object):
+    pass
+
+
 class TestTemplateAPI:
+
     def make(self, context=None, request=None, id=1, **kwargs):
         from kotti.resources import get_root
         from kotti.views.util import TemplateAPI
@@ -217,19 +225,19 @@ def test_macro_bare_without_master(self, db_session):
             assert get_renderer().implementation().macros['main'] == macro
 
     def test_url_without_context(self, db_session):
-        context, request = object(), MagicMock()
+        context, request = MockContext(), MagicMock()
         api = self.make(context=context, request=request)
         api.url()
         request.resource_url.assert_called_with(context)
 
     def test_url_with_context(self, db_session):
-        context, request = object(), MagicMock()
+        context, request = MockContext(), MagicMock()
         api = self.make(request=request)
         api.url(context)
         request.resource_url.assert_called_with(context)
 
     def test_url_with_context_and_elements(self, db_session):
-        context, request = object(), MagicMock()
+        context, request = MockContext(), MagicMock()
         api = self.make(request=request)
         api.url(context, 'first', second='second')
         request.resource_url.assert_called_with(
diff --git a/kotti/views/util.py b/kotti/views/util.py
index e0ed62cd6..54eccefea 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -9,6 +9,7 @@
 from babel.numbers import format_currency
 from pyramid.decorator import reify
 from pyramid.i18n import get_locale_name
+from pyramid.interfaces import ILocation
 from pyramid.location import inside
 from pyramid.location import lineage
 from pyramid.renderers import get_renderer
@@ -138,6 +139,16 @@ def __init__(self, context, request, bare=None, **kwargs):
         self.slots = Slots(context, request)
         self.__dict__.update(kwargs)
 
+    def is_location(self, context):
+        """Is the context a location?
+
+        :param context: The context.
+        :type context: kotti.interfaces.INode
+        :rtype: bool
+        :returns: True if Is the context available in the content lineage
+        """
+        return ILocation.providedBy(context)
+
     @reify
     def edit_needed(self):
         if 'kotti.fanstatic.edit_needed' in self.S:
@@ -194,6 +205,8 @@ def url(self, context=None, *elements, **kwargs):
 
         if context is None:
             context = self.context
+        if not ILocation.providedBy(context):
+            return self.request.url
         return self.request.resource_url(context, *elements, **kwargs)
 
     @reify

From 682bb09005740444d15791173a10223963d91f5b Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Tue, 29 Sep 2015 14:27:36 +0100
Subject: [PATCH 337/600] Add pot and po files generated by running ./i18n.sh

---
 kotti/locale/Kotti.pot                  |  957 ++++++++---------
 kotti/locale/de/LC_MESSAGES/Kotti.po    | 1250 +++++++++++-----------
 kotti/locale/en/LC_MESSAGES/Kotti.po    |  925 ++++++++--------
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po | 1251 +++++++++++-----------
 kotti/locale/it/LC_MESSAGES/Kotti.po    | 1075 +++++++++----------
 kotti/locale/ja/LC_MESSAGES/Kotti.po    | 1063 +++++++++----------
 kotti/locale/ko/LC_MESSAGES/Kotti.po    | 1236 +++++++++++----------
 kotti/locale/nl/LC_MESSAGES/Kotti.po    | 1065 +++++++++----------
 kotti/locale/pl/LC_MESSAGES/Kotti.po    | 1257 +++++++++++-----------
 kotti/locale/pt/LC_MESSAGES/Kotti.po    | 1295 +++++++++++------------
 10 files changed, 5528 insertions(+), 5846 deletions(-)

diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 587ac6352..bd1ed1d4e 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -1,4 +1,4 @@
-# 
+#
 # SOME DESCRIPTIVE TITLE
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
@@ -6,15 +6,91 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\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: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Lingua 3.8\n"
+"Language: \n"
+"Generated-By: Lingua 3.11\n"
+
+#: ./kotti/security.py:190
+msgid "Viewer"
+msgstr ""
+
+#: ./kotti/security.py:191
+msgid "Editor"
+msgstr ""
+
+#: ./kotti/security.py:192
+msgid "Owner"
+msgstr ""
+
+#: ./kotti/security.py:193
+msgid "Admin"
+msgstr ""
+
+#: ./kotti/resources.py:508 ./kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr ""
+
+#: ./kotti/resources.py:509 ./kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr ""
+
+#: ./kotti/resources.py:510 ./kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr ""
+
+#: ./kotti/resources.py:511 ./kotti/views/edit/actions.py:458
+#: ./kotti/templates/edit/rename.pt:31 ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr ""
+
+#: ./kotti/resources.py:512 ./kotti/views/users.py:443
+#: ./kotti/views/edit/actions.py:460
+#: ./kotti/templates/site-setup/delete-user.pt:24
+#: ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/templates/edit/delete-nodes.pt:50
+#: ./kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr ""
+
+#: ./kotti/resources.py:637 ./kotti/views/edit/content.py:85
+msgid "Document"
+msgstr ""
+
+#: ./kotti/resources.py:726 ./kotti/views/edit/content.py:113
+#: ./kotti/views/edit/content.py:66
+msgid "File"
+msgstr ""
+
+#: ./kotti/resources.py:772 ./kotti/views/edit/content.py:141
+msgid "Image"
+msgstr ""
+
+#: ./kotti/resources.py:529
+msgid "Folder view"
+msgstr ""
+
+#: ./kotti/resources.py:523 ./kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr ""
+
+#: ./kotti/resources.py:524 ./kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr ""
+
+#: ./kotti/resources.py:525
+msgid "Share"
+msgstr ""
+
+#: ./kotti/resources.py:526 ./kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr ""
 
 #: ./kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -43,8 +119,8 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -56,7 +132,8 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -68,8 +145,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -81,17 +159,17 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: ./kotti/populate.py:121
+#: ./kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: ./kotti/populate.py:122
+#: ./kotti/populate.py:124
 msgid ""
 "Our company is the leading manufacturer of foo widgets used in a wide variety"
 " of aviation and and industrial products."
 msgstr ""
 
-#: ./kotti/populate.py:123
+#: ./kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
@@ -113,777 +191,708 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:627 ./kotti/views/edit/content.py:82
-msgid "Document"
+#: ./kotti/views/form.py:79 ./kotti/views/users.py:69
+#: ./kotti/views/edit/actions.py:374 ./kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
 msgstr ""
 
-#: ./kotti/resources.py:666 ./kotti/views/edit/content.py:110
-#: ./kotti/views/edit/content.py:63
-msgid "File"
+#: ./kotti/views/form.py:174
+msgid "Item was added."
 msgstr ""
 
-#: ./kotti/resources.py:753 ./kotti/views/edit/content.py:138
-msgid "Image"
+#: ./kotti/views/form.py:156 ./kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
 msgstr ""
 
-#: ./kotti/resources.py:517
-msgid "Folder view"
+#: ./kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: ./kotti/resources.py:504 ./kotti/templates/view/folder.pt:17
-msgid "Contents"
+#: ./kotti/views/form.py:77 ./kotti/views/users.py:441
+msgid "Save"
 msgstr ""
 
-#: ./kotti/resources.py:505 ./kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: ./kotti/views/form.py:78 ./kotti/views/users.py:316
+#: ./kotti/views/users.py:350 ./kotti/views/users.py:442
+#: ./kotti/templates/edit/delete-nodes.pt:45
+#: ./kotti/templates/edit/delete.pt:19
+#: ./kotti/templates/edit/change-state.pt:66
+#: ./kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
 msgstr ""
 
-#: ./kotti/resources.py:506
-msgid "Share"
+#: ./kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: ./kotti/resources.py:507 ./kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
+#: ./kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/resources.py:508 ./kotti/views/edit/actions.py:446
-msgid "Copy"
+#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:378
+msgid "User Management"
 msgstr ""
 
-#: ./kotti/resources.py:509 ./kotti/views/edit/actions.py:447
-msgid "Cut"
+#: ./kotti/views/login.py:237
+msgid "You have reset your password."
 msgstr ""
 
-#: ./kotti/resources.py:510 ./kotti/views/edit/actions.py:443
-msgid "Paste"
+#: ./kotti/views/login.py:199
+msgid "You have been logged out."
 msgstr ""
 
-#: ./kotti/resources.py:511 ./kotti/templates/edit/rename-nodes.pt:7
-#: ./kotti/templates/edit/rename-nodes.pt:55
-#: ./kotti/templates/edit/rename.pt:42 ./kotti/views/edit/actions.py:448
-msgid "Rename"
+#: ./kotti/views/login.py:65 ./kotti/views/users.py:270
+msgid "Full name"
 msgstr ""
 
-#: ./kotti/resources.py:512 ./kotti/templates/edit/delete-nodes.pt:8
-#: ./kotti/templates/edit/delete-nodes.pt:90
-#: ./kotti/templates/edit/delete.pt:28
-#: ./kotti/templates/site-setup/delete-user.pt:36 ./kotti/views/users.py:443
-#: ./kotti/views/edit/actions.py:450
-msgid "Delete"
+#: ./kotti/views/login.py:68
+msgid "Username"
 msgstr ""
 
-#: ./kotti/security.py:189
-msgid "Viewer"
+#: ./kotti/views/login.py:73 ./kotti/views/login.py:224
+#: ./kotti/views/users.py:199
+msgid "Email"
 msgstr ""
 
-#: ./kotti/security.py:190
-msgid "Editor"
+#: ./kotti/views/login.py:108
+msgid ""
+"Congratulations! You are successfully registered. You should be receiving an "
+"email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: ./kotti/security.py:191
-msgid "Owner"
+#: ./kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
 msgstr ""
 
-#: ./kotti/security.py:192
-msgid "Admin"
+#: ./kotti/views/login.py:163
+msgid "Login failed."
 msgstr ""
 
-#: ./kotti/templates/add-dropdown.pt:5
-msgid "Add"
+#: ./kotti/views/login.py:212 ./kotti/views/users.py:212
+#: ./kotti/templates/login.pt:25
+msgid "Password"
 msgstr ""
 
-#: ./kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
+#: ./kotti/views/login.py:285
+#, python-format
+msgid "Reset your password - ${title}."
 msgstr ""
 
-#: ./kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
+#: ./kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:35
-msgid "View"
+#: ./kotti/views/login.py:172
+msgid ""
+"You should be receiving an email with a link to reset your password. Doing so"
+" will activate your account."
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:76
-msgid "Navigate"
+#: ./kotti/views/login.py:177
+msgid "That username or email is not known by this system."
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:98
-msgid "Preferences"
+#: ./kotti/views/login.py:82
+msgid "Register"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
+#: ./kotti/views/login.py:89 ./kotti/views/login.py:256
+msgid "There was an error."
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:131
-msgid "Logout"
+#: ./kotti/views/login.py:249
+msgid "Submit"
 msgstr ""
 
-#: ./kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
+#: ./kotti/views/login.py:278
+msgid "Your password reset token may have expired."
 msgstr ""
 
-#: ./kotti/templates/email-reset-password.pt:7
-#: ./kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
+#: ./kotti/views/users.py:313 ./kotti/views/users.py:501
+#: ./kotti/views/users.py:536 ./kotti/templates/site-setup/users.pt:79
+#: ./kotti/templates/edit/share.pt:59
+msgid "User"
 msgstr ""
 
-#: ./kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
+#: ./kotti/views/users.py:347 ./kotti/views/users.py:188
+#: ./kotti/views/users.py:501 ./kotti/views/users.py:536
+#: ./kotti/templates/site-setup/users.pt:80 ./kotti/templates/edit/share.pt:60
+msgid "Group"
 msgstr ""
 
-#: ./kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
+#: ./kotti/views/users.py:267
+msgid ""
+"Leave this empty and tick the 'Send password registration' box below to have "
+"the user set their own password."
 msgstr ""
 
-#: ./kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
+#: ./kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
 msgstr ""
 
-#: ./kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
+#: ./kotti/views/users.py:145
+msgid "Invalid value"
 msgstr ""
 
-#: ./kotti/templates/forbidden.pt:7
-msgid "Forbidden"
+#: ./kotti/views/users.py:151
+msgid "A user with that name already exists."
 msgstr ""
 
-#: ./kotti/templates/login.pt:16
-msgid "Login"
+#: ./kotti/views/users.py:158
+msgid "A user with that email already exists."
 msgstr ""
 
-#: ./kotti/templates/login.pt:25 ./kotti/templates/login.pt:87
-msgid "Username or email"
+#: ./kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
 msgstr ""
 
-#: ./kotti/templates/login.pt:34 ./kotti/views/login.py:212
-#: ./kotti/views/users.py:212
-msgid "Password"
+#: ./kotti/views/users.py:196 ./kotti/views/edit/content.py:33
+#: ./kotti/templates/view/folder.pt:20
+#: ./kotti/templates/edit/delete-nodes.pt:22
+#: ./kotti/templates/edit/contents.pt:39
+#: ./kotti/templates/edit/change-state.pt:18
+msgid "Title"
 msgstr ""
 
-#: ./kotti/templates/login.pt:47
-msgid "Log in"
+#: ./kotti/views/users.py:207 ./kotti/templates/site-setup/users.pt:68
+#: ./kotti/templates/edit/share.pt:48
+msgid "Name"
 msgstr ""
 
-#: ./kotti/templates/login.pt:65
-msgid "Forgot your password?"
+#: ./kotti/views/users.py:219
+msgid "Active"
 msgstr ""
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#. 
-#: ./kotti/templates/login.pt:77 ./kotti/templates/login.pt:100
-msgid "Reset password"
+#: ./kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
 msgstr ""
 
-#. Canonical text for ${reset_password} is: "Reset password"
-#: ./kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
+#: ./kotti/views/users.py:226
+msgid "Global roles"
 msgstr ""
 
-#: ./kotti/templates/login.pt:118
-msgid "Not registered yet?"
+#: ./kotti/views/users.py:230
+msgid "Groups"
 msgstr ""
 
-#: ./kotti/templates/login.pt:127
-msgid "Register for an account on this site."
+#: ./kotti/views/users.py:315
+msgid "Add User"
 msgstr ""
 
-#: ./kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
+#: ./kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
 msgstr ""
 
-#: ./kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
+#: ./kotti/views/users.py:349
+msgid "Add Group"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
+#: ./kotti/views/users.py:465 ./kotti/views/users.py:71
+#: ./kotti/views/edit/actions.py:312 ./kotti/views/edit/actions.py:378
+#: ./kotti/views/edit/actions.py:424 ./kotti/views/edit/actions.py:420
+msgid "No changes were made."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
+#: ./kotti/views/users.py:558
+msgid "No name was given."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:26
-#: ./kotti/templates/edit/contents.pt:57
-#: ./kotti/templates/edit/delete-nodes.pt:33
-#: ./kotti/templates/view/folder.pt:28 ./kotti/views/users.py:196
-#: ./kotti/views/edit/content.py:32
-msgid "Title"
+#: ./kotti/views/users.py:98
+msgid "No users or groups were found."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:29
-#: ./kotti/templates/edit/contents.pt:60
-#: ./kotti/templates/edit/delete-nodes.pt:36 ./kotti/templates/edit/share.pt:70
-#: ./kotti/templates/edit/upload.pt:23 ./kotti/templates/edit/upload.pt:167
-#: ./kotti/templates/site-setup/users.pt:105
-#: ./kotti/templates/view/folder.pt:31
-msgid "Type"
+#: ./kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:32
-#: ./kotti/templates/edit/contents.pt:63
-#: ./kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
+#: ./kotti/views/users.py:533
+msgid "User was not found."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:35
-#: ./kotti/templates/edit/contents.pt:69
-#: ./kotti/templates/edit/delete-nodes.pt:42
-#: ./kotti/templates/view/folder.pt:34
-msgid "Creation Date"
+#: ./kotti/views/users.py:324
+msgid "Send password registration link."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:38
-#: ./kotti/templates/edit/contents.pt:72
-#: ./kotti/templates/edit/delete-nodes.pt:45
-#: ./kotti/templates/view/folder.pt:37
-msgid "Modification Date"
+#: ./kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:79
-#: ./kotti/templates/edit/change-state.pt:90
-msgid "Include children"
+#: ./kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: ./kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
+#: ./kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
+#: ./kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:111
-msgid "No change"
-msgstr ""
-
-#: ./kotti/templates/edit/change-state.pt:127
-#: ./kotti/templates/edit/share.pt:121
-#: ./kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr ""
-
-#: ./kotti/templates/edit/change-state.pt:130
-#: ./kotti/templates/edit/delete-nodes.pt:93
-#: ./kotti/templates/edit/rename-nodes.pt:58 ./kotti/views/form.py:78
-#: ./kotti/views/users.py:316 ./kotti/views/users.py:350
-#: ./kotti/views/users.py:442
-msgid "Cancel"
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:134
-msgid "Hidden"
-msgstr ""
-
-#: ./kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr ""
-
-#: ./kotti/templates/edit/delete.pt:8
-#: ./kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr ""
-
-#: ./kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
-msgstr ""
-
-#: ./kotti/templates/edit/rename-nodes.pt:16
-#: ./kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You"
-" can change both below."
-msgstr ""
-
-#: ./kotti/templates/edit/rename-nodes.pt:35
-#: ./kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr ""
-
-#: ./kotti/templates/edit/rename-nodes.pt:45
-#: ./kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr ""
-
-#: ./kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
+#: ./kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:19 ./kotti/templates/edit/share.pt:30
-#: ./kotti/templates/edit/share.pt:35 ./kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
+#: ./kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:43 ./kotti/templates/site-setup/users.pt:81
-msgid "Search"
+#: ./kotti/views/edit/actions.py:225
+#, python-format
+msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
+#: ./kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:73 ./kotti/templates/site-setup/users.pt:108
-#: ./kotti/views/users.py:207
-msgid "Name"
+#: ./kotti/views/edit/actions.py:277 ./kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:91 ./kotti/templates/site-setup/users.pt:126
-#: ./kotti/views/users.py:313 ./kotti/views/users.py:501
-#: ./kotti/views/users.py:536
-msgid "User"
+#: ./kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:94 ./kotti/templates/site-setup/users.pt:129
-#: ./kotti/views/users.py:347 ./kotti/views/users.py:188
-#: ./kotti/views/users.py:501 ./kotti/views/users.py:536
-msgid "Group"
+#: ./kotti/views/edit/actions.py:339 ./kotti/views/edit/actions.py:366
+msgid "Name and title are required."
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:101
-#: ./kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
+#: ./kotti/views/edit/actions.py:343
+msgid "Item was renamed."
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
+#: ./kotti/views/edit/actions.py:465
+msgid "Move up"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:20 ./kotti/templates/edit/upload.pt:164
-msgid "Filename"
+#: ./kotti/views/edit/actions.py:466
+msgid "Move down"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:26 ./kotti/templates/edit/upload.pt:170
-msgid "Size"
+#: ./kotti/views/edit/actions.py:467
+msgid "Show"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:29
-msgid "Status"
+#: ./kotti/views/edit/actions.py:468
+msgid "Hide"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:32
-msgid "Progress"
+#: ./kotti/views/edit/actions.py:507
+msgid "You have to select items to perform an action."
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
+#: ./kotti/views/edit/actions.py:464
+msgid "Change State"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
+#: ./kotti/views/edit/content.py:38
+msgid "Description"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
+#: ./kotti/views/edit/content.py:44
+msgid "Tags"
 msgstr ""
 
-#: ./kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
+#: ./kotti/views/edit/content.py:53
+msgid "Body"
 msgstr ""
 
-#: ./kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
+#: ./kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
 msgstr ""
 
-#: ./kotti/templates/site-setup/user.pt:25 ./kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
+#: ./kotti/views/edit/default_views.py:79
+msgid "Default view"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:15
-msgid "Search user(s) / group(s)"
+#: ./kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:24
-msgid "Add user"
+#: ./kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:33
-msgid "Add group"
+#: ./kotti/templates/forbidden.pt:10
+msgid "Forbidden"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:52
-msgid "Find users or groups"
+#: ./kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
+#: ./kotti/templates/email-reset-password.pt:4
+#: ./kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:70
-msgid "Blank search text finds all."
+#: ./kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:96
-msgid "Assign global roles"
+#: ./kotti/templates/add-dropdown.pt:3
+msgid "Add"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:180
-msgid "Add new user"
+#: ./kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:190
-msgid "Add new group"
+#: ./kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
 msgstr ""
 
-#: ./kotti/templates/view/search-results.pt:8
-msgid "Search Results"
+#: ./kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
 msgstr ""
 
-#: ./kotti/templates/view/search.pt:5
-msgid "Search..."
+#: ./kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-#: ./kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
+#: ./kotti/templates/editor-bar.pt:21
+msgid "View"
 msgstr ""
 
-#: ./kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
+#: ./kotti/templates/editor-bar.pt:44
+msgid "Navigate"
 msgstr ""
 
-#: ./kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
+#: ./kotti/templates/editor-bar.pt:55
+msgid "Preferences"
 msgstr ""
 
-#: ./kotti/views/form.py:79 ./kotti/views/users.py:69
-#: ./kotti/views/edit/actions.py:364 ./kotti/views/edit/actions.py:408
-msgid "Your changes have been saved."
+#: ./kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
 msgstr ""
 
-#: ./kotti/views/form.py:174
-msgid "Item was added."
+#: ./kotti/templates/editor-bar.pt:71
+msgid "Logout"
 msgstr ""
 
-#: ./kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
+#: ./kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
 msgstr ""
 
-#: ./kotti/views/form.py:77 ./kotti/views/users.py:441
-msgid "Save"
+#: ./kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
 msgstr ""
 
-#: ./kotti/views/form.py:198
-#, python-format
-msgid "Add ${type} to ${title}."
+#: ./kotti/templates/login.pt:15
+msgid "Login"
 msgstr ""
 
-#: ./kotti/views/form.py:202
-#, python-format
-msgid "Add ${type}."
+#: ./kotti/templates/login.pt:20 ./kotti/templates/login.pt:57
+msgid "Username or email"
 msgstr ""
 
-#: ./kotti/views/login.py:237
-msgid "You have reset your password."
+#: ./kotti/templates/login.pt:33
+msgid "Log in"
 msgstr ""
 
-#: ./kotti/views/login.py:199
-msgid "You have been logged out."
+#: ./kotti/templates/login.pt:43
+msgid "Forgot your password?"
 msgstr ""
 
-#: ./kotti/views/login.py:65 ./kotti/views/users.py:270
-msgid "Full name"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#. 
+#: ./kotti/templates/login.pt:50 ./kotti/templates/login.pt:65
+msgid "Reset password"
 msgstr ""
 
-#: ./kotti/views/login.py:68
-msgid "Username"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: ./kotti/templates/login.pt:48
+msgid ""
+"Fill out your username or email and click ${reset_password} below to receive "
+"an email with a link to reset your password."
 msgstr ""
 
-#: ./kotti/views/login.py:73 ./kotti/views/login.py:224
-#: ./kotti/views/users.py:199
-msgid "Email"
+#: ./kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
 
-#: ./kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
+#: ./kotti/templates/login.pt:82
+msgid "Register for an account on this site."
 msgstr ""
 
-#: ./kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
+#: ./kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
 msgstr ""
 
-#: ./kotti/views/login.py:163
-msgid "Login failed."
+#: ./kotti/templates/view/search.pt:12
+msgid "Search..."
 msgstr ""
 
-#: ./kotti/views/login.py:285
-#, python-format
-msgid "Reset your password - ${title}."
+#: ./kotti/templates/view/folder.pt:21 ./kotti/templates/site-setup/users.pt:67
+#: ./kotti/templates/edit/upload.pt:19 ./kotti/templates/edit/upload.pt:112
+#: ./kotti/templates/edit/delete-nodes.pt:23
+#: ./kotti/templates/edit/contents.pt:40 ./kotti/templates/edit/share.pt:47
+#: ./kotti/templates/edit/change-state.pt:19
+msgid "Type"
 msgstr ""
 
-#: ./kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
+#: ./kotti/templates/view/folder.pt:22
+#: ./kotti/templates/edit/delete-nodes.pt:25
+#: ./kotti/templates/edit/contents.pt:43
+#: ./kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
 msgstr ""
 
-#: ./kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so"
-" will activate your account."
+#: ./kotti/templates/view/folder.pt:23
+#: ./kotti/templates/edit/delete-nodes.pt:26
+#: ./kotti/templates/edit/contents.pt:44
+#: ./kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
 msgstr ""
 
-#: ./kotti/views/login.py:177
-msgid "That username or email is not known by this system."
+#: ./kotti/templates/view/search-results.pt:9
+msgid "Search Results"
 msgstr ""
 
-#: ./kotti/views/login.py:82
-msgid "Register"
+#: ./kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
 msgstr ""
 
-#: ./kotti/views/login.py:89 ./kotti/views/login.py:256
-msgid "There was an error."
+#: ./kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
 msgstr ""
 
-#: ./kotti/views/login.py:249
-msgid "Submit"
+#: ./kotti/templates/site-setup/delete-user.pt:9
+#: ./kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
 msgstr ""
 
-#: ./kotti/views/login.py:278
-msgid "Your password reset token may have expired."
+#: ./kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
 
-#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:378
-msgid "User Management"
+#: ./kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
 msgstr ""
 
-#: ./kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: ./kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
 msgstr ""
 
-#: ./kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
+#: ./kotti/templates/site-setup/users.pt:17
+msgid "Add user"
 msgstr ""
 
-#: ./kotti/views/users.py:145
-msgid "Invalid value"
+#: ./kotti/templates/site-setup/users.pt:22
+msgid "Add group"
 msgstr ""
 
-#: ./kotti/views/users.py:151
-msgid "A user with that name already exists."
+#: ./kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
 msgstr ""
 
-#: ./kotti/views/users.py:158
-msgid "A user with that email already exists."
+#: ./kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
 msgstr ""
 
-#: ./kotti/views/users.py:181
-#, python-format
-msgid "No such group: ${group}"
+#: ./kotti/templates/site-setup/users.pt:47 ./kotti/templates/edit/share.pt:14
+#: ./kotti/templates/edit/share.pt:19 ./kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
 msgstr ""
 
-#: ./kotti/views/users.py:219
-msgid "Active"
+#: ./kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
 msgstr ""
 
-#: ./kotti/views/users.py:220
-msgid "Untick this to deactivate the account."
+#: ./kotti/templates/site-setup/users.pt:55 ./kotti/templates/edit/share.pt:33
+msgid "Search"
 msgstr ""
 
-#: ./kotti/views/users.py:226
-msgid "Global roles"
+#: ./kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
 msgstr ""
 
-#: ./kotti/views/users.py:230
-msgid "Groups"
+#: ./kotti/templates/site-setup/users.pt:83 ./kotti/templates/edit/share.pt:63
+msgid "Gravatar"
 msgstr ""
 
-#: ./kotti/views/users.py:315
-msgid "Add User"
+#: ./kotti/templates/site-setup/users.pt:105 ./kotti/templates/edit/share.pt:83
+#: ./kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
 msgstr ""
 
-#: ./kotti/views/users.py:339
-#, python-format
-msgid "${title} was added."
+#: ./kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
 msgstr ""
 
-#: ./kotti/views/users.py:349
-msgid "Add Group"
+#: ./kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
 msgstr ""
 
-#: ./kotti/views/users.py:465 ./kotti/views/users.py:71
-#: ./kotti/views/edit/actions.py:302 ./kotti/views/edit/actions.py:368
-#: ./kotti/views/edit/actions.py:414 ./kotti/views/edit/actions.py:410
-msgid "No changes were made."
+#: ./kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
 msgstr ""
 
-#: ./kotti/views/users.py:558
-msgid "No name was given."
+#: ./kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
 msgstr ""
 
-#: ./kotti/views/users.py:98
-msgid "No users or groups were found."
+#: ./kotti/templates/edit/upload.pt:18 ./kotti/templates/edit/upload.pt:111
+msgid "Filename"
 msgstr ""
 
-#: ./kotti/views/users.py:505
-#, python-format
-msgid "Edit ${principal_type} ${title}"
+#: ./kotti/templates/edit/upload.pt:20 ./kotti/templates/edit/upload.pt:113
+msgid "Size"
 msgstr ""
 
-#: ./kotti/views/users.py:533
-msgid "User was not found."
+#: ./kotti/templates/edit/upload.pt:21
+msgid "Status"
 msgstr ""
 
-#: ./kotti/views/users.py:324
-msgid "Send password registration link."
+#: ./kotti/templates/edit/upload.pt:22
+msgid "Progress"
 msgstr ""
 
-#: ./kotti/views/users.py:543
-#, python-format
-msgid "${principal_type} ${title} was deleted."
+#: ./kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
 msgstr ""
 
-#: ./kotti/views/users.py:551
-#, python-format
-msgid "Delete ${principal_type} ${title}"
+#: ./kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:106
-#, python-format
-msgid "${title} was copied."
+#: ./kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:124
-#, python-format
-msgid "${title} was cut."
+#: ./kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
+#: ./kotti/templates/edit/delete-nodes.pt:24
+#: ./kotti/templates/edit/contents.pt:41
+#: ./kotti/templates/edit/change-state.pt:20
+msgid "State"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:271 ./kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
+#: ./kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:159
-#, python-format
-msgid "${title} was pasted."
+#: ./kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:162
-msgid "Could not paste node. It no longer exists."
+#: ./kotti/templates/edit/contents.pt:42
+msgid "Visibility"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:225
-#, python-format
-msgid "${title} is now visible in the navigation."
+#: ./kotti/templates/edit/contents.pt:75
+msgid "Visible"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:228
-#, python-format
-msgid "${title} is no longer visible in the navigation."
+#: ./kotti/templates/edit/contents.pt:79
+msgid "Hidden"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:293
-msgid "Nothing was deleted."
+#: ./kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:329 ./kotti/views/edit/actions.py:356
-msgid "Name and title are required."
+#: ./kotti/templates/edit/rename.pt:11
+#: ./kotti/templates/edit/rename-nodes.pt:13
+msgid ""
+"Each content item has a name, which is used to create the url, and a title. "
+"Read the user manual about proper formatting of name and title if needed. You"
+" can change both below."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:333
-msgid "Item was renamed."
+#: ./kotti/templates/edit/rename.pt:19
+#: ./kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:455
-msgid "Move up"
+#: ./kotti/templates/edit/rename.pt:25
+#: ./kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:456
-msgid "Move down"
+#: ./kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:457
-msgid "Show"
+#: ./kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:458
-msgid "Hide"
+#: ./kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:497
-msgid "You have to select items to perform an action."
+#: ./kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:454
-msgid "Change State"
+#: ./kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-#: ./kotti/views/edit/content.py:36
-msgid "Description"
+#: ./kotti/templates/edit/change-state.pt:40
+#: ./kotti/templates/edit/change-state.pt:45
+msgid "Include children"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:42
-msgid "Tags"
+#: ./kotti/templates/edit/change-state.pt:41
+msgid ""
+"If checked, this will attempt to modify the status of all children in any "
+"selected documents and their subdocuments."
 msgstr ""
 
-#: ./kotti/views/edit/content.py:51
-msgid "Body"
+#: ./kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:99
-msgid "Default view has been reset to default."
+#: ./kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:78
-msgid "Default view"
+#: ./kotti/templates/edit/change-state.pt:55
+msgid "No change"
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:106
-msgid "Default view has been set."
+#: ./kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:111
-msgid "Default view could not be set."
+#: ./kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
 msgstr ""
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index 242c630f6..f879764e2 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7dev4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2014-11-21 22:44+0100\n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: de <kotti@googlegroups.com>\n"
@@ -19,6 +19,81 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 "X-Generator: Poedit 1.6.9\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "Betrachter"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "Bearbeiter"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "Besitzer"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "Administrator"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopieren"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Einfügen"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "Löschen"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Datei"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Bild"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Ordneransicht"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Inhalt"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Teilen"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Aktionen"
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr "Willkommen bei Kotti"
@@ -33,29 +108,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,13 +134,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -77,9 +147,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -93,28 +163,20 @@ msgstr ""
 "\n"
 "<h2>Anmelden</h2>\n"
 "<p>\n"
-"    Sie können sich nun <a class=\"btn btn-success\" href=\"login"
-"\">anmelden</a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  "
-"Falls Sie bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, "
-"lautet dieses höchstwahrscheinlich <em>qwerty</em>.\n"
+"    Sie können sich nun <a class=\"btn btn-success\" href=\"login\">anmelden</a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  Falls Sie bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, lautet dieses höchstwahrscheinlich <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Nach der Anmeldung werden Sie eine graue Bearbeitungsleiste unter der "
-"Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung "
-"wechseln, sowie weitere Funktionen ausführen.\n"
+"    Nach der Anmeldung werden Sie eine graue Bearbeitungsleiste unter der Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung wechseln, sowie weitere Funktionen ausführen.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Konfiguration</h2>\n"
 "        <p>\n"
-"            Finden Sie heraus, wie Sie den Titel Ihrer Installation und "
-"vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen "
-"können.\n"
+"            Finden Sie heraus, wie Sie den Titel Ihrer Installation und vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen können.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -122,13 +184,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Erweiterungen</h2>\n"
 "        <p>\n"
-"            Mit Hilfe von Erweiterungen können Sie Ihrer Installation "
-"zusätzliche Funktionen hinzufügen.\n"
+"            Mit Hilfe von Erweiterungen können Sie Ihrer Installation zusätzliche Funktionen hinzufügen.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti Erweiterungen\n"
 "            </a>\n"
 "        </p>\n"
@@ -136,9 +196,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>DoKumentation</h2>\n"
 "        <p>\n"
-"            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  "
-"Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für "
-"diese und weitere Informationen.\n"
+"            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für diese und weitere Informationen.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -149,26 +207,21 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "Über"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"Unsere Firma is der führende Hersteller von Foo Produkten, welche "
-"gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen "
-"Industriesektoren eingesetzt werden."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Unsere Firma is der führende Hersteller von Foo Produkten, welche gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen Industriesektoren eingesetzt werden."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
+#, fuzzy
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -185,20 +238,18 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -216,619 +267,180 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Copyright info</a>.\n"
 "  Originally published in the\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
-msgstr "Dokument"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Ihre Änderungen wurden übernommen."
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
-msgstr "Datei"
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "Dokument hinzugefügt."
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
-msgstr "Bild"
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "Bearbeite ${title}"
 
-#: kotti/resources.py:517
-msgid "Folder view"
-msgstr "Ordneransicht"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximale Dateigröße: ${size}MB"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
-msgstr "Inhalt"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Übernehmen"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Bearbeiten"
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: kotti/resources.py:506
-msgid "Share"
-msgstr "Teilen"
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "${type} in ${title} erstellen"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
-msgstr "Aktionen"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "${type} erstellen"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Kopieren"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Benutzerverwaltung"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Ausschneiden"
+#: kotti/views/login.py:237
+msgid "You have reset your password."
+msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Einfügen"
+#: kotti/views/login.py:199
+msgid "You have been logged out."
+msgstr "Sie wurden abgemeldet."
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Umbenennen"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Vollständiger Name"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Löschen"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Benutzername"
 
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "Betrachter"
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+msgid "Email"
+msgstr "E-Mail"
 
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "Bearbeiter"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "Besitzer"
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "Registrieren - ${title}"
 
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "Administrator"
+#: kotti/views/login.py:163
+msgid "Login failed."
+msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
-msgstr "Hinzufügen"
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "Passwort"
 
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
-msgstr "Dateien hochladen"
+#: kotti/views/login.py:285
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Passwort zurücksetzen - ${title}"
 
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
-msgstr "Standardansicht setzen"
+#: kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Willkommen, ${user}!"
 
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
-msgstr "Anzeigen"
+#: kotti/views/login.py:172
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
-msgstr "Navigieren"
+#: kotti/views/login.py:177
+msgid "That username or email is not known by this system."
+msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
-msgstr "Einstellungen"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registrieren"
 
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
-msgstr "Seiten-Einstellungen"
+#: kotti/views/login.py:89 kotti/views/login.py:256
+msgid "There was an error."
+msgstr "Ein Fehler ist aufgetreten."
 
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
-msgstr "Abmelden"
+#: kotti/views/login.py:249
+msgid "Submit"
+msgstr "Absenden"
 
-#: kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
-msgstr "Passwort zurücksetzen bei ${site_title}"
+#: kotti/views/login.py:278
+msgid "Your password reset token may have expired."
+msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
-msgstr "Hallo ${user_title}!"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "Benutzer"
 
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} "
-"zurückzusetzen: ${url}"
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "Gruppe"
 
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
-msgstr "Ihre Anmeldung bei ${site_title}"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
 
-#: kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
-msgstr "Ihre Anmeldung bei ${site_title}"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Meine Einstellungen - ${title}"
 
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich "
-"anzumelden: ${url}"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Ungültige Eingabe"
 
-#: kotti/templates/forbidden.pt:7
-msgid "Forbidden"
-msgstr "Zugriff verweigert"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Ein Benutzer mit diesem Namen existiert bereits."
 
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "Anmelden"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
-msgstr "Benutzername oder E-Mail"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Unbekannte Gruppe: ${group}"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "Passwort"
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
+msgstr "Titel"
 
-#: kotti/templates/login.pt:47
-msgid "Log in"
-msgstr "Anmelden"
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "Name"
 
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
-msgstr "Passwort vergessen?"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
-msgstr "Passwort zurücksetzen"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Geben Sie oben Ihren Benutzernamen oder Ihre E-Mail Adresse an und klicken "
-"Sie auf ${reset_password}. Sie werden daraufhin eine E-Mail erhalten, die "
-"einen Link zum zurücksetzen Ihres Passworts enthält."
-
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
-msgstr "Noch nicht registriert?"
-
-#: kotti/templates/login.pt:127
-msgid "Register for an account on this site."
-msgstr "Einen Benutzer für den Zugang zu dieser Seite erstellen."
-
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
-msgstr "Setze ${state}"
-
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
-msgstr "Sie sind hier:"
-
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
-msgstr "Workflowstatus ändern"
-
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/"
-"oder verwalten kann."
-
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
-msgstr "Titel"
-
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
-msgstr "Typ"
-
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
-msgstr "Status"
-
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
-msgstr "Erstellungsdatum"
-
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
-msgstr "Bearbeitungsdatum"
-
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
-msgstr "Unterordner einbeziehen"
-
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Wenn Sie diese Option anwählen, wirkt sich die Statusänderung sowohl auf "
-"alle ausgewählte als auch auf die darin enthaltenen Dokumente aus."
-
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
-msgstr "Ändere Status in"
-
-#: kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
-msgstr ""
-"Wählen Sie den neuen Status, der für alle ausgwählten Dokumente gesetzt "
-"werden soll."
-
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
-msgstr "Keine Änderungen."
-
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr "Änderungen übernehmen"
-
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr "Kein sichtbarer Inhalt."
-
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr "Sichtbarkeit"
-
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr "Sichtbar"
-
-#: kotti/templates/edit/contents.pt:134
-msgid "Hidden"
-msgstr "Unsichtbar"
-
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
-
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr "Lösche ${title}"
-
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Sind Sie sicher, dass Sie ${title} löschen möchten?"
-
-#: kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
-msgstr "Navigieren"
-
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Jeder Inhalt hat einen Namen, der auch Bestandteil der URL ist, und einen "
-"Titel. Sie können beides ändern, indem Sie unten einen neuen Namen und/oder "
-"Titel angeben."
-
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr "Neuer Name"
-
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr "Neuer Titel"
-
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr "${title} umbenennen"
-
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
-msgstr "Teile ${title}"
-
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
-msgstr "Suche Benutzer und Gruppen"
-
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
-msgstr "Suche"
-
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
-msgstr "Lokale Rollen zuweisen"
-
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "Name"
-
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "Benutzer"
-
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "Gruppe"
-
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
-msgstr "Inhalte aus lokalen Dateien hochladen"
-
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-msgid "Filename"
-msgstr "Dateiname"
-
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
-msgstr "Größe"
-
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
-msgstr "Status"
-
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
-msgstr "Fortschritt"
-
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
-msgstr "Hochzuladene Dateien auswählen..."
-
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
-msgstr "${number} Dateien hochladen"
-
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
-msgstr "Alle Fehlermeldungen ausblenden"
-
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
-
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
-msgstr "Zurück zur Benutzerverwaltung"
-
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr "Bearbeite ${title}"
-
-#: kotti/templates/site-setup/users.pt:15
-msgid "Search user(s) / group(s)"
-msgstr "Suche Benutzer / Gruppe(n)"
-
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
-msgstr "Neuer Benutzer"
-
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
-msgstr "Neue Gruppe"
-
-#: kotti/templates/site-setup/users.pt:52
-msgid "Find users or groups"
-msgstr "Suche Benutzer oder Gruppen"
-
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
-msgstr "Benutzer- / Gruppenname"
-
-#: kotti/templates/site-setup/users.pt:70
-msgid "Blank search text finds all."
-msgstr "Suche mit leerem Eingabefeld liefert alle Benutzer."
-
-#: kotti/templates/site-setup/users.pt:96
-msgid "Assign global roles"
-msgstr "Globale Rollen zuweisen"
-
-#: kotti/templates/site-setup/users.pt:180
-msgid "Add new user"
-msgstr "Neuen Benutzer hinzufügen"
-
-#: kotti/templates/site-setup/users.pt:190
-msgid "Add new group"
-msgstr "Neue Gruppe hinzufügen"
-
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
-msgstr "Suche..."
-
-#: kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
-msgstr "Verschlagwortet mit:"
-
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Willkommen, ${user}! Sie sind angemeldet."
-
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr "Willkommen! Sie sind nicht angemeldet."
-
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
-msgid "Your changes have been saved."
-msgstr "Ihre Änderungen wurden übernommen."
-
-#: kotti/views/form.py:174
-msgid "Item was added."
-msgstr "Dokument hinzugefügt."
-
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maximale Dateigröße: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Übernehmen"
-
-#: kotti/views/form.py:198
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "${type} in ${title} erstellen"
-
-#: kotti/views/form.py:202
-#, python-format
-msgid "Add ${type}."
-msgstr "${type} erstellen"
-
-#: kotti/views/login.py:237
-msgid "You have reset your password."
-msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
-
-#: kotti/views/login.py:199
-msgid "You have been logged out."
-msgstr "Sie wurden abgemeldet."
-
-#: kotti/views/login.py:65 kotti/views/users.py:270
-msgid "Full name"
-msgstr "Vollständiger Name"
-
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "Benutzername"
-
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
-msgid "Email"
-msgstr "E-Mail"
-
-#: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
-"einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
-
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr "Registrieren - ${title}"
-
-#: kotti/views/login.py:163
-msgid "Login failed."
-msgstr "Anmeldung fehlgeschlagen."
-
-#: kotti/views/login.py:285
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Passwort zurücksetzen - ${title}"
-
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Willkommen, ${user}!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
-"einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
-
-#: kotti/views/login.py:177
-msgid "That username or email is not known by this system."
-msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
-
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Registrieren"
-
-#: kotti/views/login.py:89 kotti/views/login.py:256
-msgid "There was an error."
-msgstr "Ein Fehler ist aufgetreten."
-
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Absenden"
-
-#: kotti/views/login.py:278
-msgid "Your password reset token may have expired."
-msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
-
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "Benutzerverwaltung"
-
-#: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke "
-"Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu "
-"lassen."
-
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Meine Einstellungen - ${title}"
-
-#: kotti/views/users.py:145
-msgid "Invalid value"
-msgstr "Ungültige Eingabe"
-
-#: kotti/views/users.py:151
-msgid "A user with that name already exists."
-msgstr "Ein Benutzer mit diesem Namen existiert bereits."
-
-#: kotti/views/users.py:158
-msgid "A user with that email already exists."
-msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
-
-#: kotti/views/users.py:181
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Unbekannte Gruppe: ${group}"
-
-#: kotti/views/users.py:219
-msgid "Active"
-msgstr "Aktiv"
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Aktiv"
 
 #: kotti/views/users.py:220
 msgid "Untick this to deactivate the account."
@@ -856,8 +468,8 @@ msgid "Add Group"
 msgstr "Neue Gruppe"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Keine Änderungen."
 
@@ -907,11 +519,6 @@ msgstr "${title} ausgeschnitten."
 msgid "${title} was moved."
 msgstr "${title} verschoben."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} gelöscht."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -931,70 +538,411 @@ msgstr "${title} wird nun in der Navigation angezeigt."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} gelöscht."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Nichts wurde gelöscht."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Name und Titel werden benötigt."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "Objekt umbenannt."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Nach oben verschieben"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Nach unten verschieben"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Anzeigen"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Verstecken"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Status ändern"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Beschreibung"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Schlagworte:"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Inhalt"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "Standardansicht wurde zurückgesetzt."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Standardansicht"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Standardansicht wurde gesetzt."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "Standardansicht konnte nicht geändert werden."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Zugriff verweigert"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Passwort zurücksetzen bei ${site_title}"
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Hallo ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} zurückzusetzen: ${url}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Dateien hochladen"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Ihre Anmeldung bei ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Ihre Anmeldung bei ${site_title}"
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich anzumelden: ${url}"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Anzeigen"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigieren"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Seiten-Einstellungen"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Abmelden"
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Setze ${state}"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Standardansicht setzen"
+
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Anmelden"
+
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Benutzername oder E-Mail"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Anmelden"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Passwort vergessen?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Passwort zurücksetzen"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Geben Sie oben Ihren Benutzernamen oder Ihre E-Mail Adresse an und klicken Sie auf ${reset_password}. Sie werden daraufhin eine E-Mail erhalten, die einen Link zum zurücksetzen Ihres Passworts enthält."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "Noch nicht registriert?"
+
+#: kotti/templates/login.pt:82
+msgid "Register for an account on this site."
+msgstr "Einen Benutzer für den Zugang zu dieser Seite erstellen."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Verschlagwortet mit:"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Suche..."
+
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "Erstellungsdatum"
+
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "Bearbeitungsdatum"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
+
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "Lösche ${title}"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Zurück zur Benutzerverwaltung"
+
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Suche Benutzer / Gruppe(n)"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Neuer Benutzer"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Neue Gruppe"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Suche Benutzer oder Gruppen"
+
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "Benutzer- / Gruppenname"
+
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "Suche Benutzer und Gruppen"
+
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Suche mit leerem Eingabefeld liefert alle Benutzer."
+
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "Suche"
+
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Globale Rollen zuweisen"
+
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "Änderungen übernehmen"
+
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Neuen Benutzer hinzufügen"
+
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Neue Gruppe hinzufügen"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigieren"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Inhalte aus lokalen Dateien hochladen"
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+msgid "Filename"
+msgstr "Dateiname"
+
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr "Größe"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr "Status"
+
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr "Fortschritt"
+
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr "Hochzuladene Dateien auswählen..."
+
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr "${number} Dateien hochladen"
+
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr "Alle Fehlermeldungen ausblenden"
+
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
+
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "Status"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Sie sind hier:"
+
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Kein sichtbarer Inhalt."
+
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Sichtbarkeit"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Sichtbar"
+
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Unsichtbar"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "${title} umbenennen"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Jeder Inhalt hat einen Namen, der auch Bestandteil der URL ist, und einen Titel. Sie können beides ändern, indem Sie unten einen neuen Namen und/oder Titel angeben."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "Neuer Name"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "Neuer Titel"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Sind Sie sicher, dass Sie ${title} löschen möchten?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Teile ${title}"
+
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Lokale Rollen zuweisen"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Workflowstatus ändern"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/oder verwalten kann."
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Unterordner einbeziehen"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Wenn Sie diese Option anwählen, wirkt sich die Statusänderung sowohl auf alle ausgewählte als auch auf die darin enthaltenen Dokumente aus."
+
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Ändere Status in"
+
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Wählen Sie den neuen Status, der für alle ausgwählten Dokumente gesetzt werden soll."
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Keine Änderungen."
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Willkommen, ${user}! Sie sind angemeldet."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Willkommen! Sie sind nicht angemeldet."
+
 #~ msgid "Private"
 #~ msgstr "Privat"
 
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index c7186f8ca..f8db8bd51 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -18,6 +18,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "Generated-By: Babel 0.9.6\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr ""
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr ""
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr ""
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr ""
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr ""
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr ""
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr ""
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr ""
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr ""
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr ""
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr ""
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr ""
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr ""
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr ""
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr ""
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr ""
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr ""
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr ""
@@ -32,29 +107,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +133,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +146,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -90,23 +160,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -123,760 +190,680 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
 msgstr ""
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
+#: kotti/views/form.py:174
+msgid "Item was added."
 msgstr ""
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
 msgstr ""
 
-#: kotti/resources.py:517
-msgid "Folder view"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
 msgstr ""
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
 msgstr ""
 
-#: kotti/resources.py:506
-msgid "Share"
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
 msgstr ""
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
 msgstr ""
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
+#: kotti/views/login.py:237
+msgid "You have reset your password."
 msgstr ""
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
+#: kotti/views/login.py:199
+msgid "You have been logged out."
 msgstr ""
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
 msgstr ""
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
+#: kotti/views/login.py:68
+msgid "Username"
 msgstr ""
 
-#: kotti/security.py:189
-msgid "Viewer"
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+msgid "Email"
 msgstr ""
 
-#: kotti/security.py:190
-msgid "Editor"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/security.py:191
-msgid "Owner"
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
 msgstr ""
 
-#: kotti/security.py:192
-msgid "Admin"
+#: kotti/views/login.py:163
+msgid "Login failed."
 msgstr ""
 
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
 msgstr ""
 
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
+#: kotti/views/login.py:285
+#, python-format
+msgid "Reset your password - ${title}."
 msgstr ""
 
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
+#: kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
+#: kotti/views/login.py:172
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
+#: kotti/views/login.py:177
+msgid "That username or email is not known by this system."
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
+#: kotti/views/login.py:82
+msgid "Register"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
+#: kotti/views/login.py:89 kotti/views/login.py:256
+msgid "There was an error."
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
+#: kotti/views/login.py:249
+msgid "Submit"
 msgstr ""
 
-#: kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
+#: kotti/views/login.py:278
+msgid "Your password reset token may have expired."
 msgstr ""
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
 msgstr ""
 
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
 msgstr ""
 
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr ""
 
-#: kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
 msgstr ""
 
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
+#: kotti/views/users.py:145
+msgid "Invalid value"
 msgstr ""
 
-#: kotti/templates/forbidden.pt:7
-msgid "Forbidden"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
 msgstr ""
 
-#: kotti/templates/login.pt:16
-msgid "Login"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
 msgstr ""
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
 msgstr ""
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
 msgstr ""
 
-#: kotti/templates/login.pt:47
-msgid "Log in"
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
 msgstr ""
 
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
+#: kotti/views/users.py:219
+msgid "Active"
 msgstr ""
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
 msgstr ""
 
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
+#: kotti/views/users.py:226
+msgid "Global roles"
 msgstr ""
 
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
+#: kotti/views/users.py:230
+msgid "Groups"
 msgstr ""
 
-#: kotti/templates/login.pt:127
-msgid "Register for an account on this site."
+#: kotti/views/users.py:315
+msgid "Add User"
 msgstr ""
 
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
 msgstr ""
 
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
+#: kotti/views/users.py:349
+msgid "Add Group"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
+#: kotti/views/users.py:558
+msgid "No name was given."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
+#: kotti/views/users.py:533
+msgid "User was not found."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
+#: kotti/views/users.py:324
+msgid "Send password registration link."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
+#: kotti/views/edit/actions.py:225
+#, python-format
+msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:134
-msgid "Hidden"
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
 msgstr ""
 
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
 msgstr ""
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
 msgstr ""
 
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
 msgstr ""
 
-#: kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
+#: kotti/views/edit/actions.py:467
+msgid "Show"
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
+#: kotti/views/edit/actions.py:507
+msgid "You have to select items to perform an action."
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
 msgstr ""
 
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
+#: kotti/views/edit/content.py:38
+msgid "Description"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
+#: kotti/views/edit/content.py:44
+msgid "Tags"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
+#: kotti/views/edit/content.py:53
+msgid "Body"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
 msgstr ""
 
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
 msgstr ""
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
 msgstr ""
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-msgid "Filename"
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
 msgstr ""
 
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
 msgstr ""
 
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
 msgstr ""
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:15
-msgid "Search user(s) / group(s)"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:52
-msgid "Find users or groups"
+#: kotti/templates/login.pt:15
+msgid "Login"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:70
-msgid "Blank search text finds all."
+#: kotti/templates/login.pt:33
+msgid "Log in"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:96
-msgid "Assign global roles"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:180
-msgid "Add new user"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:190
-msgid "Add new group"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr ""
 
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
+#: kotti/templates/login.pt:82
+msgid "Register for an account on this site."
 msgstr ""
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr ""
 
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr ""
-
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr ""
-
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
-msgid "Your changes have been saved."
-msgstr ""
-
-#: kotti/views/form.py:174
-msgid "Item was added."
-msgstr ""
-
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr ""
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr ""
-
-#: kotti/views/form.py:198
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr ""
-
-#: kotti/views/form.py:202
-#, python-format
-msgid "Add ${type}."
-msgstr ""
-
-#: kotti/views/login.py:237
-msgid "You have reset your password."
-msgstr ""
-
-#: kotti/views/login.py:199
-msgid "You have been logged out."
-msgstr ""
-
-#: kotti/views/login.py:65 kotti/views/users.py:270
-msgid "Full name"
-msgstr ""
-
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr ""
-
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
-msgid "Email"
-msgstr ""
-
-#: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr ""
-
-#: kotti/views/login.py:163
-msgid "Login failed."
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
 msgstr ""
 
-#: kotti/views/login.py:285
-#, python-format
-msgid "Reset your password - ${title}."
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
 msgstr ""
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
 msgstr ""
 
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
 msgstr ""
 
-#: kotti/views/login.py:177
-msgid "That username or email is not known by this system."
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
 msgstr ""
 
-#: kotti/views/login.py:82
-msgid "Register"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
 msgstr ""
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
-msgid "There was an error."
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
 msgstr ""
 
-#: kotti/views/login.py:249
-msgid "Submit"
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
 msgstr ""
 
-#: kotti/views/login.py:278
-msgid "Your password reset token may have expired."
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
 msgstr ""
 
-#: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
 msgstr ""
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
 msgstr ""
 
-#: kotti/views/users.py:145
-msgid "Invalid value"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
 msgstr ""
 
-#: kotti/views/users.py:151
-msgid "A user with that name already exists."
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
 msgstr ""
 
-#: kotti/views/users.py:158
-msgid "A user with that email already exists."
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
 msgstr ""
 
-#: kotti/views/users.py:181
-#, python-format
-msgid "No such group: ${group}"
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
 msgstr ""
 
-#: kotti/views/users.py:219
-msgid "Active"
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
 msgstr ""
 
-#: kotti/views/users.py:220
-msgid "Untick this to deactivate the account."
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
 msgstr ""
 
-#: kotti/views/users.py:226
-msgid "Global roles"
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
 msgstr ""
 
-#: kotti/views/users.py:230
-msgid "Groups"
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
 msgstr ""
 
-#: kotti/views/users.py:315
-msgid "Add User"
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
 msgstr ""
 
-#: kotti/views/users.py:339
-#, python-format
-msgid "${title} was added."
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
 msgstr ""
 
-#: kotti/views/users.py:349
-msgid "Add Group"
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
 msgstr ""
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
-msgid "No changes were made."
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
 msgstr ""
 
-#: kotti/views/users.py:558
-msgid "No name was given."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+msgid "Filename"
 msgstr ""
 
-#: kotti/views/users.py:505
-#, python-format
-msgid "Edit ${principal_type} ${title}"
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
 msgstr ""
 
-#: kotti/views/users.py:533
-msgid "User was not found."
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
 msgstr ""
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
 msgstr ""
 
-#: kotti/views/users.py:543
-#, python-format
-msgid "${principal_type} ${title} was deleted."
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/views/users.py:551
-#, python-format
-msgid "Delete ${principal_type} ${title}"
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/views/edit/actions.py:106
-#, python-format
-msgid "${title} was copied."
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/views/edit/actions.py:124
-#, python-format
-msgid "${title} was cut."
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
 msgstr ""
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
 msgstr ""
 
-#: kotti/views/edit/actions.py:159
-#, python-format
-msgid "${title} was pasted."
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
 msgstr ""
 
-#: kotti/views/edit/actions.py:162
-msgid "Could not paste node. It no longer exists."
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
 msgstr ""
 
-#: kotti/views/edit/actions.py:225
-#, python-format
-msgid "${title} is now visible in the navigation."
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
 msgstr ""
 
-#: kotti/views/edit/actions.py:228
-#, python-format
-msgid "${title} is no longer visible in the navigation."
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
 msgstr ""
 
-#: kotti/views/edit/actions.py:293
-msgid "Nothing was deleted."
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
 msgstr ""
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
-msgid "Name and title are required."
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr ""
 
-#: kotti/views/edit/actions.py:333
-msgid "Item was renamed."
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
 msgstr ""
 
-#: kotti/views/edit/actions.py:455
-msgid "Move up"
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
 msgstr ""
 
-#: kotti/views/edit/actions.py:456
-msgid "Move down"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
 msgstr ""
 
-#: kotti/views/edit/actions.py:457
-msgid "Show"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
 msgstr ""
 
-#: kotti/views/edit/actions.py:458
-msgid "Hide"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
 msgstr ""
 
-#: kotti/views/edit/actions.py:497
-msgid "You have to select items to perform an action."
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
 msgstr ""
 
-#: kotti/views/edit/actions.py:454
-msgid "Change State"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-#: kotti/views/edit/content.py:36
-msgid "Description"
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
 msgstr ""
 
-#: kotti/views/edit/content.py:42
-msgid "Tags"
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr ""
 
-#: kotti/views/edit/content.py:51
-msgid "Body"
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
 msgstr ""
 
-#: kotti/views/edit/default_views.py:99
-msgid "Default view has been reset to default."
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-#: kotti/views/edit/default_views.py:78
-msgid "Default view"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
 msgstr ""
 
-#: kotti/views/edit/default_views.py:106
-msgid "Default view has been set."
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-#: kotti/views/edit/default_views.py:111
-msgid "Default view could not be set."
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
 msgstr ""
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 369507a06..75c59cc6b 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9a3dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:34+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2013-09-22 20:21+0100\n"
 "Last-Translator: Fabien Castarède <fabien.castarede@free.fr>\n"
 "Language-Team: French\n"
@@ -18,6 +18,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "Generated-By: Babel 0.9.6\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "Lecteur"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "Editeur"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "Propriétaire"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "Administrateur"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copier"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Couper"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Coller"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "Renommer"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "Supprimer"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Document"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Fichier"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Image"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Contenus"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Contenus"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Modifier"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Permissions"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Actions"
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr "Bienvenue dans Kotti"
@@ -27,34 +102,30 @@ msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
 #: kotti/populate.py:66
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +133,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +146,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -92,31 +162,25 @@ msgstr ""
 "\n"
 "<h2>Identifiez vous</h2>\n"
 "<p>\n"
-"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</"
-"a> sur votre site internet\n"
-"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de "
-"passe pour\n"
+"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</a> sur votre site internet\n"
+"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de passe pour\n"
 "    votre compte administrateur, celui-ci devrait être <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition "
-"en dessous de la\n"
-"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition "
-"et la visualisation, telle qu'\n"
+"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition en dessous de la\n"
+"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition et la visualisation, telle qu'\n"
 "    elle apparaitra aux visiteurs.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configuration</h2>\n"
 "        <p>\n"
-"            Trouvez comment configurer le titre de votre site ainsi que "
-"d'autres paramètres en utilisant\n"
+"            Trouvez comment configurer le titre de votre site ainsi que d'autres paramètres en utilisant\n"
 "            un éditeur de texte.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manuelle\n"
 "            </a>\n"
 "        </p>\n"
@@ -124,13 +188,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Extensions</h2>\n"
 "        <p>\n"
-"            Des extensions vous permettent d'étendre les fonctionnalités de "
-"votre site internet Kotti.\n"
+"            Des extensions vous permettent d'étendre les fonctionnalités de votre site internet Kotti.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Extensions de Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -138,8 +200,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Découvrez tout ce que vous pouvez faire avec Kotti? La License "
-"de Kotti?Parcourez le\n"
+"            Découvrez tout ce que vous pouvez faire avec Kotti? La License de Kotti?Parcourez le\n"
 "            manuel pour plus d'informations.\n"
 "        </p>\n"
 "        <p>\n"
@@ -151,25 +212,21 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "A propos"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"Notre société est spécialisée dans la conception de pièces foo utilisées "
-"dans une grande variétée de produits."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Notre société est spécialisée dans la conception de pièces foo utilisées dans une grande variétée de produits."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
+#, fuzzy
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -186,20 +243,18 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"Cinq avions EA300 volants en formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -217,618 +272,180 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Crédit de la photot:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Copyright info</a>.\n"
 "  Originalement publié sur\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
-msgstr "Document"
-
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
-msgstr "Fichier"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Vos modifications ont été enregistrées."
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
-msgstr "Image"
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "L'élément a été ajouté."
 
-#: kotti/resources.py:517
-msgid "Folder view"
-msgstr "Contenus"
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "Modifier ${title}"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
-msgstr "Contenus"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Taille maximum d'un fichier : ${size} MB"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Modifier"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Enregistrer"
 
-#: kotti/resources.py:506
-msgid "Share"
-msgstr "Permissions"
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "Annuler"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
-msgstr "Actions"
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Ajouter un(e) ${type} dans ${title}."
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Copier"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "Ajouter ${type}."
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Couper"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gestion des utilisateurs"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Coller"
+#: kotti/views/login.py:237
+msgid "You have reset your password."
+msgstr "Vous avez réinitialisé votre mot de passe."
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Renommer"
+#: kotti/views/login.py:199
+msgid "You have been logged out."
+msgstr "Vous avez été déconnecté."
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Supprimer"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Nom complet"
 
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "Lecteur"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Identifiant"
 
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "Editeur"
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+msgid "Email"
+msgstr "E-mail"
 
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "Propriétaire"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez recevoir un e-mail contenant le lien permettant d'initialiser votre mot de passe, afin d'activer votre compte."
 
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "Administrateur"
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "S'inscrire - ${title}"
 
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
-msgstr "Ajouter"
+#: kotti/views/login.py:163
+msgid "Login failed."
+msgstr "La connexion à échouée."
 
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
-msgstr "Téléverser des contenus"
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "Mot de passe"
 
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
-msgstr "Définir la vue par défaut"
+#: kotti/views/login.py:285
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Réinitialiser votre mot de passe - ${title}"
 
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
-msgstr "Voir"
+#: kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bienvenue, ${user} !"
 
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
-msgstr "Parcourir"
+#: kotti/views/login.py:172
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
 
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
-msgstr "Préférences"
+#: kotti/views/login.py:177
+msgid "That username or email is not known by this system."
+msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
-msgstr "Paramètres du Site"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "S'inscrire"
 
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
-msgstr "Se déconnecter"
+#: kotti/views/login.py:89 kotti/views/login.py:256
+msgid "There was an error."
+msgstr "Il y a une erreur."
 
-#: kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
-msgstr "Réinitialiser votre mot de passe pour ${site_title}."
+#: kotti/views/login.py:249
+msgid "Submit"
+msgstr "Soumettre"
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
-msgstr "Bonjour, ${user_title} !"
+#: kotti/views/login.py:278
+msgid "Your password reset token may have expired."
+msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : "
-"${url}"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "Utilisateur"
 
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
-msgstr "Votre inscription sur ${site_title}"
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "Groupe"
 
-#: kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
-msgstr "Vous vous joignez à ${site_title}."
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
 
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mes préférences - ${title}"
 
-#: kotti/templates/forbidden.pt:7
-msgid "Forbidden"
-msgstr "Interdit"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Valeur invalide"
 
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "Identifiant"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Un utilisateur avec ce nom existe déjà."
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
-msgstr "Identifiant ou e-mail"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "Mot de passe"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Aucun groupe : ${group}"
 
-#: kotti/templates/login.pt:47
-msgid "Log in"
-msgstr "Se connecter"
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
+msgstr "Titre"
 
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
-msgstr "Mot de passe oublié ?"
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "Nom"
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
-msgstr "Réinitialiser le mot de passe"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur "
-"${reset_password} ci-dessous afin de recevoir un mail contenant le lien de "
-"réinitialisation de votre mot de passe."
-
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
-msgstr ""
-
-#: kotti/templates/login.pt:127
-msgid "Register for an account on this site."
-msgstr "Enregistrez-vous sur ce site."
-
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
-msgstr "Rendre ${state}"
-
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
-msgstr "Vous êtes ici :"
-
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
-msgstr "Modifier le statut de workflow"
-
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/"
-"ou le gérer."
-
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
-msgstr "Titre"
-
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
-msgstr "Type"
-
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
-msgstr "Statut"
-
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
-msgstr "Date de création"
-
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
-msgstr "Date de modification"
-
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
-msgstr "Inclure les contenus enfants"
-
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Si coché, cela modifiera le statut de tous les contenus enfants dans les "
-"documents sélectionnés et leurs documents enfants."
-
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
-msgstr "Modifier le statut à"
-
-#: kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
-msgstr "Sélectionner le nouveau statut à appliquer aux éléments choisis."
-
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
-msgstr "Aucune modification"
-
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr "Appliquer les modifications"
-
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Annuler"
-
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr "Aucun contenu ici."
-
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr "Visibilité"
-
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr "Visible"
-
-#: kotti/templates/edit/contents.pt:134
-msgid "Hidden"
-msgstr "Caché"
-
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
-
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr "Supprimer ${title}"
-
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Etes-vous sûr de vouloir supprimer ${title} ?"
-
-#: kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
-msgstr "Parcourir le Site"
-
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Chaque contenu a un nom, qui est utilisé pour créer une url, et un titre. "
-"Consultez, si besoin, le manuel à propos du format des nom et titre. Vous "
-"pouvez modifier les deux."
-
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr "Nouveau nom"
-
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr "Nouveau titre"
-
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr "Renommer ${title}"
-
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
-msgstr "Permissions pour ${title}"
-
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
-msgstr "Rechercher des utilisateurs ou des groupes"
-
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
-msgstr "Rechercher"
-
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
-msgstr "Assigner des rôles locaux"
-
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "Nom"
-
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "Utilisateur"
-
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "Groupe"
-
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
-msgstr "Téléverser des contenus à partir de fichiers locaux"
-
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
-msgstr "Poids"
-
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
-msgstr "Statut"
-
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
-msgstr "Progression"
-
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
-msgstr "Selectionner des fichiers à téléverser..."
-
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
-msgstr "Téléverser ${number} fichiers."
-
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
-msgstr "Ignorer toutes les erreurs"
-
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
-
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
-msgstr "Retour à la gestion des Utilisateurs"
-
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr "Modifier ${title}"
-
-#: kotti/templates/site-setup/users.pt:15
-msgid "Search user(s) / group(s)"
-msgstr "Rechercher des utilisateurs ou des groupes"
-
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
-msgstr "Ajouter un utilisateur"
-
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
-msgstr "Ajouter un groupe"
-
-#: kotti/templates/site-setup/users.pt:52
-msgid "Find users or groups"
-msgstr "Rechercher des utilisateurs ou des groupes"
-
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
-msgstr "Utilisateur / groupe"
-
-#: kotti/templates/site-setup/users.pt:70
-msgid "Blank search text finds all."
-msgstr ""
-"Rechercher et modifier des utilisateurs (Laissez le champ vide pour les "
-"afficher tous)."
-
-#: kotti/templates/site-setup/users.pt:96
-msgid "Assign global roles"
-msgstr "Assigner des rôles locaux"
-
-#: kotti/templates/site-setup/users.pt:180
-msgid "Add new user"
-msgstr "Ajouter un utilisateur"
-
-#: kotti/templates/site-setup/users.pt:190
-msgid "Add new group"
-msgstr "Ajouter un groupe"
-
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
-msgstr "Résultats de la recherche"
-
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
-msgstr "Rechercher..."
-
-#: kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
-msgstr "Mots-clés associés :"
-
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Bienvenue, ${user} ! Vous êtes connecté."
-
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr "Bienvenue, vous n'êtes pas connecté."
-
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
-msgid "Your changes have been saved."
-msgstr "Vos modifications ont été enregistrées."
-
-#: kotti/views/form.py:174
-msgid "Item was added."
-msgstr "L'élément a été ajouté."
-
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Taille maximum d'un fichier : ${size} MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Enregistrer"
-
-#: kotti/views/form.py:198
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Ajouter un(e) ${type} dans ${title}."
-
-#: kotti/views/form.py:202
-#, python-format
-msgid "Add ${type}."
-msgstr "Ajouter ${type}."
-
-#: kotti/views/login.py:237
-msgid "You have reset your password."
-msgstr "Vous avez réinitialisé votre mot de passe."
-
-#: kotti/views/login.py:199
-msgid "You have been logged out."
-msgstr "Vous avez été déconnecté."
-
-#: kotti/views/login.py:65 kotti/views/users.py:270
-msgid "Full name"
-msgstr "Nom complet"
-
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "Identifiant"
-
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
-msgid "Email"
-msgstr "E-mail"
-
-#: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez "
-"recevoir un e-mail contenant le lien permettant d'initialiser votre mot de "
-"passe, afin d'activer votre compte."
-
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr "S'inscrire - ${title}"
-
-#: kotti/views/login.py:163
-msgid "Login failed."
-msgstr "La connexion à échouée."
-
-#: kotti/views/login.py:285
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Réinitialiser votre mot de passe - ${title}"
-
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bienvenue, ${user} !"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre "
-"mot de passe, afin d'activer votre compte."
-
-#: kotti/views/login.py:177
-msgid "That username or email is not known by this system."
-msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
-
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "S'inscrire"
-
-#: kotti/views/login.py:89 kotti/views/login.py:256
-msgid "There was an error."
-msgstr "Il y a une erreur."
-
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Soumettre"
-
-#: kotti/views/login.py:278
-msgid "Your password reset token may have expired."
-msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
-
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "Gestion des utilisateurs"
-
-#: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous "
-"pour que l'utilisateur définisse son propre mot de passe."
-
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mes préférences - ${title}"
-
-#: kotti/views/users.py:145
-msgid "Invalid value"
-msgstr "Valeur invalide"
-
-#: kotti/views/users.py:151
-msgid "A user with that name already exists."
-msgstr "Un utilisateur avec ce nom existe déjà."
-
-#: kotti/views/users.py:158
-msgid "A user with that email already exists."
-msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
-
-#: kotti/views/users.py:181
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Aucun groupe : ${group}"
-
-#: kotti/views/users.py:219
-msgid "Active"
-msgstr "Actif"
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Actif"
 
 #: kotti/views/users.py:220
 msgid "Untick this to deactivate the account."
@@ -856,8 +473,8 @@ msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Aucune modification a été effectuée."
 
@@ -907,11 +524,6 @@ msgstr "${title} a été coupé."
 msgid "${title} was moved."
 msgstr "${title} a été déplacé."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} a été supprimé."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -931,70 +543,411 @@ msgstr "${title} est désormais visible dans la navigation."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nest plus visible dans la navigation."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} a été supprimé."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Rien n'a été supprimé."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Le nom et le titre sont obligatoires."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "L'élément a été renommé."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Décaler vers le haut"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Décaler vers le bas"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Rendre visible"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Cacher"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Vous avez sélectionné des éléments afin de les traiter."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Modifier le statut"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Description"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Mots-clés"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Contenu"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "La vue par défaut a été réinitialisée."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vue par défaut"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "La vue par défaut a été définie."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "La vue par défaut ne peut pas être définie."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Interdit"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Réinitialiser votre mot de passe pour ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Bonjour, ${user_title} !"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : ${url}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Ajouter"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Téléverser des contenus"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Votre inscription sur ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Vous vous joignez à ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Voir"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Parcourir"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Préférences"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Paramètres du Site"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Se déconnecter"
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Rendre ${state}"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Définir la vue par défaut"
+
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Identifiant"
+
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Identifiant ou e-mail"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Se connecter"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Mot de passe oublié ?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Réinitialiser le mot de passe"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur ${reset_password} ci-dessous afin de recevoir un mail contenant le lien de réinitialisation de votre mot de passe."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr ""
+
+#: kotti/templates/login.pt:82
+msgid "Register for an account on this site."
+msgstr "Enregistrez-vous sur ce site."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Mots-clés associés :"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Rechercher..."
+
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "Type"
+
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "Date de création"
+
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "Date de modification"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Résultats de la recherche"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
+
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "Supprimer ${title}"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Retour à la gestion des Utilisateurs"
+
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Rechercher des utilisateurs ou des groupes"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Ajouter un utilisateur"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Ajouter un groupe"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Rechercher des utilisateurs ou des groupes"
+
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "Utilisateur / groupe"
+
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "Rechercher des utilisateurs ou des groupes"
+
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Rechercher et modifier des utilisateurs (Laissez le champ vide pour les afficher tous)."
+
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "Rechercher"
+
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Assigner des rôles locaux"
+
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "Appliquer les modifications"
+
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Ajouter un utilisateur"
+
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Ajouter un groupe"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Parcourir le Site"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Téléverser des contenus à partir de fichiers locaux"
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+msgid "Filename"
+msgstr "Nom du fichier"
+
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr "Poids"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr "Statut"
+
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr "Progression"
+
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr "Selectionner des fichiers à téléverser..."
+
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr "Téléverser ${number} fichiers."
+
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr "Ignorer toutes les erreurs"
+
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
+
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "Statut"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Vous êtes ici :"
+
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Aucun contenu ici."
+
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Visibilité"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Visible"
+
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Caché"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Renommer ${title}"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Chaque contenu a un nom, qui est utilisé pour créer une url, et un titre. Consultez, si besoin, le manuel à propos du format des nom et titre. Vous pouvez modifier les deux."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "Nouveau nom"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "Nouveau titre"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Etes-vous sûr de vouloir supprimer ${title} ?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Permissions pour ${title}"
+
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Assigner des rôles locaux"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Modifier le statut de workflow"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/ou le gérer."
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Inclure les contenus enfants"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Si coché, cela modifiera le statut de tous les contenus enfants dans les documents sélectionnés et leurs documents enfants."
+
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Modifier le statut à"
+
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Sélectionner le nouveau statut à appliquer aux éléments choisis."
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Aucune modification"
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Bienvenue, ${user} ! Vous êtes connecté."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Bienvenue, vous n'êtes pas connecté."
+
 #~ msgid "Private"
 #~ msgstr "Privé"
 
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index a70a09c98..07c69f20b 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9.2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2014-01-19 11:14+0100\n"
 "Last-Translator: Xavi Torné <xavitorne@gmail.com>\n"
 "Language-Team: it \n"
@@ -17,6 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "Generated-By: Babel 0.9.6\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "Visualizzatore"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "Proprietario"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "Admin"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copia"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Taglia"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Incolla"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "Rinomina"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "Elimina"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Documento"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "File"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Immagine"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Vista della cartella"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Contenuti"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Modificare"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Condividi"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Azioni"
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr "Benvenuto in Kotti"
@@ -31,29 +106,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -61,13 +132,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -75,9 +145,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -92,42 +162,32 @@ msgstr ""
 "<h2>Accedi</h2>\n"
 "<p>\n"
 "    <a class=\"btn btn-success\" href=\"login\">Accedi</a> al sito \n"
-"    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una "
-"password per\n"
-"    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</"
-"em>.\n"
+"    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una password per\n"
+"    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Quando sarai autenticato, vedrai la barra di editor grigia sotto la "
-"barra di navigazione in alto.\n"
-"    Questa barra ti permetterà di passare dalla modifica alla "
-"visualizzazione della pagina corrente    così come apparirà a tuoi "
-"visitatori.\n"
+"    Quando sarai autenticato, vedrai la barra di editor grigia sotto la barra di navigazione in alto.\n"
+"    Questa barra ti permetterà di passare dalla modifica alla visualizzazione della pagina corrente    così come apparirà a tuoi visitatori.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configura</h2>\n"
 "        <p>\n"
-"            Scopri come configurare il titolo del tuo Kotti e molte altre "
-"impostazion            utilizzando un semplice file di testo sul vostro "
-"sistema.\n"
+"            Scopri come configurare il titolo del tuo Kotti e molte altre impostazion            utilizzando un semplice file di testo sul vostro sistema.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration."
-"html\">               Manuale di configurazione\n"
+"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
 "            </a>\n"
 "        </p>\n"
 "    </div>\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            Esistono molti add-ons che permettono di estendere le "
-"funzionalità del tuo sito Kotti        </p>\n"
+"            Esistono molti add-ons che permettono di estendere le funzionalità del tuo sito Kotti        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Add-ons di Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -135,8 +195,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentazione</h2>\n"
 "        <p>\n"
-"            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  "
-"Leggi il manuale per maggiori informazioni        </p>\n"
+"            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
@@ -146,25 +205,20 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "Chi siamo"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"La nostra azienda è il leader nella produzione di foo widget, usati in una "
-"grande varietà di prodotti per l'aviazione e industriali."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "La nostra azienda è il leader nella produzione di foo widget, usati in una grande varietà di prodotti per l'aviazione e industriali."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -181,476 +235,17 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
-msgstr "Documento"
-
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
-msgstr "File"
-
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
-msgstr "Immagine"
-
-#: kotti/resources.py:517
-msgid "Folder view"
-msgstr "Vista della cartella"
-
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
-msgstr "Contenuti"
-
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Modificare"
-
-#: kotti/resources.py:506
-msgid "Share"
-msgstr "Condividi"
-
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
-msgstr "Azioni"
-
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Copia"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Taglia"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Incolla"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Rinomina"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Elimina"
-
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "Visualizzatore"
-
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "Editor"
-
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "Proprietario"
-
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "Admin"
-
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
-msgstr "Aggiungere"
-
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
-msgstr "Carica contenuto"
-
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
-msgstr "Seleziona la vista predefinita"
-
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
-msgstr "Vista"
-
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
-msgstr "Navigazione"
-
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
-msgstr "Configurazione del sito"
-
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
-msgstr "Esci"
-
-#: kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
-msgstr "Resetta la tua password per ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
-msgstr "Ciao, ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Segui il link per resettare la tua password a ${site_title}: ${url}"
-
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
-msgstr "La tua registrazione per ${site_title}"
-
-#: kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
-msgstr "Stai entrando in ${site_title}."
-
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Premi qui per impostare la tua password e accedere: ${url}"
-
-#: kotti/templates/forbidden.pt:7
-msgid "Forbidden"
-msgstr "Vietato"
-
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "Accedi"
-
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
-msgstr "Username o email"
-
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "Password"
-
-#: kotti/templates/login.pt:47
-msgid "Log in"
-msgstr "Accedi"
-
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
-msgstr "Hai dimenticato la tua password?"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
-msgstr "Resetta password"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Inserisci il tuo username o email e premi ${reset_password} per ricevere una "
-"email con il link per resettare la tua password."
-
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
-msgstr "Non sei ancora registrato?"
-
-#: kotti/templates/login.pt:127
-msgid "Register for an account on this site."
-msgstr "Registrati per avere un account su questo sito."
-
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
-msgstr "Rendi ${state}"
-
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
-msgstr "Sei qua:"
-
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
-msgstr "Cambia lo stato del workflow"
-
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Lo stato del workflow di un item determina chi lo può vedere, editare e/o "
-"modificare."
-
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
-msgstr "Titolo"
-
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
-msgstr "Tipo"
-
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
-msgstr "Stato"
-
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
-msgstr "Data di creazione"
-
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
-msgstr "Data di modifica"
-
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
-msgstr "Includere figli"
-
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Se selezionato, verrà modificato lo stato dei figli dei documenti "
-"selezionati e i suoi sottodocumenti."
-
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
-msgstr "Cambia stato a"
-
-#: kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
-msgstr "Seleziona il nuovo stato per tutti gli elementi selezionati."
-
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
-msgstr "Nessuna modifica"
-
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr "Applica le modifiche"
-
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Cancella"
-
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr "Non è presente nessun elemento di contenuto."
-
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr "Visibilità"
-
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr "Visibile"
-
-#: kotti/templates/edit/contents.pt:134
-msgid "Hidden"
-msgstr "Nascosto"
-
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
-
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr "Elimina ${title}"
-
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Sei sicuro di voler eliminare ${title}?"
-
-#: kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
-msgstr "Navigazione del Sito"
-
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Ogni contenuto ha un nome, che è usato per creare la url, e un titolo. Leggi "
-"il manuale utente per saperne di più sul formato del nome e del titolo. Si "
-"possono cambiare entrambi qui sotto."
-
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr "Nuovo nome"
-
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr "Nuovo titolo"
-
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr "Rinomina ${title}"
-
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
-msgstr "Condividi ${title}"
-
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
-msgstr "Cerca utenti e gruppi"
-
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
-msgstr "Cerca"
-
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
-msgstr "Assegna ruoli locali"
-
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "Nome"
-
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "Utente"
-
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "Gruppo"
-
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
-msgstr "Carica un contenuto da uno o più file locali"
-
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-msgid "Filename"
-msgstr "Nome del file"
-
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
-msgstr "Dimensione"
-
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
-msgstr "Stato"
-
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
-msgstr "Avanzamento"
-
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
-msgstr ""
-
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
-
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
-msgstr "Torna alla gestione degli utenti"
-
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr " Modificare ${title}"
-
-#: kotti/templates/site-setup/users.pt:15
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "Cerca utente(i) / gruppo(i)"
-
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
-msgstr "Aggiungi un utente"
-
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
-msgstr "Aggiungi un gruppo"
-
-#: kotti/templates/site-setup/users.pt:52
-msgid "Find users or groups"
-msgstr "Cerca utenti o gruppi"
-
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
-msgstr ""
-
-#: kotti/templates/site-setup/users.pt:70
-msgid "Blank search text finds all."
-msgstr "Lascia il testo vuoto per trovare tutti gli utenti."
-
-#: kotti/templates/site-setup/users.pt:96
-msgid "Assign global roles"
-msgstr "Assegna ruoli globali"
-
-#: kotti/templates/site-setup/users.pt:180
-msgid "Add new user"
-msgstr "Aggiungi un nuovo utente"
-
-#: kotti/templates/site-setup/users.pt:190
-msgid "Add new group"
-msgstr "Aggiungi un nuovo gruppo"
-
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
-msgstr "Risultati di ricerca"
-
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
-msgstr "Cerca..."
-
-#: kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
-msgstr "Taggati con:"
-
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Benvenuto, ${user}! Sei loggato."
-
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr "Benvenuto, non sei loggato."
-
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "Le tue modifiche sono state salvate."
 
@@ -658,6 +253,11 @@ msgstr "Le tue modifiche sono state salvate."
 msgid "Item was added."
 msgstr "L'elemento è stato aggiunto."
 
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr " Modificare ${title}"
+
 #: kotti/views/form.py:264
 #, python-format
 msgid "Maximum file size: ${size}MB"
@@ -667,6 +267,13 @@ msgstr "Dimensione massima del file: ${size}MB"
 msgid "Save"
 msgstr "Salva"
 
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "Cancella"
+
 #: kotti/views/form.py:198
 #, python-format
 msgid "Add ${type} to ${title}."
@@ -677,6 +284,10 @@ msgstr "Aggiungere ${type} a ${title}."
 msgid "Add ${type}."
 msgstr "Aggiungere ${type}."
 
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gestione utenti"
+
 #: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "Hai resettato la tua password."
@@ -698,12 +309,8 @@ msgid "Email"
 msgstr "Email"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per "
-"settare la tua password e attivare il tuo account."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per settare la tua password e attivare il tuo account."
 
 #: kotti/views/login.py:123
 #, python-format
@@ -714,6 +321,11 @@ msgstr "Registrazione - ${title}"
 msgid "Login failed."
 msgstr "Errore nell'accesso."
 
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "Password"
+
 #: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
@@ -725,12 +337,8 @@ msgid "Welcome, ${user}!"
 msgstr "Benvenuto, ${user}!"
 
 #: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Dovresti ricevere una email con un link per resettare la tua password. "
-"Clikkandolo si attiverà il tuo account."
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
 
 #: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
@@ -752,17 +360,20 @@ msgstr "Invia"
 msgid "Your password reset token may have expired."
 msgstr "Il token per resettare la tua password è scaduto."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "Gestione utenti"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "Utente"
+
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "Gruppo"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' "
-"per mandare all'utente la sua password."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -786,6 +397,17 @@ msgstr "Un utente con questa email già esiste."
 msgid "No such group: ${group}"
 msgstr "Gruppo non esistente: ${group}"
 
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
+msgstr "Titolo"
+
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "Nome"
+
 #: kotti/views/users.py:219
 msgid "Active"
 msgstr "Attivo"
@@ -816,8 +438,8 @@ msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Non sono state fatte modifiche."
 
@@ -867,11 +489,6 @@ msgstr "${title} è stato tagliato."
 msgid "${title} was moved."
 msgstr "${title} è stato spostato."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} è stato cancellato."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -891,70 +508,412 @@ msgstr "${title} è ora visibile nella navigazione."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} non è più visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} è stato cancellato."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Non è stato cancellato niente."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Nome e titolo sono obbligatori."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "L'elemento è stato rinominato"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Muovere su"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Muovi giù"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Mostra"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Nascondi"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Devi selezionare degli elementi per fare quest'azione."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Cambia stato"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Descrizione"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Contenuto"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "La vista predefinita è stata modificata a predefinita."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vista predefinita"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "E' stata selezionata la vista predefinita."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "La vista predefinita non può essere selezionata."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Vietato"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Resetta la tua password per ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Ciao, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Segui il link per resettare la tua password a ${site_title}: ${url}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Aggiungere"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Carica contenuto"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "La tua registrazione per ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Stai entrando in ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Premi qui per impostare la tua password e accedere: ${url}"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Vista"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigazione"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Configurazione del sito"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Esci"
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Rendi ${state}"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Seleziona la vista predefinita"
+
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Accedi"
+
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Username o email"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Accedi"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Hai dimenticato la tua password?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Resetta password"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Inserisci il tuo username o email e premi ${reset_password} per ricevere una email con il link per resettare la tua password."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "Non sei ancora registrato?"
+
+#: kotti/templates/login.pt:82
+msgid "Register for an account on this site."
+msgstr "Registrati per avere un account su questo sito."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Taggati con:"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Cerca..."
+
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "Tipo"
+
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "Data di creazione"
+
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "Data di modifica"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Risultati di ricerca"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
+
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "Elimina ${title}"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Torna alla gestione degli utenti"
+
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "Cerca utente(i) / gruppo(i)"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Aggiungi un utente"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Aggiungi un gruppo"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Cerca utenti o gruppi"
+
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
+
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "Cerca utenti e gruppi"
+
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Lascia il testo vuoto per trovare tutti gli utenti."
+
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "Cerca"
+
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Assegna ruoli globali"
+
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "Applica le modifiche"
+
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Aggiungi un nuovo utente"
+
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Aggiungi un nuovo gruppo"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigazione del Sito"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Carica un contenuto da uno o più file locali"
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+msgid "Filename"
+msgstr "Nome del file"
+
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr "Dimensione"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr "Stato"
+
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr "Avanzamento"
+
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr ""
+
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
+
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "Stato"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Sei qua:"
+
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Non è presente nessun elemento di contenuto."
+
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Visibilità"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Visibile"
+
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Nascosto"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Rinomina ${title}"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Ogni contenuto ha un nome, che è usato per creare la url, e un titolo. Leggi il manuale utente per saperne di più sul formato del nome e del titolo. Si possono cambiare entrambi qui sotto."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "Nuovo nome"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "Nuovo titolo"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Sei sicuro di voler eliminare ${title}?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Condividi ${title}"
+
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Assegna ruoli locali"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Cambia lo stato del workflow"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Lo stato del workflow di un item determina chi lo può vedere, editare e/o modificare."
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Includere figli"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Se selezionato, verrà modificato lo stato dei figli dei documenti selezionati e i suoi sottodocumenti."
+
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Cambia stato a"
+
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Seleziona il nuovo stato per tutti gli elementi selezionati."
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Nessuna modifica"
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Benvenuto, ${user}! Sei loggato."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Benvenuto, non sei loggato."
+
 #~ msgid "Private"
 #~ msgstr "Privato"
 
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 6ef1c8f9d..2ae412eb3 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7.0\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2013-09-19 02:45+0900\n"
 "Last-Translator: OCHIAI, Gouji <gjo.ext@gmail.com>\n"
 "Language-Team: ja <kotti@googlegroups.com>\n"
@@ -19,6 +19,81 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "Generated-By: Babel 0.9.6\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "閲覧者"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "編集者"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "所有者"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "管理者"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "コピー"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "切り取り"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "貼り付け"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "名称変更"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "削除"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "ドキュメント"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "ファイル"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "画像"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "フォルダー表示"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "コンテンツ"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "編集"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "共有"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "アクション"
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr ""
@@ -33,29 +108,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,13 +134,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -77,9 +147,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -91,23 +161,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -124,489 +191,17 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
-msgstr "ドキュメント"
-
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
-msgstr "ファイル"
-
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
-msgstr "画像"
-
-#: kotti/resources.py:517
-msgid "Folder view"
-msgstr "フォルダー表示"
-
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
-msgstr "コンテンツ"
-
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "編集"
-
-#: kotti/resources.py:506
-msgid "Share"
-msgstr "共有"
-
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
-msgstr "アクション"
-
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "コピー"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "切り取り"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "貼り付け"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "名称変更"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "削除"
-
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "閲覧者"
-
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "編集者"
-
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "所有者"
-
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "管理者"
-
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
-msgstr "追加"
-
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
-msgstr "アップロード"
-
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
-msgstr "表示方法の設定"
-
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
-msgstr "表示"
-
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
-msgstr "ナビゲート"
-
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
-msgstr "設定"
-
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
-msgstr "サイト設定"
-
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
-msgstr "ログアウト"
-
-#: kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
-msgstr "${site_title} のパスワードをリセット"
-
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
-msgstr "こんにちは ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"${site_title} のパスワードをリセットするにはこのリンクをクリックしてくださ"
-"い: ${url}"
-
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
-msgstr "${site_title} へのアカウント登録"
-
-#: kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
-msgstr "あなたは ${site_title} に参加しようとしています。"
-
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"パスワードをセットしてログインするにはこのリンクをクリックしてください: "
-"${url}"
-
-#: kotti/templates/forbidden.pt:7
-msgid "Forbidden"
-msgstr "表示権限がありません"
-
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "ログイン"
-
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
-msgstr "ユーザー名またはメールアドレス"
-
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "パスワード"
-
-#: kotti/templates/login.pt:47
-msgid "Log in"
-msgstr "ログイン"
-
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
-msgstr "パスワードを忘れた?"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
-msgstr "パスワードをリセット"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-#, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} を"
-"クリックしてください。パスワードをリセットするためのリンクが書かれたメールが"
-"送信されます。"
-
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
-msgstr ""
-
-#: kotti/templates/login.pt:127
-#, fuzzy
-msgid "Register for an account on this site."
-msgstr ""
-"まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
-
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
-msgstr "${state} にする"
-
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
-msgstr "今の場所:"
-
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
-msgstr "ワークフローの状態を変更"
-
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフロー"
-"の状態を変更します。"
-
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
-msgstr "タイトル"
-
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
-msgstr "種類"
-
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
-msgstr "状態"
-
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
-msgstr "作成日"
-
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
-msgstr "変更日"
-
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
-msgstr "配下のアイテムを含める"
-
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"チェックすると、状態の変更が選択したドキュメントや、その配下のドキュメントの"
-"すべての配下のアイテムに適用されます。"
-
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
-msgstr "変更後の状態"
-
-#: kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
-msgstr "新しく設定する状態を選択して下さい。"
-
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
-msgstr "変更しない"
-
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr "変更を適用"
-
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr "ここにはコンテンツアイテムが含まれていません。"
-
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr "表示状態"
-
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr "表示中"
-
-#: kotti/templates/edit/contents.pt:134
-msgid "Hidden"
-msgstr "非表示"
-
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr "本当に以下のアイテムを削除しますか?"
-
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr "${title} を削除する"
-
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr "本当に ${title} を削除しますか?"
-
-#: kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
-msgstr "ナビゲート"
-
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"それぞれのコンテンツには名称とタイトルがあり、名称は URL を生成するのに使用し"
-"ます。下のフォームでは、その両方を変更することができます。"
-
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr "新しい名称"
-
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr "新しいタイトル"
-
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr "${title} の名称変更"
-
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
-msgstr "${title} を共有"
-
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
-msgstr "ユーザーとグループを検索"
-
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
-msgstr "検索"
-
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
-msgstr "ローカルロールに割り当て"
-
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "名称"
-
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "ユーザー"
-
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "グループ"
-
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-#, fuzzy
-msgid "Filename"
-msgstr "名称変更"
-
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
-msgstr ""
-
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "本当に ${type} ${title} を削除しますか?"
-
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
-msgstr "ユーザー管理に戻る"
-
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr "${title} を編集"
-
-#: kotti/templates/site-setup/users.pt:15
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "ユーザーとグループを検索"
-
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
-msgstr "ユーザーを追加"
-
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
-msgstr "グループを追加"
-
-#: kotti/templates/site-setup/users.pt:52
-#, fuzzy
-msgid "Find users or groups"
-msgstr "ユーザーとグループを検索"
-
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
-msgstr ""
-
-#: kotti/templates/site-setup/users.pt:70
-#, fuzzy
-msgid "Blank search text finds all."
-msgstr "ユーザーを検索して変更する (空文字列での検索で全部表示) 。"
-
-#: kotti/templates/site-setup/users.pt:96
-#, fuzzy
-msgid "Assign global roles"
-msgstr "ローカルロールに割り当て"
-
-#: kotti/templates/site-setup/users.pt:180
-#, fuzzy
-msgid "Add new user"
-msgstr "ユーザーを追加"
-
-#: kotti/templates/site-setup/users.pt:190
-#, fuzzy
-msgid "Add new group"
-msgstr "グループを追加"
-
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
-msgstr "検索結果"
-
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
-msgstr "検索..."
-
-#: kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
-msgstr "付与されたタグ:"
-
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr "ようこそ ${user}! ログインしています。"
-
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr "ようこそ。ログインしていません。"
-
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "変更内容を保存しました。"
 
@@ -614,6 +209,11 @@ msgstr "変更内容を保存しました。"
 msgid "Item was added."
 msgstr "${title} を追加しました。"
 
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "${title} を編集"
+
 #: kotti/views/form.py:264
 #, python-format
 msgid "Maximum file size: ${size}MB"
@@ -623,6 +223,13 @@ msgstr "最大ファイルサイズ: ${size}MB"
 msgid "Save"
 msgstr "保存"
 
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "キャンセル"
+
 #: kotti/views/form.py:198
 #, python-format
 msgid "Add ${type} to ${title}."
@@ -633,6 +240,10 @@ msgstr "${title} に ${type} を追加する。"
 msgid "Add ${type}."
 msgstr "${type} を追加する。"
 
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "ユーザー管理"
+
 #: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "パスワードのリセットに成功しました。"
@@ -654,12 +265,8 @@ msgid "Email"
 msgstr "メールアドレス"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワー"
-"ドを設定して下さい。"
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワードを設定して下さい。"
 
 #: kotti/views/login.py:123
 #, python-format
@@ -670,6 +277,11 @@ msgstr "登録 - ${title}"
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "パスワード"
+
 #: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
@@ -681,12 +293,8 @@ msgid "Welcome, ${user}!"
 msgstr "ようこそ ${user}!"
 
 #: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"まもなくパスワードをリセットするためのリンクが記載されたメールが送信されま"
-"す。"
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
 
 #: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
@@ -708,17 +316,20 @@ msgstr "送信"
 msgid "Your password reset token may have expired."
 msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "ユーザー管理"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "ユーザー"
+
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "グループ"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー"
-"自身にパスワードを設定させられます。"
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
 
 #: kotti/views/users.py:587
 #, python-format
@@ -742,6 +353,17 @@ msgstr "そのメールアドレスをもつユーザーがすでに存在しま
 msgid "No such group: ${group}"
 msgstr "グループが見つかりません: ${group}"
 
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
+msgstr "タイトル"
+
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "名称"
+
 #: kotti/views/users.py:219
 msgid "Active"
 msgstr "有効"
@@ -772,8 +394,8 @@ msgid "Add Group"
 msgstr "グループ追加"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "変更箇所がありませんでした。"
 
@@ -823,11 +445,6 @@ msgstr "${title} を切り取りました。"
 msgid "${title} was moved."
 msgstr "${title} を移動しました。"
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} を削除しました。"
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -847,70 +464,420 @@ msgstr "${title} がナビゲーションに表示されるようになりまし
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} がナビゲーションでは非表示になりました。"
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} を削除しました。"
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "削除対象がありません。"
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "名称とタイトルは必須です。"
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "名称変更しました"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "上に移動する"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "下に移動する"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "表示中にする"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "非表示にする"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "状態を変更"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "説明"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "タグ"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "本文"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "デフォルト表示は既定値にリセットされました。"
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "デフォルト表示"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "デフォルト表示が設定されました。"
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "デフォルト表示は設定できませんでした。"
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "表示権限がありません"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "${site_title} のパスワードをリセット"
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "こんにちは ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "${site_title} のパスワードをリセットするにはこのリンクをクリックしてください: ${url}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "追加"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "アップロード"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "${site_title} へのアカウント登録"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "あなたは ${site_title} に参加しようとしています。"
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "パスワードをセットしてログインするにはこのリンクをクリックしてください: ${url}"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "表示"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "ナビゲート"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "設定"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "サイト設定"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "ログアウト"
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "${state} にする"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "表示方法の設定"
+
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "ログイン"
+
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "ユーザー名またはメールアドレス"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "ログイン"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "パスワードを忘れた?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "パスワードをリセット"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+#, fuzzy
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} をクリックしてください。パスワードをリセットするためのリンクが書かれたメールが送信されます。"
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr ""
+
+#: kotti/templates/login.pt:82
+#, fuzzy
+msgid "Register for an account on this site."
+msgstr "まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "付与されたタグ:"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "検索..."
+
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "種類"
+
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "作成日"
+
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "変更日"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "検索結果"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
+
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "${title} を削除する"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "本当に ${type} ${title} を削除しますか?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "ユーザー管理に戻る"
+
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "ユーザーとグループを検索"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "ユーザーを追加"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "グループを追加"
+
+#: kotti/templates/site-setup/users.pt:34
+#, fuzzy
+msgid "Find users or groups"
+msgstr "ユーザーとグループを検索"
+
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
+
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "ユーザーとグループを検索"
+
+#: kotti/templates/site-setup/users.pt:49
+#, fuzzy
+msgid "Blank search text finds all."
+msgstr "ユーザーを検索して変更する (空文字列での検索で全部表示) 。"
+
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "検索"
+
+#: kotti/templates/site-setup/users.pt:63
+#, fuzzy
+msgid "Assign global roles"
+msgstr "ローカルロールに割り当て"
+
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "変更を適用"
+
+#: kotti/templates/site-setup/users.pt:115
+#, fuzzy
+msgid "Add new user"
+msgstr "ユーザーを追加"
+
+#: kotti/templates/site-setup/users.pt:121
+#, fuzzy
+msgid "Add new group"
+msgstr "グループを追加"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "ナビゲート"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+#, fuzzy
+msgid "Filename"
+msgstr "名称変更"
+
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr ""
+
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "本当に以下のアイテムを削除しますか?"
+
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "状態"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "今の場所:"
+
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "ここにはコンテンツアイテムが含まれていません。"
+
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "表示状態"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "表示中"
+
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "非表示"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "${title} の名称変更"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "それぞれのコンテンツには名称とタイトルがあり、名称は URL を生成するのに使用します。下のフォームでは、その両方を変更することができます。"
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "新しい名称"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "新しいタイトル"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "本当に ${title} を削除しますか?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "${title} を共有"
+
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "ローカルロールに割り当て"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "ワークフローの状態を変更"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフローの状態を変更します。"
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "配下のアイテムを含める"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "チェックすると、状態の変更が選択したドキュメントや、その配下のドキュメントのすべての配下のアイテムに適用されます。"
+
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "変更後の状態"
+
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "新しく設定する状態を選択して下さい。"
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "変更しない"
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "ようこそ ${user}! ログインしています。"
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "ようこそ。ログインしていません。"
+
 #~ msgid "Private"
 #~ msgstr "プライベート"
 
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index 2f0bdb434..065186b6b 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.10b2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2014-10-19 08:22+0900\n"
 "Last-Translator: mete0r <mete0r@sarangbang.or.kr>\n"
 "Language-Team: Korean\n"
@@ -18,6 +18,81 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "열람자"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "편집자"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "소유자"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "관리자"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "복사"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "잘라내기"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "붙여넣기"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "이름 바꾸기"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "삭제"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "문서"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "파일"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "화상"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "폴더로 보임"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "컨텐츠 항목"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "편집"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "공유"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "동작"
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr "Kotti에 오신 것을 환영합니다"
@@ -32,29 +107,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +133,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +146,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -92,25 +162,20 @@ msgstr ""
 "\n"
 "<h2>로그인</h2>\n"
 "<p>\n"
-"    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집"
-"할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습"
-"니다.\n"
+"    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습니다.\n"
 "</p>\n"
 "<p>\n"
-"    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 "
-"현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
+"    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>설정</h2>\n"
 "        <p>\n"
-"            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파"
-"일로 설정하는 법을 알아보세요.\n"
+"            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파일로 설정하는 법을 알아보세요.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html\">\n"
 "               설정 매뉴얼\n"
 "            </a>\n"
 "        </p>\n"
@@ -118,13 +183,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>애드온</h2>\n"
 "        <p>\n"
-"            몇가지 애드온으로 당신의 Kotti 사이트 기능을 확장할 수 있습니"
-"다.\n"
+"            몇가지 애드온으로 당신의 Kotti 사이트 기능을 확장할 수 있습니다.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti 애드온\n"
 "            </a>\n"
 "        </p>\n"
@@ -132,8 +195,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>기술문헌</h2>\n"
 "        <p>\n"
-"            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이"
-"죠?  좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
+"            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이죠?  좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -144,25 +206,21 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "이 사이트에 대하여"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조"
-"업체입니다."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조업체입니다."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
+#, fuzzy
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -179,20 +237,18 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -210,609 +266,180 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>사진 크레딧:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  저작권 정보</a>.\n"
 "  Originally published in the\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
-msgstr "문서"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "수정사항이 저장되었습니다."
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
-msgstr "파일"
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "항목이 추가되었습니다."
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
-msgstr "화상"
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "\"${title}\" 편집"
 
-#: kotti/resources.py:517
-msgid "Folder view"
-msgstr "폴더로 보임"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "최대 파일 크기: ${size}MB"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
-msgstr "컨텐츠 항목"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "저장"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "편집"
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "취소"
 
-#: kotti/resources.py:506
-msgid "Share"
-msgstr "공유"
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "${type}을(를) \"${title}\"에 추가합니다."
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
-msgstr "동작"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "${type}을(를) 추가합니다."
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "복사"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "사용자 관리"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "잘라내기"
+#: kotti/views/login.py:237
+msgid "You have reset your password."
+msgstr "암호를 재설정했습니다."
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "붙여넣기"
+#: kotti/views/login.py:199
+msgid "You have been logged out."
+msgstr "로그아웃되었습니다."
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "이름 바꾸기"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "전체 이름"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "삭제"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "사용자 이름"
 
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "열람자"
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+msgid "Email"
+msgstr "전자메일"
 
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "편집자"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
 
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "소유자"
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "등록 - ${title}"
 
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "관리자"
+#: kotti/views/login.py:163
+msgid "Login failed."
+msgstr "로그인이 실패했습니다."
 
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
-msgstr "추가"
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "암호"
 
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
-msgstr "컨텐트 올리기"
+#: kotti/views/login.py:285
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "암호를 재설정하세요 - ${title}."
 
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
-msgstr "보이는 방식 설정"
+#: kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "${user}님, 환영합니다!"
 
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
-msgstr "보기"
+#: kotti/views/login.py:172
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
 
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
-msgstr "둘러보기"
+#: kotti/views/login.py:177
+msgid "That username or email is not known by this system."
+msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
-msgstr "기본 설정"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "등록하기"
 
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
-msgstr "사이트 설정"
+#: kotti/views/login.py:89 kotti/views/login.py:256
+msgid "There was an error."
+msgstr "오류가 있습니다."
 
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
-msgstr "로그아웃"
+#: kotti/views/login.py:249
+msgid "Submit"
+msgstr "제출"
 
-#: kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
-msgstr "${site_title}의 암호를 재설정하십시오."
+#: kotti/views/login.py:278
+msgid "Your password reset token may have expired."
+msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
-msgstr "${user_title}님, 안녕하세요!"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "사용자"
 
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "이 링크를 눌러 ${site_title}에서의 암호를 설정하십시오: ${url}"
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "그룹"
 
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
-msgstr "${site_title} 가입"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
 
-#: kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
-msgstr "${site_title}에 가입 중입니다."
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "나의 선호사항"
 
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
-msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "잘못된 값입니다."
 
-#: kotti/templates/forbidden.pt:7
-msgid "Forbidden"
-msgstr "금지됨"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "로그인"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
-msgstr "사용자 이름 혹은 전자메일"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "그런 그룹이 없습니다: ${group}"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "암호"
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
+msgstr "제목"
 
-#: kotti/templates/login.pt:47
-msgid "Log in"
-msgstr "로그인"
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "이름"
 
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
-msgstr "암호를 잊으셨습니까?"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
-msgstr "암호 재설정"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"사용자 이름이나 전자메일을 입력한 뒤 아래의 ${reset_password}를 누르면 암호"
-"를 재설정할 수 있는 링크를 전자메일로 받으실 수 있습니다."
-
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
-msgstr "아직 등록하지 않으셨습니까?"
-
-#: kotti/templates/login.pt:127
-msgid "Register for an account on this site."
-msgstr "이 사이트에 계정을 등록하십시오."
-
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
-msgstr "\"${state}\"로(으로) 바꿈"
-
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
-msgstr "현재 위치:"
-
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
-msgstr "작업 상태 바꾸기"
-
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니"
-"다."
-
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
-msgstr "제목"
-
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
-msgstr "유형"
-
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
-msgstr "작업 상태"
-
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
-msgstr "만든 날"
-
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
-msgstr "바꾼 날"
-
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
-msgstr "하위 항목 포함 여부"
-
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr "체크하면, 고른 문서와 그 하위 문서 모두를 바꿉니다."
-
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
-msgstr "바꿀 상태"
-
-#: kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
-msgstr "고른 항목 모두가 갖게 될 상태를 선택하십시오."
-
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
-msgstr "바꾸지 않음"
-
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr "바꾸기 적용"
-
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "취소"
-
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr "여기엔 하위 항목이 없습니다."
-
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr "가시성"
-
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr "보임"
-
-#: kotti/templates/edit/contents.pt:134
-msgid "Hidden"
-msgstr "숨김"
-
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr "다음 항목을 정말 지우겠습니까?"
-
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr "\"${title}\" 삭제"
-
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr "\"${title}\"을(를) 정말 지우겠습니까?"
-
-#: kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
-msgstr "사이트 둘러보기"
-
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"각 컨텐트 항목은 이름을 가지며, 이는 URL과 제목을 만드는데 사용됩니다. 이름"
-"과 제목의 올바른 형식에 대해 알려면 사용자 매뉴얼을 읽으십시오. 둘 다 아래에"
-"서 바꿀 수 있습니다."
-
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr "새 이름"
-
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr "새 제목"
-
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr "\"${title}\" 이름 바꾸기"
-
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
-msgstr "\"${title}\" 공유하기"
-
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
-msgstr "사용자와 그룹 검색"
-
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
-msgstr "검색"
-
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
-msgstr "컨텐츠별 역할 부여"
-
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "이름"
-
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "사용자"
-
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "그룹"
-
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
-msgstr "내 컴퓨터에서 컨텐트 올리기"
-
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-msgid "Filename"
-msgstr "파일 이름"
-
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
-msgstr "크기"
-
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
-msgstr "상태"
-
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
-msgstr "진행률"
-
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
-msgstr ""
-
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
-
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
-msgstr "사용자 관리로 되돌아가기"
-
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr "\"${title}\" 편집"
-
-#: kotti/templates/site-setup/users.pt:15
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "사용자/그룹 검색"
-
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
-msgstr "사용자 추가"
-
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
-msgstr "그룹 추가"
-
-#: kotti/templates/site-setup/users.pt:52
-msgid "Find users or groups"
-msgstr "사용자나 그룹 찾기"
-
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
-msgstr "사용자나 그룹 이름"
-
-#: kotti/templates/site-setup/users.pt:70
-msgid "Blank search text finds all."
-msgstr "비워두면 모두 찾습니다."
-
-#: kotti/templates/site-setup/users.pt:96
-msgid "Assign global roles"
-msgstr "사이트 전체 역할 부여"
-
-#: kotti/templates/site-setup/users.pt:180
-msgid "Add new user"
-msgstr "새 사용자 추가"
-
-#: kotti/templates/site-setup/users.pt:190
-msgid "Add new group"
-msgstr "새 그룹 추가"
-
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
-msgstr "검색결과"
-
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
-msgstr "검색..."
-
-#: kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
-msgstr "태그:"
-
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr "${user}님, 환영합니다! 로그인되었습니다."
-
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr "환영합니다, 로그인되지 않았습니다."
-
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
-msgid "Your changes have been saved."
-msgstr "수정사항이 저장되었습니다."
-
-#: kotti/views/form.py:174
-msgid "Item was added."
-msgstr "항목이 추가되었습니다."
-
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "최대 파일 크기: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "저장"
-
-#: kotti/views/form.py:198
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "${type}을(를) \"${title}\"에 추가합니다."
-
-#: kotti/views/form.py:202
-#, python-format
-msgid "Add ${type}."
-msgstr "${type}을(를) 추가합니다."
-
-#: kotti/views/login.py:237
-msgid "You have reset your password."
-msgstr "암호를 재설정했습니다."
-
-#: kotti/views/login.py:199
-msgid "You have been logged out."
-msgstr "로그아웃되었습니다."
-
-#: kotti/views/login.py:65 kotti/views/users.py:270
-msgid "Full name"
-msgstr "전체 이름"
-
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "사용자 이름"
-
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
-msgid "Email"
-msgstr "전자메일"
-
-#: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 "
-"받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
-
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr "등록 - ${title}"
-
-#: kotti/views/login.py:163
-msgid "Login failed."
-msgstr "로그인이 실패했습니다."
-
-#: kotti/views/login.py:285
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "암호를 재설정하세요 - ${title}."
-
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "${user}님, 환영합니다!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
-
-#: kotti/views/login.py:177
-msgid "That username or email is not known by this system."
-msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
-
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "등록하기"
-
-#: kotti/views/login.py:89 kotti/views/login.py:256
-msgid "There was an error."
-msgstr "오류가 있습니다."
-
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "제출"
-
-#: kotti/views/login.py:278
-msgid "Your password reset token may have expired."
-msgstr "암호 재설정 토큰이 만료된 것 같습니다."
-
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "사용자 관리"
-
-#: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정"
-"합니다."
-
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "나의 선호사항"
-
-#: kotti/views/users.py:145
-msgid "Invalid value"
-msgstr "잘못된 값입니다."
-
-#: kotti/views/users.py:151
-msgid "A user with that name already exists."
-msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
-
-#: kotti/views/users.py:158
-msgid "A user with that email already exists."
-msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
-
-#: kotti/views/users.py:181
-#, python-format
-msgid "No such group: ${group}"
-msgstr "그런 그룹이 없습니다: ${group}"
-
-#: kotti/views/users.py:219
-msgid "Active"
-msgstr "활성"
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "활성"
 
 #: kotti/views/users.py:220
 msgid "Untick this to deactivate the account."
@@ -840,8 +467,8 @@ msgid "Add Group"
 msgstr "그룹 추가"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "아무 것도 바뀌지 않았습니다."
 
@@ -891,11 +518,6 @@ msgstr "\"${title}\"이(가) 잘라내어졌습니다."
 msgid "${title} was moved."
 msgstr "\"${title}\"이(가) 옮겨졌습니다."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "\"${title}\"이(가) 지워졌습니다."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -915,70 +537,412 @@ msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
 msgid "${title} is no longer visible in the navigation."
 msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "\"${title}\"이(가) 지워졌습니다."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "아무것도 지워지지 않았습니다."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "이름과 제목이 필요합니다."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "항목이 재명명되었습니다."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "위로 옮김"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "아래로 옮김"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "보이기"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "숨기기"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "적용할 항목을 선택해야합니다."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "작업 상태 바꾸기"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "설명"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "태그"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "본문"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "기본형 보기로 재설정되었습니다."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "기본형으로 보임"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "보이는 방식이 설정되었습니다."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "보이는 방식을 설정할 수 없었습니다."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "금지됨"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "${site_title}의 암호를 재설정하십시오."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "${user_title}님, 안녕하세요!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "이 링크를 눌러 ${site_title}에서의 암호를 설정하십시오: ${url}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "추가"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "컨텐트 올리기"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "${site_title} 가입"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "${site_title}에 가입 중입니다."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "보기"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "둘러보기"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "사이트 설정"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "로그아웃"
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "\"${state}\"로(으로) 바꿈"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "보이는 방식 설정"
+
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "로그인"
+
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "사용자 이름 혹은 전자메일"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "로그인"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "암호를 잊으셨습니까?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "암호 재설정"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "사용자 이름이나 전자메일을 입력한 뒤 아래의 ${reset_password}를 누르면 암호를 재설정할 수 있는 링크를 전자메일로 받으실 수 있습니다."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "아직 등록하지 않으셨습니까?"
+
+#: kotti/templates/login.pt:82
+msgid "Register for an account on this site."
+msgstr "이 사이트에 계정을 등록하십시오."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "태그:"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "검색..."
+
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "유형"
+
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "만든 날"
+
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "바꾼 날"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "검색결과"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
+
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "\"${title}\" 삭제"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "사용자 관리로 되돌아가기"
+
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "사용자/그룹 검색"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "사용자 추가"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "그룹 추가"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "사용자나 그룹 찾기"
+
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "사용자나 그룹 이름"
+
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "사용자와 그룹 검색"
+
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "비워두면 모두 찾습니다."
+
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "검색"
+
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "사이트 전체 역할 부여"
+
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr ""
+
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "바꾸기 적용"
+
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "새 사용자 추가"
+
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "새 그룹 추가"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "사이트 둘러보기"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "내 컴퓨터에서 컨텐트 올리기"
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+msgid "Filename"
+msgstr "파일 이름"
+
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr "크기"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr "상태"
+
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr "진행률"
+
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr ""
+
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "다음 항목을 정말 지우겠습니까?"
+
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "작업 상태"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "현재 위치:"
+
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "여기엔 하위 항목이 없습니다."
+
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "가시성"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "보임"
+
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "숨김"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "\"${title}\" 이름 바꾸기"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "각 컨텐트 항목은 이름을 가지며, 이는 URL과 제목을 만드는데 사용됩니다. 이름과 제목의 올바른 형식에 대해 알려면 사용자 매뉴얼을 읽으십시오. 둘 다 아래에서 바꿀 수 있습니다."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "새 이름"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "새 제목"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "\"${title}\"을(를) 정말 지우겠습니까?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "\"${title}\" 공유하기"
+
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "컨텐츠별 역할 부여"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "작업 상태 바꾸기"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니다."
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "하위 항목 포함 여부"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "체크하면, 고른 문서와 그 하위 문서 모두를 바꿉니다."
+
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "바꿀 상태"
+
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "고른 항목 모두가 갖게 될 상태를 선택하십시오."
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "바꾸지 않음"
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "${user}님, 환영합니다! 로그인되었습니다."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "환영합니다, 로그인되지 않았습니다."
+
 #~ msgid "Private"
 #~ msgstr "내부 전용"
 
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index 62d3f1596..3cf5caa8f 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2014-02-13 21:51+0100\n"
 "Last-Translator: Wim Boucquaert <wim.boucquaert@gmail.com>\n"
 "Language-Team: nl <kotti@googlegroups.com>\n"
@@ -18,6 +18,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "Generated-By: Babel 0.9.6\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "Lezer"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "Eigenaar"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "Beheerder"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopiëren"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Knippen"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Plakken"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "Hernoemen"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Document"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Bestand"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Afbeelding"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Map weergave"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Inhoud"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Bewerken"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Delen"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Acties"
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr ""
@@ -32,29 +107,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +133,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +146,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -90,23 +160,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -123,491 +190,17 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
-msgstr "Document"
-
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
-msgstr "Bestand"
-
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
-msgstr "Afbeelding"
-
-#: kotti/resources.py:517
-msgid "Folder view"
-msgstr "Map weergave"
-
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
-msgstr "Inhoud"
-
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Bewerken"
-
-#: kotti/resources.py:506
-msgid "Share"
-msgstr "Delen"
-
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
-msgstr "Acties"
-
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Knippen"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Plakken"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Hernoemen"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "Lezer"
-
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "Editor"
-
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "Eigenaar"
-
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "Beheerder"
-
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
-msgstr "Toevoegen"
-
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
-msgstr "Inhoud Opladen"
-
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
-msgstr "Zet standaard weergave"
-
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
-msgstr "Weergeven"
-
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
-msgstr "Navigeren"
-
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
-msgstr "Site Instellingen"
-
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
-msgstr "Afmelden"
-
-#: kotti/templates/email-reset-password.pt:3
-msgid "Reset your password for ${site_title}."
-msgstr "Herstel je wachtwoord voor ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
-msgstr "Welkom, ${user}!"
-
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: "
-"${url}"
-
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
-msgstr "Je registratie voor ${site_title}"
-
-#: kotti/templates/email-set-password.pt:9
-msgid "You are joining ${site_title}."
-msgstr "Je treedt toe tot ${site_title}."
-
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
-
-#: kotti/templates/forbidden.pt:7
-msgid "Forbidden"
-msgstr "Verboden"
-
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "Aanmelden"
-
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
-msgstr "Gebuikersnaam of e-mail"
-
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: kotti/templates/login.pt:47
-msgid "Log in"
-msgstr "Aanmelden"
-
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
-msgstr "Wachtwoord vergeten?"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
-msgstr "Wachtwoord herstellen"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-#, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Vul je gebruikersnaam of e-mailadres in en klik op ${reset_password} "
-"hieronder om een e-mail te ontvangen om je wachtwoord te herstellen."
-
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
-msgstr ""
-
-#: kotti/templates/login.pt:127
-#, fuzzy
-msgid "Register for an account on this site."
-msgstr "Nog niet geregistreerd? ${register} voor een account op deze site."
-
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
-msgstr "Maak ${state}"
-
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
-msgstr "U bent hier:"
-
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
-msgstr "Wijzig de workflow status"
-
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of "
-"beheren."
-
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
-msgstr "Titel"
-
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
-msgstr "Type"
-
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
-msgstr "Status"
-
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
-msgstr "Aanmaak datum"
-
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
-msgstr "Wijzigingsdatum"
-
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
-msgstr "Inclusief onderliggende"
-
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Indien aangevinkt zal een poging ondernomen worden om de status van alle "
-"onderliggende items te wijzigen van de geselecteerd documenten en hun "
-"onderliggende documenten."
-
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
-msgstr "Wij status naar"
-
-#: kotti/templates/edit/change-state.pt:103
-msgid "Select the new state where all chosen items should be set."
-msgstr ""
-"Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te "
-"worden."
-
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
-msgstr "Geen wijzigingen"
-
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr "Wijzigingen toepassen"
-
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr "Bevat geen content items."
-
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr "Zichtbaarheid"
-
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr "Zichtbaar"
-
-#: kotti/templates/edit/contents.pt:134
-msgid "Hidden"
-msgstr "Verborgen"
-
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
-
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr "Verwijder ${title}"
-
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Ben je zeker dat je ${title} wil verwijderen?"
-
-#: kotti/templates/edit/nav-tree-view.pt:7
-msgid "Navigate Site"
-msgstr "Site Navigeren"
-
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te "
-"maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel "
-"en naam. Je kan beiden hieronder aanpassen."
-
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr "Nieuwe naam"
-
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr "Nieuwe titel"
-
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr "Hernoemen ${title}"
-
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
-msgstr "Delen ${title}"
-
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
-msgstr "Zoeken naar gebruikers en groepen"
-
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
-msgstr "Zoeken"
-
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
-msgstr "Locale rollen toewijzen"
-
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "Naam"
-
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "gebruiker"
-
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "Groep"
-
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
-#, fuzzy
-msgid "Filename"
-msgstr "Hernoemen"
-
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
-msgstr ""
-
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
-msgstr ""
-
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
-
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
-msgstr "Terug naar gebruiksersbeheer"
-
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr "Bewerken ${title}"
-
-#: kotti/templates/site-setup/users.pt:15
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "Zoeken naar gebruikers en groepen"
-
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
-msgstr "Gebruiker toevoegen"
-
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
-msgstr "Groep toevoegen"
-
-#: kotti/templates/site-setup/users.pt:52
-#, fuzzy
-msgid "Find users or groups"
-msgstr "Zoeken naar gebruikers en groepen"
-
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
-msgstr ""
-
-#: kotti/templates/site-setup/users.pt:70
-#, fuzzy
-msgid "Blank search text finds all."
-msgstr ""
-"Zoek en wijzig gebruikers (laat tekstveld leeg om alle gebruikers te vinden."
-
-#: kotti/templates/site-setup/users.pt:96
-#, fuzzy
-msgid "Assign global roles"
-msgstr "Locale rollen toewijzen"
-
-#: kotti/templates/site-setup/users.pt:180
-#, fuzzy
-msgid "Add new user"
-msgstr "Gebruiker toevoegen"
-
-#: kotti/templates/site-setup/users.pt:190
-#, fuzzy
-msgid "Add new group"
-msgstr "Groep toevoegen"
-
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
-msgstr "Zoek Resultaten"
-
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
-msgstr "Zoeken..."
-
-#: kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
-msgstr "Getagd met:"
-
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Welkom, ${user}! U bent nu aangemeld."
-
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr "Wilkom, je bent niet aangemeld."
-
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "Je wijzigingen werden opgeslagen."
 
@@ -615,6 +208,11 @@ msgstr "Je wijzigingen werden opgeslagen."
 msgid "Item was added."
 msgstr "Item werd toegevoegd."
 
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "Bewerken ${title}"
+
 #: kotti/views/form.py:264
 #, python-format
 msgid "Maximum file size: ${size}MB"
@@ -624,6 +222,13 @@ msgstr "Maximale bestandsgrootte: ${size}MB"
 msgid "Save"
 msgstr "Opslaan"
 
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "Annuleren"
+
 #: kotti/views/form.py:198
 #, python-format
 msgid "Add ${type} to ${title}."
@@ -634,6 +239,10 @@ msgstr "Voeg ${type} aan ${title} toe."
 msgid "Add ${type}."
 msgstr "Voeg ${type} toe."
 
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gebruikersbeheer"
+
 #: kotti/views/login.py:237
 msgid "You have reset your password."
 msgstr "Je wachtwoord werd hersteld."
@@ -655,12 +264,8 @@ msgid "Email"
 msgstr "E-mailadres"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link "
-"om je wachtwoord in te stellen. Deze handeling zal je account activeren."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om je wachtwoord in te stellen. Deze handeling zal je account activeren."
 
 #: kotti/views/login.py:123
 #, python-format
@@ -671,6 +276,11 @@ msgstr "Refistreer - ${title}"
 msgid "Login failed."
 msgstr "Aanmelden mislukt."
 
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "Wachtwoord"
+
 #: kotti/views/login.py:285
 #, python-format
 msgid "Reset your password - ${title}."
@@ -682,12 +292,8 @@ msgid "Welcome, ${user}!"
 msgstr "Welkom, ${user}!"
 
 #: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via "
-"deze link activeer je je account."
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
 
 #: kotti/views/login.py:177
 msgid "That username or email is not known by this system."
@@ -709,17 +315,20 @@ msgstr "Verzenden"
 msgid "Your password reset token may have expired."
 msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "Gebruikersbeheer"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "gebruiker"
+
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "Groep"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' "
-"hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -743,6 +352,17 @@ msgstr "Een gebruiker met deze naam bestaat reeds."
 msgid "No such group: ${group}"
 msgstr "Onbekende groep: ${group}"
 
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
+msgstr "Titel"
+
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "Naam"
+
 #: kotti/views/users.py:219
 msgid "Active"
 msgstr "Actief"
@@ -773,8 +393,8 @@ msgid "Add Group"
 msgstr "Groep toevoegen"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Geen wijzigingen aangebracht."
 
@@ -824,11 +444,6 @@ msgstr "${title} werd geknipt."
 msgid "${title} was moved."
 msgstr "${title} werd verplaatst."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} werd verwijderd."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -848,70 +463,420 @@ msgstr "${title} is nu zichtbaar in de navigatie."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} is niet langer zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} werd verwijderd."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Er werd niks verwijderd."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Naam en titel zijn vereist."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "Item werd hernoemd."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Naar boven"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Weergeven"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Verbergen"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Je dient items te selecteren om acties uit te voeren."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Wijzig Status."
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Beschrijving"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Inhoud"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "Standaard weergave werd hersteld naar standaard."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Standaard weergave"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Standaard weergave is ingesteld."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "Standaar weergave kon niet ingesteld worden."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Verboden"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Herstel je wachtwoord voor ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Welkom, ${user}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: ${url}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Toevoegen"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Inhoud Opladen"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Je registratie voor ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Je treedt toe tot ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Weergeven"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigeren"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Site Instellingen"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Afmelden"
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Maak ${state}"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Zet standaard weergave"
+
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Aanmelden"
+
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Gebuikersnaam of e-mail"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Aanmelden"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Wachtwoord vergeten?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Wachtwoord herstellen"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+#, fuzzy
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Vul je gebruikersnaam of e-mailadres in en klik op ${reset_password} hieronder om een e-mail te ontvangen om je wachtwoord te herstellen."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr ""
+
+#: kotti/templates/login.pt:82
+#, fuzzy
+msgid "Register for an account on this site."
+msgstr "Nog niet geregistreerd? ${register} voor een account op deze site."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Getagd met:"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Zoeken..."
+
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "Type"
+
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "Aanmaak datum"
+
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "Wijzigingsdatum"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Zoek Resultaten"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
+
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "Verwijder ${title}"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Terug naar gebruiksersbeheer"
+
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "Zoeken naar gebruikers en groepen"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Gebruiker toevoegen"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Groep toevoegen"
+
+#: kotti/templates/site-setup/users.pt:34
+#, fuzzy
+msgid "Find users or groups"
+msgstr "Zoeken naar gebruikers en groepen"
+
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
+
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "Zoeken naar gebruikers en groepen"
+
+#: kotti/templates/site-setup/users.pt:49
+#, fuzzy
+msgid "Blank search text finds all."
+msgstr "Zoek en wijzig gebruikers (laat tekstveld leeg om alle gebruikers te vinden."
+
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "Zoeken"
+
+#: kotti/templates/site-setup/users.pt:63
+#, fuzzy
+msgid "Assign global roles"
+msgstr "Locale rollen toewijzen"
+
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "Wijzigingen toepassen"
+
+#: kotti/templates/site-setup/users.pt:115
+#, fuzzy
+msgid "Add new user"
+msgstr "Gebruiker toevoegen"
+
+#: kotti/templates/site-setup/users.pt:121
+#, fuzzy
+msgid "Add new group"
+msgstr "Groep toevoegen"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Site Navigeren"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+#, fuzzy
+msgid "Filename"
+msgstr "Hernoemen"
+
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr ""
+
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr ""
+
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
+
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "Status"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "U bent hier:"
+
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Bevat geen content items."
+
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Zichtbaarheid"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Zichtbaar"
+
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Verborgen"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Hernoemen ${title}"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel en naam. Je kan beiden hieronder aanpassen."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "Nieuwe naam"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "Nieuwe titel"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Ben je zeker dat je ${title} wil verwijderen?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Delen ${title}"
+
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Locale rollen toewijzen"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Wijzig de workflow status"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of beheren."
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Inclusief onderliggende"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Indien aangevinkt zal een poging ondernomen worden om de status van alle onderliggende items te wijzigen van de geselecteerd documenten en hun onderliggende documenten."
+
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Wij status naar"
+
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te worden."
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Geen wijzigingen"
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Welkom, ${user}! U bent nu aangemeld."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Wilkom, je bent niet aangemeld."
+
 #~ msgid "Private"
 #~ msgstr "Privaat"
 
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index 7e67456a6..756b68c07 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 1.1.5-dev\n"
-"POT-Creation-Date: 2015-09-13 21:09+0200\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2015-09-09 12:49+0200\n"
 "Last-Translator: Piotr Dobrogost <p@2015.dobrogost.net>\n"
 "Language-Team: Polish\n"
@@ -14,8 +14,82 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Lingua 3.8\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "Czytelnik"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "Edytor"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "Właściciel"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "Administrator"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Wytnij"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Wklej"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "Zmień nazwę"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "Usuń"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Plik"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Obraz"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Widok katalogów"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Zawartość"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Edytuj"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Udostępnij"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Akcje"
 
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -24,22 +98,20 @@ msgstr "Witaj w Kotti"
 #: kotti/populate.py:65
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
-    
+
 #: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -51,8 +123,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -60,14 +131,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -91,27 +160,23 @@ msgstr ""
 "\n"
 "<h2>Zaloguj się</h2>\n"
 "<p>\n"
-"    Możesz <a class=\"btn btn-success\" href=\"login\">zalogować się</a> do "
-"twojego serwisu\n"
+"    Możesz <a class=\"btn btn-success\" href=\"login\">zalogować się</a> do twojego serwisu\n"
 "    i zmieniać jego zawartość.  Jeżeli jeszcze nie ustaliłeś hasła dla\n"
 "    konta administratora, domyślnie jest to <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Po zalogowaniu zobaczysz szare menu edycyjne poniżej\n"
-"    menu nawigacyjnego. Umożliwia ono przełączanie się między edycją a "
-"wyglądem aktualnej strony widzianej z perspektywy użytkowników.\n"
+"    menu nawigacyjnego. Umożliwia ono przełączanie się między edycją a wyglądem aktualnej strony widzianej z perspektywy użytkowników.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Konfiguracja</h2>\n"
 "        <p>\n"
-"            Dowiedz się jak skonfigurować tytył i inne ustawienia "
-"używając             prostego pliku tekstowego w systemie plików.\n"
+"            Dowiedz się jak skonfigurować tytył i inne ustawienia używając             prostego pliku tekstowego w systemie plików.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Podręcznik konfiguracji\n"
 "            </a>\n"
 "        </p>\n"
@@ -119,13 +184,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Wtyczki</h2>\n"
 "        <p>\n"
-"            Wtyczki pozwalają na rozszerzenie funkcjonalności twojego "
-"serwisu opartego na Kotti.\n"
+"            Wtyczki pozwalają na rozszerzenie funkcjonalności twojego serwisu opartego na Kotti.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Wtyczki do Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -133,9 +196,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Dokumentacja</h2>\n"
 "        <p>\n"
-"            Zastanawiasz się co jeszcze możesz zrobić korzystając z "
-"Kotti?              Jaką ma licencję? Przeczytaj podręcznik aby dowiedzieć "
-"się więcej.\n"
+"            Zastanawiasz się co jeszcze możesz zrobić korzystając z Kotti?              Jaką ma licencję? Przeczytaj podręcznik aby dowiedzieć się więcej.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -151,20 +212,15 @@ msgid "About"
 msgstr "Informacje"
 
 #: kotti/populate.py:124
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim "
-"asortymencie produktów dla lotnictwa i przemysłu."
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim asortymencie produktów dla lotnictwa i przemysłu."
 
 #: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -182,8 +238,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -193,8 +248,7 @@ msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"pięć barwnych samolotów Extra EA300 lecących w szyku\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -212,772 +266,677 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Zdjęcie:</em> \"Northern Lights Formation\" autorstwa FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Prawa autorskie</a>.\n"
 "  Oryginalnie opublikowane w artykule\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:504 kotti/views/edit/actions.py:456
-msgid "Copy"
-msgstr "Kopiuj"
-
-#: kotti/resources.py:505 kotti/views/edit/actions.py:457
-msgid "Cut"
-msgstr "Wytnij"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Twoje zmiany zostały zapisane."
 
-#: kotti/resources.py:506 kotti/views/edit/actions.py:453
-msgid "Paste"
-msgstr "Wklej"
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "Element został dodany."
 
-#: kotti/resources.py:507 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
-msgid "Rename"
-msgstr "Zmień nazwę"
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "Edycja ${title}"
 
-#: kotti/resources.py:508 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
-msgid "Delete"
-msgstr "Usuń"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maksymalny rozmiar pliku: ${size}MB"
 
-#: kotti/resources.py:635 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Dokument"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Zapisz"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "Plik"
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "Anuluj"
 
-#: kotti/resources.py:773 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "Obraz"
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Dodaj ${type} do ${title}."
 
-#: kotti/resources.py:525
-msgid "Folder view"
-msgstr "Widok katalogów"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "Dodaj ${type}."
 
-#: kotti/resources.py:519 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Zawartość"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Zarządzanie użytkownikami"
 
-#: kotti/resources.py:520 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Edytuj"
+#: kotti/views/login.py:237
+msgid "You have reset your password."
+msgstr "Zresetowałeś swoje hasło."
 
-#: kotti/resources.py:521
-msgid "Share"
-msgstr "Udostępnij"
+#: kotti/views/login.py:199
+msgid "You have been logged out."
+msgstr "Zostałeś wylogowany."
 
-#: kotti/resources.py:522 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Akcje"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Imię i nazwisko"
 
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "Czytelnik"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Nazwa użytkownika"
 
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "Edytor"
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+msgid "Email"
+msgstr ""
 
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "Właściciel"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
 
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "Administrator"
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "Zarejestruj - ${title}"
 
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Dodaj"
+#: kotti/views/login.py:163
+msgid "Login failed."
+msgstr "Nie udało się zalogować."
 
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Dołącz treści"
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "Hasło"
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Ustaw domyślny widok"
+#: kotti/views/login.py:285
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Resetowanie hasła - ${title}."
 
-#: kotti/templates/editor-bar.pt:21
-msgid "View"
-msgstr "Widok"
+#: kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Witaj, ${user}!"
 
-#: kotti/templates/editor-bar.pt:44
-msgid "Navigate"
-msgstr "Nawigacja"
+#: kotti/views/login.py:172
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
 
-#: kotti/templates/editor-bar.pt:55
-msgid "Preferences"
-msgstr "Ustawienia"
+#: kotti/views/login.py:177
+msgid "That username or email is not known by this system."
+msgstr "Nieznana nazwa użytkownika lub email."
 
-#: kotti/templates/editor-bar.pt:60
-msgid "Site Setup"
-msgstr "Ustawienia strony"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Zarejestruj"
 
-#: kotti/templates/editor-bar.pt:71
-msgid "Logout"
-msgstr "Wyloguj się"
+#: kotti/views/login.py:89 kotti/views/login.py:256
+msgid "There was an error."
+msgstr "Wystąpił błąd."
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Zresetuj swoje hasło do ${site_title}."
+#: kotti/views/login.py:249
+msgid "Submit"
+msgstr "Zatwierdź"
 
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Witaj, ${user_title}!"
+#: kotti/views/login.py:278
+msgid "Your password reset token may have expired."
+msgstr "Twój token do resetu hasła mógł stracić ważność."
 
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Kliknij na link, aby zresetować hasło do ${site_title}: ${url}"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "Użytkownik"
 
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Rejestracja na ${site_title}"
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "Grupa"
 
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Rejestrujesz się na ${site_title}."
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
 
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Moje ustawienia - ${title}"
 
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Brak dostępu"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Niepoprawna wartość"
 
-#: kotti/templates/login.pt:15
-msgid "Login"
-msgstr "Logowanie"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Użytkownik z takim imieniem już istnieje."
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
-msgid "Username or email"
-msgstr "Nazwa użytkownika lub email"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Użytkownik z takim adresem email już istnieje."
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "Hasło"
-
-#: kotti/templates/login.pt:33
-msgid "Log in"
-msgstr "Zaloguj się"
-
-#: kotti/templates/login.pt:43
-msgid "Forgot your password?"
-msgstr "Zapomniałeś hasła?"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
-msgid "Reset password"
-msgstr "Reset hasła"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} "
-"poniżej, aby otrzymać email z linkiem do zresetowania hasła."
-
-#: kotti/templates/login.pt:76
-msgid "Not registered yet?"
-msgstr "Nie jesteś jeszcze zarejestrowany?"
-
-#: kotti/templates/login.pt:82
-msgid "Register for an account on this site."
-msgstr "Zarejestruj się na stronie."
-
-#: kotti/templates/workflow-dropdown.pt:14
-msgid "Make ${state}"
-msgstr "Zrób ${state}"
-
-#: kotti/templates/edit/breadcrumbs.pt:8
-msgid "You are here:"
-msgstr "Jesteś tutaj:"
-
-#: kotti/templates/edit/change-state.pt:8
-msgid "Change workflow state"
-msgstr "Zmień stan publikacji"
-
-#: kotti/templates/edit/change-state.pt:12
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub "
-"zarządzać nim."
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Nie ma takiej grupy: ${group}"
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
 #: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
 msgid "Title"
 msgstr "Tytuł"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Typ"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
-msgid "State"
-msgstr "Stan"
-
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
-msgid "Creation Date"
-msgstr "Data utworzenia"
-
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
-msgid "Modification Date"
-msgstr "Data modyfikacji"
-
-#: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
-msgid "Include children"
-msgstr "Załącz potomka"
-
-#: kotti/templates/edit/change-state.pt:41
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych "
-"dokumentów, oraz ich poddokumenty."
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "Nazwa"
 
-#: kotti/templates/edit/change-state.pt:50
-msgid "Change state to"
-msgstr "Zmień stan na"
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Aktywne"
 
-#: kotti/templates/edit/change-state.pt:51
-msgid "Select the new state where all chosen items should be set."
-msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Odznacz, aby dezaktywować konto."
 
-#: kotti/templates/edit/change-state.pt:55
-msgid "No change"
-msgstr "Bez zmian"
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Globalne role"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
-msgid "Apply changes"
-msgstr "Zapisz zmiany"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Grupy"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Anuluj"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Dodaj użytkownika"
 
-#: kotti/templates/edit/contents.pt:30
-msgid "No content items are contained here."
-msgstr "Brak elementów potomnych."
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} został dodany."
 
-#: kotti/templates/edit/contents.pt:42
-msgid "Visibility"
-msgstr "Widoczność"
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Dodaj grupę"
 
-#: kotti/templates/edit/contents.pt:75
-msgid "Visible"
-msgstr "Widoczny"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "Nie wykonano żadnych zmian."
 
-#: kotti/templates/edit/contents.pt:79
-msgid "Hidden"
-msgstr "Ukryty"
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "Nie przekazano nazwy."
 
-#: kotti/templates/edit/delete-nodes.pt:14
-msgid "Are you sure you want to delete the following items?"
-msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "Nie znaleziono użytkowników ani grup."
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Usuń ${title}"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Edycja ${principal_type} ${title}"
 
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
+#: kotti/views/users.py:533
+msgid "User was not found."
+msgstr "Użytkownik nie został odnaleziony."
 
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Nawigacja strony"
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "Wyślij link do rejestracji na email."
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. "
-"W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu "
-"nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} został usunięty."
 
-#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
-msgid "New name"
-msgstr "Nowa nazwa"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Usuń ${principal_type} ${title}"
 
-#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
-msgid "New title"
-msgstr "Nowy tytuł"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} został skopiowany."
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Zmień nazwę ${title}"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} został wycięty."
 
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Udostępnij ${title}"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} został przeniesiony."
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
-msgid "Search users and groups"
-msgstr "Szukaj użytkowników i grup"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} został wklejony."
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
-msgid "Search"
-msgstr "Szukaj"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "Nie można wkleić. Element już nie istnieje."
 
-#: kotti/templates/edit/share.pt:42
-msgid "Assign local roles"
-msgstr "Przypisz lokalne role"
+#: kotti/views/edit/actions.py:225
+#, python-format
+msgid "${title} is now visible in the navigation."
+msgstr "${title} jest teraz widoczny w nawigacji."
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "Nazwa"
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} nie jest już widoczny w nawigacji."
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "Użytkownik"
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} został usunięty."
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "Grupa"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "Nic nie zostało usunięte"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
-msgid "Gravatar"
-msgstr ""
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Nazwa i tytuł są obowiązkowe."
 
-#: kotti/templates/edit/upload.pt:10
-msgid "Upload content from local file(s)"
-msgstr "Załącz zawartość z lokalnego pliku(ów)"
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "Zmieniono nazwę elementu."
 
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
-msgid "Filename"
-msgstr "Nazwa pliku"
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "W górę"
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
-msgid "Size"
-msgstr "Rozmiar"
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "W dół"
 
-#: kotti/templates/edit/upload.pt:21
-msgid "Status"
-msgstr "Status"
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Pokaż"
 
-#: kotti/templates/edit/upload.pt:22
-msgid "Progress"
-msgstr "Postęp"
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Ukryj"
 
-#: kotti/templates/edit/upload.pt:88
-msgid "Select file(s) to upload..."
-msgstr "Wybierz plik(i) do przesłania..."
+#: kotti/views/edit/actions.py:507
+msgid "You have to select items to perform an action."
+msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
 
-#: kotti/templates/edit/upload.pt:96
-msgid "Upload ${number} files."
-msgstr "Prześlij ${number} plików."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Zmień stan"
 
-#: kotti/templates/edit/upload.pt:101
-msgid "Dismiss all errors"
-msgstr "Zignoruj wszystkie błędy"
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Opis"
 
-#: kotti/templates/site-setup/delete-user.pt:15
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tagi"
 
-#: kotti/templates/site-setup/user.pt:12
-msgid "Back to User Management"
-msgstr "Powrót do zarządzania użytkownikami"
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Treść"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr "Edycja ${title}"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Zresetowano widok na domyślny."
 
-#: kotti/templates/site-setup/users.pt:12
-msgid "Search user(s) / group(s)"
-msgstr "Szukaj użytkownika(ów) / grupę(y)"
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Domyślny widok"
 
-#: kotti/templates/site-setup/users.pt:17
-msgid "Add user"
-msgstr "Dodaj użytkownika"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Ustawiono domyślny widok."
 
-#: kotti/templates/site-setup/users.pt:22
-msgid "Add group"
-msgstr "Dodaj grupę"
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Domyślny widok nie mógł zostać ustawiony."
 
-#: kotti/templates/site-setup/users.pt:34
-msgid "Find users or groups"
-msgstr "Znajdź użytkowników lub grupy"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Brak dostępu"
 
-#: kotti/templates/site-setup/users.pt:39
-msgid "User- / groupname"
-msgstr "Użytkownik- / nazwa grupy"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Zresetuj swoje hasło do ${site_title}."
 
-#: kotti/templates/site-setup/users.pt:49
-msgid "Blank search text finds all."
-msgstr "Zostaw puste, aby znaleźć wszystko."
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Witaj, ${user_title}!"
 
-#: kotti/templates/site-setup/users.pt:63
-msgid "Assign global roles"
-msgstr "Przypisz globalne role"
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Kliknij na link, aby zresetować hasło do ${site_title}: ${url}"
 
-#: kotti/templates/site-setup/users.pt:115
-msgid "Add new user"
-msgstr "Dodaj nowego użytkownika"
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Dodaj"
 
-#: kotti/templates/site-setup/users.pt:121
-msgid "Add new group"
-msgstr "Dodaj nową grupę"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Dołącz treści"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Wyniki wyszukania"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Rejestracja na ${site_title}"
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Szukaj..."
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Rejestrujesz się na ${site_title}."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Otagowane z:"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Witaj, ${user}! Jesteś zalogowany."
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Widok"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Witaj, nie jesteś zalogowany."
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Nawigacja"
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
-msgid "Your changes have been saved."
-msgstr "Twoje zmiany zostały zapisane."
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Ustawienia"
 
-#: kotti/views/form.py:174
-msgid "Item was added."
-msgstr "Element został dodany."
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Ustawienia strony"
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maksymalny rozmiar pliku: ${size}MB"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Wyloguj się"
 
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Zapisz"
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Zrób ${state}"
 
-#: kotti/views/form.py:198
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Dodaj ${type} do ${title}."
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Ustaw domyślny widok"
 
-#: kotti/views/form.py:202
-#, python-format
-msgid "Add ${type}."
-msgstr "Dodaj ${type}."
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Logowanie"
 
-#: kotti/views/login.py:237
-msgid "You have reset your password."
-msgstr "Zresetowałeś swoje hasło."
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Nazwa użytkownika lub email"
 
-#: kotti/views/login.py:199
-msgid "You have been logged out."
-msgstr "Zostałeś wylogowany."
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Zaloguj się"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
-msgid "Full name"
-msgstr "Imię i nazwisko"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Zapomniałeś hasła?"
 
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "Nazwa użytkownika"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Reset hasła"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
-msgid "Email"
-msgstr ""
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} poniżej, aby otrzymać email z linkiem do zresetowania hasła."
 
-#: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do "
-"ustawienia swego hasła. Robiąc to aktywujesz konto."
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "Nie jesteś jeszcze zarejestrowany?"
 
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr "Zarejestruj - ${title}"
+#: kotti/templates/login.pt:82
+msgid "Register for an account on this site."
+msgstr "Zarejestruj się na stronie."
 
-#: kotti/views/login.py:163
-msgid "Login failed."
-msgstr "Nie udało się zalogować."
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Otagowane z:"
 
-#: kotti/views/login.py:285
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Resetowanie hasła - ${title}."
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Szukaj..."
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Witaj, ${user}!"
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "Typ"
 
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło "
-"aktywujesz swoje konto."
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "Data utworzenia"
 
-#: kotti/views/login.py:177
-msgid "That username or email is not known by this system."
-msgstr "Nieznana nazwa użytkownika lub email."
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "Data modyfikacji"
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Zarejestruj"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Wyniki wyszukania"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
-msgid "There was an error."
-msgstr "Wystąpił błąd."
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Zatwierdź"
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
 
-#: kotti/views/login.py:278
-msgid "Your password reset token may have expired."
-msgstr "Twój token do resetu hasła mógł stracić ważność."
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "Usuń ${title}"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "Zarządzanie użytkownikami"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
 
-#: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby "
-"użytkownik sam ustawił sobie hasło."
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Powrót do zarządzania użytkownikami"
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Moje ustawienia - ${title}"
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Szukaj użytkownika(ów) / grupę(y)"
 
-#: kotti/views/users.py:145
-msgid "Invalid value"
-msgstr "Niepoprawna wartość"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Dodaj użytkownika"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Dodaj grupę"
 
-#: kotti/views/users.py:151
-msgid "A user with that name already exists."
-msgstr "Użytkownik z takim imieniem już istnieje."
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Znajdź użytkowników lub grupy"
 
-#: kotti/views/users.py:158
-msgid "A user with that email already exists."
-msgstr "Użytkownik z takim adresem email już istnieje."
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "Użytkownik- / nazwa grupy"
 
-#: kotti/views/users.py:181
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Nie ma takiej grupy: ${group}"
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "Szukaj użytkowników i grup"
 
-#: kotti/views/users.py:219
-msgid "Active"
-msgstr "Aktywne"
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Zostaw puste, aby znaleźć wszystko."
 
-#: kotti/views/users.py:220
-msgid "Untick this to deactivate the account."
-msgstr "Odznacz, aby dezaktywować konto."
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "Szukaj"
 
-#: kotti/views/users.py:226
-msgid "Global roles"
-msgstr "Globalne role"
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Przypisz globalne role"
 
-#: kotti/views/users.py:230
-msgid "Groups"
-msgstr "Grupy"
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr ""
 
-#: kotti/views/users.py:315
-msgid "Add User"
-msgstr "Dodaj użytkownika"
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "Zapisz zmiany"
 
-#: kotti/views/users.py:339
-#, python-format
-msgid "${title} was added."
-msgstr "${title} został dodany."
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Dodaj nowego użytkownika"
 
-#: kotti/views/users.py:349
-msgid "Add Group"
-msgstr "Dodaj grupę"
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Dodaj nową grupę"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "Nie wykonano żadnych zmian."
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Nawigacja strony"
 
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "Nie przekazano nazwy."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Załącz zawartość z lokalnego pliku(ów)"
 
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "Nie znaleziono użytkowników ani grup."
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
+msgid "Filename"
+msgstr "Nazwa pliku"
 
-#: kotti/views/users.py:505
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Edycja ${principal_type} ${title}"
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr "Rozmiar"
 
-#: kotti/views/users.py:533
-msgid "User was not found."
-msgstr "Użytkownik nie został odnaleziony."
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr "Status"
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "Wyślij link do rejestracji na email."
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr "Postęp"
 
-#: kotti/views/users.py:543
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} został usunięty."
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr "Wybierz plik(i) do przesłania..."
 
-#: kotti/views/users.py:551
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Usuń ${principal_type} ${title}"
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr "Prześlij ${number} plików."
 
-#: kotti/views/edit/actions.py:106
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} został skopiowany."
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr "Zignoruj wszystkie błędy"
 
-#: kotti/views/edit/actions.py:124
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} został wycięty."
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} został przeniesiony."
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "Stan"
 
-#: kotti/views/edit/actions.py:159
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} został wklejony."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Jesteś tutaj:"
 
-#: kotti/views/edit/actions.py:162
-msgid "Could not paste node. It no longer exists."
-msgstr "Nie można wkleić. Element już nie istnieje."
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Brak elementów potomnych."
 
-#: kotti/views/edit/actions.py:225
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} jest teraz widoczny w nawigacji."
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Widoczność"
 
-#: kotti/views/edit/actions.py:228
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} nie jest już widoczny w nawigacji."
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Widoczny"
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} został usunięty."
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Ukryty"
 
-#: kotti/views/edit/actions.py:303
-msgid "Nothing was deleted."
-msgstr "Nic nie zostało usunięte"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Zmień nazwę ${title}"
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
-msgid "Name and title are required."
-msgstr "Nazwa i tytuł są obowiązkowe."
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
 
-#: kotti/views/edit/actions.py:343
-msgid "Item was renamed."
-msgstr "Zmieniono nazwę elementu."
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "Nowa nazwa"
 
-#: kotti/views/edit/actions.py:465
-msgid "Move up"
-msgstr "W górę"
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "Nowy tytuł"
 
-#: kotti/views/edit/actions.py:466
-msgid "Move down"
-msgstr "W dół"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
 
-#: kotti/views/edit/actions.py:467
-msgid "Show"
-msgstr "Pokaż"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Udostępnij ${title}"
 
-#: kotti/views/edit/actions.py:468
-msgid "Hide"
-msgstr "Ukryj"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Przypisz lokalne role"
 
-#: kotti/views/edit/actions.py:507
-msgid "You have to select items to perform an action."
-msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Zmień stan publikacji"
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "Zmień stan"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub zarządzać nim."
 
-#: kotti/views/edit/content.py:38
-msgid "Description"
-msgstr "Opis"
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Załącz potomka"
 
-#: kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Tagi"
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych dokumentów, oraz ich poddokumenty."
 
-#: kotti/views/edit/content.py:53
-msgid "Body"
-msgstr "Treść"
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Zmień stan na"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "Zresetowano widok na domyślny."
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
 
-#: kotti/views/edit/default_views.py:79
-msgid "Default view"
-msgstr "Domyślny widok"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Bez zmian"
 
-#: kotti/views/edit/default_views.py:107
-msgid "Default view has been set."
-msgstr "Ustawiono domyślny widok."
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Witaj, ${user}! Jesteś zalogowany."
 
-#: kotti/views/edit/default_views.py:112
-msgid "Default view could not be set."
-msgstr "Domyślny widok nie mógł zostać ustawiony."
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Witaj, nie jesteś zalogowany."
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 3ccc8e218..e0d5f100f 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-09-29 14:24+0100\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: Nuno Teixeira <teixas@gmail.com>\n"
 "Language-Team: pt <LL@li.org>\n"
@@ -18,6 +18,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "Generated-By: Babel 0.9.6\n"
 
+#: kotti/security.py:190
+msgid "Viewer"
+msgstr "Leitor"
+
+#: kotti/security.py:191
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:192
+msgid "Owner"
+msgstr "Dono"
+
+#: kotti/security.py:193
+msgid "Admin"
+msgstr "Admin"
+
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copiar"
+
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Cortar"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Colar"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:458
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40
+msgid "Rename"
+msgstr "Renomear"
+
+#: kotti/resources.py:512 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+#: kotti/templates/site-setup/delete-user.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+msgid "Delete"
+msgstr "Apagar"
+
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Documento"
+
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Ficheiro"
+
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Imagem"
+
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Vista de pasta"
+
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Conteúdo"
+
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Editar"
+
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Partilha"
+
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Ações"
+
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
 msgstr ""
@@ -32,29 +107,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +133,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +146,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -90,23 +160,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -123,812 +190,716 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
-msgstr "Documento"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "As suas alterações foram guardadas."
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
-msgstr "Ficheiro"
+#: kotti/views/form.py:174
+#, fuzzy
+msgid "Item was added."
+msgstr "${title} adicionado."
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
-msgstr "Imagem"
+#: kotti/views/form.py:156 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "Editar ${title}"
 
-#: kotti/resources.py:517
-msgid "Folder view"
-msgstr "Vista de pasta"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Tamanho máximo do ficheiro: ${size}MB"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
-msgstr "Conteúdo"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Guardar"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Editar"
+#: kotti/views/form.py:78 kotti/views/users.py:316 kotti/views/users.py:350
+#: kotti/views/users.py:442 kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: kotti/resources.py:506
-msgid "Share"
-msgstr "Partilha"
+#: kotti/views/form.py:198
+#, fuzzy, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Adicionar ${type} em ${title}"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
-msgstr "Ações"
+#: kotti/views/form.py:202
+#, fuzzy, python-format
+msgid "Add ${type}."
+msgstr "Adicionar ${type}"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Copiar"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gestão de Utilizadores"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Cortar"
+#: kotti/views/login.py:237
+#, fuzzy
+msgid "You have reset your password."
+msgstr "Você reinicializou a palavra passe com sucesso"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Colar"
+#: kotti/views/login.py:199
+msgid "You have been logged out."
+msgstr "Você desligou a sessão"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Renomear"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+#, fuzzy
+msgid "Full name"
+msgstr "Nome completo"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Apagar"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Nome utilizador"
 
-#: kotti/security.py:189
-msgid "Viewer"
-msgstr "Leitor"
+#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+msgid "Email"
+msgstr "E-mail"
 
-#: kotti/security.py:190
-msgid "Editor"
-msgstr "Editor"
+#: kotti/views/login.py:108
+#, fuzzy
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/security.py:191
-msgid "Owner"
-msgstr "Dono"
+#: kotti/views/login.py:123
+#, fuzzy, python-format
+msgid "Register - ${title}"
+msgstr "Registar ${title}"
 
-#: kotti/security.py:192
-msgid "Admin"
-msgstr "Admin"
+#: kotti/views/login.py:163
+msgid "Login failed."
+msgstr "Erro de autenticação"
 
-#: kotti/templates/add-dropdown.pt:5
-msgid "Add"
-msgstr "Adicionar"
+#: kotti/views/login.py:212 kotti/views/users.py:212
+#: kotti/templates/login.pt:25
+msgid "Password"
+msgstr "Palavra passe"
 
-#: kotti/templates/add-dropdown.pt:27
-msgid "Upload Content"
-msgstr "Colocar Conteúdo"
+#: kotti/views/login.py:285
+#, fuzzy, python-format
+msgid "Reset your password - ${title}."
+msgstr "Reiniciar a sua palavra passe - ${title}"
 
-#: kotti/templates/default-view-selector.pt:5
-msgid "Set default view"
-msgstr "Definir vista por defeito"
+#: kotti/views/login.py:159
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bem-vindo, ${user}!"
 
-#: kotti/templates/editor-bar.pt:35
-msgid "View"
-msgstr "Ver"
+#: kotti/views/login.py:172
+#, fuzzy
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/templates/editor-bar.pt:76
-msgid "Navigate"
-msgstr "Navegar"
+#: kotti/views/login.py:177
+#, fuzzy
+msgid "That username or email is not known by this system."
+msgstr "Este utilizador ou e-mail não são reconhecidos."
 
-#: kotti/templates/editor-bar.pt:98
-msgid "Preferences"
-msgstr "Preferências"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registar-se"
 
-#: kotti/templates/editor-bar.pt:109
-msgid "Site Setup"
-msgstr "Configurar Sítio"
+#: kotti/views/login.py:89 kotti/views/login.py:256
+msgid "There was an error."
+msgstr "Ocorreu um erro."
 
-#: kotti/templates/editor-bar.pt:131
-msgid "Logout"
-msgstr "Sair"
+#: kotti/views/login.py:249
+msgid "Submit"
+msgstr "Enviar"
 
-#: kotti/templates/email-reset-password.pt:3
-#, fuzzy
-msgid "Reset your password for ${site_title}."
-msgstr "Reiniciar a sua palavra passe em ${site_title}"
+#: kotti/views/login.py:278
+msgid "Your password reset token may have expired."
+msgstr "A seu pedido para alterar a palavra passe expirou."
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
-msgid "Hello, ${user_title}!"
-msgstr "Bem-vindo, ${user_title}!"
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/site-setup/users.pt:79 kotti/templates/edit/share.pt:59
+msgid "User"
+msgstr "Utilizador"
 
-#: kotti/templates/email-reset-password.pt:10
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536 kotti/templates/site-setup/users.pt:80
+#: kotti/templates/edit/share.pt:60
+msgid "Group"
+msgstr "Grupo"
 
-#: kotti/templates/email-set-password.pt:3
-msgid "Your registration for ${site_title}"
-msgstr "O seu registo em ${site_title}"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
 
-#: kotti/templates/email-set-password.pt:9
-#, fuzzy
-msgid "You are joining ${site_title}."
-msgstr "O seu registo em ${site_title}"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Minhas preferências - ${title}"
 
-#: kotti/templates/email-set-password.pt:12
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Valor inválido"
 
-#: kotti/templates/forbidden.pt:7
-#, fuzzy
-msgid "Forbidden"
-msgstr "Escondido"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Esse utilizador com esse nome já existe."
 
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "Entrar"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Esse utilizador com esse e-mail já existe."
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
-msgid "Username or email"
-msgstr "Utilizador ou e-mail"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Grupo não encontrado: ${group}"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
-#: kotti/views/users.py:212
-msgid "Password"
-msgstr "Palavra passe"
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/view/folder.pt:20 kotti/templates/edit/delete-nodes.pt:22
+#: kotti/templates/edit/contents.pt:39 kotti/templates/edit/change-state.pt:18
+msgid "Title"
+msgstr "Título"
 
-#: kotti/templates/login.pt:47
-msgid "Log in"
-msgstr "Entrar"
+#: kotti/views/users.py:207 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:48
+msgid "Name"
+msgstr "Nome"
 
-#: kotti/templates/login.pt:65
-msgid "Forgot your password?"
-msgstr "Esqueceu-se da palavra passe?"
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Activo"
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
-msgid "Reset password"
-msgstr "Repor a palavra passe"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-#, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Preencha o seu nome de utilizador com o seu e-mail e clique em "
-"${reset_password} para receber um e-mail com uma ligação para reiniciar a "
-"sua palavra passe."
-
-#: kotti/templates/login.pt:118
-msgid "Not registered yet?"
-msgstr ""
-
-#: kotti/templates/login.pt:127
-#, fuzzy
-msgid "Register for an account on this site."
-msgstr "Não se encontra registado? ${register} para criar uma conta."
-
-#: kotti/templates/workflow-dropdown.pt:19
-msgid "Make ${state}"
-msgstr "Tornar ${state}"
-
-#: kotti/templates/edit/breadcrumbs.pt:5
-msgid "You are here:"
-msgstr "Você está aqui:"
-
-#: kotti/templates/edit/change-state.pt:7
-msgid "Change workflow state"
-msgstr "Modificar estado de workflow"
-
-#: kotti/templates/edit/change-state.pt:14
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"O estado de workflow de um item define quem o pode ver, edit e/ou "
-"administrar."
-
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
-msgid "Title"
-msgstr "Título"
-
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
-msgid "Type"
-msgstr "Tipo"
-
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
-msgid "State"
-msgstr "Estado"
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Retirar para desactivar a conta."
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
-msgid "Creation Date"
-msgstr "Data de Criação"
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Papéis globais"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
-msgid "Modification Date"
-msgstr "Data de Modificação"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Grupos"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
-msgid "Include children"
-msgstr "Incluir nós interiores"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Adicionar Utilizador"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Se estiver selecionado irá tentar alterar o estado dos "
-"documentosselecionados e dos seus subdocumentos."
+#: kotti/views/users.py:339
+#, fuzzy, python-format
+msgid "${title} was added."
+msgstr "${title} adicionado."
 
-#: kotti/templates/edit/change-state.pt:100
-msgid "Change state to"
-msgstr "Mudar estado para"
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Adicionar Grupo"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 #, fuzzy
-msgid "Select the new state where all chosen items should be set."
-msgstr "Selecione o novo estado para os items selecionados."
-
-#: kotti/templates/edit/change-state.pt:111
-msgid "No change"
+msgid "No changes were made."
 msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
-msgid "Apply changes"
-msgstr "Aplicar alterações"
-
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: kotti/templates/edit/contents.pt:43
-msgid "No content items are contained here."
-msgstr "Não existem items nesta pasta."
-
-#: kotti/templates/edit/contents.pt:66
-msgid "Visibility"
-msgstr "Visibilidade"
-
-#: kotti/templates/edit/contents.pt:125
-msgid "Visible"
-msgstr "Visível"
-
-#: kotti/templates/edit/contents.pt:134
+#: kotti/views/users.py:558
 #, fuzzy
-msgid "Hidden"
-msgstr "Escondido"
-
-#: kotti/templates/edit/delete-nodes.pt:17
-msgid "Are you sure you want to delete the following items?"
-msgstr "Deseja realmente eliminar os items seguintes?"
+msgid "No name was given."
+msgstr "Nenhum nome foi indicado."
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
-msgid "Delete ${title}"
-msgstr "Apagar ${title}"
+#: kotti/views/users.py:98
+#, fuzzy
+msgid "No users or groups were found."
+msgstr "Utilizadores e grupos não encontrados."
 
-#: kotti/templates/edit/delete.pt:20
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Deseja realmente eliminar ${title}?"
+#: kotti/views/users.py:505
+#, fuzzy, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Editar ${principal_type} - ${title}"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/views/users.py:533
 #, fuzzy
-msgid "Navigate Site"
-msgstr "Navegar"
+msgid "User was not found."
+msgstr "Utilizador não encontrado."
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
+#: kotti/views/users.py:324
 #, fuzzy
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Cada item tem um nome que será usado para criar o url e o título.  Poderá "
-"alterá-los colocando os novos detalhes abaixo."
-
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
-msgid "New name"
-msgstr "Novo nome"
-
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
-msgid "New title"
-msgstr "Novo título"
+msgid "Send password registration link."
+msgstr "Enviar ligação para registo de palavra passe"
 
-#: kotti/templates/edit/rename.pt:7
-msgid "Rename ${title}"
-msgstr "Renomear ${title}"
+#: kotti/views/users.py:543
+#, fuzzy, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} apagado."
 
-#: kotti/templates/edit/share.pt:7
-msgid "Share ${title}"
-msgstr "Partilhar ${title}"
+#: kotti/views/users.py:551
+#, fuzzy, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Apagar ${principal_type} - ${title}"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
-msgid "Search users and groups"
-msgstr "Procurar utilizadores e grupos"
+#: kotti/views/edit/actions.py:106
+#, fuzzy, python-format
+msgid "${title} was copied."
+msgstr "${title} copiado."
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
-msgid "Search"
-msgstr "Procurar"
+#: kotti/views/edit/actions.py:124
+#, fuzzy, python-format
+msgid "${title} was cut."
+msgstr "${title} cortado."
 
-#: kotti/templates/edit/share.pt:60
-msgid "Assign local roles"
-msgstr "Atribuir papéis locais"
+#: kotti/views/edit/actions.py:183
+#, fuzzy, python-format
+msgid "${title} was moved."
+msgstr "${title} movido."
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
-#: kotti/views/users.py:207
-msgid "Name"
-msgstr "Nome"
+#: kotti/views/edit/actions.py:159
+#, fuzzy, python-format
+msgid "${title} was pasted."
+msgstr "${title} colado."
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
-msgid "User"
-msgstr "Utilizador"
+#: kotti/views/edit/actions.py:162
+#, fuzzy
+msgid "Could not paste node. It no longer exists."
+msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
-msgid "Group"
-msgstr "Grupo"
+#: kotti/views/edit/actions.py:225
+#, python-format
+msgid "${title} is now visible in the navigation."
+msgstr "${title} encontra-se visivel na navegação."
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} já não está visivel na navegação."
 
-#: kotti/templates/edit/upload.pt:9
-msgid "Upload content from local file(s)"
-msgstr ""
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, fuzzy, python-format
+msgid "${title} was deleted."
+msgstr "${title} apagado."
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/views/edit/actions.py:303
 #, fuzzy
-msgid "Filename"
-msgstr "Renomear"
-
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
-msgid "Size"
-msgstr ""
+msgid "Nothing was deleted."
+msgstr "Nada foi apagado."
 
-#: kotti/templates/edit/upload.pt:29
-msgid "Status"
-msgstr ""
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Nome e título são obrigatórios."
 
-#: kotti/templates/edit/upload.pt:32
-msgid "Progress"
-msgstr ""
+#: kotti/views/edit/actions.py:343
+#, fuzzy
+msgid "Item was renamed."
+msgstr "Item renomeado"
 
-#: kotti/templates/edit/upload.pt:124
-msgid "Select file(s) to upload..."
-msgstr ""
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "Mover para cima"
 
-#: kotti/templates/edit/upload.pt:134
-msgid "Upload ${number} files."
-msgstr ""
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "Mover para baixo"
 
-#: kotti/templates/edit/upload.pt:144
-msgid "Dismiss all errors"
-msgstr ""
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Mostrar"
 
-#: kotti/templates/site-setup/delete-user.pt:20
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Deseja realmente eliminar ${type} ${title}?"
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Esconder"
 
-#: kotti/templates/site-setup/user.pt:13
-msgid "Back to User Management"
-msgstr "Voltar à gestão de utilizadores"
+#: kotti/views/edit/actions.py:507
+#, fuzzy
+msgid "You have to select items to perform an action."
+msgstr "Terá de escolher items para executar a ação."
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
-#, python-format
-msgid "Edit ${title}"
-msgstr "Editar ${title}"
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Alterar Estado"
 
-#: kotti/templates/site-setup/users.pt:15
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "Procurar utilizadores e grupos"
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Descrição"
 
-#: kotti/templates/site-setup/users.pt:24
-msgid "Add user"
-msgstr "Adicionar utilizador"
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Etiquetas"
 
-#: kotti/templates/site-setup/users.pt:33
-msgid "Add group"
-msgstr "Adicionar grupo"
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Corpo"
 
-#: kotti/templates/site-setup/users.pt:52
-#, fuzzy
-msgid "Find users or groups"
-msgstr "Procurar utilizadores e grupos"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "A vista original foi indicada como a vista por defeito."
 
-#: kotti/templates/site-setup/users.pt:63
-msgid "User- / groupname"
-msgstr ""
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Vista por defeito"
 
-#: kotti/templates/site-setup/users.pt:70
-#, fuzzy
-msgid "Blank search text finds all."
-msgstr ""
-"Encontre e modifique utilizadores (Uma pesquisa em branco retorna\"\n"
-"\" todos os utilizadores)"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Vista por defeito foi alterada."
 
-#: kotti/templates/site-setup/users.pt:96
-#, fuzzy
-msgid "Assign global roles"
-msgstr "Atribuir papéis locais"
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Vista por defeito não pode ser alterada."
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/forbidden.pt:10
 #, fuzzy
-msgid "Add new user"
-msgstr "Adicionar utilizador"
+msgid "Forbidden"
+msgstr "Escondido"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/email-reset-password.pt:2
 #, fuzzy
-msgid "Add new group"
-msgstr "Adicionar grupo"
-
-#: kotti/templates/view/search-results.pt:8
-msgid "Search Results"
-msgstr "Resultados da pesquisa"
+msgid "Reset your password for ${site_title}."
+msgstr "Reiniciar a sua palavra passe em ${site_title}"
 
-#: kotti/templates/view/search.pt:5
-msgid "Search..."
-msgstr "Procurar..."
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Bem-vindo, ${user_title}!"
 
-#: kotti/templates/view/tags.pt:5
-msgid "Tagged with:"
-msgstr "Marcado como:"
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
 
-#: kotti/tests/testing_view.pt:7
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Bem-vindo, ${user}! Você está autenticado."
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Adicionar"
 
-#: kotti/tests/testing_view.pt:14
-msgid "Welcome, you are not logged in."
-msgstr "Bem-vindo, você não está autenticado."
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Colocar Conteúdo"
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
-msgid "Your changes have been saved."
-msgstr "As suas alterações foram guardadas."
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "O seu registo em ${site_title}"
 
-#: kotti/views/form.py:174
+#: kotti/templates/email-set-password.pt:5
 #, fuzzy
-msgid "Item was added."
-msgstr "${title} adicionado."
-
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Tamanho máximo do ficheiro: ${size}MB"
+msgid "You are joining ${site_title}."
+msgstr "O seu registo em ${site_title}"
 
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Guardar"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
 
-#: kotti/views/form.py:198
-#, fuzzy, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Adicionar ${type} em ${title}"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Ver"
 
-#: kotti/views/form.py:202
-#, fuzzy, python-format
-msgid "Add ${type}."
-msgstr "Adicionar ${type}"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navegar"
 
-#: kotti/views/login.py:237
-#, fuzzy
-msgid "You have reset your password."
-msgstr "Você reinicializou a palavra passe com sucesso"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Preferências"
 
-#: kotti/views/login.py:199
-msgid "You have been logged out."
-msgstr "Você desligou a sessão"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Configurar Sítio"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
-#, fuzzy
-msgid "Full name"
-msgstr "Nome completo"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Sair"
 
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "Nome utilizador"
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Tornar ${state}"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
-msgid "Email"
-msgstr "E-mail"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Definir vista por defeito"
 
-#: kotti/views/login.py:108
-#, fuzzy
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma "
-"ligação temporária para reiniciar a sua palavra passe."
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Entrar"
 
-#: kotti/views/login.py:123
-#, fuzzy, python-format
-msgid "Register - ${title}"
-msgstr "Registar ${title}"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Utilizador ou e-mail"
 
-#: kotti/views/login.py:163
-msgid "Login failed."
-msgstr "Erro de autenticação"
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Entrar"
 
-#: kotti/views/login.py:285
-#, fuzzy, python-format
-msgid "Reset your password - ${title}."
-msgstr "Reiniciar a sua palavra passe - ${title}"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Esqueceu-se da palavra passe?"
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bem-vindo, ${user}!"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Repor a palavra passe"
 
-#: kotti/views/login.py:172
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
 #, fuzzy
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Preencha o seu nome de utilizador com o seu e-mail e clique em ${reset_password} para receber um e-mail com uma ligação para reiniciar a sua palavra passe."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
-"Você deverá receber um e-mail com uma ligação temporária para reiniciar a "
-"sua palavra passe."
 
-#: kotti/views/login.py:177
+#: kotti/templates/login.pt:82
 #, fuzzy
-msgid "That username or email is not known by this system."
-msgstr "Este utilizador ou e-mail não são reconhecidos."
+msgid "Register for an account on this site."
+msgstr "Não se encontra registado? ${register} para criar uma conta."
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Registar-se"
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Marcado como:"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Procurar..."
+
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:67
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/share.pt:47 kotti/templates/edit/change-state.pt:19
+msgid "Type"
+msgstr "Tipo"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
-msgid "There was an error."
-msgstr "Ocorreu um erro."
+#: kotti/templates/view/folder.pt:22 kotti/templates/edit/delete-nodes.pt:25
+#: kotti/templates/edit/contents.pt:43 kotti/templates/edit/change-state.pt:21
+msgid "Creation Date"
+msgstr "Data de Criação"
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Enviar"
+#: kotti/templates/view/folder.pt:23 kotti/templates/edit/delete-nodes.pt:26
+#: kotti/templates/edit/contents.pt:44 kotti/templates/edit/change-state.pt:22
+msgid "Modification Date"
+msgstr "Data de Modificação"
 
-#: kotti/views/login.py:278
-msgid "Your password reset token may have expired."
-msgstr "A seu pedido para alterar a palavra passe expirou."
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Resultados da pesquisa"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "Gestão de Utilizadores"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
 
-#: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
 msgstr ""
-"Deixe este campo por preencher e escolha a opção 'Enviar ligação para "
-"registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Minhas preferências - ${title}"
+#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+msgid "Delete ${title}"
+msgstr "Apagar ${title}"
 
-#: kotti/views/users.py:145
-msgid "Invalid value"
-msgstr "Valor inválido"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Deseja realmente eliminar ${type} ${title}?"
 
-#: kotti/views/users.py:151
-msgid "A user with that name already exists."
-msgstr "Esse utilizador com esse nome já existe."
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Voltar à gestão de utilizadores"
 
-#: kotti/views/users.py:158
-msgid "A user with that email already exists."
-msgstr "Esse utilizador com esse e-mail já existe."
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "Procurar utilizadores e grupos"
 
-#: kotti/views/users.py:181
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Grupo não encontrado: ${group}"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Adicionar utilizador"
 
-#: kotti/views/users.py:219
-msgid "Active"
-msgstr "Activo"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Adicionar grupo"
 
-#: kotti/views/users.py:220
-msgid "Untick this to deactivate the account."
-msgstr "Retirar para desactivar a conta."
+#: kotti/templates/site-setup/users.pt:34
+#, fuzzy
+msgid "Find users or groups"
+msgstr "Procurar utilizadores e grupos"
 
-#: kotti/views/users.py:226
-msgid "Global roles"
-msgstr "Papéis globais"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
 
-#: kotti/views/users.py:230
-msgid "Groups"
-msgstr "Grupos"
+#: kotti/templates/site-setup/users.pt:47 kotti/templates/edit/share.pt:14
+#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:26
+msgid "Search users and groups"
+msgstr "Procurar utilizadores e grupos"
 
-#: kotti/views/users.py:315
-msgid "Add User"
-msgstr "Adicionar Utilizador"
+#: kotti/templates/site-setup/users.pt:49
+#, fuzzy
+msgid "Blank search text finds all."
+msgstr ""
+"Encontre e modifique utilizadores (Uma pesquisa em branco retorna\"\n"
+"\" todos os utilizadores)"
 
-#: kotti/views/users.py:339
-#, fuzzy, python-format
-msgid "${title} was added."
-msgstr "${title} adicionado."
+#: kotti/templates/site-setup/users.pt:55 kotti/templates/edit/share.pt:33
+msgid "Search"
+msgstr "Procurar"
 
-#: kotti/views/users.py:349
-msgid "Add Group"
-msgstr "Adicionar Grupo"
+#: kotti/templates/site-setup/users.pt:63
+#, fuzzy
+msgid "Assign global roles"
+msgstr "Atribuir papéis locais"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/templates/site-setup/users.pt:83 kotti/templates/edit/share.pt:63
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/site-setup/users.pt:105 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:64
+msgid "Apply changes"
+msgstr "Aplicar alterações"
+
+#: kotti/templates/site-setup/users.pt:115
 #, fuzzy
-msgid "No changes were made."
-msgstr "Não foram efectuadas nenhumas alterações"
+msgid "Add new user"
+msgstr "Adicionar utilizador"
 
-#: kotti/views/users.py:558
+#: kotti/templates/site-setup/users.pt:121
 #, fuzzy
-msgid "No name was given."
-msgstr "Nenhum nome foi indicado."
+msgid "Add new group"
+msgstr "Adicionar grupo"
 
-#: kotti/views/users.py:98
+#: kotti/templates/edit/nav-tree-view.pt:8
 #, fuzzy
-msgid "No users or groups were found."
-msgstr "Utilizadores e grupos não encontrados."
+msgid "Navigate Site"
+msgstr "Navegar"
 
-#: kotti/views/users.py:505
-#, fuzzy, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Editar ${principal_type} - ${title}"
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr ""
 
-#: kotti/views/users.py:533
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 #, fuzzy
-msgid "User was not found."
-msgstr "Utilizador não encontrado."
+msgid "Filename"
+msgstr "Renomear"
 
-#: kotti/views/users.py:324
-#, fuzzy
-msgid "Send password registration link."
-msgstr "Enviar ligação para registo de palavra passe"
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
+msgid "Size"
+msgstr ""
 
-#: kotti/views/users.py:543
-#, fuzzy, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} apagado."
+#: kotti/templates/edit/upload.pt:21
+msgid "Status"
+msgstr ""
 
-#: kotti/views/users.py:551
-#, fuzzy, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Apagar ${principal_type} - ${title}"
+#: kotti/templates/edit/upload.pt:22
+msgid "Progress"
+msgstr ""
 
-#: kotti/views/edit/actions.py:106
-#, fuzzy, python-format
-msgid "${title} was copied."
-msgstr "${title} copiado."
+#: kotti/templates/edit/upload.pt:88
+msgid "Select file(s) to upload..."
+msgstr ""
 
-#: kotti/views/edit/actions.py:124
-#, fuzzy, python-format
-msgid "${title} was cut."
-msgstr "${title} cortado."
+#: kotti/templates/edit/upload.pt:96
+msgid "Upload ${number} files."
+msgstr ""
 
-#: kotti/views/edit/actions.py:183
-#, fuzzy, python-format
-msgid "${title} was moved."
-msgstr "${title} movido."
+#: kotti/templates/edit/upload.pt:101
+msgid "Dismiss all errors"
+msgstr ""
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, fuzzy, python-format
-msgid "${title} was deleted."
-msgstr "${title} apagado."
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Deseja realmente eliminar os items seguintes?"
 
-#: kotti/views/edit/actions.py:159
-#, fuzzy, python-format
-msgid "${title} was pasted."
-msgstr "${title} colado."
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/change-state.pt:20
+msgid "State"
+msgstr "Estado"
 
-#: kotti/views/edit/actions.py:162
-#, fuzzy
-msgid "Could not paste node. It no longer exists."
-msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Você está aqui:"
 
-#: kotti/views/edit/actions.py:225
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} encontra-se visivel na navegação."
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Não existem items nesta pasta."
 
-#: kotti/views/edit/actions.py:228
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} já não está visivel na navegação."
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Visível"
 
-#: kotti/views/edit/actions.py:293
+#: kotti/templates/edit/contents.pt:79
 #, fuzzy
-msgid "Nothing was deleted."
-msgstr "Nada foi apagado."
+msgid "Hidden"
+msgstr "Escondido"
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
-msgid "Name and title are required."
-msgstr "Nome e título são obrigatórios."
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Renomear ${title}"
 
-#: kotti/views/edit/actions.py:333
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 #, fuzzy
-msgid "Item was renamed."
-msgstr "Item renomeado"
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Cada item tem um nome que será usado para criar o url e o título.  Poderá alterá-los colocando os novos detalhes abaixo."
 
-#: kotti/views/edit/actions.py:455
-msgid "Move up"
-msgstr "Mover para cima"
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+msgid "New name"
+msgstr "Novo nome"
 
-#: kotti/views/edit/actions.py:456
-msgid "Move down"
-msgstr "Mover para baixo"
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:33
+msgid "New title"
+msgstr "Novo título"
 
-#: kotti/views/edit/actions.py:457
-msgid "Show"
-msgstr "Mostrar"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Deseja realmente eliminar ${title}?"
 
-#: kotti/views/edit/actions.py:458
-msgid "Hide"
-msgstr "Esconder"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Partilhar ${title}"
 
-#: kotti/views/edit/actions.py:497
-#, fuzzy
-msgid "You have to select items to perform an action."
-msgstr "Terá de escolher items para executar a ação."
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Atribuir papéis locais"
 
-#: kotti/views/edit/actions.py:454
-msgid "Change State"
-msgstr "Alterar Estado"
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Modificar estado de workflow"
 
-#: kotti/views/edit/content.py:36
-msgid "Description"
-msgstr "Descrição"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "O estado de workflow de um item define quem o pode ver, edit e/ou administrar."
 
-#: kotti/views/edit/content.py:42
-msgid "Tags"
-msgstr "Etiquetas"
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Incluir nós interiores"
 
-#: kotti/views/edit/content.py:51
-msgid "Body"
-msgstr "Corpo"
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Se estiver selecionado irá tentar alterar o estado dos documentosselecionados e dos seus subdocumentos."
 
-#: kotti/views/edit/default_views.py:99
-msgid "Default view has been reset to default."
-msgstr "A vista original foi indicada como a vista por defeito."
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Mudar estado para"
 
-#: kotti/views/edit/default_views.py:78
-msgid "Default view"
-msgstr "Vista por defeito"
+#: kotti/templates/edit/change-state.pt:51
+#, fuzzy
+msgid "Select the new state where all chosen items should be set."
+msgstr "Selecione o novo estado para os items selecionados."
 
-#: kotti/views/edit/default_views.py:106
-msgid "Default view has been set."
-msgstr "Vista por defeito foi alterada."
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/views/edit/default_views.py:111
-msgid "Default view could not be set."
-msgstr "Vista por defeito não pode ser alterada."
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Bem-vindo, ${user}! Você está autenticado."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Bem-vindo, você não está autenticado."
 
 #~ msgid "Private"
 #~ msgstr "Privado"

From 969173f3a33f212b186e46bebd1e4ee22799a8a9 Mon Sep 17 00:00:00 2001
From: Matt Russell <mgrbyte@users.noreply.github.com>
Date: Wed, 30 Sep 2015 01:36:09 +0100
Subject: [PATCH 338/600] Fix malformed namespace prefixes

---
 kotti/templates/view/search.pt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kotti/templates/view/search.pt b/kotti/templates/view/search.pt
index df41a5390..14d75e23c 100644
--- a/kotti/templates/view/search.pt
+++ b/kotti/templates/view/search.pt
@@ -1,4 +1,5 @@
-<form xmlns:i18nxmlns="http://www.w3.org/1999/xhtml"
+<form
+    xmlns="http://www.w3.org/1999/xhtml"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n" i18n:domain="Kotti"
     class="navbar-form navbar-right"
     action="${api.url(api.root)}@@search-results"

From dae4f5a5f914a490e5333f954fafb5a5f11d680b Mon Sep 17 00:00:00 2001
From: Matt Russell <mgrbyte@users.noreply.github.com>
Date: Wed, 30 Sep 2015 01:38:27 +0100
Subject: [PATCH 339/600] Remove uneeded namespace prefixes

As per #463
---
 kotti/templates/view/search.pt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kotti/templates/view/search.pt b/kotti/templates/view/search.pt
index 14d75e23c..52af4167c 100644
--- a/kotti/templates/view/search.pt
+++ b/kotti/templates/view/search.pt
@@ -1,6 +1,5 @@
 <form
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:i18n="http://xml.zope.org/namespaces/i18n" i18n:domain="Kotti"
+    i18n:domain="Kotti"
     class="navbar-form navbar-right"
     action="${api.url(api.root)}@@search-results"
     method="post" role="search"

From f63f5a24f144c7441721fc1d2ea9dc02f6b02232 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 30 Sep 2015 12:44:15 +0200
Subject: [PATCH 340/600] Outfactor the code that runs after successful
 authentication into a configurable ``kotti.login_success_callback`` function.

---
 CHANGES.txt                             |  3 +-
 docs/developing/basic/configuration.rst | 70 +++++++++++--------------
 kotti/__init__.py                       |  2 +
 kotti/views/login.py                    | 35 ++++++++++---
 4 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8ece87d52..23b4e5129 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Change History
 1.2.1 - unreleased
 ------------------
 
-- No changes yet.
+- Outfactor the code that runs after successful authentication into a
+  configurable ``kotti.login_success_callback`` function.
 
 1.2.0 - 2015-09-27
 ------------------
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 55252b84c..479ea5e4d 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -37,61 +37,51 @@ Overview of settings
 This table provides an overview of available settings.
 All these settings must go into the ``[app:kotti]`` section of your Paste Deploy configuration file.
 
+Only the settings in bold letters required.
+The rest has defaults.
+
+Do take a look at the required settings (in bold) and adjust them in your site's configuration.
+A few of the settings are less important, and sometimes only used by developers, not integrators.
+
 ================================  ==============================================
 Setting                           Description
 ================================  ==============================================
 **kotti.site_title**              The title of your site
-**kotti.secret**                  Secret token used for the initial admin
-                                  password
-kotti.secret2                     Secret token used for email password reset
-                                  token
+**kotti.secret**                  Secret token used for the initial admin password
+kotti.secret2                     Secret token used for email password reset token
 **sqlalchemy.url**                `SQLAlchemy database URL`_
 **mail.default_sender**           Sender address for outgoing email
-mail.host                         Email host to send from
-pyramid.includes                  List of Python configuration hooks
-kotti.available_types             List of active content types
-kotti.base_includes               List of base Python configuration hooks
-kotti.zcml_includes               List of packages to include the ZCML from
-kotti.configurators               List of advanced functions for config
-kotti.request_factory             Override Kotti's default request factory
-kotti.root_factory                Override Kotti's default Pyramid
-                                  *root factory*
-kotti.populators                  List of functions to fill initial database
-kotti.search_content              Override Kotti's default search function
 kotti.asset_overrides             Override Kotti's templates
-kotti.templates.api               Override ``api`` object available in
-                                  templates
-kotti.fanstatic.view_needed       List of static resources used for public
-                                  interface
-kotti.fanstatic.edit_needed       List of static resources used for edit
-                                  interface
 kotti.authn_policy_factory        Component used for authentication
 kotti.authz_policy_factory        Component used for authorization
-kotti.session_factory             Component used for sessions
+kotti.available_types             List of active content types
+kotti.base_includes               List of base Python configuration hooks
 kotti.caching_policy_chooser      Component for choosing the cache header policy
-kotti.url_normalizer              Component used for url normalization
+kotti.configurators               List of advanced functions for config
 kotti.date_format                 Date format to use, default: ``medium``
 kotti.datetime_format             Datetime format to use, default: ``medium``
-kotti.time_format                 Time format to use, default: ``medium``
-kotti.max_file_size               Max size for file uploads,
-                                  default: ```10`` (MB)
-kotti.modification_date_excludes  List of attributes in dotted name notation
-                                  that should not trigger an update of
-                                  ``modification_date`` on change.
 kotti.depot.*.*                   Configure the blob storage. More details below
-kotti.sanitizers                  Configure available :ref:`sanitizers`.
-kotti.sanitize_on_write           Configure :ref:`sanitizers` to be used on
-                                  write access to resource objects.
-pyramid.default_locale_name       Set the user interface language,
-                                  default ``en``
+kotti.fanstatic.edit_needed       List of static resources used for edit interface
+kotti.fanstatic.view_needed       List of static resources used for public interface
+kotti.login_success_callback      Override Kotti's default login_success_callback function
+kotti.max_file_size               Max size for file uploads, default: ```10`` (MB)
+kotti.modification_date_excludes  List of attributes in dotted name notation that should not trigger an update of ``modification_date`` on change
+kotti.populators                  List of functions to fill initial database
+kotti.request_factory             Override Kotti's default request factory
+kotti.root_factory                Override Kotti's default Pyramid *root factory*
+kotti.sanitize_on_write           Configure :ref:`sanitizers` to be used on write access to resource objects
+kotti.sanitizers                  Configure available :ref:`sanitizers`
+kotti.search_content              Override Kotti's default search function
+kotti.session_factory             Component used for sessions
+kotti.templates.api               Override ``api`` object available in templates
+kotti.time_format                 Time format to use, default: ``medium``
+kotti.url_normalizer              Component used for url normalization
+kotti.zcml_includes               List of packages to include the ZCML from
+mail.host                         Email host to send from
+pyramid.default_locale_name       Set the user interface language, default ``en``
+pyramid.includes                  List of Python configuration hooks
 ================================  ==============================================
 
-Only the settings in bold letters required.
-The rest has defaults.
-
-Do take a look at the required settings (in bold) and adjust them in your site's configuration.
-A few of the settings are less important, and sometimes only used by developers, not integrators.
-
 kotti.secret and kotti.secret2
 ------------------------------
 
diff --git a/kotti/__init__.py b/kotti/__init__.py
index fa60ed85f..00b7f0793 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -91,6 +91,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.depot.0.name': 'dbfiles',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
+    'kotti.login_success_callback': 'kotti.views.login.login_success_callback',
     'kotti.max_file_size': '10',
     'kotti.modification_date_excludes': ' '.join([
         'kotti.resources.Node.position',
@@ -137,6 +138,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.configurators',
     'kotti.fanstatic.edit_needed',
     'kotti.fanstatic.view_needed',
+    'kotti.login_success_callback',
     'kotti.modification_date_excludes',
     'kotti.populators',
     'kotti.principals_factory',
diff --git a/kotti/views/login.py b/kotti/views/login.py
index 36f0be5ee..cd073c68d 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -130,6 +130,33 @@ def register(context, request):
         }
 
 
+def login_success_callback(request, user, came_from):
+    """ Default implementation of ``kotti.login_success_callback``.  You can
+    implement a custom function with the same signature and point the
+    ``kotti.login_success_callback`` setting to it.
+
+    :param request: Current request
+    :type request: :class:`kotti.request.Request`
+
+    :param user: Principal, who just logged in successfully.
+    :type user: :class:`kotti.security.Princial`
+
+    :param came_from: URL the user came from
+    :type came_from: str
+
+    :result: Any Pyramid response object, by default a redirect to
+             ``came_from`` or the context where login was called.
+    :rtype: :class:`pyramid.httpexceptions.HTTPFound`
+    """
+
+    headers = remember(request, user.name)
+    request.session.flash(
+        _(u"Welcome, ${user}!",
+          mapping=dict(user=user.title or user.name)), 'success')
+    user.last_login_date = datetime.now()
+    return HTTPFound(location=came_from, headers=headers)
+
+
 @view_config(name='login', renderer='kotti:templates/login.pt')
 def login(context, request):
     """
@@ -154,12 +181,8 @@ def login(context, request):
 
         if (user is not None and user.active and
                 principals.validate_password(password, user.password)):
-            headers = remember(request, user.name)
-            request.session.flash(
-                _(u"Welcome, ${user}!",
-                  mapping=dict(user=user.title or user.name)), 'success')
-            user.last_login_date = datetime.now()
-            return HTTPFound(location=came_from, headers=headers)
+            return get_settings()['kotti.login_success_callback'][0](
+                request, user, came_from)
         request.session.flash(_(u"Login failed."), 'error')
 
     if 'reset-password' in request.POST:

From 5cc0019b0dcc59f99540e306068fa9696b7a9209 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 30 Sep 2015 12:46:20 +0200
Subject: [PATCH 341/600] Fix type in the docs.  [ci skip]

---
 docs/developing/basic/configuration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 479ea5e4d..161719a8d 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -64,7 +64,7 @@ kotti.depot.*.*                   Configure the blob storage. More details below
 kotti.fanstatic.edit_needed       List of static resources used for edit interface
 kotti.fanstatic.view_needed       List of static resources used for public interface
 kotti.login_success_callback      Override Kotti's default login_success_callback function
-kotti.max_file_size               Max size for file uploads, default: ```10`` (MB)
+kotti.max_file_size               Max size for file uploads, default: ``10`` (MB)
 kotti.modification_date_excludes  List of attributes in dotted name notation that should not trigger an update of ``modification_date`` on change
 kotti.populators                  List of functions to fill initial database
 kotti.request_factory             Override Kotti's default request factory

From 43d8082fc58be4e8ea431b16fb6881ac4e89cc9d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 1 Oct 2015 09:44:31 +0200
Subject: [PATCH 342/600] Support principal search on non string attributes.

---
 CHANGES.txt                  | 1 +
 kotti/security.py            | 2 +-
 kotti/tests/test_security.py | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 23b4e5129..ca15ca336 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Change History
 
 - Outfactor the code that runs after successful authentication into a
   configurable ``kotti.login_success_callback`` function.
+- Support principal search on non string attributes.
 
 1.2.0 - 2015-09-27
 ------------------
diff --git a/kotti/security.py b/kotti/security.py
index 08f4d431d..4550194c5 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -490,7 +490,7 @@ def search(self, **kwargs):
         filters = []
         for key, value in kwargs.items():
             col = getattr(self.factory, key)
-            if '*' in value:
+            if isinstance(value, basestring) and '*' in value:
                 value = value.replace('*', '%').lower()
                 filters.append(func.lower(col).like(value))
             else:
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index 3248f8921..84ba60c84 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -397,6 +397,8 @@ def test_users_search(self, db_session):
         with raises(AttributeError):
             users.search(name=u"bob", foo=u"bar")
         assert list(users.search()) == []
+        # search on a non string attribute
+        assert bob in list(users.search(active=True))
 
     def test_groups_from_users(self, db_session, root):
         from kotti.resources import Node

From 47455058cdc45ede06dcd348f238719f1aa33abd Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 1 Oct 2015 10:23:39 +0200
Subject: [PATCH 343/600] Support principal searches matching *all* arguments
 (i.e. using the ``and`` operator, ``or`` is still the default).

---
 CHANGES.txt                  |  2 ++
 kotti/security.py            | 11 ++++++++---
 kotti/tests/test_security.py |  4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ca15ca336..1080d92f0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ Change History
 - Outfactor the code that runs after successful authentication into a
   configurable ``kotti.login_success_callback`` function.
 - Support principal search on non string attributes.
+- Support principal searches matching *all* arguments
+  (i.e. using the ``and`` operator, ``or`` is still the default).
 
 1.2.0 - 2015-09-27
 ------------------
diff --git a/kotti/security.py b/kotti/security.py
index 4550194c5..e750b8ab0 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -10,6 +10,7 @@
 from sqlalchemy import Integer
 from sqlalchemy import Unicode
 from sqlalchemy import func
+from sqlalchemy.sql.expression import and_
 from sqlalchemy.sql.expression import or_
 from sqlalchemy.orm.exc import NoResultFound
 from pyramid.location import lineage
@@ -483,10 +484,9 @@ def iterkeys(self):
     def keys(self):
         return list(self.iterkeys())
 
-    def search(self, **kwargs):
+    def search(self, operator='or', **kwargs):
         if not kwargs:
             return []
-
         filters = []
         for key, value in kwargs.items():
             col = getattr(self.factory, key)
@@ -497,7 +497,12 @@ def search(self, **kwargs):
                 filters.append(col == value)
 
         query = DBSession.query(self.factory)
-        query = query.filter(or_(*filters))
+        if operator == 'or':
+            query = query.filter(or_(*filters))
+        elif operator == 'and':
+            query = query.filter(and_(*filters))
+        else:
+            raise ValueError('Operator must be either "or" or "and".')
         return query
 
     log_rounds = 10
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index 84ba60c84..332f399cb 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -399,6 +399,10 @@ def test_users_search(self, db_session):
         assert list(users.search()) == []
         # search on a non string attribute
         assert bob in list(users.search(active=True))
+        # test operator
+        assert len(list(users.search(name=u'bob', active=True))) == 2
+        assert len(list(users.search(operator=u'and', name=u'bob',
+                                     active=True))) == 1
 
     def test_groups_from_users(self, db_session, root):
         from kotti.resources import Node

From 0d28def364e7cf225880f93a4570c0e9edb486fa Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 1 Oct 2015 10:40:18 +0200
Subject: [PATCH 344/600] Revise bad API.

---
 kotti/security.py            | 26 ++++++++++++++++++++++----
 kotti/tests/test_security.py |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/kotti/security.py b/kotti/security.py
index e750b8ab0..7b7e05973 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -484,10 +484,26 @@ def iterkeys(self):
     def keys(self):
         return list(self.iterkeys())
 
-    def search(self, operator='or', **kwargs):
+    def search(self, match='any', **kwargs):
+        """ Search the principal database.
+
+        :param match: ``any`` to return all principals matching any search
+                      param, ``all`` to return only principals matching
+                      all params
+        :type match: str
+
+        :param **kwargs: Search conditions, e.g. ``name='bob', active=True``.
+        :type **kwargs: varying.
+
+        :result: SQLAlchemy query object
+        :rtype: :class:`sqlalchemy.orm.query.Query``
+        """
+
         if not kwargs:
             return []
+
         filters = []
+
         for key, value in kwargs.items():
             col = getattr(self.factory, key)
             if isinstance(value, basestring) and '*' in value:
@@ -497,12 +513,14 @@ def search(self, operator='or', **kwargs):
                 filters.append(col == value)
 
         query = DBSession.query(self.factory)
-        if operator == 'or':
+
+        if match == 'any':
             query = query.filter(or_(*filters))
-        elif operator == 'and':
+        elif match == 'all':
             query = query.filter(and_(*filters))
         else:
-            raise ValueError('Operator must be either "or" or "and".')
+            raise ValueError('match must be either "any" or "all".')
+
         return query
 
     log_rounds = 10
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index 332f399cb..726d9ff3a 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -401,7 +401,7 @@ def test_users_search(self, db_session):
         assert bob in list(users.search(active=True))
         # test operator
         assert len(list(users.search(name=u'bob', active=True))) == 2
-        assert len(list(users.search(operator=u'and', name=u'bob',
+        assert len(list(users.search(match=u'all', name=u'bob',
                                      active=True))) == 1
 
     def test_groups_from_users(self, db_session, root):

From aa83838f29b3875e03e153a043a802086e59a43c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 1 Oct 2015 14:34:47 +0200
Subject: [PATCH 345/600] Outfactor the code that runs after a valid password
 reset request into a configurable ``kotti.password_reset_callback`` function.

---
 CHANGES.txt                             |  2 ++
 docs/developing/basic/configuration.rst |  3 ++-
 kotti/__init__.py                       |  2 ++
 kotti/views/login.py                    | 34 ++++++++++++++++++++-----
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1080d92f0..39dd8228a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ Change History
 
 - Outfactor the code that runs after successful authentication into a
   configurable ``kotti.login_success_callback`` function.
+- Outfactor the code that runs after a valid password reset request into a
+  configurable ``kotti.password_reset_callback`` function.
 - Support principal search on non string attributes.
 - Support principal searches matching *all* arguments
   (i.e. using the ``and`` operator, ``or`` is still the default).
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 161719a8d..6ebbb6942 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -63,11 +63,12 @@ kotti.datetime_format             Datetime format to use, default: ``medium``
 kotti.depot.*.*                   Configure the blob storage. More details below
 kotti.fanstatic.edit_needed       List of static resources used for edit interface
 kotti.fanstatic.view_needed       List of static resources used for public interface
-kotti.login_success_callback      Override Kotti's default login_success_callback function
+kotti.login_success_callback      Override Kotti's default ``login_success_callback`` function
 kotti.max_file_size               Max size for file uploads, default: ``10`` (MB)
 kotti.modification_date_excludes  List of attributes in dotted name notation that should not trigger an update of ``modification_date`` on change
 kotti.populators                  List of functions to fill initial database
 kotti.request_factory             Override Kotti's default request factory
+kotti.reset_password_callback     Override Kotti's default ``reset_password_callback`` function
 kotti.root_factory                Override Kotti's default Pyramid *root factory*
 kotti.sanitize_on_write           Configure :ref:`sanitizers` to be used on write access to resource objects
 kotti.sanitizers                  Configure available :ref:`sanitizers`
diff --git a/kotti/__init__.py b/kotti/__init__.py
index 00b7f0793..b8c47b352 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -102,6 +102,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.register.group': '',
     'kotti.register.role': '',
     'kotti.request_factory': 'kotti.request.Request',
+    'kotti.reset_password_callback': 'kotti.views.login.reset_password_callback',  # noqa
     'kotti.root_factory': 'kotti.resources.default_get_root',
     'kotti.sanitizers': ' '.join([
         'xss_protection:kotti.sanitizers.xss_protection',
@@ -143,6 +144,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.populators',
     'kotti.principals_factory',
     'kotti.request_factory',
+    'kotti.reset_password_callback',
     'kotti.root_factory',
     'kotti.search_content',
     'kotti.session_factory',
diff --git a/kotti/views/login.py b/kotti/views/login.py
index cd073c68d..53238892c 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -157,6 +157,32 @@ def login_success_callback(request, user, came_from):
     return HTTPFound(location=came_from, headers=headers)
 
 
+def reset_password_callback(request, user):
+    """ Default implementation of ``kotti.reset_password_callback``.  You can
+    implement a custom function with the same signature and point the
+    ``kotti.reset_password_callback`` setting to it.
+
+    :param request: Current request
+    :type request: :class:`kotti.request.Request`
+
+    :param user: Principal, who's password was requested to be reset.
+    :type user: :class:`kotti.security.Princial`
+
+    :result: Any Pyramid response object, by default a redirect to to the same
+             URL from where the password reset was called.
+    :rtype: :class:`pyramid.httpexceptions.HTTPFound`
+    """
+
+    email_set_password(
+        user, request,
+        template_name='kotti:templates/email-reset-password.pt')
+    request.session.flash(_(
+        u"You should be receiving an email with a link to reset your "
+        u"password. Doing so will activate your account."), 'success')
+
+    return HTTPFound(location=request.url)
+
+
 @view_config(name='login', renderer='kotti:templates/login.pt')
 def login(context, request):
     """
@@ -189,12 +215,8 @@ def login(context, request):
         login = request.params['login']
         user = _find_user(login)
         if user is not None and user.active:
-            email_set_password(
-                user, request,
-                template_name='kotti:templates/email-reset-password.pt')
-            request.session.flash(_(
-                u"You should be receiving an email with a link to reset your "
-                u"password. Doing so will activate your account."), 'success')
+            return get_settings()['kotti.reset_password_callback'][0](
+                request, user)
         else:
             request.session.flash(
                 _(u"That username or email is not known by this system."),

From 1f06109ced5ab6407c57d47fede9c4347b797f98 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 1 Oct 2015 15:09:41 +0200
Subject: [PATCH 346/600] Set nicer caption on password reset form's submit
 button.

---
 kotti/locale/Kotti.pot               | 428 +++++++++++-----------
 kotti/locale/de/LC_MESSAGES/Kotti.mo | Bin 15091 -> 18633 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po | 529 ++++++++++++---------------
 kotti/views/login.py                 |   3 +-
 4 files changed, 451 insertions(+), 509 deletions(-)

diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 587ac6352..ef0c62711 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -1,4 +1,4 @@
-# 
+#
 # SOME DESCRIPTIVE TITLE
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-10-01 15:07+0200\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: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Lingua 3.8\n"
+"Language: \n"
+"Generated-By: Lingua 3.11\n"
 
 #: ./kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -43,8 +43,8 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -56,7 +56,8 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -68,8 +69,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -81,17 +83,17 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: ./kotti/populate.py:121
+#: ./kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: ./kotti/populate.py:122
+#: ./kotti/populate.py:124
 msgid ""
 "Our company is the leading manufacturer of foo widgets used in a wide variety"
 " of aviation and and industrial products."
 msgstr ""
 
-#: ./kotti/populate.py:123
+#: ./kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
@@ -113,169 +115,169 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:627 ./kotti/views/edit/content.py:82
-msgid "Document"
+#: ./kotti/resources.py:509 ./kotti/views/edit/actions.py:456
+msgid "Copy"
 msgstr ""
 
-#: ./kotti/resources.py:666 ./kotti/views/edit/content.py:110
-#: ./kotti/views/edit/content.py:63
-msgid "File"
+#: ./kotti/resources.py:510 ./kotti/views/edit/actions.py:457
+msgid "Cut"
 msgstr ""
 
-#: ./kotti/resources.py:753 ./kotti/views/edit/content.py:138
-msgid "Image"
+#: ./kotti/resources.py:511 ./kotti/views/edit/actions.py:453
+msgid "Paste"
 msgstr ""
 
-#: ./kotti/resources.py:517
-msgid "Folder view"
+#: ./kotti/resources.py:512 ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/templates/edit/rename-nodes.pt:40
+#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:458
+msgid "Rename"
 msgstr ""
 
-#: ./kotti/resources.py:504 ./kotti/templates/view/folder.pt:17
-msgid "Contents"
+#: ./kotti/resources.py:513 ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/templates/edit/delete-nodes.pt:50
+#: ./kotti/templates/edit/delete.pt:24
+#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:443
+#: ./kotti/views/edit/actions.py:460
+msgid "Delete"
 msgstr ""
 
-#: ./kotti/resources.py:505 ./kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: ./kotti/resources.py:640 ./kotti/views/edit/content.py:85
+msgid "Document"
 msgstr ""
 
-#: ./kotti/resources.py:506
-msgid "Share"
+#: ./kotti/resources.py:731 ./kotti/views/edit/content.py:113
+#: ./kotti/views/edit/content.py:66
+msgid "File"
 msgstr ""
 
-#: ./kotti/resources.py:507 ./kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
+#: ./kotti/resources.py:778 ./kotti/views/edit/content.py:141
+msgid "Image"
 msgstr ""
 
-#: ./kotti/resources.py:508 ./kotti/views/edit/actions.py:446
-msgid "Copy"
+#: ./kotti/resources.py:530
+msgid "Folder view"
 msgstr ""
 
-#: ./kotti/resources.py:509 ./kotti/views/edit/actions.py:447
-msgid "Cut"
+#: ./kotti/resources.py:524 ./kotti/templates/view/folder.pt:15
+msgid "Contents"
 msgstr ""
 
-#: ./kotti/resources.py:510 ./kotti/views/edit/actions.py:443
-msgid "Paste"
+#: ./kotti/resources.py:525 ./kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
 msgstr ""
 
-#: ./kotti/resources.py:511 ./kotti/templates/edit/rename-nodes.pt:7
-#: ./kotti/templates/edit/rename-nodes.pt:55
-#: ./kotti/templates/edit/rename.pt:42 ./kotti/views/edit/actions.py:448
-msgid "Rename"
+#: ./kotti/resources.py:526
+msgid "Share"
 msgstr ""
 
-#: ./kotti/resources.py:512 ./kotti/templates/edit/delete-nodes.pt:8
-#: ./kotti/templates/edit/delete-nodes.pt:90
-#: ./kotti/templates/edit/delete.pt:28
-#: ./kotti/templates/site-setup/delete-user.pt:36 ./kotti/views/users.py:443
-#: ./kotti/views/edit/actions.py:450
-msgid "Delete"
+#: ./kotti/resources.py:527 ./kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
 msgstr ""
 
-#: ./kotti/security.py:189
+#: ./kotti/security.py:191
 msgid "Viewer"
 msgstr ""
 
-#: ./kotti/security.py:190
+#: ./kotti/security.py:192
 msgid "Editor"
 msgstr ""
 
-#: ./kotti/security.py:191
+#: ./kotti/security.py:193
 msgid "Owner"
 msgstr ""
 
-#: ./kotti/security.py:192
+#: ./kotti/security.py:194
 msgid "Admin"
 msgstr ""
 
-#: ./kotti/templates/add-dropdown.pt:5
+#: ./kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr ""
 
-#: ./kotti/templates/add-dropdown.pt:27
+#: ./kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr ""
 
-#: ./kotti/templates/default-view-selector.pt:5
+#: ./kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:35
+#: ./kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:76
+#: ./kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:98
+#: ./kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:109
+#: ./kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:131
+#: ./kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr ""
 
-#: ./kotti/templates/email-reset-password.pt:3
+#: ./kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr ""
 
-#: ./kotti/templates/email-reset-password.pt:7
-#: ./kotti/templates/email-set-password.pt:6
+#: ./kotti/templates/email-reset-password.pt:4
+#: ./kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr ""
 
-#: ./kotti/templates/email-reset-password.pt:10
+#: ./kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr ""
 
-#: ./kotti/templates/email-set-password.pt:3
+#: ./kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr ""
 
-#: ./kotti/templates/email-set-password.pt:9
+#: ./kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr ""
 
-#: ./kotti/templates/email-set-password.pt:12
+#: ./kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-#: ./kotti/templates/forbidden.pt:7
+#: ./kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr ""
 
-#: ./kotti/templates/login.pt:16
+#: ./kotti/templates/login.pt:15
 msgid "Login"
 msgstr ""
 
-#: ./kotti/templates/login.pt:25 ./kotti/templates/login.pt:87
+#: ./kotti/templates/login.pt:20 ./kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr ""
 
-#: ./kotti/templates/login.pt:34 ./kotti/views/login.py:212
+#: ./kotti/templates/login.pt:25 ./kotti/views/login.py:257
 #: ./kotti/views/users.py:212
 msgid "Password"
 msgstr ""
 
-#: ./kotti/templates/login.pt:47
+#: ./kotti/templates/login.pt:33
 msgid "Log in"
 msgstr ""
 
-#: ./kotti/templates/login.pt:65
+#: ./kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr ""
 
@@ -283,312 +285,310 @@ msgstr ""
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #. 
-#: ./kotti/templates/login.pt:77 ./kotti/templates/login.pt:100
+#: ./kotti/templates/login.pt:50 ./kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr ""
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: ./kotti/templates/login.pt:74
+#: ./kotti/templates/login.pt:48
 msgid ""
 "Fill out your username or email and click ${reset_password} below to receive "
 "an email with a link to reset your password."
 msgstr ""
 
-#: ./kotti/templates/login.pt:118
+#: ./kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr ""
 
-#: ./kotti/templates/login.pt:127
+#: ./kotti/templates/login.pt:82
 msgid "Register for an account on this site."
 msgstr ""
 
-#: ./kotti/templates/workflow-dropdown.pt:19
+#: ./kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr ""
 
-#: ./kotti/templates/edit/breadcrumbs.pt:5
+#: ./kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:7
+#: ./kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:14
+#: ./kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:26
-#: ./kotti/templates/edit/contents.pt:57
-#: ./kotti/templates/edit/delete-nodes.pt:33
-#: ./kotti/templates/view/folder.pt:28 ./kotti/views/users.py:196
-#: ./kotti/views/edit/content.py:32
+#: ./kotti/templates/edit/change-state.pt:18
+#: ./kotti/templates/edit/contents.pt:39
+#: ./kotti/templates/edit/delete-nodes.pt:22
+#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:196
+#: ./kotti/views/edit/content.py:33
 msgid "Title"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:29
-#: ./kotti/templates/edit/contents.pt:60
-#: ./kotti/templates/edit/delete-nodes.pt:36 ./kotti/templates/edit/share.pt:70
-#: ./kotti/templates/edit/upload.pt:23 ./kotti/templates/edit/upload.pt:167
-#: ./kotti/templates/site-setup/users.pt:105
-#: ./kotti/templates/view/folder.pt:31
+#: ./kotti/templates/edit/change-state.pt:19
+#: ./kotti/templates/edit/contents.pt:40
+#: ./kotti/templates/edit/delete-nodes.pt:23 ./kotti/templates/edit/share.pt:47
+#: ./kotti/templates/edit/upload.pt:19 ./kotti/templates/edit/upload.pt:112
+#: ./kotti/templates/site-setup/users.pt:67 ./kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:32
-#: ./kotti/templates/edit/contents.pt:63
-#: ./kotti/templates/edit/delete-nodes.pt:39
+#: ./kotti/templates/edit/change-state.pt:20
+#: ./kotti/templates/edit/contents.pt:41
+#: ./kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:35
-#: ./kotti/templates/edit/contents.pt:69
-#: ./kotti/templates/edit/delete-nodes.pt:42
-#: ./kotti/templates/view/folder.pt:34
+#: ./kotti/templates/edit/change-state.pt:21
+#: ./kotti/templates/edit/contents.pt:43
+#: ./kotti/templates/edit/delete-nodes.pt:25
+#: ./kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:38
-#: ./kotti/templates/edit/contents.pt:72
-#: ./kotti/templates/edit/delete-nodes.pt:45
-#: ./kotti/templates/view/folder.pt:37
+#: ./kotti/templates/edit/change-state.pt:22
+#: ./kotti/templates/edit/contents.pt:44
+#: ./kotti/templates/edit/delete-nodes.pt:26
+#: ./kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:79
-#: ./kotti/templates/edit/change-state.pt:90
+#: ./kotti/templates/edit/change-state.pt:40
+#: ./kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:82
+#: ./kotti/templates/edit/change-state.pt:41
 msgid ""
 "If checked, this will attempt to modify the status of all children in any "
 "selected documents and their subdocuments."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:100
+#: ./kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:103
+#: ./kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:111
+#: ./kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:127
-#: ./kotti/templates/edit/share.pt:121
-#: ./kotti/templates/site-setup/users.pt:165
+#: ./kotti/templates/edit/change-state.pt:64 ./kotti/templates/edit/share.pt:83
+#: ./kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:130
-#: ./kotti/templates/edit/delete-nodes.pt:93
-#: ./kotti/templates/edit/rename-nodes.pt:58 ./kotti/views/form.py:78
+#: ./kotti/templates/edit/change-state.pt:66
+#: ./kotti/templates/edit/delete-nodes.pt:45
+#: ./kotti/templates/edit/delete.pt:19
+#: ./kotti/templates/edit/rename-nodes.pt:42 ./kotti/views/form.py:78
 #: ./kotti/views/users.py:316 ./kotti/views/users.py:350
 #: ./kotti/views/users.py:442
 msgid "Cancel"
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:43
+#: ./kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:66
+#: ./kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:125
+#: ./kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:134
+#: ./kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr ""
 
-#: ./kotti/templates/edit/delete-nodes.pt:17
+#: ./kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: ./kotti/templates/edit/delete.pt:8
-#: ./kotti/templates/site-setup/delete-user.pt:8
+#: ./kotti/templates/edit/delete.pt:9
+#: ./kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr ""
 
-#: ./kotti/templates/edit/delete.pt:20
+#: ./kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr ""
 
-#: ./kotti/templates/edit/nav-tree-view.pt:7
+#: ./kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr ""
 
-#: ./kotti/templates/edit/rename-nodes.pt:16
-#: ./kotti/templates/edit/rename.pt:14
+#: ./kotti/templates/edit/rename-nodes.pt:13
+#: ./kotti/templates/edit/rename.pt:11
 msgid ""
 "Each content item has a name, which is used to create the url, and a title. "
 "Read the user manual about proper formatting of name and title if needed. You"
 " can change both below."
 msgstr ""
 
-#: ./kotti/templates/edit/rename-nodes.pt:35
-#: ./kotti/templates/edit/rename.pt:26
+#: ./kotti/templates/edit/rename-nodes.pt:26
+#: ./kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr ""
 
-#: ./kotti/templates/edit/rename-nodes.pt:45
-#: ./kotti/templates/edit/rename.pt:35
+#: ./kotti/templates/edit/rename-nodes.pt:33
+#: ./kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr ""
 
-#: ./kotti/templates/edit/rename.pt:7
+#: ./kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:7
+#: ./kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:19 ./kotti/templates/edit/share.pt:30
-#: ./kotti/templates/edit/share.pt:35 ./kotti/templates/site-setup/users.pt:68
+#: ./kotti/templates/edit/share.pt:14 ./kotti/templates/edit/share.pt:19
+#: ./kotti/templates/edit/share.pt:26 ./kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:43 ./kotti/templates/site-setup/users.pt:81
+#: ./kotti/templates/edit/share.pt:33 ./kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:60
+#: ./kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:73 ./kotti/templates/site-setup/users.pt:108
+#: ./kotti/templates/edit/share.pt:48 ./kotti/templates/site-setup/users.pt:68
 #: ./kotti/views/users.py:207
 msgid "Name"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:91 ./kotti/templates/site-setup/users.pt:126
+#: ./kotti/templates/edit/share.pt:59 ./kotti/templates/site-setup/users.pt:79
 #: ./kotti/views/users.py:313 ./kotti/views/users.py:501
 #: ./kotti/views/users.py:536
 msgid "User"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:94 ./kotti/templates/site-setup/users.pt:129
+#: ./kotti/templates/edit/share.pt:60 ./kotti/templates/site-setup/users.pt:80
 #: ./kotti/views/users.py:347 ./kotti/views/users.py:188
 #: ./kotti/views/users.py:501 ./kotti/views/users.py:536
 msgid "Group"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:101
-#: ./kotti/templates/site-setup/users.pt:136
+#: ./kotti/templates/edit/share.pt:63 ./kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:9
+#: ./kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:20 ./kotti/templates/edit/upload.pt:164
+#: ./kotti/templates/edit/upload.pt:18 ./kotti/templates/edit/upload.pt:111
 msgid "Filename"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:26 ./kotti/templates/edit/upload.pt:170
+#: ./kotti/templates/edit/upload.pt:20 ./kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:29
+#: ./kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:32
+#: ./kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:124
+#: ./kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:134
+#: ./kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:144
+#: ./kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr ""
 
-#: ./kotti/templates/site-setup/delete-user.pt:20
+#: ./kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
 
-#: ./kotti/templates/site-setup/user.pt:13
+#: ./kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr ""
 
-#: ./kotti/templates/site-setup/user.pt:25 ./kotti/views/form.py:156
+#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:15
+#: ./kotti/templates/site-setup/users.pt:12
 msgid "Search user(s) / group(s)"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:24
+#: ./kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:33
+#: ./kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:52
+#: ./kotti/templates/site-setup/users.pt:34
 msgid "Find users or groups"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:63
+#: ./kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:70
+#: ./kotti/templates/site-setup/users.pt:49
 msgid "Blank search text finds all."
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:96
+#: ./kotti/templates/site-setup/users.pt:63
 msgid "Assign global roles"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:180
+#: ./kotti/templates/site-setup/users.pt:115
 msgid "Add new user"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:190
+#: ./kotti/templates/site-setup/users.pt:121
 msgid "Add new group"
 msgstr ""
 
-#: ./kotti/templates/view/search-results.pt:8
+#: ./kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr ""
 
-#: ./kotti/templates/view/search.pt:5
+#: ./kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr ""
 
-#: ./kotti/templates/view/tags.pt:5
+#: ./kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr ""
 
-#: ./kotti/tests/testing_view.pt:7
+#: ./kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-#: ./kotti/tests/testing_view.pt:14
+#: ./kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr ""
 
 #: ./kotti/views/form.py:79 ./kotti/views/users.py:69
-#: ./kotti/views/edit/actions.py:364 ./kotti/views/edit/actions.py:408
+#: ./kotti/views/edit/actions.py:374 ./kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr ""
 
@@ -615,11 +615,22 @@ msgstr ""
 msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/views/login.py:237
+#: ./kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr ""
 
-#: ./kotti/views/login.py:199
+#: ./kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr ""
+
+#: ./kotti/views/login.py:179
+msgid ""
+"You should be receiving an email with a link to reset your password. Doing so"
+" will activate your account."
+msgstr ""
+
+#: ./kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr ""
 
@@ -631,7 +642,7 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: ./kotti/views/login.py:73 ./kotti/views/login.py:224
+#: ./kotti/views/login.py:73 ./kotti/views/login.py:269
 #: ./kotti/views/users.py:199
 msgid "Email"
 msgstr ""
@@ -647,27 +658,16 @@ msgstr ""
 msgid "Register - ${title}"
 msgstr ""
 
-#: ./kotti/views/login.py:163
+#: ./kotti/views/login.py:212
 msgid "Login failed."
 msgstr ""
 
-#: ./kotti/views/login.py:285
+#: ./kotti/views/login.py:331
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: ./kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr ""
-
-#: ./kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so"
-" will activate your account."
-msgstr ""
-
-#: ./kotti/views/login.py:177
+#: ./kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr ""
 
@@ -675,15 +675,15 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: ./kotti/views/login.py:89 ./kotti/views/login.py:256
+#: ./kotti/views/login.py:89 ./kotti/views/login.py:302
 msgid "There was an error."
 msgstr ""
 
-#: ./kotti/views/login.py:249
-msgid "Submit"
+#: ./kotti/views/login.py:295
+msgid "Set password"
 msgstr ""
 
-#: ./kotti/views/login.py:278
+#: ./kotti/views/login.py:324
 msgid "Your password reset token may have expired."
 msgstr ""
 
@@ -749,8 +749,8 @@ msgid "Add Group"
 msgstr ""
 
 #: ./kotti/views/users.py:465 ./kotti/views/users.py:71
-#: ./kotti/views/edit/actions.py:302 ./kotti/views/edit/actions.py:368
-#: ./kotti/views/edit/actions.py:414 ./kotti/views/edit/actions.py:410
+#: ./kotti/views/edit/actions.py:312 ./kotti/views/edit/actions.py:378
+#: ./kotti/views/edit/actions.py:424 ./kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr ""
 
@@ -800,11 +800,6 @@ msgstr ""
 msgid "${title} was moved."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:271 ./kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr ""
-
 #: ./kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -824,66 +819,71 @@ msgstr ""
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:293
+#: ./kotti/views/edit/actions.py:277 ./kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr ""
+
+#: ./kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:329 ./kotti/views/edit/actions.py:356
+#: ./kotti/views/edit/actions.py:339 ./kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:333
+#: ./kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:455
+#: ./kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:456
+#: ./kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:457
+#: ./kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:458
+#: ./kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:497
+#: ./kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:454
+#: ./kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:36
+#: ./kotti/views/edit/content.py:38
 msgid "Description"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:42
+#: ./kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:51
+#: ./kotti/views/edit/content.py:53
 msgid "Body"
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:99
+#: ./kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:78
+#: ./kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:106
+#: ./kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:111
+#: ./kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr ""
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index 803b241d845b019ff910880b80f593efa15e6db2..8b6032c06fb0571df325277ec428229f1733a2dc 100644
GIT binary patch
delta 7540
zcmb`J36K=k8OIyBbVU&n4^(_CA_(jOA|NgxHwcOciYKObrgx^@neMf_XV*nddn2eQ
zZj71)Z}GlD1&>loL)2I?F_y8)GDc%k5vimqlrdH%#;W}O-8~D40wH$QH^28@_xs*=
zz4zuHl{Z%Rh(FxF*R2-M)5u}S{k<*g?{LiC{P29buVvlW$FerTJ$hQ!je{&}1mia!
zY*~%)SvU%Af&<|Jhahky8~~?4rdW%h-aFa*PI#1M#nvhs!+G&D$lBKLVPE($WL;|$
zWL;}BWDV<c*bnYA*s}J5gW;a=$gE!n_n|)#>bu$5`_rKGp9|+g8}7sU*26T8X5bk(
z7JdxJ!-0pU7SDtG(?1U$1bwJTEr-3}{ZNKJ47K1>us?he%JW~taq!P@8a$B6cfd2@
zMAo-9(~t)v4^I`2g$n5eC{Jvt2>4J7gm4JF94ZxeL2R~Ohce_(a46gaWys!qtZW_%
z<;V!A^(MpkDH=0r$dk|E5%6D73m-y93P(VNt{&>U@lXnmgPm{&RL)<3TIg-4)cgS|
z0vogbS5OZ0HR=2V4DpxZ!x_**!=NUN%K9fjEjSlOa3R$9ufYA_>rjTi2j%G}P(}9z
zEW<qsgY>pT&ASZh`>V3?)kEWS;C2Scg0&V(!3HP~-i0d0k05ntZG<wYM{W9jAE-zS
zgHk*u>raN7KQrS=P>wBuN5V2xDsG8ssHh%*MBRE3YMXoj71GVH9rhlUdT=S!f>&n!
z>!CuvIvZb;aV?adC*g3o0V)!kpdz&yvZIMV=8zVvKRgOHz+Ui7s0rsneb@{Yfs3FF
zz8=cM`yhpFJq{<sH=u#NSXC(+4wdr>us56urEfm$rS;FEQNzIb>3~&)z3G>s3<#kV
zEQ3t2mcwJ<4NxAw412@hLA`$;%8`$t4DCZl3l4!~&#Hs^ZV~LS{lA!o6y>3Ee=$^u
zS7!Y#s0k0iKJXDJgP(?~jTfLi{RPzgcj1w6BUEJju}72IfJ*UXs7Rg-4`+QVq)`u7
zLl?fR7jV=_%Nh;mLDFSK@Rc5xbvrbDE$bW(iJG34b;;N?$JcUd9mjW%LFxMh9tZ~=
zn;JF->I9t%<?s?1tH@euh?hetxD__Sx1d66O-Lis2ddv6s^|tm89Efo^J&@msZb$5
zKkJvEQgJcVL3MNX{?Q4<U!i%PfeYX-vkym3v@F)PPJq*3JDdgA!-L?L@IW|lQX0}x
zP&F|h_JNl{73bAZhOB}za1GSFC*fJ}wMoSPJQ_#f_9}QOoDTP<l%?n-xF=i;XTbBJ
za(y>cQ9cc|onC?p`EMX~XMF{g>tV;I^JhTS!~&@KZBX;Ch-n-_V-?gwPr$YC8K@##
z+LTUop$?2yP~-PN8Tc4fO4dPn{2crh+yD=SH%&>4?@_4v&q3w>&5ZFMX(&XWLmAL>
zYO1&&q{gg)P_=O=)WVG!kB5rb9H`y#E>vpXhg#?}s8IJNe+vC!@HSWvwa#lPW9uy%
zhcNJ7_Tn=rgT90Y)|`+k7!9Rx3LFF%!y)iOC<9hN16M&A`eerEGrkH{w7-Qi@PmXg
z|8{7|@;ykr6c2_9T_aR37ec)cGOmOV)4vzWlZ6z9cm`AomO>SE5o*D9s9awOrROH7
zUG^ZXVSVdk8p_Gvpggo@rYF@wa3tO1pcFMj<=TUaPy`3Vt1{jRWyo`|7XBPAfq#K2
zzA3X({moEC+X-V8(Fz(;cr%oOyP$IZ5L6Ak2=(2o8Q;v_zXRpjr*IDZCsgE`W~YXp
z1$)w83P-?ZsP`+OYGUnd_Wy7i&oZEeKZMH7MyT<BLxs$sT?<Wu2gBJ=-!FyAbs>8n
zWaBZE1J`9-1COTvQ+O2o0LtN>bBVv9vH#pOG{?Yt`X@pP*y@C<;Ir^ZICq|99S=*;
zz=vQDD5b54o(B-6@qA<=qUTcN9ApKeg-0RmP;0sJ|2VSsGmefHQ;78FWYcp8atab4
zijq9K7-8pHi;y;C52OLn>3KV%y3sD_jr2mQ&$U@2{yq(biby9RzaV=dT#>a8hd)5Z
zBPSwC!DWbY+kz++eGolQAj6VYn)BOew`cu_p$c+Z)(3I&Uwkwz<yTdC7V;BBkB=w~
z)#nBpVb*Dck0J|^GqN#ZS=QbQo{+Uqg4!v1=BKcV35mZ)<ECs-xCmLA^-C~9RwI*<
z?;(0FM+(TPh@N|q=}F77x-yP|9a;O<j7qn*`XgEYDGfY`oQ<f^a)_RTkXw+)kRKsW
zB6{vdw1pNU_aJ(1PLces<kxJ~&(ofOxX8?G{C=ndsDi{4a8l7av93otk@Jvikf#wn
zLsKM&O4dv+t^MeXL>6R&_rW`nOOR${EK-MDjp(@&nS|V>4$qCse_t9ikU7Zd$SmYc
z#73?{evFh6Jr5!0CarYe56arYVaRpJ$%um-f^7X<NT(h-4OxS%MYO*4L$Ri*IBx1f
zzhGRisexuqQ`^)U!*jM@F*(~aO}5FE>@b{C+Z=fYsS7K)oD+t%rWiOaQ))|o!S!mV
zf<%Ws)kMDO^ecf0-N;FF*<Rj+ksU-PSF}AoFPPYkLX-2o$nm1E-kA9<nq!J~yW@?}
zcYf%2#x`v%-Qfp$)8Yq-u0*q)FT1?W<@|~lnNBAfW87#&sborSt5fPU&5mhu%2O}u
zaDu3_sexvFO;ZD&RlQpjdpSodjtCrs=>;c`^<$C|)P#;>qM~C8fzxT6yc_v}X|@rk
z<aZ=*BEKy$$Ftkrf*rX&v9SX=5}6Jc6?RFV$|u4RcDPZl$n>bg!7Vh#k)oi$w7X7+
z+N_so%vFMbpx}AIF?NV!nZmX<2NSBnZFdQ;AB0uM@@{)IQGwr4n<lYotI?casw?N~
z#;31h<=80sGkvecEmQ(0&3`hkS6LlY`*U1u^(&DnDgwT8mrj$9fmz^3kvk$ZksFmT
zn{Ugu*J*sbO7m9L6FPk872?oT!XyNgNx6+Vk#limT3lMBHqn`M!p<;q%JoTTq$5dV
zRoT~#+`d>{uf?zJo}A62aAPXB7)5Q98yZ?=dVS#7d5q2bxv<_33Js3eP_iQ@j2iMz
zJ85sj*oJ01baM?=*ORo@7o&113wPBlSdD608pNVvm$o(|#t}PBl4f;#)zm=Bc9y(k
z9p!F%K40g1;f^ym-FTI9vlAG<#n|ZtW5-*UCy{r^m@2-d;^kD$cFB!MU$QH=O<<Dg
zWN-gJNr}HPD_fG%*4gIPw{=EE-%HY={<Pu8Ot%y3ri5&TT=6Ko+;)8A1m!774!6%j
zT9#F>zx(*l@^h6kn>ESuj<c}D_wwYRqi9E_><4jj`Xnc8-e-eH#njemTN`PX=<AZ3
zbG(pk!QQjOZ9h1Ts!j5iR+vsnY1ba2SxzgoTV;2Z8N>eH{mru_O*`8=+ovQ8*@QG^
z-KM3RU<W%Q-56bu4Es;lJN^IK_40nxyLt{d<$#%fTW8=Fic#XR_EddMSL=Yox>gLB
zv+nHyFZJ8o(NUUSB3(BQnY8ZBA=mWWcWh%_<5)BH*vX9(M>me^x}f&p{f@2Mc5vPD
zTGJz*R6o8Zy(Fi5Wv7&PzIIKX?mDJ*!+Ou-Sm$ggve$O~&a}H#a%)y}W|Cu7$qdT7
z*>R&v%*CLA`Cid3MUI)z(G{4}dF61MaFenwm(Cn+o6yLXW;f)-HLVVZ=qah&oT?jM
zKm}7hQ=43!wdR~kft%R0aKIIul2cG^H9OpZCA$(4vb^hrPH5udhV{8(7<JgiAj}of
zN;MXDa=D&t^NFlZLsnrOE@DELScnd1i-TSvEIBSmJpQwjlWFtpN?Vj(tXz}atf5ns
zo3niWK~#e+XP0%jGRk8i#h!lw-GNKi#B!&EPodwz*By!)TVqbeYn58&*_DvkC@|l0
zjmEot6fel`!(BKEbd_eoAXnHhh6BJ!f}`=pm|4m)9nbgp<5c1%QXEtw{9P!K7;aek
zQg({OtioBSjBVq-;v5)$TS$l0a?0nq(Ol+gLok%ZatG&l`ZpoDZ#Xcv`z!cux9hGS
z5IebC<K4Smzmv;#cF^JQH`NI!;Oe%|BC*}sc@i6Uo?B{hOgnkf%<hTRC@1+%_wP1I
zT~-M<+#fB|zS^cXi>|k<5>uWmzJm-^ElLj1-AK@mFWUHjylJ=beAf^6#Q1OeubS<@
z<URj)X88+t^}d}G@c%hIadbAY#rQ9+L&NjgENm$@k&fH+?@T$}BiV+SX3QDMY19!r
zCDIa@h3+!PTV|Nk?gSgwx3qBSCnq6C7hf;ruuRv|E}Z4JZm}{we3Roe*}v6OX#SQ9
udI$O4%KzO>@a|mE-S&_3y<N{@dPU#&$gqKZv#Y1;o(ZR~`)a}$J^u^Ng}y`p

delta 3948
zcmZA3d2o$a7{~E*8zMp?LL#W<DnUrn+$2N@5e-sXtwrs7Z6OG?zM5JqjS|#a)V?oQ
z7dkEez^IOvwllP`46RzGqcgObPSJjU_dRCXo|)%<&Uv?U&U4QDCg+xW9u_#)BFn8Z
zltaYx#D?<5JW#z7Ka|Vi#)JnMa|IjHzEjnhWQ>S3rZHw?H5`xCaUODsS%p!!)1Lp_
zp1+6<IDQ-BjB!jDchjdy#R`~#!I+KoYjQCLJ7Z-Wi4}1&hTv@5UVve=m!YoPXwUCK
zJ>QQV@EGbk52KBze^Z5uj{_N)hU1WH%w}Ye<|x*{v#1PR$8z`>HBb-JREHs01*1?i
zkK-o=TVfXG;aWU^>6jbMJ@jwpQPBgJpi)|l8sRZi2F{{7IFB#jWz<rXVJ(bhbQ(wt
ztc%&Gfec5j;uO?G98|_upq6_*I_kJH`HjWysE+ed4|GteTZp=@2=##FI0M%qNifxG
zx*f%%mZm8(Nt0#Uy-^bwjJkh3>bV6q$-g?9#R1(=h-$Avb+`$q;x^O`HJNS%#-awA
zjGAd{)TZl-6L1LXITuj(eUG~SM|=FPZU0t_{A*30azGELUE7^OB5E_HBYm4J)PVY-
zt{;S&$t=`^=iBxQR0h^tx1%O@5bNV<)Kc6-vTvR^RJ5j1JXM=64VBVdoQ4BYGx!eG
z;SaWb3$?a)?eX8OPf^dQP$%$uncApKWTP^bi@eFEFKWr1(Nr2xS%jM50n`nC)P=`U
z890X;@h#L0|3b!Y$}{>FSQouG0JTJOPy;VUJ!d8A`CBm*ce!oH_^If^Pf;CzVLgr7
zG+&`^yn?BC4K>3^hOhe?pw1_tCgMX4v@fdTNvOBNL0z{6m5Ci#P4EB5RJ8VAqEcLH
z+drdjC_@eGF>2&NUUzSVqh=b7y1yaT#|-3BGYGXe<|1P@MW{^fMUrPuW0FJV7L_p=
z$uM<dHa5X^SP#$ODG!?lL-`==<6s=eKViBVcombd1|J1J38p=2Km(CC)J#NWY%ywY
zZLl6jM-MndB^ga4H>EyQCem%Y4QjKsM-8wCs)I@Pcp)m)#kRc>wFJA77t5To=Sxu;
zxsQYK&qm~57xs(iqk;LDg*!0^e?gs3;IpWi<)Bj8AGH@|qL$_WR>Y4`137^j;04ru
zH?S|3;Q;JLdW&&?6Y`%;B{RW&&|D0my#U){F=~x3Vr9IE+B^?XDgPU_6iJEhz<QzX
zpMu&8vr+eNLEV1@WAOy)y6X;=9aQdMC@$lvx^W%qLvaFi{1R%WS5dqEC)AAZ;dy+7
zdL2)`<fgb310NdH+CQ;YWu3!m$Dsz`q*2j>TVVyvL2Z)GsE&tP$73<==~xbfeeTj!
zLUmLRmFi|#6}#a3I2hGYnN@!h^%hh_jyt9v6^$qXz1R}<fB~on=Ak~J3s7sn9yNgD
z=*1JLf!?s*xBh|Jv>rA}B!*eNs6Ca6QF{M7QBmrKqSkVby<n^LGu+MbZ&5Ruljgb*
zwFJvB4A-JM+=*IiKdPgXsJHAgYM_zq^lDfKqv_xHsPJl=Tx^76Q4cCXt@S2UhPI<#
zr=!-dQ3JY%FXBV&gVD|0J(P#aU<qo8_n@A07<J!CbgEN1M@4IY4Rzsd>#wK_AEB;$
zf|^-mI^P0}MP+UjYM_Ove^?eHpA=JM&mToC={Kkh-$Xq(q&fN5+Ei`so~VyCXm><)
zGz?>KBI<_4s1z<oo!?-O??w&qi1jSS(=NpZ7)<^(^F;JwCPw4H4Dz2uWhw_+<5n!j
zo2b_?pFeFaaW#7J5_(Xx7)z*ZBccd>SV&Ny%;L8nv5(N+&|uWhLgGIqu>Ks;cRs?N
zVdDnM8h&3T@(HD{5iy;}B)Sq4i7~`;1bfRYBa|I|qV<MoDV~)DwlW8``Em$N&>6(f
zvog<C_#eWQ5Nvq!3ZW&LO|&9L651=}36=eXHlK=8y_zUcgR+ZwjZkKv744hGgf@7%
z-v2&S))OjuE`bk+s_zh!?J+)JW)IPc=w*+I8Mdzdk!9<hv8Ju(T1Q(a;Jdc2{>>yB
z1Btc7IARL%9+5!|CRDUcqlj*5P___lRH3YJ3H-^PX6q}hb5R?7w{0K99YkNEh!~~^
zt3(saiM@n2+yO#m6QOs$C$X7ODRv3`F6KA(U+v-4`3#shh_?3lR^&wp{3qQ3*~5Xi
zX9+rQ^3$J~PaGmtyn$c$qhzarPj3|(dapa$gCF8XVkR+^NG1}9w+WTEh;-ruH7HAo
zU?Q7nNAyr)U#8NV7(x^h>xl7$%1+|-K+XNs>K%VpYExN6bRk9%F~t8%A_uw?8;I@p
z<SH4OIjME1*PA)UzdEYa;~$XP&g0)3Q&hPmC$3p=&w^nS#!U6kh+7yGo}7}HlH&FG
zTBN2nN%ob5#m7XXCHj1cDL!vXN{h5K4*HwMdp$wTk}^t`Mm_cyq?C&+S(4K+BzxGD
Pk$EFV=J_w>lm-0*r<Z}D

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index 242c630f6..1fbccf790 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7dev4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
-"PO-Revision-Date: 2014-11-21 22:44+0100\n"
+"POT-Creation-Date: 2015-10-01 15:07+0200\n"
+"PO-Revision-Date: 2015-10-01 15:07+0200\n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: de <kotti@googlegroups.com>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 0.9.6\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -28,34 +28,30 @@ msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Herzlichen Glückwunsch! Sie haben Kotti erfolgreich installiert."
 
 #: kotti/populate.py:66
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,13 +59,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -77,9 +72,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -93,28 +88,20 @@ msgstr ""
 "\n"
 "<h2>Anmelden</h2>\n"
 "<p>\n"
-"    Sie können sich nun <a class=\"btn btn-success\" href=\"login"
-"\">anmelden</a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  "
-"Falls Sie bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, "
-"lautet dieses höchstwahrscheinlich <em>qwerty</em>.\n"
+"    Sie können sich nun <a class=\"btn btn-success\" href=\"login\">anmelden</a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  Falls Sie bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, lautet dieses höchstwahrscheinlich <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Nach der Anmeldung werden Sie eine graue Bearbeitungsleiste unter der "
-"Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung "
-"wechseln, sowie weitere Funktionen ausführen.\n"
+"    Nach der Anmeldung werden Sie eine Bearbeitungsleiste unter der Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung wechseln, sowie weitere Funktionen ausführen.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Konfiguration</h2>\n"
 "        <p>\n"
-"            Finden Sie heraus, wie Sie den Titel Ihrer Installation und "
-"vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen "
-"können.\n"
+"            Finden Sie heraus, wie Sie den Titel Ihrer Installation und vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen können.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -122,13 +109,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Erweiterungen</h2>\n"
 "        <p>\n"
-"            Mit Hilfe von Erweiterungen können Sie Ihrer Installation "
-"zusätzliche Funktionen hinzufügen.\n"
+"            Mit Hilfe von Erweiterungen können Sie Ihrer Installation zusätzliche Funktionen hinzufügen.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti Erweiterungen\n"
 "            </a>\n"
 "        </p>\n"
@@ -136,9 +121,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>DoKumentation</h2>\n"
 "        <p>\n"
-"            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  "
-"Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für "
-"diese und weitere Informationen.\n"
+"            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für diese und weitere Informationen.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -149,26 +132,20 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "Über"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"Unsere Firma is der führende Hersteller von Foo Produkten, welche "
-"gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen "
-"Industriesektoren eingesetzt werden."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Unsere Firma is der führende Hersteller von Foo Produkten, welche gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen Industriesektoren eingesetzt werden."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -185,20 +162,18 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -216,171 +191,166 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Copyright info</a>.\n"
 "  Originally published in the\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopieren"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Einfügen"
+
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Löschen"
+
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "Datei"
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "Bild"
 
-#: kotti/resources.py:517
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "Ordneransicht"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhalt"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: kotti/resources.py:506
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "Teilen"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Aktionen"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Kopieren"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Einfügen"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Löschen"
-
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "Betrachter"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "Bearbeiter"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "Besitzer"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "Administrator"
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr "Dateien hochladen"
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr "Standardansicht setzen"
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr "Anzeigen"
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr "Navigieren"
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr "Seiten-Einstellungen"
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr "Abmelden"
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "Passwort zurücksetzen bei ${site_title}"
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr "Hallo ${user_title}!"
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} "
-"zurückzusetzen: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} zurückzusetzen: ${url}"
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr "Ihre Anmeldung bei ${site_title}"
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr "Ihre Anmeldung bei ${site_title}"
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich "
-"anzumelden: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich anzumelden: ${url}"
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr "Zugriff verweigert"
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "Anmelden"
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr "Benutzername oder E-Mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Passwort"
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
@@ -388,308 +358,289 @@ msgstr "Passwort vergessen?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Geben Sie oben Ihren Benutzernamen oder Ihre E-Mail Adresse an und klicken "
-"Sie auf ${reset_password}. Sie werden daraufhin eine E-Mail erhalten, die "
-"einen Link zum zurücksetzen Ihres Passworts enthält."
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Geben Sie oben Ihren Benutzernamen oder Ihre E-Mail Adresse an und klicken Sie auf ${reset_password}. Sie werden daraufhin eine E-Mail erhalten, die einen Link zum zurücksetzen Ihres Passworts enthält."
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr "Noch nicht registriert?"
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 msgid "Register for an account on this site."
 msgstr "Einen Benutzer für den Zugang zu dieser Seite erstellen."
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Setze ${state}"
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Sie sind hier:"
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Workflowstatus ändern"
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/"
-"oder verwalten kann."
+msgstr "Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/oder verwalten kann."
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr "Titel"
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Typ"
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr "Status"
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Erstellungsdatum"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Bearbeitungsdatum"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr "Unterordner einbeziehen"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Wenn Sie diese Option anwählen, wirkt sich die Statusänderung sowohl auf "
-"alle ausgewählte als auch auf die darin enthaltenen Dokumente aus."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Wenn Sie diese Option anwählen, wirkt sich die Statusänderung sowohl auf alle ausgewählte als auch auf die darin enthaltenen Dokumente aus."
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr "Ändere Status in"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
-msgstr ""
-"Wählen Sie den neuen Status, der für alle ausgwählten Dokumente gesetzt "
-"werden soll."
+msgstr "Wählen Sie den neuen Status, der für alle ausgwählten Dokumente gesetzt werden soll."
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr "Keine Änderungen."
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "Änderungen übernehmen"
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "Kein sichtbarer Inhalt."
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr "Unsichtbar"
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Lösche ${title}"
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr "Sind Sie sicher, dass Sie ${title} löschen möchten?"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr "Navigieren"
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Jeder Inhalt hat einen Namen, der auch Bestandteil der URL ist, und einen "
-"Titel. Sie können beides ändern, indem Sie unten einen neuen Namen und/oder "
-"Titel angeben."
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Jeder Inhalt hat einen Namen, der auch Bestandteil der URL ist, und einen Titel. Sie können beides ändern, indem Sie unten einen neuen Namen und/oder Titel angeben."
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "Neuer Name"
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "Neuer Titel"
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr "${title} umbenennen"
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "Teile ${title}"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr "Suche Benutzer und Gruppen"
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr "Suche"
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr "Lokale Rollen zuweisen"
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr "Name"
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr "Benutzer"
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr "Gruppe"
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Inhalte aus lokalen Dateien hochladen"
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 msgid "Filename"
 msgstr "Dateiname"
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr "Größe"
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr "Status"
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr "Hochzuladene Dateien auswählen..."
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr "${number} Dateien hochladen"
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr "Alle Fehlermeldungen ausblenden"
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr "Zurück zur Benutzerverwaltung"
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bearbeite ${title}"
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 msgid "Search user(s) / group(s)"
 msgstr "Suche Benutzer / Gruppe(n)"
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr "Neuer Benutzer"
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr "Neue Gruppe"
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 msgid "Find users or groups"
 msgstr "Suche Benutzer oder Gruppen"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr "Benutzer- / Gruppenname"
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 msgid "Blank search text finds all."
 msgstr "Suche mit leerem Eingabefeld liefert alle Benutzer."
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 msgid "Assign global roles"
 msgstr "Globale Rollen zuweisen"
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 msgid "Add new group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr "Suche..."
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr "Verschlagwortet mit:"
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "Willkommen, ${user}! Sie sind angemeldet."
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "Willkommen! Sie sind nicht angemeldet."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "Ihre Änderungen wurden übernommen."
 
@@ -716,11 +667,20 @@ msgstr "${type} in ${title} erstellen"
 msgid "Add ${type}."
 msgstr "${type} erstellen"
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Willkommen, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "Sie wurden abgemeldet."
 
@@ -732,46 +692,29 @@ msgstr "Vollständiger Name"
 msgid "Username"
 msgstr "Benutzername"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-Mail"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
-"einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
 #: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrieren - ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:331
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Passwort zurücksetzen - ${title}"
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Willkommen, ${user}!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
-"einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
@@ -779,15 +722,15 @@ msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 msgid "Register"
 msgstr "Registrieren"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89 kotti/views/login.py:302
 msgid "There was an error."
 msgstr "Ein Fehler ist aufgetreten."
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Absenden"
+#: kotti/views/login.py:295
+msgid "Set password"
+msgstr "Passwort setzen"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:324
 msgid "Your password reset token may have expired."
 msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
@@ -796,13 +739,8 @@ msgid "User Management"
 msgstr "Benutzerverwaltung"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke "
-"Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu "
-"lassen."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -856,8 +794,8 @@ msgid "Add Group"
 msgstr "Neue Gruppe"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Keine Änderungen."
 
@@ -907,11 +845,6 @@ msgstr "${title} ausgeschnitten."
 msgid "${title} was moved."
 msgstr "${title} verschoben."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} gelöscht."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -931,70 +864,78 @@ msgstr "${title} wird nun in der Navigation angezeigt."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} gelöscht."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Nichts wurde gelöscht."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Name und Titel werden benötigt."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "Objekt umbenannt."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Nach oben verschieben"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Nach unten verschieben"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Anzeigen"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Verstecken"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Status ändern"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Beschreibung"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Schlagworte:"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Inhalt"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "Standardansicht wurde zurückgesetzt."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Standardansicht"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Standardansicht wurde gesetzt."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "Standardansicht konnte nicht geändert werden."
 
+#~ msgid "Submit"
+#~ msgstr "Absenden"
+
 #~ msgid "Private"
 #~ msgstr "Privat"
 
diff --git a/kotti/views/login.py b/kotti/views/login.py
index 53238892c..432eddbd3 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -291,7 +291,8 @@ def set_password(context, request,
     :rtype: pyramid.httpexceptions.HTTPFound or dict
     """
 
-    form = Form(SetPasswordSchema(), buttons=(Button('submit', _(u'Submit')),))
+    form = Form(SetPasswordSchema(),
+                buttons=(Button('submit', _(u'Set password')),))
     rendered_form = None
 
     if 'submit' in request.POST:

From 7153299cd0a7c5a1fb80f54631d8652b4a22fe4b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 1 Oct 2015 15:35:23 +0200
Subject: [PATCH 347/600] Prevent displaying two redundant error messages in
 password reset form.

---
 kotti/tests/browser.txt | 2 +-
 kotti/views/login.py    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/kotti/tests/browser.txt b/kotti/tests/browser.txt
index b12023e94..3ba218f3e 100644
--- a/kotti/tests/browser.txt
+++ b/kotti/tests/browser.txt
@@ -779,7 +779,7 @@ We'll use that link to set our password:
   >>> ctrl("Password", index=0).value = "newpassword"
   >>> ctrl(name='password-confirm').value = "newpasswoops" # a silly error
   >>> ctrl(name="submit").click()
-  >>> "There was an error" in browser.contents
+  >>> "There was a problem with your submission" in browser.contents
   True
   >>> ctrl("Password", index=0).value = "newpassword"
   >>> ctrl(name='password-confirm').value = "newpassword"
diff --git a/kotti/views/login.py b/kotti/views/login.py
index 432eddbd3..68a0c97fe 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -299,7 +299,6 @@ def set_password(context, request,
         try:
             appstruct = form.validate(request.POST.items())
         except ValidationFailure, e:
-            request.session.flash(_(u"There was an error."), 'error')
             rendered_form = e.render()
         else:
             token = appstruct['token']

From 884af4aafe7354d96954f76af0b0b64899567801 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 2 Oct 2015 13:56:03 +0200
Subject: [PATCH 348/600] Support optional --rev with kotti-migrate upgrade.

---
 CHANGES.txt      | 1 +
 kotti/migrate.py | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 39dd8228a..27cfacadf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ Change History
 - Support principal search on non string attributes.
 - Support principal searches matching *all* arguments
   (i.e. using the ``and`` operator, ``or`` is still the default).
+- Support optional --rev with kotti-migrate upgrade.
 
 1.2.0 - 2015-09-27
 ------------------
diff --git a/kotti/migrate.py b/kotti/migrate.py
index a2414ddb1..21409aac9 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -132,7 +132,7 @@ def stamp_heads():
         stamp_head(location)
 
 
-def upgrade(location=DEFAULT_LOCATION):
+def upgrade(location=DEFAULT_LOCATION, revision=None):
     # We don't want to fire any kind of events during a migration,
     # because "migrations are a low-level thing".
     from kotti import events
@@ -140,7 +140,8 @@ def upgrade(location=DEFAULT_LOCATION):
 
     pkg_env = PackageEnvironment(location)
 
-    revision = pkg_env.script_dir.get_current_head()
+    if revision is None:
+        revision = pkg_env.script_dir.get_current_head()
     print(u'Upgrading {0}:'.format(pkg_env.location))
 
     def upgrade(heads, context):
@@ -194,7 +195,7 @@ def kotti_migrate_command():
 
     Usage:
       kotti-migrate <config_uri> list_all
-      kotti-migrate <config_uri> upgrade [--scripts=<location>]
+      kotti-migrate <config_uri> upgrade [--scripts=<location>] [--rev=<rev>]
       kotti-migrate <config_uri> upgrade_all
       kotti-migrate <config_uri> stamp_head [--scripts=<location>] [--rev=<rev>]
 
@@ -240,7 +241,7 @@ def callback(arguments):
             func = list_all
         elif arguments['upgrade']:
             func = upgrade
-            args = args_with_location
+            args = args_with_location + (arguments['--rev'],)
         elif arguments['upgrade_all']:
             func = upgrade_all
         elif arguments['stamp_head']:

From 6caf67ae063ac44090114f1ce98b7bb7c9daa040 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 7 Oct 2015 21:40:36 +0200
Subject: [PATCH 349/600] Bump version.

---
 CHANGES.txt                             |   2 +-
 kotti/locale/Kotti.pot                  |   8 +-
 kotti/locale/de/LC_MESSAGES/Kotti.mo    | Bin 18633 -> 18633 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po    |   8 +-
 kotti/locale/en/LC_MESSAGES/Kotti.mo    | Bin 449 -> 449 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po    | 436 ++++++++++----------
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 18638 -> 13518 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po | 526 +++++++++++-------------
 kotti/locale/it/LC_MESSAGES/Kotti.mo    | Bin 12657 -> 12628 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po    | 506 +++++++++++------------
 kotti/locale/ja/LC_MESSAGES/Kotti.mo    | Bin 12364 -> 12334 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po    | 484 ++++++++++------------
 kotti/locale/ko/LC_MESSAGES/Kotti.mo    | Bin 14928 -> 13322 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po    | 501 +++++++++++-----------
 kotti/locale/nl/LC_MESSAGES/Kotti.mo    | Bin 11253 -> 11220 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po    | 488 ++++++++++------------
 kotti/locale/pl/LC_MESSAGES/Kotti.mo    | Bin 17915 -> 17881 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po    | 194 ++++-----
 kotti/locale/pt/LC_MESSAGES/Kotti.mo    | Bin 7711 -> 7681 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po    | 478 ++++++++++-----------
 requirements.txt                        |   2 +-
 setup.py                                |   2 +-
 22 files changed, 1658 insertions(+), 1977 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 27cfacadf..9e4bbd2ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.2.1 - unreleased
+1.2.1 - 2015-10-07
 ------------------
 
 - Outfactor the code that runs after successful authentication into a
diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index ef0c62711..2cafab89a 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2015-10-01 15:07+0200\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\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"
@@ -662,7 +662,7 @@ msgstr ""
 msgid "Login failed."
 msgstr ""
 
-#: ./kotti/views/login.py:331
+#: ./kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: ./kotti/views/login.py:89 ./kotti/views/login.py:302
+#: ./kotti/views/login.py:89
 msgid "There was an error."
 msgstr ""
 
@@ -683,7 +683,7 @@ msgstr ""
 msgid "Set password"
 msgstr ""
 
-#: ./kotti/views/login.py:324
+#: ./kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr ""
 
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index 8b6032c06fb0571df325277ec428229f1733a2dc..0f1ea164844117869f80ed6f56c17f4724922b79 100644
GIT binary patch
delta 22
ecmX>(k@4h2#tqDx?B)tahE^s9o4GXi%L4#b1qQYN

delta 18
acmX>(k@4h2#tqDxleIN@Hw$R)lm`GqT?R`4

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index 1fbccf790..50d818308 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7dev4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2015-10-01 15:07+0200\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2015-10-01 15:07+0200\n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: de <kotti@googlegroups.com>\n"
@@ -709,7 +709,7 @@ msgstr "Registrieren - ${title}"
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Passwort zurücksetzen - ${title}"
@@ -722,7 +722,7 @@ msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 msgid "Register"
 msgstr "Registrieren"
 
-#: kotti/views/login.py:89 kotti/views/login.py:302
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "Ein Fehler ist aufgetreten."
 
@@ -730,7 +730,7 @@ msgstr "Ein Fehler ist aufgetreten."
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: kotti/views/login.py:324
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index 0a090a05ce65dabda58eccf9cd234e38be246e8a..0356e00c52c21fc6a7143fecdf76d629a3f80bdb 100644
GIT binary patch
delta 25
gcmX@ee2{s<R6aukT?2CkBSR|_18oDNjf>?N0bp?k(f|Me

delta 25
gcmX@ee2{s<R6YYET_Ym}LqjWLV{HS&jf>?N0bo}K&;S4c

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index c7186f8ca..fe7e914e6 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -32,29 +32,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +58,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +71,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -90,23 +85,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -123,169 +115,168 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
-msgid "Document"
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
 msgstr ""
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
-msgid "File"
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
 msgstr ""
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
-msgid "Image"
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
 msgstr ""
 
-#: kotti/resources.py:517
-msgid "Folder view"
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
 msgstr ""
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
-msgid "Contents"
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
 msgstr ""
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
+msgid "Document"
 msgstr ""
 
-#: kotti/resources.py:506
-msgid "Share"
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
 msgstr ""
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
-msgid "Actions"
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
+msgid "Image"
 msgstr ""
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
+#: kotti/resources.py:530
+msgid "Folder view"
 msgstr ""
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
+msgid "Contents"
 msgstr ""
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
 msgstr ""
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
+#: kotti/resources.py:526
+msgid "Share"
 msgstr ""
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
 msgstr ""
 
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr ""
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr ""
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr ""
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr ""
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr ""
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr ""
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr ""
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr ""
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr ""
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr ""
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr ""
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr ""
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr ""
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr ""
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr ""
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr ""
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr ""
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr ""
 
@@ -293,296 +284,289 @@ msgstr ""
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr ""
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr ""
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 msgid "Register for an account on this site."
 msgstr ""
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr ""
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr ""
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr ""
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr ""
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr ""
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 msgid "Filename"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr ""
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 msgid "Search user(s) / group(s)"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 msgid "Find users or groups"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 msgid "Blank search text finds all."
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 msgid "Assign global roles"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 msgid "Add new user"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 msgid "Add new group"
 msgstr ""
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr ""
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr ""
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr ""
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr ""
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr ""
 
@@ -609,11 +593,20 @@ msgstr ""
 msgid "Add ${type}."
 msgstr ""
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr ""
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr ""
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr ""
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr ""
 
@@ -625,14 +618,12 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr ""
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
 #: kotti/views/login.py:123
@@ -640,27 +631,16 @@ msgstr ""
 msgid "Register - ${title}"
 msgstr ""
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr ""
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr ""
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr ""
 
@@ -668,15 +648,15 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr ""
 
-#: kotti/views/login.py:249
-msgid "Submit"
+#: kotti/views/login.py:295
+msgid "Set password"
 msgstr ""
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr ""
 
@@ -685,9 +665,7 @@ msgid "User Management"
 msgstr ""
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr ""
 
 #: kotti/views/users.py:587
@@ -742,8 +720,8 @@ msgid "Add Group"
 msgstr ""
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr ""
 
@@ -793,11 +771,6 @@ msgstr ""
 msgid "${title} was moved."
 msgstr ""
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr ""
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -817,66 +790,71 @@ msgstr ""
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr ""
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr ""
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr ""
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr ""
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr ""
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr ""
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr ""
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr ""
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr ""
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr ""
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr ""
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr ""
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr ""
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr ""
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr ""
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index b0c1df66d24b792df1d4a385ace1cf9ec79397e5..5850420e325f2be73b948478b821d1432d7882c7 100644
GIT binary patch
delta 3801
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
Gr}uxf=2kQS

literal 18638
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

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 369507a06..3510ce14d 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9a3dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:34+0100\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2013-09-22 20:21+0100\n"
 "Last-Translator: Fabien Castarède <fabien.castarede@free.fr>\n"
 "Language-Team: French\n"
@@ -27,34 +27,30 @@ msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
 #: kotti/populate.py:66
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +58,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +71,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -92,31 +87,25 @@ msgstr ""
 "\n"
 "<h2>Identifiez vous</h2>\n"
 "<p>\n"
-"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</"
-"a> sur votre site internet\n"
-"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de "
-"passe pour\n"
+"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</a> sur votre site internet\n"
+"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de passe pour\n"
 "    votre compte administrateur, celui-ci devrait être <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition "
-"en dessous de la\n"
-"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition "
-"et la visualisation, telle qu'\n"
+"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition en dessous de la\n"
+"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition et la visualisation, telle qu'\n"
 "    elle apparaitra aux visiteurs.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configuration</h2>\n"
 "        <p>\n"
-"            Trouvez comment configurer le titre de votre site ainsi que "
-"d'autres paramètres en utilisant\n"
+"            Trouvez comment configurer le titre de votre site ainsi que d'autres paramètres en utilisant\n"
 "            un éditeur de texte.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manuelle\n"
 "            </a>\n"
 "        </p>\n"
@@ -124,13 +113,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Extensions</h2>\n"
 "        <p>\n"
-"            Des extensions vous permettent d'étendre les fonctionnalités de "
-"votre site internet Kotti.\n"
+"            Des extensions vous permettent d'étendre les fonctionnalités de votre site internet Kotti.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Extensions de Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -138,8 +125,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Découvrez tout ce que vous pouvez faire avec Kotti? La License "
-"de Kotti?Parcourez le\n"
+"            Découvrez tout ce que vous pouvez faire avec Kotti? La License de Kotti?Parcourez le\n"
 "            manuel pour plus d'informations.\n"
 "        </p>\n"
 "        <p>\n"
@@ -151,25 +137,21 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "A propos"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"Notre société est spécialisée dans la conception de pièces foo utilisées "
-"dans une grande variétée de produits."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Notre société est spécialisée dans la conception de pièces foo utilisées dans une grande variétée de produits."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
+#, fuzzy
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -186,20 +168,18 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"Cinq avions EA300 volants en formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -217,170 +197,166 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Crédit de la photot:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Copyright info</a>.\n"
 "  Originalement publié sur\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copier"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Couper"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Coller"
+
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Renommer"
+
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Supprimer"
+
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "Fichier"
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "Image"
 
-#: kotti/resources.py:517
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "Contenus"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenus"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modifier"
 
-#: kotti/resources.py:506
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "Permissions"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Actions"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Copier"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Couper"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Coller"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Renommer"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Supprimer"
-
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "Lecteur"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "Editeur"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "Administrateur"
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Ajouter"
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr "Téléverser des contenus"
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr "Définir la vue par défaut"
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr "Voir"
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr "Parcourir"
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr "Préférences"
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr "Paramètres du Site"
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "Réinitialiser votre mot de passe pour ${site_title}."
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr "Bonjour, ${user_title} !"
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : "
-"${url}"
+msgstr "Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : ${url}"
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr "Votre inscription sur ${site_title}"
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr "Vous vous joignez à ${site_title}."
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
+msgstr "Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "Identifiant"
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr "Identifiant ou e-mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Mot de passe"
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
@@ -388,308 +364,289 @@ msgstr "Mot de passe oublié ?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur "
-"${reset_password} ci-dessous afin de recevoir un mail contenant le lien de "
-"réinitialisation de votre mot de passe."
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur ${reset_password} ci-dessous afin de recevoir un mail contenant le lien de réinitialisation de votre mot de passe."
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 msgid "Register for an account on this site."
 msgstr "Enregistrez-vous sur ce site."
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Rendre ${state}"
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Vous êtes ici :"
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Modifier le statut de workflow"
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/"
-"ou le gérer."
+msgstr "Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/ou le gérer."
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr "Titre"
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Type"
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr "Statut"
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Date de création"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Date de modification"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr "Inclure les contenus enfants"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Si coché, cela modifiera le statut de tous les contenus enfants dans les "
-"documents sélectionnés et leurs documents enfants."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Si coché, cela modifiera le statut de tous les contenus enfants dans les documents sélectionnés et leurs documents enfants."
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr "Modifier le statut à"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
 msgstr "Sélectionner le nouveau statut à appliquer aux éléments choisis."
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr "Aucune modification"
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "Appliquer les modifications"
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr "Annuler"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "Aucun contenu ici."
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr "Visible"
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr "Caché"
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Supprimer ${title}"
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr "Etes-vous sûr de vouloir supprimer ${title} ?"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr "Parcourir le Site"
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Chaque contenu a un nom, qui est utilisé pour créer une url, et un titre. "
-"Consultez, si besoin, le manuel à propos du format des nom et titre. Vous "
-"pouvez modifier les deux."
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Chaque contenu a un nom, qui est utilisé pour créer une url, et un titre. Consultez, si besoin, le manuel à propos du format des nom et titre. Vous pouvez modifier les deux."
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "Nouveau nom"
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "Nouveau titre"
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr "Renommer ${title}"
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "Permissions pour ${title}"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr "Rechercher"
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr "Assigner des rôles locaux"
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr "Nom"
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr "Utilisateur"
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr "Groupe"
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Téléverser des contenus à partir de fichiers locaux"
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 msgid "Filename"
 msgstr "Nom du fichier"
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr "Poids"
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr "Statut"
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr "Progression"
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr "Selectionner des fichiers à téléverser..."
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr "Téléverser ${number} fichiers."
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr "Ignorer toutes les erreurs"
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr "Retour à la gestion des Utilisateurs"
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr "Modifier ${title}"
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 msgid "Search user(s) / group(s)"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr "Ajouter un groupe"
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 msgid "Find users or groups"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr "Utilisateur / groupe"
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 msgid "Blank search text finds all."
-msgstr ""
-"Rechercher et modifier des utilisateurs (Laissez le champ vide pour les "
-"afficher tous)."
+msgstr "Rechercher et modifier des utilisateurs (Laissez le champ vide pour les afficher tous)."
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 msgid "Assign global roles"
 msgstr "Assigner des rôles locaux"
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 msgid "Add new user"
 msgstr "Ajouter un utilisateur"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 msgid "Add new group"
 msgstr "Ajouter un groupe"
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr "Rechercher..."
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr "Mots-clés associés :"
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "Bienvenue, ${user} ! Vous êtes connecté."
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "Bienvenue, vous n'êtes pas connecté."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "Vos modifications ont été enregistrées."
 
@@ -716,11 +673,20 @@ msgstr "Ajouter un(e) ${type} dans ${title}."
 msgid "Add ${type}."
 msgstr "Ajouter ${type}."
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr "Vous avez réinitialisé votre mot de passe."
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bienvenue, ${user} !"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "Vous avez été déconnecté."
 
@@ -732,47 +698,29 @@ msgstr "Nom complet"
 msgid "Username"
 msgstr "Identifiant"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-mail"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez "
-"recevoir un e-mail contenant le lien permettant d'initialiser votre mot de "
-"passe, afin d'activer votre compte."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez recevoir un e-mail contenant le lien permettant d'initialiser votre mot de passe, afin d'activer votre compte."
 
 #: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "S'inscrire - ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "La connexion à échouée."
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Réinitialiser votre mot de passe - ${title}"
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bienvenue, ${user} !"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre "
-"mot de passe, afin d'activer votre compte."
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
@@ -780,15 +728,16 @@ msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 msgid "Register"
 msgstr "S'inscrire"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "Il y a une erreur."
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Soumettre"
+#: kotti/views/login.py:295
+#, fuzzy
+msgid "Set password"
+msgstr "Réinitialiser le mot de passe"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
@@ -797,12 +746,8 @@ msgid "User Management"
 msgstr "Gestion des utilisateurs"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous "
-"pour que l'utilisateur définisse son propre mot de passe."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -856,8 +801,8 @@ msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Aucune modification a été effectuée."
 
@@ -907,11 +852,6 @@ msgstr "${title} a été coupé."
 msgid "${title} was moved."
 msgstr "${title} a été déplacé."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} a été supprimé."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -931,70 +871,78 @@ msgstr "${title} est désormais visible dans la navigation."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nest plus visible dans la navigation."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} a été supprimé."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Rien n'a été supprimé."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Le nom et le titre sont obligatoires."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "L'élément a été renommé."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Décaler vers le haut"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Décaler vers le bas"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Rendre visible"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Cacher"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Vous avez sélectionné des éléments afin de les traiter."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Modifier le statut"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Description"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Mots-clés"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Contenu"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "La vue par défaut a été réinitialisée."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vue par défaut"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "La vue par défaut a été définie."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "La vue par défaut ne peut pas être définie."
 
+#~ msgid "Submit"
+#~ msgstr "Soumettre"
+
 #~ msgid "Private"
 #~ msgstr "Privé"
 
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index 984780a47beef16607be02b1d2fc98d1cf8a604b..3ad276b27c6796b26f101d871e8ce82f2b336d9a 100644
GIT binary patch
delta 3106
zcmXxmd2EzL7{~G1Y-?e!wqT*O(1RXJ!ELuKSST(0K>+I!Vu?x<MS%($Qx#E^1oDak
zYN=rRauvEDmjaSNQX;7wRs@4a1R|hqqM#gV0%(aw#H9HBvE!!0XJ+2_otfvEdEd}8
z^UO@=$9@T`4Zod~!Ib($V=m%uAOG+h9Wo}2V=#&{a5%PLe>{YD<7rIAE0~5i?e$P{
z{Q6KVq`v|Sa5^%TW0p`!qN5S-!WQ&mE2d)%1Nbra#m})1p0Mq67^Hmxb>DS+{a<7P
zlaOM}Wb~o#tHmOG3QL*aG*TH!$3av?J=hNu31=XtqcRi41bhg!&|1`lb;w+1HY)P@
zScXkF9zVrayp0vu%HRs%G$t^=>87HTo=2_F$10S8bkqccF$;@OTX7#|;ESk*EXQ1I
zK`mq-`tc}gqEomRyHEi%vR~P_5*<yrhl&O|gi6^_)Qw-E1~`ce@O$LX)Dos9n1kAq
zd8o)2*|v*XcntOYF4VZ~sChb&Khv2;{?&1gmL~iGU&fzN4?H%&7<R)vfm-PEs0bG#
z*)&bqfE!Wc1lTV<*B^ENAXI<Ywu@0)S%rGOZXo$r1kcf-L-+~~!bPYBtwlZ1hKi&E
zHSiJJK81R|%X$$N*)_~ZFDIB?HN%iDGZwX#Q<2>;FF90{(q%XwH=rWu$0{^oI;x$E
zN_p7!ms_h)15LyNtV2cYpfa@#c@xbV)Shq0LOg~F(78%Q5A>jJyop+A5+_WNWn(24
zVGh=#wqz-4VQWy&wV?+52=(dMYug7<_jRJ?`2uw|PQ<S}rkhGR9p_Pz^v{ex5Jn9c
zL9Mt9HBlYvv_E67H=-h4iF$q$Ds%0qJwAvU=Nr@lzC|st8<X_@U#6mnuAv_2#e7U*
z<CU^es6BrKwRf|SB$+pG2)1D{euB^9Z?=Cb7e~;Zi+LEsw>-vth9$IX7(B}SW&su5
zxC@!voI{dfZrFA(Cq7XT>iT444l@h&J$N0Jp&h6#JBf<4%X$G7@h_+VZlE%iN*W!d
zu7HXhg*vShk#lIKS?AjRM$}%$@KM}~I=r_~3rQXtkE{aAXwN~t4eL?&?Zq5ChUIu=
zDEZflGsutjEFX0^BB;HtL`7PIl{gzG;AUKimvI!%WWO}dI@AKUpzhm&+S042jP%-e
zVu8N>9P|Pw{!Ol-L!aQqsPDjTWRYec>TG<6di{PyP4p)o#$Hrv50QVW<~S<S>!=C6
zq$Lr3n1Cs$vy_I5Fwdc)6m3R5xF3`7Ys|qjs0aSCdWXd`m5Q1m!<vhFewe*pZJmU3
z=$~TS`%zonX?0Ff;Xs-TsKe2V^KeK}e1c}{I@AQ4P?79IZBYjjtT~R#)bFT_D4o)e
z+QI>-=gN_DZAK#*b<8v>8n_;PxBztqmY@b~Mm?|vBX|V$cKm@_u%A~)Z^dv_|0LA?
zGjJI$Mvd3!o_OZcFo|{+`t<%6Qt{JKib{1g>hwQ=dQa=I53WKTrWk5rdyw;II+3-Q
zOQ^k0W|cAx6<8)}i=(J<CSes$!D8k&O;i-g0ql$2sMqikYLEX$eUf|8hXeT9Xo6g8
z7z4B;s1#S?XdI84_%+lxE9~{v$WUfII*R1D?dU??m_*n*Bq7v?A`7+hGSvNJQ44qw
zLs*N-;0)A#4X6O-qn>{Ub1;V5s>7)Jx=YNsJ9~AJ4h`Uq#xs$O_tGxL7w~D!$Fryp
z%PlO#h}+@I^t|hy^<^inr2W48k1w+>MoqtDio$uDvW`+sSxV7wHl=~Gm9n0q-z*A;
z<<4)ewHe9Eo&O#$cN_e9o)vDhf1u|>cc*`{XQSKWFAuiad&l8+w=|ILG48{GR|mPY
zr&FG^*M*{Kb$<#>@N97lf+dl)w3kp;Q<N(GA7CWqJ&Jy7;+Ps-<t`3}b2r<bM%3xi
zhq#6ECgpKTllx_`By}6L4V3?XJKVmZyx=C9*%Te`58B6swguWRWlZ&kN~4izMNV01
V<;duWXj%KjtlP=$_ZNq~{{d92JhA`)

delta 3135
zcmXxm32anF9LMq5^xoaJa;%kt^uC~_-4<*qP#}<$LIW|PVnPv@1X4pOL@WZrDhLwf
z(no<76e(D!fT%?TG@?N<$RS4+F9d?1U{Hz)#Blljb;k|EXXd?`H#7hLya#Q8_CWC0
z&f)cj-@B9^l&KNMT*Ob^{KaoXoH1Egfdx1NdtnoH!DHAJFJLFUi9U>u58dyHx?hNy
zSdJMu4VfxvR#S=MLL)|E6NX_6K7>2bi-#}<Ph&Kmwe8CoOZz&i-#vTZ^FYT0rYn|n
zJrUI}fH^oF{mgF~sr2Q-QPhrHY@;*!Fafhskr{&FScO_>05xGXGN-9S?R+s7;szXy
z-(myC^Uz{!L2cjyhBLppN<|_48@0kjR-p)FqbA73p4cCiigB2TFQFE)9#gOhwU95-
zgKemZ&g1)d1+{@j@{xoaF{lX-P|<^qAvrN^sE$9O9&iq4;~&T$6JVQ~U=}JR3sE~?
zZrhtt3*U(vzaRD7gQ$59BY(^ZAMw|P%d|A%HJphzPy?nsXbf2~HK>KoN9}MK5>>MS
zYw$hPb9#_3jY~uI&p}-;w(T-hDl1Xrs}qR7b}*L<I)sa`8!ksJXe(;K4%AK#qaJ+9
zw$G!+U$Op!+Sy%9$1a>;vT90@OJ)=*m6MQcm<2&93h5fG!|kXYq_PT4n2l=tQ6Vq3
z*N0gvQ4e|?Gq4)9<CUmLtwG*M(~QdbN0^D<p*9%2Lq!8zoG5jSMy)gfwX=LI#r~L#
zGf^q2M=h)wHEsv$fuEp09iQ9w5mdhusCmA(o<+_`(ELV41KY6(Z=!b8t9xi*8S4IU
z)XFPR6HZ5+`k=kP3AN*9)c8H92!4ag^=Z^|E}<5372SIO+o>q`cThVEC*d04!*t9-
zg{~5n`>CiL&Ow4_8t`Fk#Xfivt5Fwq{aOC%jY}{McjK!rV}8JV<~I|0dI7FNb^HQZ
zi@Amb!^9+q+Udv`GsLzhAaj{HsPDpBRD=$oQg<1()9cn-sMOp;Z6Jp51r@4nDhk~|
zYbEN`jz`X;skJV#*EgYZx*MOs{is9SDK)f^Ow6Y}8Vhkg>aF+y)$eOe#$Qs2zjA(;
z3tF+C_$X%sP#=)ts9Zma+UZ0r#d$ak_u`9q2m9e{@}=kOLM?C~s^0-rO2aZj5%Hng
zJu-s&M}WL>p%^EkKE>-$XW}5THgg1ZHvU4rhWAkud5HIC=tG6J4Y_5`p>`TUULr9O
zBQOQSF$;B;a)VUnQ7J`*XfJBuag4%?n2dj-26(eWCZZyhjheu3EkTVRjL|sOT7^?+
zPqyvjsFVlK*vjvy!*vUFID9$AJcoTz6Ku2YLQSv-wUZ;L6rDgeZO)-06-gKskpych
zDusEdaU+rQ9W-O8D5SNh2hT+}u0oxG^{5AKLk5_An1?^2-i|0<87(*!_0|kUU9Up*
ze*qWcI@I%$azl~H#VEc1{iwLPF$g_40u}19sM8-no#we1joVR&XE$nLhmiAU&LC?t
zw^6yyWR)@(wXs4}ipx>YsltKGZzfaGhhsBpC#Nt5+flFKZBz>4=%i1x54GSt)C48g
zGV5^ka(yH!)K6jwjz=w^9`(HK7*vN3sW6B67`3BIwtW-TF`ez}u=GZKF9x7?Fb36s
z9BLue7>Bi}NX|#~TZ-C<gBstA$+$n?jPA(U&$i<&RL=A{)B}=H5y{0za1_?!0!+sn
zs1Hm6?{FrLbXwfqT`Qcg+({9uXm4_^xVt~~7B&6iDca5wN&{sOWf4Wc$&?z(7Rq{x
zev>F1nvUNL>l;W^I{v%7%&GFExmG$adlFpRoCZ(1Yol|)QxyBA?OTS;PKr0l^_nx(
zJFDAj+7l>G+xtShX>?9{hq*R8zS#V{b+lihtf44Wb(Fr8*D3m~4Ph#<-kA}bmC|Id
zEJd9reUKf>Ldtl`a%W#`ey4Y+ZJ_-BYjOUKO^bb-rsAz*zO^+cZi_eavF8Id)iYa<
oCXNk@D=5q>EKK(MON)wn7x-KI^t>M*Q8BHq`kB_;KG|Xa0i9b#oB#j-

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index a70a09c98..6381d12b1 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.9.2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2014-01-19 11:14+0100\n"
 "Last-Translator: Xavi Torné <xavitorne@gmail.com>\n"
 "Language-Team: it \n"
@@ -31,29 +31,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -61,13 +57,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -75,9 +70,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -92,42 +87,32 @@ msgstr ""
 "<h2>Accedi</h2>\n"
 "<p>\n"
 "    <a class=\"btn btn-success\" href=\"login\">Accedi</a> al sito \n"
-"    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una "
-"password per\n"
-"    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</"
-"em>.\n"
+"    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una password per\n"
+"    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Quando sarai autenticato, vedrai la barra di editor grigia sotto la "
-"barra di navigazione in alto.\n"
-"    Questa barra ti permetterà di passare dalla modifica alla "
-"visualizzazione della pagina corrente    così come apparirà a tuoi "
-"visitatori.\n"
+"    Quando sarai autenticato, vedrai la barra di editor grigia sotto la barra di navigazione in alto.\n"
+"    Questa barra ti permetterà di passare dalla modifica alla visualizzazione della pagina corrente    così come apparirà a tuoi visitatori.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configura</h2>\n"
 "        <p>\n"
-"            Scopri come configurare il titolo del tuo Kotti e molte altre "
-"impostazion            utilizzando un semplice file di testo sul vostro "
-"sistema.\n"
+"            Scopri come configurare il titolo del tuo Kotti e molte altre impostazion            utilizzando un semplice file di testo sul vostro sistema.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration."
-"html\">               Manuale di configurazione\n"
+"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
 "            </a>\n"
 "        </p>\n"
 "    </div>\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            Esistono molti add-ons che permettono di estendere le "
-"funzionalità del tuo sito Kotti        </p>\n"
+"            Esistono molti add-ons che permettono di estendere le funzionalità del tuo sito Kotti        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Add-ons di Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -135,8 +120,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentazione</h2>\n"
 "        <p>\n"
-"            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  "
-"Leggi il manuale per maggiori informazioni        </p>\n"
+"            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
@@ -146,25 +130,20 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "Chi siamo"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"La nostra azienda è il leader nella produzione di foo widget, usati in una "
-"grande varietà di prodotti per l'aviazione e industriali."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "La nostra azienda è il leader nella produzione di foo widget, usati in una grande varietà di prodotti per l'aviazione e industriali."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -181,169 +160,168 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copia"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Taglia"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Incolla"
+
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Rinomina"
+
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Elimina"
+
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "File"
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "Immagine"
 
-#: kotti/resources.py:517
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "Vista della cartella"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenuti"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modificare"
 
-#: kotti/resources.py:506
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "Condividi"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Azioni"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Copia"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Taglia"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Incolla"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Rinomina"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Elimina"
-
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "Visualizzatore"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "Proprietario"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "Admin"
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Aggiungere"
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr "Carica contenuto"
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr "Seleziona la vista predefinita"
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr "Vista"
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr "Navigazione"
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr "Configurazione del sito"
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr "Esci"
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "Resetta la tua password per ${site_title}."
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr "Ciao, ${user_title}!"
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr "Segui il link per resettare la tua password a ${site_title}: ${url}"
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr "La tua registrazione per ${site_title}"
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr "Stai entrando in ${site_title}."
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
 msgstr "Premi qui per impostare la tua password e accedere: ${url}"
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr "Vietato"
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "Accedi"
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr "Username o email"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Password"
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr "Accedi"
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la tua password?"
 
@@ -351,306 +329,290 @@ msgstr "Hai dimenticato la tua password?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr "Resetta password"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Inserisci il tuo username o email e premi ${reset_password} per ricevere una "
-"email con il link per resettare la tua password."
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Inserisci il tuo username o email e premi ${reset_password} per ricevere una email con il link per resettare la tua password."
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr "Non sei ancora registrato?"
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 msgid "Register for an account on this site."
 msgstr "Registrati per avere un account su questo sito."
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Rendi ${state}"
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Sei qua:"
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Cambia lo stato del workflow"
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Lo stato del workflow di un item determina chi lo può vedere, editare e/o "
-"modificare."
+msgstr "Lo stato del workflow di un item determina chi lo può vedere, editare e/o modificare."
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr "Titolo"
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Tipo"
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr "Stato"
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data di creazione"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data di modifica"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr "Includere figli"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Se selezionato, verrà modificato lo stato dei figli dei documenti "
-"selezionati e i suoi sottodocumenti."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Se selezionato, verrà modificato lo stato dei figli dei documenti selezionati e i suoi sottodocumenti."
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr "Cambia stato a"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
 msgstr "Seleziona il nuovo stato per tutti gli elementi selezionati."
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr "Nessuna modifica"
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "Applica le modifiche"
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr "Cancella"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "Non è presente nessun elemento di contenuto."
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr "Visibilità"
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr "Visibile"
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Elimina ${title}"
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr "Sei sicuro di voler eliminare ${title}?"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr "Navigazione del Sito"
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Ogni contenuto ha un nome, che è usato per creare la url, e un titolo. Leggi "
-"il manuale utente per saperne di più sul formato del nome e del titolo. Si "
-"possono cambiare entrambi qui sotto."
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Ogni contenuto ha un nome, che è usato per creare la url, e un titolo. Leggi il manuale utente per saperne di più sul formato del nome e del titolo. Si possono cambiare entrambi qui sotto."
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "Nuovo nome"
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "Nuovo titolo"
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr "Rinomina ${title}"
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "Condividi ${title}"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr "Cerca utenti e gruppi"
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr "Cerca"
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr "Assegna ruoli locali"
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr "Nome"
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr "Utente"
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr "Gruppo"
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Carica un contenuto da uno o più file locali"
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 msgid "Filename"
 msgstr "Nome del file"
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr "Dimensione"
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr "Stato"
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr "Torna alla gestione degli utenti"
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr " Modificare ${title}"
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 #, fuzzy
 msgid "Search user(s) / group(s)"
 msgstr "Cerca utente(i) / gruppo(i)"
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr "Aggiungi un utente"
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr "Aggiungi un gruppo"
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 msgid "Find users or groups"
 msgstr "Cerca utenti o gruppi"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 msgid "Blank search text finds all."
 msgstr "Lascia il testo vuoto per trovare tutti gli utenti."
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 msgid "Assign global roles"
 msgstr "Assegna ruoli globali"
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 msgid "Add new group"
 msgstr "Aggiungi un nuovo gruppo"
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Risultati di ricerca"
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr "Cerca..."
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr "Taggati con:"
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "Benvenuto, ${user}! Sei loggato."
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "Benvenuto, non sei loggato."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "Le tue modifiche sono state salvate."
 
@@ -677,11 +639,20 @@ msgstr "Aggiungere ${type} a ${title}."
 msgid "Add ${type}."
 msgstr "Aggiungere ${type}."
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr "Hai resettato la tua password."
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Benvenuto, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "Sei uscito."
 
@@ -693,46 +664,29 @@ msgstr "Nome completo"
 msgid "Username"
 msgstr "Username"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr "Email"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per "
-"settare la tua password e attivare il tuo account."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per settare la tua password e attivare il tuo account."
 
 #: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrazione - ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Errore nell'accesso."
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetta la tua password - ${title}."
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Benvenuto, ${user}!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Dovresti ricevere una email con un link per resettare la tua password. "
-"Clikkandolo si attiverà il tuo account."
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Questo username o email non è riconosciuto dal sistema."
 
@@ -740,15 +694,16 @@ msgstr "Questo username o email non è riconosciuto dal sistema."
 msgid "Register"
 msgstr "Registrazione"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "C'è stato un errore."
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Invia"
+#: kotti/views/login.py:295
+#, fuzzy
+msgid "Set password"
+msgstr "Resetta password"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "Il token per resettare la tua password è scaduto."
 
@@ -757,12 +712,8 @@ msgid "User Management"
 msgstr "Gestione utenti"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' "
-"per mandare all'utente la sua password."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -816,8 +767,8 @@ msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Non sono state fatte modifiche."
 
@@ -867,11 +818,6 @@ msgstr "${title} è stato tagliato."
 msgid "${title} was moved."
 msgstr "${title} è stato spostato."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} è stato cancellato."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -891,70 +837,78 @@ msgstr "${title} è ora visibile nella navigazione."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} non è più visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} è stato cancellato."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Non è stato cancellato niente."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Nome e titolo sono obbligatori."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "L'elemento è stato rinominato"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Muovere su"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Muovi giù"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Mostra"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Nascondi"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Devi selezionare degli elementi per fare quest'azione."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Cambia stato"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Descrizione"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Contenuto"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "La vista predefinita è stata modificata a predefinita."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vista predefinita"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "E' stata selezionata la vista predefinita."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "La vista predefinita non può essere selezionata."
 
+#~ msgid "Submit"
+#~ msgstr "Invia"
+
 #~ msgid "Private"
 #~ msgstr "Privato"
 
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index 8afab5d0692126151c0a527e48ff9c0c0a3bce65..75d8f15a2f800fb01bb05ed76a5b515049fec77b 100644
GIT binary patch
delta 2762
zcmXxle@vBC9LMoPfCl$MUVccR6vVIiVO)Oy$jPKJ+HjC_vC%4-HJuiQQ%gp8AuSV9
z!H0`btxY#XqdA1BtT~rWH#6-Ivsvkw)EY`l%fiyt>iyxKo^hVnIp=wvbH3;MoQHd%
z@kpa@A}YjhIQl6IDc3@b`5HeA<HT{pZA=E<L@#<GjLE`EjK(I6!4C9bAI9P#d;OHX
zehJg*pTabZj5KDhF+NjBWey#SF&Ll1hp`%&(=?)DX~GBb4cl(F?M@7(-@$4eK;|%$
zn2EPB591#)rVwi|3fnP``He$`MVnz%AS0-WPauEh3@5GVGUnqnR$$^hCc_s{f&GaZ
zM`=)oLQ#QuQ43pw8n+T3!8*)fezTrR0`{Q-IEu+Qjtby=bm25=qPsYP|Dq-wVL6ZD
zG1P?LpvL(Tm6>VOeZQi{nL%YVi1+8y%3M^`k&KEk8#PfWYJjDv0jp8>*V^{WsDWR>
zP1uaO|0g6F=4Vtuf1?%>&PE|-lYmW_6GQ$r@cVS=!TqQQhEV;-Z2Kf?bDl>HFog>E
z9<qr{Fj2*$3l&fr>i#U$LaI^YK4aT2qMlz9Oa4{aKnH)Ol~XGAAXzfUF%G{#y|YPV
zPGjZ=0**yZu)wxcQ7O){{l&=QO$BN}D^Qtu4%wGxosWv%T??k;0BQxFp&mGky72-k
zkgKSGf5&qC2a~Xri%NL|DwFF_&o!gQ^I<q{x7YWeUbW9}Z#aMjbPS;)zKR;?w!J=s
z3h+K^;AFm04eUj&s0j636)GbQs8_WLb>Ak`f?804wBzje-$g|?I+%)ssEnLPy|Zal
z>i<H$<2X)<n1@eb9j?W#w*LlZ)1Jd8m4f;BQIIk9s0Gd}AV|z)gVgH#e~pShw^OJ9
zu3JNyMg3XUWvJ`xu@)UH!yix?SV)vwVUD!`GiaA1bDLGDJ=KP6BhxLJ-yF0ZCsFVA
z5_aP?)WA)oBNN*&4~MW2ze5ESnZyRf0#pEXsORdft5Flbj=Fy*Zonhx+ejseWop7+
z)Pre{1p+C;8rl`M-G$mTe$)yMpfWIym3RleSVZ0x$ZFJtO~~6bdu{(PDxlF6@_&xX
zS$knOck2N^C*ANVDkB$B6J9|D@QZEVN0Mabr3JqCT+{-Vp(cDDwHY^~p4)2eLOs`?
z<_k=4f(}i18i(;RY6b1-fjzJTHNaupK8~8;TRe!rp|1Dy!sQ?mn;As~bOkm36mqM%
zk6Ku=@A1HeZ0i!_3p2}c4z5M+HO;7j`mKko<EYG>v+W7gkIyZv!gw~0_Qp!o*V2j=
z_%Uj8`=+UcQE~H>CYX;}K{_gc0&6+yGhJ%0uRvv>5tYgoWGK^*x%fHi`8(EosB!ge
zDl-wtygrjprI?PzsFiL+t>^>P07p@&8@GOm3UtC=zlHo0G&8pC&IxSVXw(W<q9*P@
zjkg<X(2r62{wJxp>G)%|gP+Akfn6Mfny3o-GtY9;0NYR*>qI@*Yuo!#fe)iT&(o-{
z;VwpC2Km=lQiRIb7A$5?vyaNt_!Vx(IP#|y?ZV|aib`#Wb2uy|sN1<1w#MVoZl&nh
zOWEmEh35usb2f8+(-{n}PV1z%MVC41DQt+@;{nbc6zz&W$KxvT^ibPP(NRL#<utfT
z!nRX;oARzR;CeE)m)c7d9eV<pHs_`*BeS2DqI`?;DuqvZcA4+sT#8oWqWGLLceQ5+
zwRXz?N0-y%E=YWj<`#;6TK7@5QgoD3{9}{uGvQ;O#H9yE=6M%+OOo>Q$_u^O-u$ua
N2|1pz=$x{U{{S@m8~y+Q

delta 2792
zcmXxleN5F=9LMo<11?^;D3^yQ6`yzt5#{m_hBS>r9%MFTNn5R4EDIOSCT3{Y3x%3b
ziC)m`4-K3Y$f9JeTq@Y2U^CH~TQrx;(H~~B%$!ME^!|8Hzj1!AbI$K~&iS5)-{s>~
zXIJ@uiV1BqTn9<hNn@eLT*Mw1H?F_k#-!n0%);4G#>~YP7>hoP!@cOiPK?Jd?DKQ>
z`BhA%{tl+#jLF7?8{;=mka1E`fgxCh4`4Mirdf-M#fOt{n=QB4^7|M@{Shp|E@TXI
z6Vq`5y_i15m|T1YW3UAi7~dQr!=%lZs6Yl#1AmMBneVx2Mq`+b<G2_zql2qfhYBp5
z>8qb;)C$F;0$GBZ*m6|AD{uxrk7<l=Hj|l(ou~lL;A|X11@J3I;y7v`C*gmBQ&0mA
z;7lAu4fqSHpIfMv8ArXR{Zc<+s1@~~Uo)F#E4-)(7oi3!MRib#>aZI1{&TimkLq|6
z)?*{;{oBZ*n14_Kxj7)3$W&wwW-iuYVI1qPj=QN)!%tBSK1bCL+VWY{;rtQR!5!2L
zTtvemGO_p|PD2HhhkCyNHIZsmzpHHdRaE;8@vOfxO;qq_c5+L`c4XDeH<*B<s6D%h
zjBTRt4+flq8X&`#b5ToNVC$D6i(sBaO{fO75^IoiX*T-FXz#XTDt4h}a30m*66(dv
zs6eix0uG^2fKfOLOHoT+i(1KzsCJF0{`O!5w%X^1QT_XmlF^>`pk6$IId~cs`Jbo`
zoqUse?nVXbK@G6b)|a4WR)K2wENW%eqPDC7)qW>x;1(nxzd1lgd)R?`u^W@|Bx+@T
zM(v%04b~P+LGAT?Zi!fm^KmuSVw<g>zzoWXd|F9ZhKC#+Jk$i;9FSst|4Ya$r(!GW
zv%7=};Er`Vqp1EdYYpo87F4@#d<5^JRv?EcHN(fP<(Njf5*gbxpw3n+>in4xmBCZi
zi>N)mhAnst)p0Y+k&dnC#nYIJf1m<NnZ*}?<){EwquSM3eW-zVqu&1j{jZT3B(o0l
znWhFjhH6+iCm2WtE~C8CmOJp?nL!190<{7oScERtI}0mNf%s4ZHY2-fx@`SdNvyvj
z8m3|hFWU!4d0P#7xas)?)QXIu2E2g^AT%Xd_8^O7(vV#<OHmW3K@GSLbr^S{+O=6b
zQvAV&y;Nv`bEpA-z+-qFHG>1G!833O)xm%*e}@|2ckIMTY_y*DT2CUenqgExH&Ffm
zi!?DF|3krn7or{%S)W3_Jo7R-u@PxwwxK%ewf0*_P%CrAmT#l}359WBiZKgyHeN@4
zE&FgW`p=Nj>2~n83zJX-WTIyBC@O$*YbEM4ecC=>gIa+Ns4Zwgx-`AG07p^nU3`l&
z8r5$CvNC>?OhyBj;lo&kn&}SIjE<uk4xv_P#CjDK=xzHvY+mp^H}WHCVr_XYE~D&4
zP1J{OJd93#|2<^%LLX{?33OvjX0SXHb(*tL1J)paW*s*L){dIMN2qqkZMh#cfnn5V
zdIi-_9P1y2#aL8GrizS~Za-=TKEqP{4cB8H>!?F?3@h<GYKi9r4!V*YdjqFjFL_!i
zZzAamkah&}A{IEB121y-1==D?Qg%|?pvPP*NgNRKCh0!XTO^&10|7^5zGok~JtSTE
zq;~^lk@>DI<hGKw2ewBpif<!VL(-+63|*T8qmgOp2gxbQw@I&%_@wXsC~U)Ul4cS~
zY7C^iOFZw8Ya;!B?Fuxxa}sw`e1oKaweOMGrF+*x?)&>LxWA5YR;_=buC~6fH6blz
la#nU`cJ?f<w;(4cBg@-2JawMOd9AT&tiQeQuZ)7w{{V}1Avpj5

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 6ef1c8f9d..5147865ed 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.7.0\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2013-09-19 02:45+0900\n"
 "Last-Translator: OCHIAI, Gouji <gjo.ext@gmail.com>\n"
 "Language-Team: ja <kotti@googlegroups.com>\n"
@@ -33,29 +33,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,13 +59,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -77,9 +72,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -91,23 +86,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -124,173 +116,168 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "コピー"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "切り取り"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "貼り付け"
+
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "名称変更"
+
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "削除"
+
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "ドキュメント"
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "ファイル"
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "画像"
 
-#: kotti/resources.py:517
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "フォルダー表示"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "編集"
 
-#: kotti/resources.py:506
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "共有"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "アクション"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "コピー"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "切り取り"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "貼り付け"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "名称変更"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "削除"
-
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "閲覧者"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "編集者"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "所有者"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "管理者"
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "追加"
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr "アップロード"
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr "表示方法の設定"
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr "表示"
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr "ナビゲート"
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr "設定"
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr "サイト設定"
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr "ログアウト"
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "${site_title} のパスワードをリセット"
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr "こんにちは ${user_title}!"
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"${site_title} のパスワードをリセットするにはこのリンクをクリックしてくださ"
-"い: ${url}"
+msgstr "${site_title} のパスワードをリセットするにはこのリンクをクリックしてください: ${url}"
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr "${site_title} へのアカウント登録"
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr "あなたは ${site_title} に参加しようとしています。"
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"パスワードをセットしてログインするにはこのリンクをクリックしてください: "
-"${url}"
+msgstr "パスワードをセットしてログインするにはこのリンクをクリックしてください: ${url}"
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr "表示権限がありません"
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "ログイン"
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr "ユーザー名またはメールアドレス"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "パスワード"
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr "ログイン"
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr "パスワードを忘れた?"
 
@@ -298,315 +285,298 @@ msgstr "パスワードを忘れた?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
+#: kotti/templates/login.pt:48
 #, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} を"
-"クリックしてください。パスワードをリセットするためのリンクが書かれたメールが"
-"送信されます。"
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} をクリックしてください。パスワードをリセットするためのリンクが書かれたメールが送信されます。"
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 #, fuzzy
 msgid "Register for an account on this site."
-msgstr ""
-"まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
+msgstr "まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "${state} にする"
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "今の場所:"
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "ワークフローの状態を変更"
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフロー"
-"の状態を変更します。"
+msgstr "アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフローの状態を変更します。"
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr "タイトル"
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "種類"
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr "状態"
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "作成日"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "変更日"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr "配下のアイテムを含める"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"チェックすると、状態の変更が選択したドキュメントや、その配下のドキュメントの"
-"すべての配下のアイテムに適用されます。"
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "チェックすると、状態の変更が選択したドキュメントや、その配下のドキュメントのすべての配下のアイテムに適用されます。"
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr "変更後の状態"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
 msgstr "新しく設定する状態を選択して下さい。"
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr "変更しない"
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "変更を適用"
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "ここにはコンテンツアイテムが含まれていません。"
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr "表示状態"
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr "表示中"
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr "非表示"
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr "本当に以下のアイテムを削除しますか?"
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "${title} を削除する"
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr "本当に ${title} を削除しますか?"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr "ナビゲート"
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"それぞれのコンテンツには名称とタイトルがあり、名称は URL を生成するのに使用し"
-"ます。下のフォームでは、その両方を変更することができます。"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "それぞれのコンテンツには名称とタイトルがあり、名称は URL を生成するのに使用します。下のフォームでは、その両方を変更することができます。"
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "新しい名称"
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "新しいタイトル"
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr "${title} の名称変更"
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "${title} を共有"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr "ユーザーとグループを検索"
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr "検索"
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr "ローカルロールに割り当て"
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr "名称"
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr "ユーザー"
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr "グループ"
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 #, fuzzy
 msgid "Filename"
 msgstr "名称変更"
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "本当に ${type} ${title} を削除しますか?"
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr "ユーザー管理に戻る"
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr "${title} を編集"
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 #, fuzzy
 msgid "Search user(s) / group(s)"
 msgstr "ユーザーとグループを検索"
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr "ユーザーを追加"
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr "グループを追加"
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 #, fuzzy
 msgid "Find users or groups"
 msgstr "ユーザーとグループを検索"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 #, fuzzy
 msgid "Blank search text finds all."
 msgstr "ユーザーを検索して変更する (空文字列での検索で全部表示) 。"
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 #, fuzzy
 msgid "Assign global roles"
 msgstr "ローカルロールに割り当て"
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 #, fuzzy
 msgid "Add new user"
 msgstr "ユーザーを追加"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 #, fuzzy
 msgid "Add new group"
 msgstr "グループを追加"
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "検索結果"
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr "検索..."
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr "付与されたタグ:"
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "ようこそ ${user}! ログインしています。"
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "ようこそ。ログインしていません。"
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "変更内容を保存しました。"
 
@@ -633,11 +603,20 @@ msgstr "${title} に ${type} を追加する。"
 msgid "Add ${type}."
 msgstr "${type} を追加する。"
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr "パスワードのリセットに成功しました。"
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "ようこそ ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "ログアウトしました。"
 
@@ -649,46 +628,29 @@ msgstr "フルネーム"
 msgid "Username"
 msgstr "ユーザー名"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr "メールアドレス"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワー"
-"ドを設定して下さい。"
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワードを設定して下さい。"
 
 #: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "登録 - ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "パスワードのリセット - ${title}"
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "ようこそ ${user}!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"まもなくパスワードをリセットするためのリンクが記載されたメールが送信されま"
-"す。"
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
 
@@ -696,15 +658,16 @@ msgstr "ユーザー名もメールアドレスも見つかりませんでした
 msgid "Register"
 msgstr "登録"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "エラーが発生しました。"
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "送信"
+#: kotti/views/login.py:295
+#, fuzzy
+msgid "Set password"
+msgstr "パスワードをリセット"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
@@ -713,12 +676,8 @@ msgid "User Management"
 msgstr "ユーザー管理"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー"
-"自身にパスワードを設定させられます。"
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
 
 #: kotti/views/users.py:587
 #, python-format
@@ -772,8 +731,8 @@ msgid "Add Group"
 msgstr "グループ追加"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "変更箇所がありませんでした。"
 
@@ -823,11 +782,6 @@ msgstr "${title} を切り取りました。"
 msgid "${title} was moved."
 msgstr "${title} を移動しました。"
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} を削除しました。"
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -847,70 +801,78 @@ msgstr "${title} がナビゲーションに表示されるようになりまし
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} がナビゲーションでは非表示になりました。"
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} を削除しました。"
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "削除対象がありません。"
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "名称とタイトルは必須です。"
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "名称変更しました"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "上に移動する"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "下に移動する"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "表示中にする"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "非表示にする"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "状態を変更"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "説明"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "タグ"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "本文"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "デフォルト表示は既定値にリセットされました。"
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "デフォルト表示"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "デフォルト表示が設定されました。"
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "デフォルト表示は設定できませんでした。"
 
+#~ msgid "Submit"
+#~ msgstr "送信"
+
 #~ msgid "Private"
 #~ msgstr "プライベート"
 
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index b401efe29124298404c7e020c704630d06da7d7d..82ecfead69876dc6d024723493ca083848b87534 100644
GIT binary patch
delta 3717
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
Ge*Xa|p;5yC

delta 5339
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
Ii5&0uFHsI>&j0`b

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index 2f0bdb434..7acc2f065 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.10b2dev\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2014-10-19 08:22+0900\n"
 "Last-Translator: mete0r <mete0r@sarangbang.or.kr>\n"
 "Language-Team: Korean\n"
@@ -32,29 +32,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +58,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +71,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -92,25 +87,20 @@ msgstr ""
 "\n"
 "<h2>로그인</h2>\n"
 "<p>\n"
-"    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집"
-"할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습"
-"니다.\n"
+"    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습니다.\n"
 "</p>\n"
 "<p>\n"
-"    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 "
-"현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
+"    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>설정</h2>\n"
 "        <p>\n"
-"            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파"
-"일로 설정하는 법을 알아보세요.\n"
+"            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파일로 설정하는 법을 알아보세요.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html\">\n"
 "               설정 매뉴얼\n"
 "            </a>\n"
 "        </p>\n"
@@ -118,13 +108,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>애드온</h2>\n"
 "        <p>\n"
-"            몇가지 애드온으로 당신의 Kotti 사이트 기능을 확장할 수 있습니"
-"다.\n"
+"            몇가지 애드온으로 당신의 Kotti 사이트 기능을 확장할 수 있습니다.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti 애드온\n"
 "            </a>\n"
 "        </p>\n"
@@ -132,8 +120,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>기술문헌</h2>\n"
 "        <p>\n"
-"            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이"
-"죠?  좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
+"            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이죠?  좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -144,25 +131,21 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr "이 사이트에 대하여"
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조"
-"업체입니다."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조업체입니다."
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
+#, fuzzy
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -179,20 +162,18 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -210,167 +191,166 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>사진 크레딧:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  저작권 정보</a>.\n"
 "  Originally published in the\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "복사"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "잘라내기"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "붙여넣기"
+
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "이름 바꾸기"
+
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "삭제"
+
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "문서"
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "파일"
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "화상"
 
-#: kotti/resources.py:517
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "폴더로 보임"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "컨텐츠 항목"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "편집"
 
-#: kotti/resources.py:506
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "공유"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "동작"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "복사"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "잘라내기"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "붙여넣기"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "이름 바꾸기"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "삭제"
-
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "열람자"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "편집자"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "소유자"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "관리자"
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "추가"
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr "컨텐트 올리기"
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr "보이는 방식 설정"
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr "보기"
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr "둘러보기"
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr "사이트 설정"
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr "로그아웃"
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "${site_title}의 암호를 재설정하십시오."
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr "${user_title}님, 안녕하세요!"
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr "이 링크를 눌러 ${site_title}에서의 암호를 설정하십시오: ${url}"
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr "${site_title} 가입"
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr "${site_title}에 가입 중입니다."
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
 msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr "금지됨"
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "로그인"
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr "사용자 이름 혹은 전자메일"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "암호"
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr "로그인"
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr "암호를 잊으셨습니까?"
 
@@ -378,304 +358,290 @@ msgstr "암호를 잊으셨습니까?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr "암호 재설정"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"사용자 이름이나 전자메일을 입력한 뒤 아래의 ${reset_password}를 누르면 암호"
-"를 재설정할 수 있는 링크를 전자메일로 받으실 수 있습니다."
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "사용자 이름이나 전자메일을 입력한 뒤 아래의 ${reset_password}를 누르면 암호를 재설정할 수 있는 링크를 전자메일로 받으실 수 있습니다."
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr "아직 등록하지 않으셨습니까?"
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 msgid "Register for an account on this site."
 msgstr "이 사이트에 계정을 등록하십시오."
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "\"${state}\"로(으로) 바꿈"
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "현재 위치:"
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "작업 상태 바꾸기"
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니"
-"다."
+msgstr "항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니다."
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr "제목"
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "유형"
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr "작업 상태"
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "만든 날"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "바꾼 날"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr "하위 항목 포함 여부"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "체크하면, 고른 문서와 그 하위 문서 모두를 바꿉니다."
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr "바꿀 상태"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
 msgstr "고른 항목 모두가 갖게 될 상태를 선택하십시오."
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr "바꾸지 않음"
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "바꾸기 적용"
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr "취소"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "여기엔 하위 항목이 없습니다."
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr "가시성"
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr "보임"
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr "숨김"
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr "다음 항목을 정말 지우겠습니까?"
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "\"${title}\" 삭제"
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr "\"${title}\"을(를) 정말 지우겠습니까?"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr "사이트 둘러보기"
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"각 컨텐트 항목은 이름을 가지며, 이는 URL과 제목을 만드는데 사용됩니다. 이름"
-"과 제목의 올바른 형식에 대해 알려면 사용자 매뉴얼을 읽으십시오. 둘 다 아래에"
-"서 바꿀 수 있습니다."
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "각 컨텐트 항목은 이름을 가지며, 이는 URL과 제목을 만드는데 사용됩니다. 이름과 제목의 올바른 형식에 대해 알려면 사용자 매뉴얼을 읽으십시오. 둘 다 아래에서 바꿀 수 있습니다."
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "새 이름"
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "새 제목"
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr "\"${title}\" 이름 바꾸기"
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "\"${title}\" 공유하기"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr "사용자와 그룹 검색"
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr "검색"
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr "컨텐츠별 역할 부여"
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr "이름"
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr "사용자"
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr "그룹"
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "내 컴퓨터에서 컨텐트 올리기"
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 msgid "Filename"
 msgstr "파일 이름"
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr "크기"
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr "상태"
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr "진행률"
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr "사용자 관리로 되돌아가기"
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr "\"${title}\" 편집"
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 #, fuzzy
 msgid "Search user(s) / group(s)"
 msgstr "사용자/그룹 검색"
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr "사용자 추가"
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr "그룹 추가"
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 msgid "Find users or groups"
 msgstr "사용자나 그룹 찾기"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr "사용자나 그룹 이름"
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 msgid "Blank search text finds all."
 msgstr "비워두면 모두 찾습니다."
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 msgid "Assign global roles"
 msgstr "사이트 전체 역할 부여"
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 msgid "Add new user"
 msgstr "새 사용자 추가"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 msgid "Add new group"
 msgstr "새 그룹 추가"
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "검색결과"
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr "검색..."
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr "태그:"
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "${user}님, 환영합니다! 로그인되었습니다."
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "환영합니다, 로그인되지 않았습니다."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "수정사항이 저장되었습니다."
 
@@ -702,11 +668,20 @@ msgstr "${type}을(를) \"${title}\"에 추가합니다."
 msgid "Add ${type}."
 msgstr "${type}을(를) 추가합니다."
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr "암호를 재설정했습니다."
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "${user}님, 환영합니다!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "로그아웃되었습니다."
 
@@ -718,45 +693,29 @@ msgstr "전체 이름"
 msgid "Username"
 msgstr "사용자 이름"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr "전자메일"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 "
-"받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
 
 #: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "등록 - ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "로그인이 실패했습니다."
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "암호를 재설정하세요 - ${title}."
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "${user}님, 환영합니다!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
@@ -764,15 +723,16 @@ msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 msgid "Register"
 msgstr "등록하기"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "오류가 있습니다."
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "제출"
+#: kotti/views/login.py:295
+#, fuzzy
+msgid "Set password"
+msgstr "암호 재설정"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
@@ -781,12 +741,8 @@ msgid "User Management"
 msgstr "사용자 관리"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정"
-"합니다."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -840,8 +796,8 @@ msgid "Add Group"
 msgstr "그룹 추가"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "아무 것도 바뀌지 않았습니다."
 
@@ -891,11 +847,6 @@ msgstr "\"${title}\"이(가) 잘라내어졌습니다."
 msgid "${title} was moved."
 msgstr "\"${title}\"이(가) 옮겨졌습니다."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "\"${title}\"이(가) 지워졌습니다."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -915,70 +866,78 @@ msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
 msgid "${title} is no longer visible in the navigation."
 msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "\"${title}\"이(가) 지워졌습니다."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "아무것도 지워지지 않았습니다."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "이름과 제목이 필요합니다."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "항목이 재명명되었습니다."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "위로 옮김"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "아래로 옮김"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "보이기"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "숨기기"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "적용할 항목을 선택해야합니다."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "작업 상태 바꾸기"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "설명"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "태그"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "본문"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "기본형 보기로 재설정되었습니다."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "기본형으로 보임"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "보이는 방식이 설정되었습니다."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "보이는 방식을 설정할 수 없었습니다."
 
+#~ msgid "Submit"
+#~ msgstr "제출"
+
 #~ msgid "Private"
 #~ msgstr "내부 전용"
 
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index 3cd4fc509f15f9af655bc12f9c0cb8810f43bf5f..82084007fc2e824cf628765a9ccdea98df9b3f5f 100644
GIT binary patch
delta 2762
zcmXxkdrZ}39LMno<s#>tjvf?A6g%7nBo8-1YHBohmTsb5ytP^r8k54&vI}7Rj+Zo1
zGx{k(`A4!jXw@PKYps>0wZ*DG2)B&Jat={!v(>z0IeULRPrvb;*YiBT-*fps7p|@y
zUh9k|#U3&|ouoOWUt^8=2@fao!*kJROfFu+5C-ltCLgPCIyT@8+=c<{z+~*T@4vL~
zhcJiwam+@)-<Skr98*dro{IZ%GCqiRV;C9JJcXJ|15Ux0Y&l}fZ5T(ri(%|S#xUnF
z53gVm&YEgWDXzdIj9?1m8<z}0oA*%@=|c_tDe`Ad^P`A{u^1<C38qbBFnj_vvFoUQ
zv<zCIIMhT!sK6GZ`mMsbSdF=iZ#I)j#SYX2KE`zX3^jpY(2EnOfv#a6-bM}BM>zN3
z0BXQ9sD93)R%QbA-5;oauA){nhW&FCnU{<z(or)kKn+xZ>fixXhhfzBD{Z+J)$ud9
z1shS{k0Fa;E~6&&FDeiZ2ZcGCRBXWcGgyCh{5BP8cm&m;2UR~{%U_@l=OC(sanywW
zMh=mg%&cai7d4@5)c5(QK*FegSK0EDsP=WqtiLkPQNf>S;U^2*kySFsF$KRv?b$hG
zOk-w7C!CBLV74u1p_Vw`)-ObYH%m|fJ%U<^4am7P^$r>BT@&VD7b=1is0QDlKKvdv
zkrC8{|H4YVg+Z*~rIvg>Y9;GY?HW=2Iq1Qi_Wc3WRy&962i;ggMGtDmBdCt9*!Nda
z6TFG)IGsDHjzg%3%24f=p;lx)YO6M)zT1Kds0lTZ2;RB>d&%fS7qjpvYDET7dp3bu
z`WvV{PT?mFi|}5o#!c92>n~yf<#?`CCKls|F~+Px)yHx$iZO(Fy8ks~Xk+$UdyrK%
zCvEv>>z}sX$LPA>nbwtfCo*dUwMDy86K_Wa*oRuFuTd*Cq%z~13%24Ks-cHg)i?t=
zZ>AOtu^G#-7Z>6vvKuCu<zjB85H*qIsD4(Xw(4=z!1bs=oADt$h|Vf9qhwrM5R7(k
z3e~|Nmg6vLD}4M{(sfHk-Hr^Lk7XFbjTl51bqhX0ZRrWr_hYC-cLQ}s;xbtOQ)K)Z
z(TXADof$zb*)3E=Q`ty$I1@F23{*$?sE*1}*K#Q;;>WDD_Wkpy!@L#Memm;6v}HQc
zNZ+AC5g)}~{0MbQ*D-x9aSf_L3u;UDq4uyF_uz3<`=!}Ym!l$n6g9y*)Cx8tU7J?a
zmUKI06v;8vfM22Zau8#29B1S2r~#(rL?cW>tw=hmeIaUsmB=wND^PpA3Dw^YTYeV{
zD1VMzDC1lpqZ!^tO<+oHbcv>;%CoIGsK|>@6A7atTy5)XQCruHd3YET@LP<>A5jsX
zL47xd^y8R>dB!|UMF0uX)S|9m8^+-g)SmXB20o5D8z)d55204#ENaEZummSiXJRh1
zQ9mW9_luBMW-<D8|Le#kQt={c2_qQ9cGSSfP-oyICgNFChv!jyddb#bN41a1j|P&2
zTr5+8+M;zB#HUdK?7}(o$#jy@y&k~Lcp0@s8`vn-Z$*`lx$h-r#=PPFkXRScb!{Q(
zd6TrqUFKO3v%`IX->vRZPdK}c+9ti`Swm9HdM1&!k#wp$+<><{&`$1kk{(_6{qA~i
zdE!oTuaaJKyS(=$A0$^p(sLk+dBwft&CTniw3@V?^ejooyNa}nlt9WNX@4AdkuMzB
zO)f(E|Jm!d`%2RGQGA)C{d$YkO43t7I@Ev8ciPkcK}ybKe^IC~R30oYsw@o^go^ur
OOP%KLzd7%pN&f)`5EOa<

delta 2795
zcmXxle@vBC9LMp4{OWSA!W9t%#S6%f3u3_4M6_9r32sbNn|J+~rbbCAIcF=l$%TH1
zs3rJ7gj+STOv$#AKa^!;D>YZPoTlQcO{ag5ZKaJ_q}lt!Jw5Z>*E#2To^#Ike4m47
zgTuk_FXLl64Ocg1GUZB)F=z0AiyyAPJjUeV-&l;9V~r`mrI?JHaRRoZ7x!Wc9=7+t
zxA!k&F8wz#2Q$VQ6K_n|R8WbdqZ*@e8BW3=GN;*qTFYj<3tMcv&9--AEd6`1689r>
znCs}rJ6MALL}O;+V>lk$FqQeu9x4QFK0__!C~D#p$Uk$IA4PNpOK}9}V^LCM*VdyJ
z7EkyZCkeGfDX4|qj|yxNYTTumfh#eO`As90G~A0?z?Ybb-=G%oE4pz6HBlVP{{$0J
z6CTB>cnme+Rn$0tqIPBk^_=phabi(B>cy}kOSc^*s1?pdO;m*%U<qo#AnN%Qw!H~8
za0oYH6YBY4WK+yPs0DfWKom$C5`!tg^*C<=`>%m}>ClUxqFy+J>OW@N-=RLvi>Lu^
zq9Smy8a^VEjCW%?YC*G5&zGYD38Kb*!nW&B@4t}3{;SeV2mj1=ex_j$vTNozrs5zf
zXV;OrP13~3f^$$46x#Mo)E1Z9{sqV;n8m1o)}VIc8RWY(4Ph$ET`T6|epCcMpkDY9
z_25sag<L}|IGRQ|jzu3<p|-phwUZ5~_nJ`S?ZgD^u=n3ZjUWDiigJDc^<X~+Z~(RP
z8>j)}IFq{XK`qpanxM?~SE3@TM!okqYG*c}QdW<8e>-a8He^9z(?vx&d=K?tFHXZF
zsGYfl%3Tx*RtgePxt_t#6s*D-_!QP+r|rLkg|w$|w6bv_ejLSzhw4w~11Z({ucYFq
zqXBuxyl)*qcH3OA?cc2~W>tSS>YSHbYj89&YZoe2@1PdG4;A1E)J_dzGV_}u+i_bR
zw8!$aUd+VBScrUgCWJ-Uj<fI!ycdU&ESc$S7i%;XsD-RTjk6Y&s*R|Ln^A$bV|XEz
zkElF^!|31wUu1xbr~xkFY`lg_MK*t(l(G`kDVc-Qu^Nl99(~x0It|~VQhFZs{4LZs
zmzc%=>m!+*Wz1KYgK7^U&zKviEt^0B6;Uo~z#`NF=AZ_80QKG?)bR|WB3@?=+56j2
zAG3pczdJh|IW|3XDAI%0Be;+Dan!MSj^%5M8&Jn=7b+!tP$}!jRy>6oCzum)6)NIq
zQ44HD?O+QswCM~}QBL|%k(@+Lcn+1zOBjRyVme0WMh2dWiqMbRkuuc#6{rO+K|Uw5
z8kOrN)OfpX`w;3Bgill9gqho@6;8~HEMO{XiwbPJ)OsH(@+wrMD^L-xwf!Mf>e|td
zeHf2FV;o*Z1^gTGT-e;AqJc8<`L7Z4kzh>-b<BD&77wE$9zZ>R3iWNAM-4n=`~N`g
z$OvlZ;#frh-KcM4K5D#&F-GVAQ7SxZR-z`@iZ1LzZDkMo@F42`8PvCM8C^Jn8Zd@G
z2Fh&$s(%vd{VY^K0px(0M^LG%N8dauTc{|K4^cVlN1g9;Sce`Gr7aDi`ro$gGfuZF
zJF4CJ-1W4#L-#4VbcDA#vl8x!dey1nceB%(P?@ux-g@2UT24{OFHy!&UZ&{l>T;so
zv%R~h?WE|^v46u^=$`F*joKDUtJCV9o6<>b4MkU51k>mYy7T<qw3bj_p{%3mGk=iM
zLW!qvLPqn`<oG?6-mSEnDgR$PoMum8%Ih>=q$po+QOMHhRmSg|eWyKNC&Vp#e)am=
uO?@4ydC}vFON&ZNeI+I3fk0t#N#Dt|q;an0H5(gh>Yl8r>${MDYs`Oe${TS2

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index 62d3f1596..d61531deb 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.4.4\n"
 "Report-Msgid-Bugs-To: kotti@googlegroups.com\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2014-02-13 21:51+0100\n"
 "Last-Translator: Wim Boucquaert <wim.boucquaert@gmail.com>\n"
 "Language-Team: nl <kotti@googlegroups.com>\n"
@@ -32,29 +32,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +58,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +71,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -90,23 +85,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -123,172 +115,168 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopiëren"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Knippen"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Plakken"
+
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Hernoemen"
+
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "Bestand"
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "Afbeelding"
 
-#: kotti/resources.py:517
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "Map weergave"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhoud"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bewerken"
 
-#: kotti/resources.py:506
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "Delen"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Acties"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Knippen"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Plakken"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Hernoemen"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "Lezer"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "Beheerder"
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Toevoegen"
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr "Inhoud Opladen"
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr "Zet standaard weergave"
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr "Weergeven"
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr "Navigeren"
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr "Site Instellingen"
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr "Afmelden"
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "Herstel je wachtwoord voor ${site_title}."
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr "Welkom, ${user}!"
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: "
-"${url}"
+msgstr "Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: ${url}"
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr "Je registratie voor ${site_title}"
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 msgid "You are joining ${site_title}."
 msgstr "Je treedt toe tot ${site_title}."
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
+msgstr "Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 msgid "Forbidden"
 msgstr "Verboden"
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "Aanmelden"
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr "Gebuikersnaam of e-mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr "Aanmelden"
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
@@ -296,318 +284,298 @@ msgstr "Wachtwoord vergeten?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr "Wachtwoord herstellen"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
+#: kotti/templates/login.pt:48
 #, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Vul je gebruikersnaam of e-mailadres in en klik op ${reset_password} "
-"hieronder om een e-mail te ontvangen om je wachtwoord te herstellen."
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Vul je gebruikersnaam of e-mailadres in en klik op ${reset_password} hieronder om een e-mail te ontvangen om je wachtwoord te herstellen."
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 #, fuzzy
 msgid "Register for an account on this site."
 msgstr "Nog niet geregistreerd? ${register} voor een account op deze site."
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Maak ${state}"
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "U bent hier:"
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Wijzig de workflow status"
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of "
-"beheren."
+msgstr "Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of beheren."
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr "Titel"
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Type"
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr "Status"
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Aanmaak datum"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Wijzigingsdatum"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr "Inclusief onderliggende"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Indien aangevinkt zal een poging ondernomen worden om de status van alle "
-"onderliggende items te wijzigen van de geselecteerd documenten en hun "
-"onderliggende documenten."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Indien aangevinkt zal een poging ondernomen worden om de status van alle onderliggende items te wijzigen van de geselecteerd documenten en hun onderliggende documenten."
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr "Wij status naar"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 msgid "Select the new state where all chosen items should be set."
-msgstr ""
-"Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te "
-"worden."
+msgstr "Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te worden."
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr "Geen wijzigingen"
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "Wijzigingen toepassen"
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "Bevat geen content items."
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr "Zichtbaarheid"
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr "Zichtbaar"
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Verwijder ${title}"
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr "Ben je zeker dat je ${title} wil verwijderen?"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 msgid "Navigate Site"
 msgstr "Site Navigeren"
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te "
-"maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel "
-"en naam. Je kan beiden hieronder aanpassen."
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel en naam. Je kan beiden hieronder aanpassen."
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "Nieuwe naam"
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "Nieuwe titel"
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr "Hernoemen ${title}"
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "Delen ${title}"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr "Zoeken naar gebruikers en groepen"
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr "Zoeken"
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr "Locale rollen toewijzen"
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr "Naam"
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr "gebruiker"
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr "Groep"
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 #, fuzzy
 msgid "Filename"
 msgstr "Hernoemen"
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr "Terug naar gebruiksersbeheer"
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bewerken ${title}"
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 #, fuzzy
 msgid "Search user(s) / group(s)"
 msgstr "Zoeken naar gebruikers en groepen"
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr "Gebruiker toevoegen"
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr "Groep toevoegen"
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 #, fuzzy
 msgid "Find users or groups"
 msgstr "Zoeken naar gebruikers en groepen"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 #, fuzzy
 msgid "Blank search text finds all."
-msgstr ""
-"Zoek en wijzig gebruikers (laat tekstveld leeg om alle gebruikers te vinden."
+msgstr "Zoek en wijzig gebruikers (laat tekstveld leeg om alle gebruikers te vinden."
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 #, fuzzy
 msgid "Assign global roles"
 msgstr "Locale rollen toewijzen"
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 #, fuzzy
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 #, fuzzy
 msgid "Add new group"
 msgstr "Groep toevoegen"
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Zoek Resultaten"
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr "Zoeken..."
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr "Getagd met:"
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "Welkom, ${user}! U bent nu aangemeld."
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "Wilkom, je bent niet aangemeld."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "Je wijzigingen werden opgeslagen."
 
@@ -634,11 +602,20 @@ msgstr "Voeg ${type} aan ${title} toe."
 msgid "Add ${type}."
 msgstr "Voeg ${type} toe."
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr "Je wachtwoord werd hersteld."
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Welkom, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "Je bent afgemeld."
 
@@ -650,46 +627,29 @@ msgstr "Volledige naam"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-mailadres"
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link "
-"om je wachtwoord in te stellen. Deze handeling zal je account activeren."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om je wachtwoord in te stellen. Deze handeling zal je account activeren."
 
 #: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Refistreer - ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Aanmelden mislukt."
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Herstel je wachtwoord - ${title}."
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Welkom, ${user}!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via "
-"deze link activeer je je account."
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 
@@ -697,15 +657,16 @@ msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 msgid "Register"
 msgstr "Registreer"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "Er trad een fout op."
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Verzenden"
+#: kotti/views/login.py:295
+#, fuzzy
+msgid "Set password"
+msgstr "Wachtwoord herstellen"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
@@ -714,12 +675,8 @@ msgid "User Management"
 msgstr "Gebruikersbeheer"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' "
-"hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -773,8 +730,8 @@ msgid "Add Group"
 msgstr "Groep toevoegen"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 msgid "No changes were made."
 msgstr "Geen wijzigingen aangebracht."
 
@@ -824,11 +781,6 @@ msgstr "${title} werd geknipt."
 msgid "${title} was moved."
 msgstr "${title} werd verplaatst."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} werd verwijderd."
-
 #: kotti/views/edit/actions.py:159
 #, python-format
 msgid "${title} was pasted."
@@ -848,70 +800,78 @@ msgstr "${title} is nu zichtbaar in de navigatie."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} is niet langer zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} werd verwijderd."
+
+#: kotti/views/edit/actions.py:303
 msgid "Nothing was deleted."
 msgstr "Er werd niks verwijderd."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Naam en titel zijn vereist."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 msgid "Item was renamed."
 msgstr "Item werd hernoemd."
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Naar boven"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Weergeven"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Verbergen"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Je dient items te selecteren om acties uit te voeren."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Wijzig Status."
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Beschrijving"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Inhoud"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "Standaard weergave werd hersteld naar standaard."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Standaard weergave"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Standaard weergave is ingesteld."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "Standaar weergave kon niet ingesteld worden."
 
+#~ msgid "Submit"
+#~ msgstr "Verzenden"
+
 #~ msgid "Private"
 #~ msgstr "Privaat"
 
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
index 2c4f8b3c693a24bc7a08a9929bda54a5793f7f58..eb9da4aa1e8d3e4e72530d6845b533938430db89 100644
GIT binary patch
delta 3174
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
U=uk;vuy<|VJzsBR(koH_0j`Ku^Z)<=

delta 3208
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

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index 7e67456a6..818034ddb 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 1.1.5-dev\n"
-"POT-Creation-Date: 2015-09-13 21:09+0200\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2015-09-09 12:49+0200\n"
 "Last-Translator: Piotr Dobrogost <p@2015.dobrogost.net>\n"
 "Language-Team: Polish\n"
@@ -14,8 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Lingua 3.8\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -24,22 +23,20 @@ msgstr "Witaj w Kotti"
 #: kotti/populate.py:65
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
-    
+
 #: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -51,8 +48,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -60,14 +56,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -91,27 +85,23 @@ msgstr ""
 "\n"
 "<h2>Zaloguj się</h2>\n"
 "<p>\n"
-"    Możesz <a class=\"btn btn-success\" href=\"login\">zalogować się</a> do "
-"twojego serwisu\n"
+"    Możesz <a class=\"btn btn-success\" href=\"login\">zalogować się</a> do twojego serwisu\n"
 "    i zmieniać jego zawartość.  Jeżeli jeszcze nie ustaliłeś hasła dla\n"
 "    konta administratora, domyślnie jest to <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Po zalogowaniu zobaczysz szare menu edycyjne poniżej\n"
-"    menu nawigacyjnego. Umożliwia ono przełączanie się między edycją a "
-"wyglądem aktualnej strony widzianej z perspektywy użytkowników.\n"
+"    menu nawigacyjnego. Umożliwia ono przełączanie się między edycją a wyglądem aktualnej strony widzianej z perspektywy użytkowników.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Konfiguracja</h2>\n"
 "        <p>\n"
-"            Dowiedz się jak skonfigurować tytył i inne ustawienia "
-"używając             prostego pliku tekstowego w systemie plików.\n"
+"            Dowiedz się jak skonfigurować tytył i inne ustawienia używając             prostego pliku tekstowego w systemie plików.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Podręcznik konfiguracji\n"
 "            </a>\n"
 "        </p>\n"
@@ -119,13 +109,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Wtyczki</h2>\n"
 "        <p>\n"
-"            Wtyczki pozwalają na rozszerzenie funkcjonalności twojego "
-"serwisu opartego na Kotti.\n"
+"            Wtyczki pozwalają na rozszerzenie funkcjonalności twojego serwisu opartego na Kotti.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Wtyczki do Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -133,9 +121,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Dokumentacja</h2>\n"
 "        <p>\n"
-"            Zastanawiasz się co jeszcze możesz zrobić korzystając z "
-"Kotti?              Jaką ma licencję? Przeczytaj podręcznik aby dowiedzieć "
-"się więcej.\n"
+"            Zastanawiasz się co jeszcze możesz zrobić korzystając z Kotti?              Jaką ma licencję? Przeczytaj podręcznik aby dowiedzieć się więcej.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -151,20 +137,15 @@ msgid "About"
 msgstr "Informacje"
 
 #: kotti/populate.py:124
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
-msgstr ""
-"Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim "
-"asortymencie produktów dla lotnictwa i przemysłu."
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim asortymencie produktów dla lotnictwa i przemysłu."
 
 #: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -182,8 +163,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -193,8 +173,7 @@ msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"pięć barwnych samolotów Extra EA300 lecących w szyku\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -212,84 +191,83 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Zdjęcie:</em> \"Northern Lights Formation\" autorstwa FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Prawa autorskie</a>.\n"
 "  Oryginalnie opublikowane w artykule\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:504 kotti/views/edit/actions.py:456
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: kotti/resources.py:505 kotti/views/edit/actions.py:457
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
 msgid "Cut"
 msgstr "Wytnij"
 
-#: kotti/resources.py:506 kotti/views/edit/actions.py:453
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
 msgid "Paste"
 msgstr "Wklej"
 
-#: kotti/resources.py:507 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:458
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: kotti/resources.py:508 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
 #: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:460
 msgid "Delete"
 msgstr "Usuń"
 
-#: kotti/resources.py:635 kotti/views/edit/content.py:85
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
 #: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "Plik"
 
-#: kotti/resources.py:773 kotti/views/edit/content.py:141
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "Obraz"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "Widok katalogów"
 
-#: kotti/resources.py:519 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Zawartość"
 
-#: kotti/resources.py:520 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Edytuj"
 
-#: kotti/resources.py:521
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "Udostępnij"
 
-#: kotti/resources.py:522 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Akcje"
 
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "Czytelnik"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "Edytor"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "Właściciel"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "Administrator"
 
@@ -362,7 +340,7 @@ msgstr "Logowanie"
 msgid "Username or email"
 msgstr "Nazwa użytkownika lub email"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Hasło"
@@ -385,12 +363,8 @@ msgstr "Reset hasła"
 
 #. Canonical text for ${reset_password} is: "Reset password"
 #: kotti/templates/login.pt:48
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} "
-"poniżej, aby otrzymać email z linkiem do zresetowania hasła."
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} poniżej, aby otrzymać email z linkiem do zresetowania hasła."
 
 #: kotti/templates/login.pt:76
 msgid "Not registered yet?"
@@ -414,9 +388,7 @@ msgstr "Zmień stan publikacji"
 
 #: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub "
-"zarządzać nim."
+msgstr "Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub zarządzać nim."
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
 #: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
@@ -452,12 +424,8 @@ msgid "Include children"
 msgstr "Załącz potomka"
 
 #: kotti/templates/edit/change-state.pt:41
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych "
-"dokumentów, oraz ich poddokumenty."
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych dokumentów, oraz ich poddokumenty."
 
 #: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
@@ -517,14 +485,8 @@ msgid "Navigate Site"
 msgstr "Nawigacja strony"
 
 #: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. "
-"W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu "
-"nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
 
 #: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
@@ -704,11 +666,20 @@ msgstr "Dodaj ${type} do ${title}."
 msgid "Add ${type}."
 msgstr "Dodaj ${type}."
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 msgid "You have reset your password."
 msgstr "Zresetowałeś swoje hasło."
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Witaj, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "Zostałeś wylogowany."
 
@@ -720,46 +691,29 @@ msgstr "Imię i nazwisko"
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr ""
 
 #: kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do "
-"ustawienia swego hasła. Robiąc to aktywujesz konto."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
 
 #: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Zarejestruj - ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Nie udało się zalogować."
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetowanie hasła - ${title}."
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Witaj, ${user}!"
-
-#: kotti/views/login.py:172
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło "
-"aktywujesz swoje konto."
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Nieznana nazwa użytkownika lub email."
 
@@ -767,15 +721,16 @@ msgstr "Nieznana nazwa użytkownika lub email."
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "Wystąpił błąd."
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Zatwierdź"
+#: kotti/views/login.py:295
+#, fuzzy
+msgid "Set password"
+msgstr "Reset hasła"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "Twój token do resetu hasła mógł stracić ważność."
 
@@ -784,12 +739,8 @@ msgid "User Management"
 msgstr "Zarządzanie użytkownikami"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby "
-"użytkownik sam ustawił sobie hasło."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -981,3 +932,6 @@ msgstr "Ustawiono domyślny widok."
 #: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "Domyślny widok nie mógł zostać ustawiony."
+
+#~ msgid "Submit"
+#~ msgstr "Zatwierdź"
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index c3a7a5dcafa7882e06b053c1ffbc8183817b53e0..983100318f7448a1901efd35e8f14d9347f47fb7 100644
GIT binary patch
delta 2172
zcmY+_TWnNC9LMqhYA<_0dV{uXyV%;&B87(Cc1e?hRESav)`0k+q6nqXa;e-3kr1+q
zPZb(dk2a7};6*5cwYm=`CGnC<A~A>w5W^*Hfq)N0!owyg377AW&WoEf=QA^B&RqU8
zr#&+F<GJzSoRlw(-wslk^y{-`y|^iz8^2M{EP~gu0&~WhmE%iThRvv^pJEz*j&xxM
zkyor2gLvGP2V8j&Q_bQwM5dkwXK?~%k2jl+MHs~fjNxv~!2!(2Axy!msDVfEIs6+l
zF^RdDLS+>eU>!E1Ce(>3jBnj!G;j}U<|mNLzTx&f4&pStj0G5=u?7sI1}a6yvT9Vv
zb*PCgLN06MruHk46<ZVPc`J@*d}|}4neIXj{28jFL#P+NLUnKw)$V&#2ftxEo<p@;
zkYSdEi;yaN8{4o2_5LMPyKC<G4UFr-Jy&rbbp}#dRyLNP_ArLp<9Qgug{TRvLbYFu
zn($udKGb_(I1l4g%6+J<JBOOctxV#t7w@==Br22-Q1xjnM-$9Msw@wgqm`p3Fxx$^
zb@lU611v>NpcT1n8#fL33F`e0)cXgrh(G7fdR>D))E4x+2B&c%<)7X2i?03(mQz21
z>M)IPsl!~<L<>+0s6Z~O=BDSbq879mHSV%F8HM&;<g#XNQ*kF2VGn9APoqMA7N_7%
zoPhy8iBhb@{Q)|}S(JyF^-Ro|G}dko>Z@u&jn{>mNc<ofh3Y73=3gV14Z8AqR~|uy
zFp00@16SX`iPQvEq9(K#E3qH771!_uOrqY;%NvVK7>Qim%E+)7i=htFLR^4rupW=0
zCU_S$<9|`@AG>lkqo_O?wZaOl!8cJ6+>d(i6l#G9)EOH>Pv8G}*Wj{iFzU+pocB?C
z`3SYw>66E{AP?1H4E6jK)CwC>11?8x**oreJGN5Z<DTEfe8#tb$f%=KTKkxb>fnTP
z09ma4fI38fpxR%+a=eK|*T(VJiSua1sOM2s1m>gOTa6{S4s`}PFs{&ck<qE|LG585
z>cxxBB&vf+g=2>?gj(q|SFS{bbPg&K^{6dbikesxYQPWO^N&yq>L?`s`V)JU3U%-k
zvKaf_HN1r!XuFH*Aix1p#~vy|g{ZHi1htR|Dgw2r_DfI`UyjB27V7<7sLyX-nE11;
z)=h;%){h))`w{iO-~wu(zfchxMy>D;>hD4l^_d0vCSSzar~y_YyJ}mo3_Gw2zeO$h
z2J*E&{pSQ`&yd>u&h(<(_2k|oDL_$@x?k=8l3t&>g<QKoAz0&WB)6ILzTX(E3#|1!
zgQbCH|GQv*XdAUnq<N(O{ru~}iQW!Zwbg$ZtPX9bw2t%|Nnadmv1O!9euFnF^Z_|7
zwUzV+N&BM^tns_N{3)x*tsp5_3WSbJ3rW8Xi8J1RX^Asg4+9y|NM)p^xGGv3i_C~r
PCH~A=?<HOij|83op#RL@

delta 2202
zcmYk-eN5F=9LMqRwF~!Nukxfk<wZc{W&(qIZ;RPb({MB`oVYcbQDBx_5fcQWlJ4|B
zXAfIHowMe&hZU}9DLHh_qMB=C>ZWczEt_l8EwK%9=rV1+KXLx(?stB#bAG?`_&w(b
zJ8KWsrhd)w?=ybAqzLKEJ!S`SM}Ql@@sL?HPT(S(H{C3Xk7F5jqpH4*>G&Sfg&jef
z*dPXR*p)|Ic@)#kQg)F{Jr#b!nOGV&yC17ChEL)HxCe7^1oQDC`f&_3@Ho!ETbPM{
z3b{BN<G2WyVKZt%2hq>?_8}P!{4r|gCy~oeahr>ycpv_b_hL4cHDCp5pae3eJ%Z|Z
z4QgUd$YsskRKFcrv2~%|_hFdvt)Gl$x*Ij{Ayh}7pc))Ub?^nM-Z!WYe#CCPgsRt=
zVU~qW$RkT)2fm1Ee+5<Vx_kd8ru0I~P=f&K4CG=q#!-7%huY%?EW{^J6WE5T--DX)
zTh4b-?LKgRiVG;8KyBS6)I=sTiN6~D?H>4<zCt-2^*j$X!D6I}MUhF{gQy9tbnjQW
z=W9^|w4f%?hg`Ocn+Ehy?GK>Z4`dO4&Ycaq3MWtleu>(O)2`wLoJIKuR7Yd(`2<EO
z-$Zp>MA+1E1!}@E)Iydcm#yNa_fMh5X-$#Q1lmv`-i}=M3bzILIu_$G)D~SpZNX(M
z!rNGm1$-Lwu?}DJ(H~Y(o@CY)ST=jAUL)%3dKEQZYJiMp@);^*!>E~mja+u#m9M(;
zO;iNJoWusqM%8OUO`r!gp#xZnr%_vS14}WSH`TrpiA>58WE8quWHGiHb*P$g1-^{+
zcnUSaG<ws7Gg0;PTzR1@SD{w89BZ&06~XsW?Y>1Va1_J({(mN;j<323<F3LjR}K_R
zHOxTmWiD#Mb5UDRiRy5*d%qqPp^c~kH>0+!)4kt=ZIt)wJ>%P5GK^(@YN?|LdRT$#
zV8r<y5(GPkIz(4c^{-(RZzEB*QvOPD9<2uT{!vr}no#Zfa31z!N{8Su8AV_Kb?T3y
z_V6oI!!c)g&Qu5GsKZ!|TIo_(u0wskji^XHjoPA3sENIV8t+Z_e*YZeuN58Uf&SDE
zqdNE=S&aSWD&9d3w54${)IkBN;}TSa;?BjWi9L*3Py;FwO{jKBR0KM)1bZXIUmfk|
zfj+|{sIB-M6}mI1)BOwTf5QZ7z)4i3?x0p0;vnenLk{Y5i{e6Dhw6U^vdi`cmf=Sj
z$FmVKTDfj~w*Spe#c8CiUVorCcQd(WlHwF2srwDy(LjA#C%GQ)ZlET#h1@n$i?<}W
z%=f(4ADr)d&U-hQU$~v8&ytps{{MT%J0F}C>UEF0yg!18!fr~NNRN^9<*_zfOX~0z
zhpGx+Ag84!NsT1!(+tu^Z)YgKsFmD$l7gi`=-9N8^lKkF9{MXieO=Fnj%4@HVAemr
kjOuu0JYEuuJ(Nh4SI34<<|ISuE4TJ0Tf2rzBbR;u0*VgOyZ`_I

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 3ccc8e218..5d60edff8 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 0.8\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-22 11:33+0100\n"
+"POT-Creation-Date: 2015-10-07 21:40+0200\n"
 "PO-Revision-Date: 2012-01-16 12:02+0000\n"
 "Last-Translator: Nuno Teixeira <teixas@gmail.com>\n"
 "Language-Team: pt <LL@li.org>\n"
@@ -32,29 +32,25 @@ msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configure</h2>\n"
 "        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"basic/configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -62,13 +58,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your Kotti site.\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -76,9 +71,9 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -90,23 +85,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:121
+#: kotti/populate.py:123
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:122
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide "
-"variety of aviation and and industrial products."
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -123,173 +115,171 @@ msgid ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:627 kotti/views/edit/content.py:82
+#: kotti/resources.py:509 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copiar"
+
+#: kotti/resources.py:510 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Cortar"
+
+#: kotti/resources.py:511 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Colar"
+
+#: kotti/resources.py:512 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:40 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Renomear"
+
+#: kotti/resources.py:513 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Apagar"
+
+#: kotti/resources.py:640 kotti/views/edit/content.py:85
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:666 kotti/views/edit/content.py:110
-#: kotti/views/edit/content.py:63
+#: kotti/resources.py:731 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
 msgid "File"
 msgstr "Ficheiro"
 
-#: kotti/resources.py:753 kotti/views/edit/content.py:138
+#: kotti/resources.py:778 kotti/views/edit/content.py:141
 msgid "Image"
 msgstr "Imagem"
 
-#: kotti/resources.py:517
+#: kotti/resources.py:530
 msgid "Folder view"
 msgstr "Vista de pasta"
 
-#: kotti/resources.py:504 kotti/templates/view/folder.pt:17
+#: kotti/resources.py:524 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: kotti/resources.py:505 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:525 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Editar"
 
-#: kotti/resources.py:506
+#: kotti/resources.py:526
 msgid "Share"
 msgstr "Partilha"
 
-#: kotti/resources.py:507 kotti/templates/actions-dropdown.pt:5
+#: kotti/resources.py:527 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Ações"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:446
-msgid "Copy"
-msgstr "Copiar"
-
-#: kotti/resources.py:509 kotti/views/edit/actions.py:447
-msgid "Cut"
-msgstr "Cortar"
-
-#: kotti/resources.py:510 kotti/views/edit/actions.py:443
-msgid "Paste"
-msgstr "Colar"
-
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:7
-#: kotti/templates/edit/rename-nodes.pt:55 kotti/templates/edit/rename.pt:42
-#: kotti/views/edit/actions.py:448
-msgid "Rename"
-msgstr "Renomear"
-
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:8
-#: kotti/templates/edit/delete-nodes.pt:90 kotti/templates/edit/delete.pt:28
-#: kotti/templates/site-setup/delete-user.pt:36 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:450
-msgid "Delete"
-msgstr "Apagar"
-
-#: kotti/security.py:189
+#: kotti/security.py:191
 msgid "Viewer"
 msgstr "Leitor"
 
-#: kotti/security.py:190
+#: kotti/security.py:192
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:191
+#: kotti/security.py:193
 msgid "Owner"
 msgstr "Dono"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Admin"
 msgstr "Admin"
 
-#: kotti/templates/add-dropdown.pt:5
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Adicionar"
 
-#: kotti/templates/add-dropdown.pt:27
+#: kotti/templates/add-dropdown.pt:13
 msgid "Upload Content"
 msgstr "Colocar Conteúdo"
 
-#: kotti/templates/default-view-selector.pt:5
+#: kotti/templates/default-view-selector.pt:3
 msgid "Set default view"
 msgstr "Definir vista por defeito"
 
-#: kotti/templates/editor-bar.pt:35
+#: kotti/templates/editor-bar.pt:21
 msgid "View"
 msgstr "Ver"
 
-#: kotti/templates/editor-bar.pt:76
+#: kotti/templates/editor-bar.pt:44
 msgid "Navigate"
 msgstr "Navegar"
 
-#: kotti/templates/editor-bar.pt:98
+#: kotti/templates/editor-bar.pt:55
 msgid "Preferences"
 msgstr "Preferências"
 
-#: kotti/templates/editor-bar.pt:109
+#: kotti/templates/editor-bar.pt:60
 msgid "Site Setup"
 msgstr "Configurar Sítio"
 
-#: kotti/templates/editor-bar.pt:131
+#: kotti/templates/editor-bar.pt:71
 msgid "Logout"
 msgstr "Sair"
 
-#: kotti/templates/email-reset-password.pt:3
+#: kotti/templates/email-reset-password.pt:2
 #, fuzzy
 msgid "Reset your password for ${site_title}."
 msgstr "Reiniciar a sua palavra passe em ${site_title}"
 
-#: kotti/templates/email-reset-password.pt:7
-#: kotti/templates/email-set-password.pt:6
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
 msgid "Hello, ${user_title}!"
 msgstr "Bem-vindo, ${user_title}!"
 
-#: kotti/templates/email-reset-password.pt:10
+#: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
+msgstr "Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
 
-#: kotti/templates/email-set-password.pt:3
+#: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"
 msgstr "O seu registo em ${site_title}"
 
-#: kotti/templates/email-set-password.pt:9
+#: kotti/templates/email-set-password.pt:5
 #, fuzzy
 msgid "You are joining ${site_title}."
 msgstr "O seu registo em ${site_title}"
 
-#: kotti/templates/email-set-password.pt:12
+#: kotti/templates/email-set-password.pt:6
 msgid "Click here to set your password and log in: ${url}"
 msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
 
-#: kotti/templates/forbidden.pt:7
+#: kotti/templates/forbidden.pt:10
 #, fuzzy
 msgid "Forbidden"
 msgstr "Escondido"
 
-#: kotti/templates/login.pt:16
+#: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "Entrar"
 
-#: kotti/templates/login.pt:25 kotti/templates/login.pt:87
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
 msgid "Username or email"
 msgstr "Utilizador ou e-mail"
 
-#: kotti/templates/login.pt:34 kotti/views/login.py:212
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
 #: kotti/views/users.py:212
 msgid "Password"
 msgstr "Palavra passe"
 
-#: kotti/templates/login.pt:47
+#: kotti/templates/login.pt:33
 msgid "Log in"
 msgstr "Entrar"
 
-#: kotti/templates/login.pt:65
+#: kotti/templates/login.pt:43
 msgid "Forgot your password?"
 msgstr "Esqueceu-se da palavra passe?"
 
@@ -297,320 +287,304 @@ msgstr "Esqueceu-se da palavra passe?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:77 kotti/templates/login.pt:100
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
 msgid "Reset password"
 msgstr "Repor a palavra passe"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:74
+#: kotti/templates/login.pt:48
 #, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Preencha o seu nome de utilizador com o seu e-mail e clique em "
-"${reset_password} para receber um e-mail com uma ligação para reiniciar a "
-"sua palavra passe."
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Preencha o seu nome de utilizador com o seu e-mail e clique em ${reset_password} para receber um e-mail com uma ligação para reiniciar a sua palavra passe."
 
-#: kotti/templates/login.pt:118
+#: kotti/templates/login.pt:76
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:127
+#: kotti/templates/login.pt:82
 #, fuzzy
 msgid "Register for an account on this site."
 msgstr "Não se encontra registado? ${register} para criar uma conta."
 
-#: kotti/templates/workflow-dropdown.pt:19
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Tornar ${state}"
 
-#: kotti/templates/edit/breadcrumbs.pt:5
+#: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Você está aqui:"
 
-#: kotti/templates/edit/change-state.pt:7
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Modificar estado de workflow"
 
-#: kotti/templates/edit/change-state.pt:14
+#: kotti/templates/edit/change-state.pt:12
 msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"O estado de workflow de um item define quem o pode ver, edit e/ou "
-"administrar."
+msgstr "O estado de workflow de um item define quem o pode ver, edit e/ou administrar."
 
-#: kotti/templates/edit/change-state.pt:26 kotti/templates/edit/contents.pt:57
-#: kotti/templates/edit/delete-nodes.pt:33 kotti/templates/view/folder.pt:28
-#: kotti/views/users.py:196 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
 msgid "Title"
 msgstr "Título"
 
-#: kotti/templates/edit/change-state.pt:29 kotti/templates/edit/contents.pt:60
-#: kotti/templates/edit/delete-nodes.pt:36 kotti/templates/edit/share.pt:70
-#: kotti/templates/edit/upload.pt:23 kotti/templates/edit/upload.pt:167
-#: kotti/templates/site-setup/users.pt:105 kotti/templates/view/folder.pt:31
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:112
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Tipo"
 
-#: kotti/templates/edit/change-state.pt:32 kotti/templates/edit/contents.pt:63
-#: kotti/templates/edit/delete-nodes.pt:39
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
 msgid "State"
 msgstr "Estado"
 
-#: kotti/templates/edit/change-state.pt:35 kotti/templates/edit/contents.pt:69
-#: kotti/templates/edit/delete-nodes.pt:42 kotti/templates/view/folder.pt:34
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-#: kotti/templates/edit/change-state.pt:38 kotti/templates/edit/contents.pt:72
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/view/folder.pt:37
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data de Modificação"
 
-#: kotti/templates/edit/change-state.pt:79
-#: kotti/templates/edit/change-state.pt:90
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
 msgid "Include children"
 msgstr "Incluir nós interiores"
 
-#: kotti/templates/edit/change-state.pt:82
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Se estiver selecionado irá tentar alterar o estado dos "
-"documentosselecionados e dos seus subdocumentos."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Se estiver selecionado irá tentar alterar o estado dos documentosselecionados e dos seus subdocumentos."
 
-#: kotti/templates/edit/change-state.pt:100
+#: kotti/templates/edit/change-state.pt:50
 msgid "Change state to"
 msgstr "Mudar estado para"
 
-#: kotti/templates/edit/change-state.pt:103
+#: kotti/templates/edit/change-state.pt:51
 #, fuzzy
 msgid "Select the new state where all chosen items should be set."
 msgstr "Selecione o novo estado para os items selecionados."
 
-#: kotti/templates/edit/change-state.pt:111
+#: kotti/templates/edit/change-state.pt:55
 msgid "No change"
 msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/templates/edit/change-state.pt:127 kotti/templates/edit/share.pt:121
-#: kotti/templates/site-setup/users.pt:165
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "Aplicar alterações"
 
-#: kotti/templates/edit/change-state.pt:130
-#: kotti/templates/edit/delete-nodes.pt:93
-#: kotti/templates/edit/rename-nodes.pt:58 kotti/views/form.py:78
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/form.py:78
 #: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "Não existem items nesta pasta."
 
-#: kotti/templates/edit/contents.pt:66
+#: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: kotti/templates/edit/contents.pt:125
+#: kotti/templates/edit/contents.pt:75
 msgid "Visible"
 msgstr "Visível"
 
-#: kotti/templates/edit/contents.pt:134
+#: kotti/templates/edit/contents.pt:79
 #, fuzzy
 msgid "Hidden"
 msgstr "Escondido"
 
-#: kotti/templates/edit/delete-nodes.pt:17
+#: kotti/templates/edit/delete-nodes.pt:14
 msgid "Are you sure you want to delete the following items?"
 msgstr "Deseja realmente eliminar os items seguintes?"
 
-#: kotti/templates/edit/delete.pt:8
-#: kotti/templates/site-setup/delete-user.pt:8
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Apagar ${title}"
 
-#: kotti/templates/edit/delete.pt:20
+#: kotti/templates/edit/delete.pt:13
 msgid "Are you sure you want to delete ${title}?"
 msgstr "Deseja realmente eliminar ${title}?"
 
-#: kotti/templates/edit/nav-tree-view.pt:7
+#: kotti/templates/edit/nav-tree-view.pt:8
 #, fuzzy
 msgid "Navigate Site"
 msgstr "Navegar"
 
-#: kotti/templates/edit/rename-nodes.pt:16 kotti/templates/edit/rename.pt:14
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
 #, fuzzy
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. "
-"You can change both below."
-msgstr ""
-"Cada item tem um nome que será usado para criar o url e o título.  Poderá "
-"alterá-los colocando os novos detalhes abaixo."
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Cada item tem um nome que será usado para criar o url e o título.  Poderá alterá-los colocando os novos detalhes abaixo."
 
-#: kotti/templates/edit/rename-nodes.pt:35 kotti/templates/edit/rename.pt:26
+#: kotti/templates/edit/rename-nodes.pt:26 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "Novo nome"
 
-#: kotti/templates/edit/rename-nodes.pt:45 kotti/templates/edit/rename.pt:35
+#: kotti/templates/edit/rename-nodes.pt:33 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "Novo título"
 
-#: kotti/templates/edit/rename.pt:7
+#: kotti/templates/edit/rename.pt:8
 msgid "Rename ${title}"
 msgstr "Renomear ${title}"
 
-#: kotti/templates/edit/share.pt:7
+#: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "Partilhar ${title}"
 
-#: kotti/templates/edit/share.pt:19 kotti/templates/edit/share.pt:30
-#: kotti/templates/edit/share.pt:35 kotti/templates/site-setup/users.pt:68
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
 msgid "Search users and groups"
 msgstr "Procurar utilizadores e grupos"
 
-#: kotti/templates/edit/share.pt:43 kotti/templates/site-setup/users.pt:81
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
 msgid "Search"
 msgstr "Procurar"
 
-#: kotti/templates/edit/share.pt:60
+#: kotti/templates/edit/share.pt:42
 msgid "Assign local roles"
 msgstr "Atribuir papéis locais"
 
-#: kotti/templates/edit/share.pt:73 kotti/templates/site-setup/users.pt:108
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
 #: kotti/views/users.py:207
 msgid "Name"
 msgstr "Nome"
 
-#: kotti/templates/edit/share.pt:91 kotti/templates/site-setup/users.pt:126
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
 #: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
 msgid "User"
 msgstr "Utilizador"
 
-#: kotti/templates/edit/share.pt:94 kotti/templates/site-setup/users.pt:129
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
 #: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
 #: kotti/views/users.py:536
 msgid "Group"
 msgstr "Grupo"
 
-#: kotti/templates/edit/share.pt:101 kotti/templates/site-setup/users.pt:136
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/upload.pt:9
+#: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:164
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:111
 #, fuzzy
 msgid "Filename"
 msgstr "Renomear"
 
-#: kotti/templates/edit/upload.pt:26 kotti/templates/edit/upload.pt:170
+#: kotti/templates/edit/upload.pt:20 kotti/templates/edit/upload.pt:113
 msgid "Size"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:29
+#: kotti/templates/edit/upload.pt:21
 msgid "Status"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:32
+#: kotti/templates/edit/upload.pt:22
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:124
+#: kotti/templates/edit/upload.pt:88
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:134
+#: kotti/templates/edit/upload.pt:96
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:144
+#: kotti/templates/edit/upload.pt:101
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/site-setup/delete-user.pt:20
+#: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Deseja realmente eliminar ${type} ${title}?"
 
-#: kotti/templates/site-setup/user.pt:13
+#: kotti/templates/site-setup/user.pt:12
 msgid "Back to User Management"
 msgstr "Voltar à gestão de utilizadores"
 
-#: kotti/templates/site-setup/user.pt:25 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
 msgid "Edit ${title}"
 msgstr "Editar ${title}"
 
-#: kotti/templates/site-setup/users.pt:15
+#: kotti/templates/site-setup/users.pt:12
 #, fuzzy
 msgid "Search user(s) / group(s)"
 msgstr "Procurar utilizadores e grupos"
 
-#: kotti/templates/site-setup/users.pt:24
+#: kotti/templates/site-setup/users.pt:17
 msgid "Add user"
 msgstr "Adicionar utilizador"
 
-#: kotti/templates/site-setup/users.pt:33
+#: kotti/templates/site-setup/users.pt:22
 msgid "Add group"
 msgstr "Adicionar grupo"
 
-#: kotti/templates/site-setup/users.pt:52
+#: kotti/templates/site-setup/users.pt:34
 #, fuzzy
 msgid "Find users or groups"
 msgstr "Procurar utilizadores e grupos"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:39
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:70
+#: kotti/templates/site-setup/users.pt:49
 #, fuzzy
 msgid "Blank search text finds all."
 msgstr ""
 "Encontre e modifique utilizadores (Uma pesquisa em branco retorna\"\n"
 "\" todos os utilizadores)"
 
-#: kotti/templates/site-setup/users.pt:96
+#: kotti/templates/site-setup/users.pt:63
 #, fuzzy
 msgid "Assign global roles"
 msgstr "Atribuir papéis locais"
 
-#: kotti/templates/site-setup/users.pt:180
+#: kotti/templates/site-setup/users.pt:115
 #, fuzzy
 msgid "Add new user"
 msgstr "Adicionar utilizador"
 
-#: kotti/templates/site-setup/users.pt:190
+#: kotti/templates/site-setup/users.pt:121
 #, fuzzy
 msgid "Add new group"
 msgstr "Adicionar grupo"
 
-#: kotti/templates/view/search-results.pt:8
+#: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Resultados da pesquisa"
 
-#: kotti/templates/view/search.pt:5
+#: kotti/templates/view/search.pt:12
 msgid "Search..."
 msgstr "Procurar..."
 
-#: kotti/templates/view/tags.pt:5
+#: kotti/templates/view/tags.pt:7
 msgid "Tagged with:"
 msgstr "Marcado como:"
 
-#: kotti/tests/testing_view.pt:7
+#: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "Bem-vindo, ${user}! Você está autenticado."
 
-#: kotti/tests/testing_view.pt:14
+#: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "Bem-vindo, você não está autenticado."
 
 #: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:364 kotti/views/edit/actions.py:408
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
 msgid "Your changes have been saved."
 msgstr "As suas alterações foram guardadas."
 
@@ -638,12 +612,22 @@ msgstr "Adicionar ${type} em ${title}"
 msgid "Add ${type}."
 msgstr "Adicionar ${type}"
 
-#: kotti/views/login.py:237
+#: kotti/views/login.py:282
 #, fuzzy
 msgid "You have reset your password."
 msgstr "Você reinicializou a palavra passe com sucesso"
 
-#: kotti/views/login.py:199
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bem-vindo, ${user}!"
+
+#: kotti/views/login.py:179
+#, fuzzy
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
+
+#: kotti/views/login.py:244
 msgid "You have been logged out."
 msgstr "Você desligou a sessão"
 
@@ -656,48 +640,30 @@ msgstr "Nome completo"
 msgid "Username"
 msgstr "Nome utilizador"
 
-#: kotti/views/login.py:73 kotti/views/login.py:224 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
 msgid "Email"
 msgstr "E-mail"
 
 #: kotti/views/login.py:108
 #, fuzzy
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma "
-"ligação temporária para reiniciar a sua palavra passe."
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
 #: kotti/views/login.py:123
 #, fuzzy, python-format
 msgid "Register - ${title}"
 msgstr "Registar ${title}"
 
-#: kotti/views/login.py:163
+#: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Erro de autenticação"
 
-#: kotti/views/login.py:285
+#: kotti/views/login.py:330
 #, fuzzy, python-format
 msgid "Reset your password - ${title}."
 msgstr "Reiniciar a sua palavra passe - ${title}"
 
-#: kotti/views/login.py:159
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bem-vindo, ${user}!"
-
-#: kotti/views/login.py:172
-#, fuzzy
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing "
-"so will activate your account."
-msgstr ""
-"Você deverá receber um e-mail com uma ligação temporária para reiniciar a "
-"sua palavra passe."
-
-#: kotti/views/login.py:177
+#: kotti/views/login.py:222
 #, fuzzy
 msgid "That username or email is not known by this system."
 msgstr "Este utilizador ou e-mail não são reconhecidos."
@@ -706,15 +672,16 @@ msgstr "Este utilizador ou e-mail não são reconhecidos."
 msgid "Register"
 msgstr "Registar-se"
 
-#: kotti/views/login.py:89 kotti/views/login.py:256
+#: kotti/views/login.py:89
 msgid "There was an error."
 msgstr "Ocorreu um erro."
 
-#: kotti/views/login.py:249
-msgid "Submit"
-msgstr "Enviar"
+#: kotti/views/login.py:295
+#, fuzzy
+msgid "Set password"
+msgstr "Repor a palavra passe"
 
-#: kotti/views/login.py:278
+#: kotti/views/login.py:323
 msgid "Your password reset token may have expired."
 msgstr "A seu pedido para alterar a palavra passe expirou."
 
@@ -723,12 +690,8 @@ msgid "User Management"
 msgstr "Gestão de Utilizadores"
 
 #: kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Deixe este campo por preencher e escolha a opção 'Enviar ligação para "
-"registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
 
 #: kotti/views/users.py:587
 #, python-format
@@ -782,8 +745,8 @@ msgid "Add Group"
 msgstr "Adicionar Grupo"
 
 #: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:302 kotti/views/edit/actions.py:368
-#: kotti/views/edit/actions.py:414 kotti/views/edit/actions.py:410
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
 #, fuzzy
 msgid "No changes were made."
 msgstr "Não foram efectuadas nenhumas alterações"
@@ -838,11 +801,6 @@ msgstr "${title} cortado."
 msgid "${title} was moved."
 msgstr "${title} movido."
 
-#: kotti/views/edit/actions.py:271 kotti/views/edit/actions.py:296
-#, fuzzy, python-format
-msgid "${title} was deleted."
-msgstr "${title} apagado."
-
 #: kotti/views/edit/actions.py:159
 #, fuzzy, python-format
 msgid "${title} was pasted."
@@ -863,73 +821,81 @@ msgstr "${title} encontra-se visivel na navegação."
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} já não está visivel na navegação."
 
-#: kotti/views/edit/actions.py:293
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, fuzzy, python-format
+msgid "${title} was deleted."
+msgstr "${title} apagado."
+
+#: kotti/views/edit/actions.py:303
 #, fuzzy
 msgid "Nothing was deleted."
 msgstr "Nada foi apagado."
 
-#: kotti/views/edit/actions.py:329 kotti/views/edit/actions.py:356
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
 msgid "Name and title are required."
 msgstr "Nome e título são obrigatórios."
 
-#: kotti/views/edit/actions.py:333
+#: kotti/views/edit/actions.py:343
 #, fuzzy
 msgid "Item was renamed."
 msgstr "Item renomeado"
 
-#: kotti/views/edit/actions.py:455
+#: kotti/views/edit/actions.py:465
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: kotti/views/edit/actions.py:456
+#: kotti/views/edit/actions.py:466
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:467
 msgid "Show"
 msgstr "Mostrar"
 
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:468
 msgid "Hide"
 msgstr "Esconder"
 
-#: kotti/views/edit/actions.py:497
+#: kotti/views/edit/actions.py:507
 #, fuzzy
 msgid "You have to select items to perform an action."
 msgstr "Terá de escolher items para executar a ação."
 
-#: kotti/views/edit/actions.py:454
+#: kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr "Alterar Estado"
 
-#: kotti/views/edit/content.py:36
+#: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Descrição"
 
-#: kotti/views/edit/content.py:42
+#: kotti/views/edit/content.py:44
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: kotti/views/edit/content.py:51
+#: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Corpo"
 
-#: kotti/views/edit/default_views.py:99
+#: kotti/views/edit/default_views.py:100
 msgid "Default view has been reset to default."
 msgstr "A vista original foi indicada como a vista por defeito."
 
-#: kotti/views/edit/default_views.py:78
+#: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vista por defeito"
 
-#: kotti/views/edit/default_views.py:106
+#: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Vista por defeito foi alterada."
 
-#: kotti/views/edit/default_views.py:111
+#: kotti/views/edit/default_views.py:112
 msgid "Default view could not be set."
 msgstr "Vista por defeito não pode ser alterada."
 
+#~ msgid "Submit"
+#~ msgstr "Enviar"
+
 #~ msgid "Private"
 #~ msgstr "Privado"
 
diff --git a/requirements.txt b/requirements.txt
index 7d4f440a4..070a5ebf8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.2.0
+Kotti==1.2.1
 Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.22
diff --git a/setup.py b/setup.py
index bb502e24b..d120b7b43 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.1-dev',
+      version='1.2.1',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From b051c2f2877476a76fad98104c1eadc4bafe1650 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 7 Oct 2015 21:44:05 +0200
Subject: [PATCH 350/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9e4bbd2ad..e9f0daf39 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.2.2 - unreleased
+------------------
+
+- No changes yet.
+
 1.2.1 - 2015-10-07
 ------------------
 
diff --git a/setup.py b/setup.py
index d120b7b43..1ba18c505 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.1',
+      version='1.2.2-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From a74569dbc3e01efc0e3995e96ccf1305da578268 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Fri, 9 Oct 2015 12:32:20 +0100
Subject: [PATCH 351/600] Update changelog.

[ci skip]
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e9f0daf39..9e7ecfae7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.2.2 - unreleased
 ------------------
 
-- No changes yet.
+- Add simple, default ``not found view``.
 
 1.2.1 - 2015-10-07
 ------------------

From 71026dfdcf1bcaa051769addff25ff9ead44e276 Mon Sep 17 00:00:00 2001
From: Matt Russell <mattr@netsight.co.uk>
Date: Fri, 9 Oct 2015 15:08:44 +0100
Subject: [PATCH 352/600] Fixes is_location docstring

---
 kotti/views/util.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kotti/views/util.py b/kotti/views/util.py
index 54eccefea..26bcbe390 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -140,12 +140,13 @@ def __init__(self, context, request, bare=None, **kwargs):
         self.__dict__.update(kwargs)
 
     def is_location(self, context):
-        """Is the context a location?
+        """Does `context` implement :class:`pyramid.interfaces.ILocation`?
 
         :param context: The context.
         :type context: kotti.interfaces.INode
         :rtype: bool
-        :returns: True if Is the context available in the content lineage
+        :returns: True if Is the context object implements
+                  :class:`pyramid.interfaces.ILocation`.
         """
         return ILocation.providedBy(context)
 

From d0288fe9b8d2035ff8f03b02c341f46b02843259 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 9 Oct 2015 16:33:01 +0200
Subject: [PATCH 353/600] Fix possible issues with docs.

---
 README.rst                                      | 12 ++++++------
 docs/developing/advanced/close-to-anonymous.rst |  2 +-
 docs/first_steps/overview.rst                   |  6 +++---
 kotti/security.py                               |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.rst b/README.rst
index 5be38acd6..f1ac62b57 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ Kotti
 |pypi|_
 |downloads_month|_
 |license|_
-|build status stable|_
+|build_status_stable|_
 
 .. |pypi| image:: https://img.shields.io/pypi/v/Kotti.svg?style=flat-square
 .. _pypi: https://pypi.python.org/pypi/Kotti/
@@ -16,8 +16,8 @@ Kotti
 .. |license| image:: https://img.shields.io/pypi/l/Kotti.svg?style=flat-square
 .. _license: http://www.repoze.org/LICENSE.txt
 
-.. |build status stable| image:: https://img.shields.io/travis/Kotti/Kotti/stable.svg?style=flat-square
-.. _build status stable: http://travis-ci.org/Kotti/Kotti
+.. |build_status_stable| image:: https://img.shields.io/travis/Kotti/Kotti/stable.svg?style=flat-square
+.. _build_status_stable: http://travis-ci.org/Kotti/Kotti
 
 Kotti is a high-level, Pythonic web application framework based on Pyramid_ and SQLAlchemy_.
 It includes an extensible Content Management System called the Kotti CMS (see below).
@@ -94,7 +94,7 @@ If you think you found a bug, open an issue on our `Github bugtracker <https://g
 Development
 ===========
 
-|build status master|_
+|build_status_master|_
 |coveralls|_
 |codacy|_
 |codeclimate|_
@@ -111,8 +111,8 @@ We adhere to `high quality coding standards`_, have an extensive test suite with
 
 Contributions are always welcome, read our `contribution guidelines`_ and visit our `Github repository`_.
 
-.. |build status master| image:: https://img.shields.io/travis/Kotti/Kotti/master.svg?style=flat-square
-.. _build status master: http://travis-ci.org/Kotti/Kotti
+.. |build_status_master| image:: https://img.shields.io/travis/Kotti/Kotti/master.svg?style=flat-square
+.. _build_status_master: http://travis-ci.org/Kotti/Kotti
 .. _continuous integration: http://travis-ci.org/Kotti/Kotti
 
 .. |requires.io| image:: https://img.shields.io/requires/github/Kotti/Kotti.svg?style=flat-square
diff --git a/docs/developing/advanced/close-to-anonymous.rst b/docs/developing/advanced/close-to-anonymous.rst
index 854f5682b..f42deefbf 100644
--- a/docs/developing/advanced/close-to-anonymous.rst
+++ b/docs/developing/advanced/close-to-anonymous.rst
@@ -1,7 +1,7 @@
 .. _close-to-anonymous:
 
 Close your site to anonymous users
-===================================
+==================================
 
 This recipe describes how to configure Kotti to require users to log
 in before they can view any of your site's pages.
diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index 011b984f6..9fbab1a5a 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -74,7 +74,7 @@ Use this command:
 
   git clone git@github.com:Kotti/Kotti
 
-`Continuous testing`_ against different versions of Python and with *PostgreSQL*, *MySQL* and *SQLite* and a complete test coverage make Kotti a **stable** platform to work with.  |build status|_
+`Continuous testing`_ against different versions of Python and with *PostgreSQL*, *MySQL* and *SQLite* and a complete test coverage make Kotti a **stable** platform to work with.  |build_status|_
 
 Support
 -------
@@ -90,8 +90,8 @@ Support
 .. _continuous testing: http://travis-ci.org/Kotti/Kotti
 .. _Deform: http://docs.pylonsproject.org/projects/deform/en/latest/
 .. _developed on Github: https://github.com/Kotti/Kotti
-.. |build status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=master
-.. _build status: http://travis-ci.org/Kotti/Kotti
+.. |build_status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=master
+.. _build_status: http://travis-ci.org/Kotti/Kotti
 .. _installation:
 .. _other SQL databases: http://www.sqlalchemy.org/docs/core/engines.html#supported-databases
 .. _variety of web servers: http://wsgi.org/wsgi/Servers
diff --git a/kotti/security.py b/kotti/security.py
index 5b374978e..d1ee10fd0 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -492,8 +492,8 @@ def search(self, match='any', **kwargs):
                       all params
         :type match: str
 
-        :param **kwargs: Search conditions, e.g. ``name='bob', active=True``.
-        :type **kwargs: varying.
+        :param kwargs: Search conditions, e.g. ``name='bob', active=True``.
+        :type kwargs: varying.
 
         :result: SQLAlchemy query object
         :rtype: :class:`sqlalchemy.orm.query.Query``

From 972e5e98b1cd33be4bc8e3f368dcac0e568c34aa Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 9 Oct 2015 17:02:02 +0200
Subject: [PATCH 354/600] Enhance readability of expressions in templates. 
 Also include view names as arguments to ``resource_url`` instead of string
 concatenatiion.

---
 kotti/templates/default-view-selector.pt | 2 +-
 kotti/templates/edit/change-state.pt     | 2 +-
 kotti/templates/edit/contents.pt         | 2 +-
 kotti/templates/edit/delete-nodes.pt     | 2 +-
 kotti/templates/edit/master.pt           | 3 +--
 kotti/templates/edit/upload.pt           | 5 ++---
 kotti/templates/editor-bar.pt            | 2 +-
 kotti/templates/messages.pt              | 2 +-
 kotti/templates/view/image.pt            | 2 +-
 kotti/templates/workflow-dropdown.pt     | 3 ++-
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/kotti/templates/default-view-selector.pt b/kotti/templates/default-view-selector.pt
index 18bc429bf..cf9736359 100644
--- a/kotti/templates/default-view-selector.pt
+++ b/kotti/templates/default-view-selector.pt
@@ -9,7 +9,7 @@
       <b class="glyphicon glyphicon-ok pull-right"></b>
     </a>
     <a tal:condition="not: v.is_current"
-       href="${request.resource_url(context)}set-default-view?view_name=${v.name}">
+       tal:attributes="href request.resource_url(context, 'set-default-view', query={'view_name': v.name})">
       ${v.title}
     </a>
   </li>
diff --git a/kotti/templates/edit/change-state.pt b/kotti/templates/edit/change-state.pt
index 20c66e04a..24d217070 100644
--- a/kotti/templates/edit/change-state.pt
+++ b/kotti/templates/edit/change-state.pt
@@ -24,7 +24,7 @@
           </thead>
           <tbody>
           <tr tal:repeat="item items">
-            <tal:block tal:define="url string:${request.resource_url(item)}@@contents">
+            <tal:block tal:define="url request.resource_url(item, '@@contents')">
               <td><input name="children-to-change-state" type="checkbox" value="${item.id}" checked="checked" /></td>
               <td><a href="${url}">${item.title}</a></td>
               <td>${item.type_info.title}</td>
diff --git a/kotti/templates/edit/contents.pt b/kotti/templates/edit/contents.pt
index 93ea140f9..f3f5f4683 100644
--- a/kotti/templates/edit/contents.pt
+++ b/kotti/templates/edit/contents.pt
@@ -25,7 +25,7 @@
         </tal:repeat>
       </div>
 
-      <form action="${request.resource_url(context)}@@contents" method="post">
+      <form action="${request.resource_url(context, '@@contents')}" method="post">
         <tal:no-content tal:condition="not:children">
           <span class="text-info" i18n:translate="">No content items are contained here.</span>
         </tal:no-content>
diff --git a/kotti/templates/edit/delete-nodes.pt b/kotti/templates/edit/delete-nodes.pt
index 1e1a05157..a97d1696f 100644
--- a/kotti/templates/edit/delete-nodes.pt
+++ b/kotti/templates/edit/delete-nodes.pt
@@ -28,7 +28,7 @@
             </thead>
             <tbody>
             <tr tal:repeat="item items">
-              <tal:block tal:define="url string:${request.resource_url(item)}@@contents">
+              <tal:block tal:define="url request.resource_url(item, '@@contents')">
                 <td><input name="children-to-delete" type="checkbox" value="${item.id}" checked="checked" /></td>
                 <td><a href="${url}">${item.title}</a></td>
                 <td>${item.type_info.title}</td>
diff --git a/kotti/templates/edit/master.pt b/kotti/templates/edit/master.pt
index 917fafef7..36791f960 100644
--- a/kotti/templates/edit/master.pt
+++ b/kotti/templates/edit/master.pt
@@ -2,8 +2,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      tal:define="page_slots api.slots;
-                  dummy api.edit_needed"
+      tal:define="page_slots api.slots; dummy api.edit_needed"
       metal:define-macro="main">
   <head>
     <meta charset="utf-8" />
diff --git a/kotti/templates/edit/upload.pt b/kotti/templates/edit/upload.pt
index 59ec92774..43c131401 100644
--- a/kotti/templates/edit/upload.pt
+++ b/kotti/templates/edit/upload.pt
@@ -9,9 +9,8 @@
     <div ng-app="kotti">
       <h1 i18n:translate="">Upload content from local file(s)</h1>
       <form id="uploader" ng-controller="UploadController" style="padding-top: 60px"
-        ng-init="endpoints={
-          upload:'${request.resource_url(context, 'upload')}',
-          content_types:'${request.resource_url(context, 'content_types')}'}">
+            tal:define="upload_url request.resource_url(context, 'upload'); content_types_url request.resource_url(context, 'content_types')"
+        ng-init="endpoints={upload: '${upload_url}', content_types: '${content_types_url}'}">
         <table class="table table-condensed table-hover">
           <thead ng-show="(files.length > 0)">
             <tr>
diff --git a/kotti/templates/editor-bar.pt b/kotti/templates/editor-bar.pt
index 487a899ff..269bb32b9 100644
--- a/kotti/templates/editor-bar.pt
+++ b/kotti/templates/editor-bar.pt
@@ -66,7 +66,7 @@
               <li class="divider"></li>
             </tal:condition>
             <li>
-              <a href="${api.url(api.root, '@@logout', query={'came_from': request.url})}">
+              <a tal:attributes="href api.url(api.root, '@@logout', query={'came_from': request.url, })">
                 <b class="icon icon-off"></b>
                 <span i18n:translate="">Logout</span>
               </a>
diff --git a/kotti/templates/messages.pt b/kotti/templates/messages.pt
index da420a4b3..c998df43e 100644
--- a/kotti/templates/messages.pt
+++ b/kotti/templates/messages.pt
@@ -3,7 +3,7 @@
     <div tal:define="messages request.session.pop_flash(queue)"
          tal:condition="messages"
          tal:repeat="message messages"
-         tal:attributes="class string: alert-dismissable alert alert-${'danger' if queue == 'error' else queue}">
+         class="alert-dismissable alert alert-${'danger' if queue == 'error' else queue}">
       <button type="button" class="close" data-dismiss="alert"
               aria-hidden="true">&times;</button>
       ${message}
diff --git a/kotti/templates/view/image.pt b/kotti/templates/view/image.pt
index 41a566b2e..25d2653d5 100644
--- a/kotti/templates/view/image.pt
+++ b/kotti/templates/view/image.pt
@@ -9,7 +9,7 @@
     </p>
     <div tal:replace="api.render_template('kotti:templates/view/tags.pt')" />
     <div class="body">
-        <img src="${request.resource_url(context)}image" />
+        <img src="${request.resource_url(context, 'image')}" />
     </div>
   </article>
 
diff --git a/kotti/templates/workflow-dropdown.pt b/kotti/templates/workflow-dropdown.pt
index fccc10e79..dd5b8b6a3 100644
--- a/kotti/templates/workflow-dropdown.pt
+++ b/kotti/templates/workflow-dropdown.pt
@@ -11,7 +11,8 @@
   </a>
   <ul class="dropdown-menu">
     <li tal:repeat="trans transitions">
-      <a href="${api.url(context, '@@workflow-change', query={'new_state': trans['to_state']})}" i18n:translate="">
+      <a tal:attributes="href api.url(context, '@@workflow-change', query={'new_state': trans['to_state']})"
+         i18n:translate="">
         Make <span i18n:name="state">${states[trans['to_state']]['title']}</span>
       </a>
     </li>

From 2247cb5896cf08712735ff8c5d3c9844ac02a0d1 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 9 Oct 2015 22:33:03 +0200
Subject: [PATCH 355/600] Fix remaining issues with ``resource_url`` usage (or
 the lack thereof) in templates.  Also add missing titles or associated labels
 to inputs as required by WCAG 2.0.

---
 kotti/locale/Kotti.pot                  |  794 +++++++------
 kotti/locale/de/LC_MESSAGES/Kotti.mo    |  Bin 18633 -> 18790 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po    | 1408 +++++++++++++----------
 kotti/locale/en/LC_MESSAGES/Kotti.mo    |  Bin 449 -> 157 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po    |  752 ++++++------
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo |  Bin 13518 -> 13213 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po | 1403 ++++++++++++----------
 kotti/locale/it/LC_MESSAGES/Kotti.mo    |  Bin 12628 -> 12336 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po    | 1299 +++++++++++----------
 kotti/locale/ja/LC_MESSAGES/Kotti.mo    |  Bin 12334 -> 12019 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po    | 1124 +++++++++---------
 kotti/locale/ko/LC_MESSAGES/Kotti.mo    |  Bin 13322 -> 13031 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po    | 1374 ++++++++++++----------
 kotti/locale/nl/LC_MESSAGES/Kotti.mo    |  Bin 11220 -> 10890 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po    | 1122 +++++++++---------
 kotti/locale/pl/LC_MESSAGES/Kotti.mo    |  Bin 17881 -> 17556 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po    | 1046 ++++++++++-------
 kotti/locale/pt/LC_MESSAGES/Kotti.mo    |  Bin 7681 -> 7384 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po    | 1144 +++++++++---------
 kotti/templates/deform/tag_it.pt        |    4 +-
 kotti/templates/edit/change-state.pt    |   32 +-
 kotti/templates/edit/contents.pt        |    4 +-
 kotti/templates/edit/delete-nodes.pt    |    2 +-
 kotti/templates/edit/master.pt          |   13 +-
 kotti/templates/edit/rename-nodes.pt    |    2 +
 kotti/templates/edit/share.pt           |    2 +-
 kotti/templates/edit/upload.pt          |    3 +-
 kotti/templates/login.pt                |    3 +-
 kotti/templates/site-setup/user.pt      |    2 +-
 kotti/templates/site-setup/users.pt     |    4 +-
 kotti/templates/view/search-results.pt  |    6 +-
 31 files changed, 6416 insertions(+), 5127 deletions(-)

diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index c3669f7b9..418439c35 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -1,22 +1,42 @@
+#
+# SOME DESCRIPTIVE TITLE
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#, fuzzy
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE 1.0\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\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"
+"Language: \n"
+"Generated-By: Lingua 3.11\n"
+
+#: ./kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr ""
+
+#: ./kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr ""
 
+#: ./kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +48,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +56,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -66,107 +83,22 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: ./kotti/populate.py:123
+msgid "About"
 msgstr ""
 
+#: ./kotti/populate.py:124
 msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+"Our company is the leading manufacturer of foo widgets used in a wide variety"
+" of aviation and and industrial products."
 msgstr ""
 
+#: ./kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -184,8 +116,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -193,573 +124,790 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
+#: ./kotti/resources.py:508 ./kotti/views/edit/actions.py:456
+msgid "Copy"
 msgstr ""
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
+#: ./kotti/resources.py:509 ./kotti/views/edit/actions.py:457
+msgid "Cut"
 msgstr ""
 
-#, python-format
-msgid "${title} is now visible in the navigation."
+#: ./kotti/resources.py:510 ./kotti/views/edit/actions.py:453
+msgid "Paste"
 msgstr ""
 
-#, python-format
-msgid "${title} was added."
+#: ./kotti/resources.py:511 ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/templates/edit/rename-nodes.pt:42
+#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:458
+msgid "Rename"
 msgstr ""
 
-#, python-format
-msgid "${title} was copied."
+#: ./kotti/resources.py:512 ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/templates/edit/delete-nodes.pt:50
+#: ./kotti/templates/edit/delete.pt:24
+#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:443
+#: ./kotti/views/edit/actions.py:460
+msgid "Delete"
 msgstr ""
 
-#, python-format
-msgid "${title} was cut."
+#: ./kotti/resources.py:637 ./kotti/views/edit/content.py:85
+msgid "Document"
 msgstr ""
 
-#, python-format
-msgid "${title} was deleted."
+#: ./kotti/resources.py:726 ./kotti/views/edit/content.py:113
+#: ./kotti/views/edit/content.py:66
+msgid "File"
 msgstr ""
 
-#, python-format
-msgid "${title} was moved."
+#: ./kotti/resources.py:772 ./kotti/views/edit/content.py:141
+msgid "Image"
 msgstr ""
 
-#, python-format
-msgid "${title} was pasted."
+#: ./kotti/resources.py:529
+msgid "Folder view"
 msgstr ""
 
-msgid "A user with that email already exists."
+#: ./kotti/resources.py:523 ./kotti/templates/view/folder.pt:15
+msgid "Contents"
 msgstr ""
 
-msgid "A user with that name already exists."
+#: ./kotti/resources.py:524 ./kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
 msgstr ""
 
-msgid "About"
+#: ./kotti/resources.py:525
+msgid "Share"
 msgstr ""
 
+#: ./kotti/resources.py:526 ./kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr ""
 
-msgid "Active"
-msgstr ""
-
-msgid "Add"
-msgstr ""
-
-#, python-format
-msgid "Add ${type} to ${title}."
+#: ./kotti/security.py:191
+msgid "Viewer"
 msgstr ""
 
-#, python-format
-msgid "Add ${type}."
+#: ./kotti/security.py:192
+msgid "Editor"
 msgstr ""
 
-msgid "Add Group"
+#: ./kotti/security.py:193
+msgid "Owner"
 msgstr ""
 
-msgid "Add User"
+#: ./kotti/security.py:194
+msgid "Admin"
 msgstr ""
 
-msgid "Add group"
+#: ./kotti/templates/add-dropdown.pt:3
+msgid "Add"
 msgstr ""
 
-msgid "Add new group"
+#: ./kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
 msgstr ""
 
-msgid "Add new user"
+#: ./kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
 msgstr ""
 
-msgid "Add user"
+#: ./kotti/templates/editor-bar.pt:21
+msgid "View"
 msgstr ""
 
-msgid "Admin"
+#: ./kotti/templates/editor-bar.pt:44
+msgid "Navigate"
 msgstr ""
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
+#: ./kotti/templates/editor-bar.pt:55
+msgid "Preferences"
 msgstr ""
 
-msgid "Apply changes"
+#: ./kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
 msgstr ""
 
-msgid "Are you sure you want to delete ${title}?"
+#: ./kotti/templates/editor-bar.pt:71
+msgid "Logout"
 msgstr ""
 
-msgid "Are you sure you want to delete ${type} ${title}?"
+#: ./kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
 msgstr ""
 
-msgid "Are you sure you want to delete the following items?"
+#: ./kotti/templates/email-reset-password.pt:4
+#: ./kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
 msgstr ""
 
-msgid "Assign global roles"
+#: ./kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr ""
 
-msgid "Assign local roles"
+#: ./kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
 msgstr ""
 
-msgid "Back to User Management"
+#: ./kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
 msgstr ""
 
-msgid "Blank search text finds all."
+#: ./kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-msgid "Body"
+#: ./kotti/templates/forbidden.pt:10
+msgid "Forbidden"
 msgstr ""
 
-msgid "Cancel"
+#: ./kotti/templates/login.pt:15
+msgid "Login"
 msgstr ""
 
-msgid "Change State"
+#: ./kotti/templates/login.pt:20 ./kotti/templates/login.pt:57
+msgid "Username or email"
 msgstr ""
 
-msgid "Change state to"
+#: ./kotti/templates/login.pt:25 ./kotti/views/login.py:257
+#: ./kotti/views/users.py:212
+msgid "Password"
 msgstr ""
 
-msgid "Change workflow state"
+#: ./kotti/templates/login.pt:33
+msgid "Log in"
 msgstr ""
 
-msgid "Click here to set your password and log in: ${url}"
+#: ./kotti/templates/login.pt:43
+msgid "Forgot your password?"
 msgstr ""
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#. 
+#: ./kotti/templates/login.pt:50 ./kotti/templates/login.pt:65
+msgid "Reset password"
 msgstr ""
 
+#. Canonical text for ${reset_password} is: "Reset password"
+#: ./kotti/templates/login.pt:48
 msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
+"Fill out your username or email and click ${reset_password} below to receive "
+"an email with a link to reset your password."
 msgstr ""
 
-msgid "Congratulations! You have successfully installed Kotti."
+#: ./kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
 
-msgid "Contents"
+#: ./kotti/templates/login.pt:83
+msgid "Register for an account on this site."
 msgstr ""
 
-msgid "Copy"
+#: ./kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
 msgstr ""
 
-msgid "Could not paste node. It no longer exists."
+#: ./kotti/templates/deform/tag_it.pt:1 ./kotti/views/edit/content.py:44
+msgid "Tags"
 msgstr ""
 
-msgid "Creation Date"
+#: ./kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
 msgstr ""
 
-msgid "Cut"
+#: ./kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
 msgstr ""
 
-msgid "Default view"
+#: ./kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-msgid "Default view could not be set."
+#: ./kotti/templates/edit/change-state.pt:18
+#: ./kotti/templates/edit/contents.pt:39
+#: ./kotti/templates/edit/delete-nodes.pt:22
+#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:196
+#: ./kotti/views/edit/content.py:33
+msgid "Title"
 msgstr ""
 
-msgid "Default view has been reset to default."
+#: ./kotti/templates/edit/change-state.pt:19
+#: ./kotti/templates/edit/contents.pt:40
+#: ./kotti/templates/edit/delete-nodes.pt:23 ./kotti/templates/edit/share.pt:47
+#: ./kotti/templates/edit/upload.pt:18 ./kotti/templates/edit/upload.pt:110
+#: ./kotti/templates/site-setup/users.pt:67 ./kotti/templates/view/folder.pt:21
+msgid "Type"
 msgstr ""
 
-msgid "Default view has been set."
+#: ./kotti/templates/edit/change-state.pt:20
+#: ./kotti/templates/edit/contents.pt:41
+#: ./kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
 msgstr ""
 
-msgid "Delete"
+#: ./kotti/templates/edit/change-state.pt:21
+#: ./kotti/templates/edit/contents.pt:43
+#: ./kotti/templates/edit/delete-nodes.pt:25
+#: ./kotti/templates/view/folder.pt:22
+msgid "Creation Date"
 msgstr ""
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
+#: ./kotti/templates/edit/change-state.pt:22
+#: ./kotti/templates/edit/contents.pt:44
+#: ./kotti/templates/edit/delete-nodes.pt:26
+#: ./kotti/templates/view/folder.pt:23
+msgid "Modification Date"
 msgstr ""
 
-msgid "Delete ${title}"
+#: ./kotti/templates/edit/change-state.pt:28
+#: ./kotti/templates/edit/contents.pt:50
+#: ./kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
 msgstr ""
 
-msgid "Description"
+#: ./kotti/templates/edit/change-state.pt:40
+#: ./kotti/templates/edit/change-state.pt:45
+msgid "Include children"
 msgstr ""
 
-msgid "Dismiss all errors"
+#: ./kotti/templates/edit/change-state.pt:41
+msgid ""
+"If checked, this will attempt to modify the status of all children in any "
+"selected documents and their subdocuments."
 msgstr ""
 
-msgid "Document"
+#: ./kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
 msgstr ""
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
+#: ./kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-msgid "Edit"
+#: ./kotti/templates/edit/change-state.pt:55
+msgid "No change"
 msgstr ""
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
+#: ./kotti/templates/edit/change-state.pt:64 ./kotti/templates/edit/share.pt:83
+#: ./kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
 msgstr ""
 
-#, python-format
-msgid "Edit ${title}"
+#: ./kotti/templates/edit/change-state.pt:66
+#: ./kotti/templates/edit/delete-nodes.pt:45
+#: ./kotti/templates/edit/delete.pt:19
+#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:78
+#: ./kotti/views/users.py:316 ./kotti/views/users.py:350
+#: ./kotti/views/users.py:442
+msgid "Cancel"
 msgstr ""
 
-msgid "Editor"
+#: ./kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
 msgstr ""
 
-msgid "Email"
+#: ./kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
 
-msgid "File"
+#: ./kotti/templates/edit/contents.pt:42
+msgid "Visibility"
 msgstr ""
 
-msgid "Filename"
+#: ./kotti/templates/edit/contents.pt:75
+msgid "Visible"
 msgstr ""
 
-#. Canonical text for ${reset_password} is: "Reset password"
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
+#: ./kotti/templates/edit/contents.pt:79
+msgid "Hidden"
 msgstr ""
 
-msgid "Find users or groups"
+#: ./kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-msgid "Folder view"
+#: ./kotti/templates/edit/delete.pt:9
+#: ./kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
 msgstr ""
 
-msgid "Forbidden"
+#: ./kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
 msgstr ""
 
-msgid "Forgot your password?"
+#: ./kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
 msgstr ""
 
-msgid "Full name"
+#: ./kotti/templates/edit/rename-nodes.pt:13
+#: ./kotti/templates/edit/rename.pt:11
+msgid ""
+"Each content item has a name, which is used to create the url, and a title. "
+"Read the user manual about proper formatting of name and title if needed. You"
+" can change both below."
 msgstr ""
 
-msgid "Global roles"
+#: ./kotti/templates/edit/rename-nodes.pt:26
+#: ./kotti/templates/edit/rename-nodes.pt:28
+#: ./kotti/templates/edit/rename.pt:19
+msgid "New name"
 msgstr ""
 
-msgid "Gravatar"
+#: ./kotti/templates/edit/rename-nodes.pt:34
+#: ./kotti/templates/edit/rename-nodes.pt:36
+#: ./kotti/templates/edit/rename.pt:25
+msgid "New title"
 msgstr ""
 
-msgid "Group"
+#: ./kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
 msgstr ""
 
-msgid "Groups"
+#: ./kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
 msgstr ""
 
-msgid "Hello, ${user_title}!"
+#: ./kotti/templates/edit/share.pt:14 ./kotti/templates/edit/share.pt:19
+#: ./kotti/templates/edit/share.pt:26 ./kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
 msgstr ""
 
-msgid "Hidden"
+#: ./kotti/templates/edit/share.pt:33 ./kotti/templates/site-setup/users.pt:55
+msgid "Search"
 msgstr ""
 
-msgid "Hide"
+#: ./kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
 msgstr ""
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: ./kotti/templates/edit/share.pt:48 ./kotti/templates/site-setup/users.pt:68
+#: ./kotti/views/users.py:207
+msgid "Name"
 msgstr ""
 
-msgid "Image"
+#: ./kotti/templates/edit/share.pt:59 ./kotti/templates/site-setup/users.pt:79
+#: ./kotti/views/users.py:313 ./kotti/views/users.py:501
+#: ./kotti/views/users.py:536
+msgid "User"
 msgstr ""
 
-msgid "Include children"
+#: ./kotti/templates/edit/share.pt:60 ./kotti/templates/site-setup/users.pt:80
+#: ./kotti/views/users.py:347 ./kotti/views/users.py:188
+#: ./kotti/views/users.py:501 ./kotti/views/users.py:536
+msgid "Group"
 msgstr ""
 
-msgid "Invalid value"
+#: ./kotti/templates/edit/share.pt:63 ./kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
 msgstr ""
 
-msgid "Item was added."
+#: ./kotti/templates/edit/share.pt:68 ./kotti/templates/site-setup/users.pt:89
+msgid "Assign role"
 msgstr ""
 
-msgid "Item was renamed."
+#: ./kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
 msgstr ""
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: ./kotti/templates/edit/upload.pt:17 ./kotti/templates/edit/upload.pt:109
+msgid "Filename"
 msgstr ""
 
-msgid "Log in"
+#: ./kotti/templates/edit/upload.pt:19 ./kotti/templates/edit/upload.pt:111
+msgid "Size"
 msgstr ""
 
-msgid "Login"
+#: ./kotti/templates/edit/upload.pt:20
+msgid "Status"
 msgstr ""
 
-msgid "Login failed."
+#: ./kotti/templates/edit/upload.pt:21
+msgid "Progress"
 msgstr ""
 
-msgid "Logout"
+#: ./kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
 msgstr ""
 
-msgid "Make ${state}"
+#: ./kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
 msgstr ""
 
-#, python-format
-msgid "Maximum file size: ${size}MB"
+#: ./kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
 msgstr ""
 
-msgid "Modification Date"
+#: ./kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
 msgstr ""
 
-msgid "Move down"
+#: ./kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
 msgstr ""
 
-msgid "Move up"
+#: ./kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
 
-#, python-format
-msgid "My preferences - ${title}"
+#: ./kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
 msgstr ""
 
-msgid "Name"
+#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:156
+#, python-format
+msgid "Edit ${title}"
 msgstr ""
 
-msgid "Name and title are required."
+#: ./kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
 msgstr ""
 
-msgid "Navigate"
+#: ./kotti/templates/site-setup/users.pt:17
+msgid "Add user"
 msgstr ""
 
-msgid "Navigate Site"
+#: ./kotti/templates/site-setup/users.pt:22
+msgid "Add group"
 msgstr ""
 
-msgid "New name"
+#: ./kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
 msgstr ""
 
-msgid "New title"
+#: ./kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
 msgstr ""
 
-msgid "No change"
+#: ./kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
 msgstr ""
 
-msgid "No changes were made."
+#: ./kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
 msgstr ""
 
-msgid "No content items are contained here."
+#: ./kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
 msgstr ""
 
-msgid "No name was given."
+#: ./kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
 msgstr ""
 
-#, python-format
-msgid "No such group: ${group}"
+#: ./kotti/templates/view/search-results.pt:9
+msgid "Search Results"
 msgstr ""
 
-msgid "No users or groups were found."
+#: ./kotti/templates/view/search.pt:12
+msgid "Search..."
 msgstr ""
 
-msgid "Not Found"
+#: ./kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
 msgstr ""
 
-msgid "Not registered yet?"
+#: ./kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-msgid "Nothing was deleted."
+#: ./kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
 msgstr ""
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
+#: ./kotti/views/form.py:79 ./kotti/views/users.py:69
+#: ./kotti/views/edit/actions.py:374 ./kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
 msgstr ""
 
-msgid "Owner"
+#: ./kotti/views/form.py:174
+msgid "Item was added."
 msgstr ""
 
-msgid "Password"
+#: ./kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-msgid "Paste"
+#: ./kotti/views/form.py:77 ./kotti/views/users.py:441
+msgid "Save"
 msgstr ""
 
-msgid "Preferences"
+#: ./kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
 msgstr ""
 
-msgid "Progress"
+#: ./kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
 msgstr ""
 
-msgid "Register"
+#: ./kotti/views/login.py:282
+msgid "You have reset your password."
 msgstr ""
 
+#: ./kotti/views/login.py:154
 #, python-format
-msgid "Register - ${title}"
+msgid "Welcome, ${user}!"
 msgstr ""
 
-msgid "Register for an account on this site."
+#: ./kotti/views/login.py:179
+msgid ""
+"You should be receiving an email with a link to reset your password. Doing so"
+" will activate your account."
 msgstr ""
 
-msgid "Rename"
+#: ./kotti/views/login.py:244
+msgid "You have been logged out."
 msgstr ""
 
-msgid "Rename ${title}"
+#: ./kotti/views/login.py:65 ./kotti/views/users.py:270
+msgid "Full name"
 msgstr ""
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
+#: ./kotti/views/login.py:68
+msgid "Username"
 msgstr ""
 
-#, python-format
-msgid "Reset your password - ${title}."
+#: ./kotti/views/login.py:73 ./kotti/views/login.py:269
+#: ./kotti/views/users.py:199
+msgid "Email"
 msgstr ""
 
-msgid "Reset your password for ${site_title}."
+#: ./kotti/views/login.py:108
+msgid ""
+"Congratulations! You are successfully registered. You should be receiving an "
+"email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-msgid "Save"
+#: ./kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
 msgstr ""
 
-msgid "Search"
+#: ./kotti/views/login.py:212
+msgid "Login failed."
 msgstr ""
 
-msgid "Search Results"
+#: ./kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
 msgstr ""
 
-msgid "Search user(s) / group(s)"
+#: ./kotti/views/login.py:222
+msgid "That username or email is not known by this system."
 msgstr ""
 
-msgid "Search users and groups"
+#: ./kotti/views/login.py:82
+msgid "Register"
 msgstr ""
 
-msgid "Search..."
+#: ./kotti/views/login.py:89
+msgid "There was an error."
 msgstr ""
 
-msgid "Select file(s) to upload..."
+#: ./kotti/views/login.py:295
+msgid "Set password"
 msgstr ""
 
-msgid "Select the new state where all chosen items should be set."
+#: ./kotti/views/login.py:323
+msgid "Your password reset token may have expired."
 msgstr ""
 
-msgid "Send password registration link."
+#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:378
+msgid "User Management"
 msgstr ""
 
-msgid "Set default view"
+#: ./kotti/views/users.py:267
+msgid ""
+"Leave this empty and tick the 'Send password registration' box below to have "
+"the user set their own password."
 msgstr ""
 
-msgid "Set password"
+#: ./kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
 msgstr ""
 
-msgid "Share"
+#: ./kotti/views/users.py:145
+msgid "Invalid value"
 msgstr ""
 
-msgid "Share ${title}"
+#: ./kotti/views/users.py:151
+msgid "A user with that name already exists."
 msgstr ""
 
-msgid "Show"
+#: ./kotti/views/users.py:158
+msgid "A user with that email already exists."
 msgstr ""
 
-msgid "Site Setup"
+#: ./kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
 msgstr ""
 
-msgid "Size"
+#: ./kotti/views/users.py:219
+msgid "Active"
 msgstr ""
 
-msgid "State"
+#: ./kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
 msgstr ""
 
-msgid "Status"
+#: ./kotti/views/users.py:226
+msgid "Global roles"
 msgstr ""
 
-msgid "Submit"
+#: ./kotti/views/users.py:230
+msgid "Groups"
 msgstr ""
 
-msgid "Tagged with:"
+#: ./kotti/views/users.py:315
+msgid "Add User"
 msgstr ""
 
-msgid "Tags"
+#: ./kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
 msgstr ""
 
-msgid "That username or email is not known by this system."
+#: ./kotti/views/users.py:349
+msgid "Add Group"
 msgstr ""
 
-msgid "The resource could not be found"
+#: ./kotti/views/users.py:465 ./kotti/views/users.py:71
+#: ./kotti/views/edit/actions.py:312 ./kotti/views/edit/actions.py:378
+#: ./kotti/views/edit/actions.py:424 ./kotti/views/edit/actions.py:420
+msgid "No changes were made."
 msgstr ""
 
-msgid "There was an error."
+#: ./kotti/views/users.py:558
+msgid "No name was given."
 msgstr ""
 
-msgid "Title"
+#: ./kotti/views/users.py:98
+msgid "No users or groups were found."
 msgstr ""
 
-msgid "Type"
+#: ./kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-msgid "Untick this to deactivate the account."
+#: ./kotti/views/users.py:533
+msgid "User was not found."
 msgstr ""
 
-msgid "Upload ${number} files."
+#: ./kotti/views/users.py:324
+msgid "Send password registration link."
 msgstr ""
 
-msgid "Upload Content"
+#: ./kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-msgid "Upload content from local file(s)"
+#: ./kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-msgid "User"
+#: ./kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
 msgstr ""
 
-msgid "User Management"
+#: ./kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
 msgstr ""
 
-msgid "User was not found."
+#: ./kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
 msgstr ""
 
-msgid "User- / groupname"
+#: ./kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
 msgstr ""
 
-msgid "Username"
+#: ./kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-msgid "Username or email"
+#: ./kotti/views/edit/actions.py:225
+#, python-format
+msgid "${title} is now visible in the navigation."
 msgstr ""
 
-msgid "View"
+#: ./kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-msgid "Viewer"
+#: ./kotti/views/edit/actions.py:277 ./kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
 msgstr ""
 
-msgid "Visibility"
+#: ./kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
 msgstr ""
 
-msgid "Visible"
+#: ./kotti/views/edit/actions.py:339 ./kotti/views/edit/actions.py:366
+msgid "Name and title are required."
 msgstr ""
 
-msgid "Welcome to Kotti"
+#: ./kotti/views/edit/actions.py:343
+msgid "Item was renamed."
 msgstr ""
 
-#, python-format
-msgid "Welcome, ${user}!"
+#: ./kotti/views/edit/actions.py:465
+msgid "Move up"
 msgstr ""
 
-msgid "Welcome, ${user}! You are logged in."
+#: ./kotti/views/edit/actions.py:466
+msgid "Move down"
 msgstr ""
 
-msgid "Welcome, you are not logged in."
+#: ./kotti/views/edit/actions.py:467
+msgid "Show"
 msgstr ""
 
-msgid "You are here:"
+#: ./kotti/views/edit/actions.py:468
+msgid "Hide"
 msgstr ""
 
-msgid "You are joining ${site_title}."
+#: ./kotti/views/edit/actions.py:507
+msgid "You have to select items to perform an action."
 msgstr ""
 
-msgid "You have been logged out."
+#: ./kotti/views/edit/actions.py:464
+msgid "Change State"
 msgstr ""
 
-msgid "You have reset your password."
+#: ./kotti/views/edit/content.py:38
+msgid "Description"
 msgstr ""
 
-msgid "You have to select items to perform an action."
+#: ./kotti/views/edit/content.py:53
+msgid "Body"
 msgstr ""
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
+#: ./kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
 msgstr ""
 
-msgid "Your changes have been saved."
+#: ./kotti/views/edit/default_views.py:79
+msgid "Default view"
 msgstr ""
 
-msgid "Your password reset token may have expired."
+#: ./kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
 msgstr ""
 
-msgid "Your registration for ${site_title}"
+#: ./kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
 msgstr ""
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index 0f1ea164844117869f80ed6f56c17f4724922b79..3f3f8f8a16d6cf9626c508421197e75d72e8a6cc 100644
GIT binary patch
delta 4278
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
QR^!epw@rOatJyK=KcY|LH~;_u

delta 4152
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
ZJaTScP3%BcWoD$VvMwg_r>b3X{|BW4$_W4f

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index f83c9e99d..5e364307f 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -1,22 +1,37 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
+"Language-Team: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.4\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Willkommen bei Kotti"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Herzlichen Glückwunsch! Sie haben Kotti erfolgreich installiert."
 
+#: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +43,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +51,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -68,28 +80,20 @@ msgstr ""
 "\n"
 "<h2>Anmelden</h2>\n"
 "<p>\n"
-"    Sie können sich nun <a class=\"btn btn-success\" href=\"login\">anmelden</"
-"a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  Falls Sie "
-"bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, lautet "
-"dieses höchstwahrscheinlich <em>qwerty</em>.\n"
+"    Sie können sich nun <a class=\"btn btn-success\" href=\"login\">anmelden</a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  Falls Sie bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, lautet dieses höchstwahrscheinlich <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Nach der Anmeldung werden Sie eine Bearbeitungsleiste unter der "
-"Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung "
-"wechseln, sowie weitere Funktionen ausführen.\n"
+"    Nach der Anmeldung werden Sie eine Bearbeitungsleiste unter der Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung wechseln, sowie weitere Funktionen ausführen.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Konfiguration</h2>\n"
 "        <p>\n"
-"            Finden Sie heraus, wie Sie den Titel Ihrer Installation und "
-"vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen "
-"können.\n"
+"            Finden Sie heraus, wie Sie den Titel Ihrer Installation und vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen können.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -97,13 +101,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Erweiterungen</h2>\n"
 "        <p>\n"
-"            Mit Hilfe von Erweiterungen können Sie Ihrer Installation "
-"zusätzliche Funktionen hinzufügen.\n"
+"            Mit Hilfe von Erweiterungen können Sie Ihrer Installation zusätzliche Funktionen hinzufügen.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti Erweiterungen\n"
 "            </a>\n"
 "        </p>\n"
@@ -111,9 +113,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>DoKumentation</h2>\n"
 "        <p>\n"
-"            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  "
-"Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für "
-"diese und weitere Informationen.\n"
+"            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für diese und weitere Informationen.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -124,194 +124,20 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
-msgstr ""
-"\n"
-"<h2>Anmelden</h2>\n"
-"<p>\n"
-"    Sie können sich nun <a class=\"btn btn-success\" href=\"login\">anmelden</"
-"a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  Falls Sie "
-"bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, lautet "
-"dieses höchstwahrscheinlich <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Nach der Anmeldung werden Sie eine graue Bearbeitungsleiste unter der "
-"Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung "
-"wechseln, sowie weitere Funktionen ausführen.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Konfiguration</h2>\n"
-"        <p>\n"
-"            Finden Sie heraus, wie Sie den Titel Ihrer Installation und "
-"vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen "
-"können.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Erweiterungen</h2>\n"
-"        <p>\n"
-"            Mit Hilfe von Erweiterungen können Sie Ihrer Installation "
-"zusätzliche Funktionen hinzufügen.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti Erweiterungen\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>DoKumentation</h2>\n"
-"        <p>\n"
-"            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  "
-"Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für "
-"diese und weitere Informationen.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Dokumentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
+msgstr "Über"
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
-msgstr ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Unsere Konzernzentrale:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Unsere Firma is der führende Hersteller von Foo Produkten, welche gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen Industriesektoren eingesetzt werden."
 
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -329,8 +155,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -340,8 +165,7 @@ msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -359,610 +183,932 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Copyright info</a>.\n"
 "  Originally published in the\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} gelöscht."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopieren"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Ausschneiden"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} wird nun in der Navigation angezeigt."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Einfügen"
 
-#, python-format
-msgid "${title} was added."
-msgstr "${title} hinzugefügt."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Umbenennen"
 
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} kopiert."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Löschen"
 
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} ausgeschnitten."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
 
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} gelöscht."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Datei"
 
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} verschoben."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Bild"
 
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} eingefügt."
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Ordneransicht"
 
-msgid "A user with that email already exists."
-msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Inhalt"
 
-msgid "A user with that name already exists."
-msgstr "Ein Benutzer mit diesem Namen existiert bereits."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Bearbeiten"
 
-msgid "About"
-msgstr "Über"
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Teilen"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Aktionen"
 
-msgid "Active"
-msgstr "Aktiv"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "Betrachter"
+
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "Bearbeiter"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "Besitzer"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "Administrator"
 
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Hinzufügen"
 
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "${type} in ${title} erstellen"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Dateien hochladen"
 
-#, python-format
-msgid "Add ${type}."
-msgstr "${type} erstellen"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Standardansicht setzen"
 
-msgid "Add Group"
-msgstr "Neue Gruppe"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Anzeigen"
 
-msgid "Add User"
-msgstr "Neuer Benutzer"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigieren"
 
-msgid "Add group"
-msgstr "Neue Gruppe"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Einstellungen"
 
-msgid "Add new group"
-msgstr "Neue Gruppe hinzufügen"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Seiten-Einstellungen"
 
-msgid "Add new user"
-msgstr "Neuen Benutzer hinzufügen"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Abmelden"
 
-msgid "Add user"
-msgstr "Neuer Benutzer"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Passwort zurücksetzen bei ${site_title}"
 
-msgid "Admin"
-msgstr "Administrator"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Hallo ${user_title}!"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/"
-"oder verwalten kann."
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} zurückzusetzen: ${url}"
 
-msgid "Apply changes"
-msgstr "Änderungen übernehmen"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Ihre Anmeldung bei ${site_title}"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Sind Sie sicher, dass Sie ${title} löschen möchten?"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Ihre Anmeldung bei ${site_title}"
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich anzumelden: ${url}"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Zugriff verweigert"
 
-msgid "Assign global roles"
-msgstr "Globale Rollen zuweisen"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Anmelden"
 
-msgid "Assign local roles"
-msgstr "Lokale Rollen zuweisen"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Benutzername oder E-Mail"
 
-msgid "Back to User Management"
-msgstr "Zurück zur Benutzerverwaltung"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "Passwort"
 
-msgid "Blank search text finds all."
-msgstr "Suche mit leerem Eingabefeld liefert alle Benutzer."
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Anmelden"
 
-msgid "Body"
-msgstr "Inhalt"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Passwort vergessen?"
 
-msgid "Cancel"
-msgstr "Abbrechen"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Passwort zurücksetzen"
 
-msgid "Change State"
-msgstr "Status ändern"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Geben Sie oben Ihren Benutzernamen oder Ihre E-Mail Adresse an und klicken Sie auf ${reset_password}. Sie werden daraufhin eine E-Mail erhalten, die einen Link zum zurücksetzen Ihres Passworts enthält."
 
-msgid "Change state to"
-msgstr "Ändere Status in"
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "Noch nicht registriert?"
 
-msgid "Change workflow state"
-msgstr "Workflowstatus ändern"
+#: kotti/templates/login.pt:83
+msgid "Register for an account on this site."
+msgstr "Einen Benutzer für den Zugang zu dieser Seite erstellen."
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich "
-"anzumelden: ${url}"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "Setze ${state}"
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} "
-"zurückzusetzen: ${url}"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Schlagworte:"
 
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
-"einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Sie sind hier:"
 
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr "Herzlichen Glückwunsch! Sie haben Kotti erfolgreich installiert."
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Workflowstatus ändern"
 
-msgid "Contents"
-msgstr "Inhalt"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/oder verwalten kann."
 
-msgid "Copy"
-msgstr "Kopieren"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "Titel"
 
-msgid "Could not paste node. It no longer exists."
-msgstr "Inhalt konnte nicht eingefügt werden, da er nicht mehr existiert."
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "Status"
 
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Erstellungsdatum"
 
-msgid "Cut"
-msgstr "Ausschneiden"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Bearbeitungsdatum"
 
-msgid "Default view"
-msgstr "Standardansicht"
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr "Element wählen"
 
-msgid "Default view could not be set."
-msgstr "Standardansicht konnte nicht geändert werden."
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Unterordner einbeziehen"
 
-msgid "Default view has been reset to default."
-msgstr "Standardansicht wurde zurückgesetzt."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Wenn Sie diese Option anwählen, wirkt sich die Statusänderung sowohl auf alle ausgewählte als auch auf die darin enthaltenen Dokumente aus."
 
-msgid "Default view has been set."
-msgstr "Standardansicht wurde gesetzt."
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Ändere Status in"
 
-msgid "Delete"
-msgstr "Löschen"
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Wählen Sie den neuen Status, der für alle ausgwählten Dokumente gesetzt werden soll."
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Bearbeite ${principal_type} ${title}"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Keine Änderungen."
 
-msgid "Delete ${title}"
-msgstr "Lösche ${title}"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "Änderungen übernehmen"
 
-msgid "Description"
-msgstr "Beschreibung"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Abbrechen"
 
-msgid "Dismiss all errors"
-msgstr "Alle Fehlermeldungen ausblenden"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Kein sichtbarer Inhalt."
 
-msgid "Document"
-msgstr "Dokument"
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
+msgstr "Alles auswählen/abwählen"
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
-msgstr ""
-"Jeder Inhalt hat einen Namen, der auch Bestandteil der URL ist, und einen "
-"Titel. Sie können beides ändern, indem Sie unten einen neuen Namen und/oder "
-"Titel angeben."
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Sichtbarkeit"
 
-msgid "Edit"
-msgstr "Bearbeiten"
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Sichtbar"
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Bearbeite ${principal_type} ${title}"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Unsichtbar"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr "Bearbeite ${title}"
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
 
-msgid "Editor"
-msgstr "Bearbeiter"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Lösche ${title}"
 
-msgid "Email"
-msgstr "E-Mail"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Sind Sie sicher, dass Sie ${title} löschen möchten?"
 
-msgid "File"
-msgstr "Datei"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigieren"
 
-msgid "Filename"
-msgstr "Dateiname"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Jeder Inhalt hat einen Namen, der auch Bestandteil der URL ist, und einen Titel. Sie können beides ändern, indem Sie unten einen neuen Namen und/oder Titel angeben."
 
-#. Canonical text for ${reset_password} is: "Reset password"
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Geben Sie oben Ihren Benutzernamen oder Ihre E-Mail Adresse an und klicken "
-"Sie auf ${reset_password}. Sie werden daraufhin eine E-Mail erhalten, die "
-"einen Link zum zurücksetzen Ihres Passworts enthält."
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Neuer Name"
 
-msgid "Find users or groups"
-msgstr "Suche Benutzer oder Gruppen"
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Neuer Titel"
 
-msgid "Folder view"
-msgstr "Ordneransicht"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "${title} umbenennen"
 
-msgid "Forbidden"
-msgstr "Zugriff verweigert"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Teile ${title}"
 
-msgid "Forgot your password?"
-msgstr "Passwort vergessen?"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "Suche Benutzer und Gruppen"
 
-msgid "Full name"
-msgstr "Vollständiger Name"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "Suche"
 
-msgid "Global roles"
-msgstr "Globale Rollen"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Lokale Rollen zuweisen"
 
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "Name"
 
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "Benutzer"
+
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
 msgid "Group"
 msgstr "Gruppe"
 
-msgid "Groups"
-msgstr "Gruppen"
-
-msgid "Hello, ${user_title}!"
-msgstr "Hallo ${user_title}!"
-
-msgid "Hidden"
-msgstr "Unsichtbar"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr "Gravatar"
 
-msgid "Hide"
-msgstr "Verstecken"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+msgid "Assign role"
+msgstr "Rolle zuweisen"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Wenn Sie diese Option anwählen, wirkt sich die Statusänderung sowohl auf alle "
-"ausgewählte als auch auf die darin enthaltenen Dokumente aus."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Inhalte aus lokalen Dateien hochladen"
 
-msgid "Image"
-msgstr "Bild"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+msgid "Filename"
+msgstr "Dateiname"
 
-msgid "Include children"
-msgstr "Unterordner einbeziehen"
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
+msgstr "Größe"
 
-msgid "Invalid value"
-msgstr "Ungültige Eingabe"
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Status"
 
-msgid "Item was added."
-msgstr "Dokument hinzugefügt."
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Fortschritt"
 
-msgid "Item was renamed."
-msgstr "Objekt umbenannt."
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr "Hochzuladene Dateien auswählen..."
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
-msgstr ""
-"Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke "
-"Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu "
-"lassen."
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
+msgstr "${number} Dateien hochladen"
 
-msgid "Log in"
-msgstr "Anmelden"
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr "Alle Fehlermeldungen ausblenden"
 
-msgid "Login"
-msgstr "Anmelden"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr "Nicht gefunden"
 
-msgid "Login failed."
-msgstr "Anmeldung fehlgeschlagen."
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr "Die Ressource konnte nicht gefunden werden"
 
-msgid "Logout"
-msgstr "Abmelden"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
 
-msgid "Make ${state}"
-msgstr "Setze ${state}"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Zurück zur Benutzerverwaltung"
 
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maximale Dateigröße: ${size}MB"
-
-msgid "Modification Date"
-msgstr "Bearbeitungsdatum"
+msgid "Edit ${title}"
+msgstr "Bearbeite ${title}"
 
-msgid "Move down"
-msgstr "Nach unten verschieben"
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Suche Benutzer / Gruppe(n)"
 
-msgid "Move up"
-msgstr "Nach oben verschieben"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Neuer Benutzer"
 
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Meine Einstellungen - ${title}"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Neue Gruppe"
 
-msgid "Name"
-msgstr "Name"
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Suche Benutzer oder Gruppen"
 
-msgid "Name and title are required."
-msgstr "Name und Titel werden benötigt."
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "Benutzer- / Gruppenname"
 
-msgid "Navigate"
-msgstr "Navigieren"
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Suche mit leerem Eingabefeld liefert alle Benutzer."
 
-msgid "Navigate Site"
-msgstr "Navigieren"
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Globale Rollen zuweisen"
 
-msgid "New name"
-msgstr "Neuer Name"
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Neuen Benutzer hinzufügen"
 
-msgid "New title"
-msgstr "Neuer Titel"
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Neue Gruppe hinzufügen"
 
-msgid "No change"
-msgstr "Keine Änderungen."
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Suchergebnisse"
 
-msgid "No changes were made."
-msgstr "Keine Änderungen."
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Suche..."
 
-msgid "No content items are contained here."
-msgstr "Kein sichtbarer Inhalt."
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Verschlagwortet mit:"
 
-msgid "No name was given."
-msgstr "Kein Name übergeben."
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Willkommen, ${user}! Sie sind angemeldet."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Willkommen! Sie sind nicht angemeldet."
+
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Ihre Änderungen wurden übernommen."
 
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "Dokument hinzugefügt."
+
+#: kotti/views/form.py:264
 #, python-format
-msgid "No such group: ${group}"
-msgstr "Unbekannte Gruppe: ${group}"
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximale Dateigröße: ${size}MB"
 
-msgid "No users or groups were found."
-msgstr "Keine Benutzer oder Gruppen gefunden."
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Übernehmen"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "${type} in ${title} erstellen"
 
-msgid "Not registered yet?"
-msgstr "Noch nicht registriert?"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "${type} erstellen"
 
-msgid "Nothing was deleted."
-msgstr "Nichts wurde gelöscht."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
-"Unsere Firma is der führende Hersteller von Foo Produkten, welche "
-"gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen "
-"Industriesektoren eingesetzt werden."
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Willkommen, ${user}!"
 
-msgid "Owner"
-msgstr "Besitzer"
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-msgid "Password"
-msgstr "Passwort"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Sie wurden abgemeldet."
 
-msgid "Paste"
-msgstr "Einfügen"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Vollständiger Name"
 
-msgid "Preferences"
-msgstr "Einstellungen"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Benutzername"
 
-msgid "Progress"
-msgstr "Fortschritt"
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr "E-Mail"
 
-msgid "Register"
-msgstr "Registrieren"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrieren - ${title}"
 
-msgid "Register for an account on this site."
-msgstr "Einen Benutzer für den Zugang zu dieser Seite erstellen."
-
-msgid "Rename"
-msgstr "Umbenennen"
-
-msgid "Rename ${title}"
-msgstr "${title} umbenennen"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "Passwort zurücksetzen"
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Anmeldung fehlgeschlagen."
 
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Passwort zurücksetzen - ${title}"
 
-msgid "Reset your password for ${site_title}."
-msgstr "Passwort zurücksetzen bei ${site_title}"
-
-msgid "Save"
-msgstr "Übernehmen"
-
-msgid "Search"
-msgstr "Suche"
-
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
-msgid "Search user(s) / group(s)"
-msgstr "Suche Benutzer / Gruppe(n)"
-
-msgid "Search users and groups"
-msgstr "Suche Benutzer und Gruppen"
-
-msgid "Search..."
-msgstr "Suche..."
-
-msgid "Select file(s) to upload..."
-msgstr "Hochzuladene Dateien auswählen..."
-
-msgid "Select the new state where all chosen items should be set."
-msgstr ""
-"Wählen Sie den neuen Status, der für alle ausgwählten Dokumente gesetzt "
-"werden soll."
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
-msgid "Send password registration link."
-msgstr "Schicke Passwort-Registrierungs-Link"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registrieren"
 
-msgid "Set default view"
-msgstr "Standardansicht setzen"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Ein Fehler ist aufgetreten."
 
+#: kotti/views/login.py:295
 msgid "Set password"
 msgstr "Passwort setzen"
 
-msgid "Share"
-msgstr "Teilen"
-
-msgid "Share ${title}"
-msgstr "Teile ${title}"
-
-msgid "Show"
-msgstr "Anzeigen"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
-msgid "Site Setup"
-msgstr "Seiten-Einstellungen"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Benutzerverwaltung"
 
-msgid "Size"
-msgstr "Größe"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
 
-msgid "State"
-msgstr "Status"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Meine Einstellungen - ${title}"
 
-msgid "Status"
-msgstr "Status"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Ungültige Eingabe"
 
-msgid "Submit"
-msgstr "Absenden"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Ein Benutzer mit diesem Namen existiert bereits."
 
-msgid "Tagged with:"
-msgstr "Verschlagwortet mit:"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
 
-msgid "Tags"
-msgstr "Schlagworte:"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Unbekannte Gruppe: ${group}"
 
-msgid "That username or email is not known by this system."
-msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Aktiv"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Abwählen um das Konto zu deaktivieren."
 
-msgid "There was an error."
-msgstr "Ein Fehler ist aufgetreten."
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Globale Rollen"
 
-msgid "Title"
-msgstr "Titel"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Gruppen"
 
-msgid "Type"
-msgstr "Typ"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Neuer Benutzer"
 
-msgid "Untick this to deactivate the account."
-msgstr "Abwählen um das Konto zu deaktivieren."
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} hinzugefügt."
 
-msgid "Upload ${number} files."
-msgstr "${number} Dateien hochladen"
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Neue Gruppe"
 
-msgid "Upload Content"
-msgstr "Dateien hochladen"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "Keine Änderungen."
 
-msgid "Upload content from local file(s)"
-msgstr "Inhalte aus lokalen Dateien hochladen"
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "Kein Name übergeben."
 
-msgid "User"
-msgstr "Benutzer"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "Keine Benutzer oder Gruppen gefunden."
 
-msgid "User Management"
-msgstr "Benutzerverwaltung"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Bearbeite ${principal_type} ${title}"
 
+#: kotti/views/users.py:533
 msgid "User was not found."
 msgstr "Keine Benutzer oder Gruppen gefunden."
 
-msgid "User- / groupname"
-msgstr "Benutzer- / Gruppenname"
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "Schicke Passwort-Registrierungs-Link"
 
-msgid "Username"
-msgstr "Benutzername"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} gelöscht."
 
-msgid "Username or email"
-msgstr "Benutzername oder E-Mail"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Bearbeite ${principal_type} ${title}"
 
-msgid "View"
-msgstr "Anzeigen"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} kopiert."
 
-msgid "Viewer"
-msgstr "Betrachter"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} ausgeschnitten."
 
-msgid "Visibility"
-msgstr "Sichtbarkeit"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} verschoben."
 
-msgid "Visible"
-msgstr "Sichtbar"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} eingefügt."
 
-msgid "Welcome to Kotti"
-msgstr "Willkommen bei Kotti"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "Inhalt konnte nicht eingefügt werden, da er nicht mehr existiert."
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Willkommen, ${user}!"
+msgid "${title} is now visible in the navigation."
+msgstr "${title} wird nun in der Navigation angezeigt."
 
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Willkommen, ${user}! Sie sind angemeldet."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
 
-msgid "Welcome, you are not logged in."
-msgstr "Willkommen! Sie sind nicht angemeldet."
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} gelöscht."
 
-msgid "You are here:"
-msgstr "Sie sind hier:"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "Nichts wurde gelöscht."
 
-msgid "You are joining ${site_title}."
-msgstr "Ihre Anmeldung bei ${site_title}"
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Name und Titel werden benötigt."
 
-msgid "You have been logged out."
-msgstr "Sie wurden abgemeldet."
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "Objekt umbenannt."
 
-msgid "You have reset your password."
-msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "Nach oben verschieben"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "Nach unten verschieben"
 
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Anzeigen"
+
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Verstecken"
+
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit "
-"einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Status ändern"
 
-msgid "Your changes have been saved."
-msgstr "Ihre Änderungen wurden übernommen."
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Beschreibung"
 
-msgid "Your password reset token may have expired."
-msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Inhalt"
 
-msgid "Your registration for ${site_title}"
-msgstr "Ihre Anmeldung bei ${site_title}"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Standardansicht wurde zurückgesetzt."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Standardansicht"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Standardansicht wurde gesetzt."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Standardansicht konnte nicht geändert werden."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<h2>Log in</h2>\n"
+#~ "<p>\n"
+#~ "    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
+#~ "    and start changing its contents.  If you haven't chosen a password for\n"
+#~ "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    Once you're logged in, you'll see the grey editor bar below the top\n"
+#~ "    navigation bar.  It will allow you to switch between editing and viewing the\n"
+#~ "    current page as it will appear to your visitors.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Configure</h2>\n"
+#~ "        <p>\n"
+#~ "            Find out how to configure your Kotti's title and many other settings using a\n"
+#~ "            simple text file in your file system.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               Configuration manual\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Add-ons</h2>\n"
+#~ "        <p>\n"
+#~ "            A number of add-ons allow you to extend the functionality of your Kotti site.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Kotti add-ons\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Documentation</h2>\n"
+#~ "        <p>\n"
+#~ "            Wonder what more you can do with Kotti?  What license it has?  Read the\n"
+#~ "            manual for more information.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               Documentation\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<h2>Anmelden</h2>\n"
+#~ "<p>\n"
+#~ "    Sie können sich nun <a class=\"btn btn-success\" href=\"login\">anmelden</a> und mit der Bearbeitung der Inhalte Ihrer Seite beginnen.  Falls Sie bisher kein Passwort für Ihren \"admin\" Zugang festgelegt haben, lautet dieses höchstwahrscheinlich <em>qwerty</em>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    Nach der Anmeldung werden Sie eine graue Bearbeitungsleiste unter der Hauptnavigation sehen. Dort können Sie zwischen Ansicht, Bearbeitung wechseln, sowie weitere Funktionen ausführen.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Konfiguration</h2>\n"
+#~ "        <p>\n"
+#~ "            Finden Sie heraus, wie Sie den Titel Ihrer Installation und vieles andere mehr durch die Bearbeitung einer einfachen Textdatei anpassen können.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               Configuration manual\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Erweiterungen</h2>\n"
+#~ "        <p>\n"
+#~ "            Mit Hilfe von Erweiterungen können Sie Ihrer Installation zusätzliche Funktionen hinzufügen.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Kotti Erweiterungen\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>DoKumentation</h2>\n"
+#~ "        <p>\n"
+#~ "            Fragen Sie sich, was Sie noch alles mit Kotti machen können?  Unter welcher Lizenz es veröffentlich ist?  Lesen Sie die Dokumentation für diese und weitere Informationen.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               Dokumentation\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>\n"
+#~ "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+#~ "   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+#~ "   width=\"640\" height=\"376\" />\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<p>\n"
+#~ "   Our worldwide headquarters:\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<address>\n"
+#~ "  Foo World<br />\n"
+#~ "  123 Nowhere Street, Suite 777<br />\n"
+#~ "  Omak, WA   98841   USA<br />\n"
+#~ "  +1-509-555-0100<br />\n"
+#~ "  widgets@foowrld.example.com\n"
+#~ "</address>\n"
+#~ "\n"
+#~ "<p><small style=\"font-size: smaller\">\n"
+#~ "  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+#~ "  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+#~ "  Copyright info</a>.\n"
+#~ "  Originally published in the\n"
+#~ "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+#~ "  article.\n"
+#~ "</small></p>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<p>\n"
+#~ "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+#~ "   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+#~ "   width=\"640\" height=\"376\" />\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<p>\n"
+#~ "   Unsere Konzernzentrale:\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<address>\n"
+#~ "  Foo World<br />\n"
+#~ "  123 Nowhere Street, Suite 777<br />\n"
+#~ "  Omak, WA   98841   USA<br />\n"
+#~ "  +1-509-555-0100<br />\n"
+#~ "  widgets@foowrld.example.com\n"
+#~ "</address>\n"
+#~ "\n"
+#~ "<p><small style=\"font-size: smaller\">\n"
+#~ "  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+#~ "  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+#~ "  Copyright info</a>.\n"
+#~ "  Originally published in the\n"
+#~ "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+#~ "  article.\n"
+#~ "</small></p>\n"
+
+#~ msgid "Submit"
+#~ msgstr "Absenden"
 
 #~ msgid "Private"
 #~ msgstr "Privat"
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index 0356e00c52c21fc6a7143fecdf76d629a3f80bdb..9336d47ef6e516aa48eb4f5fe4c21fb36301be9a 100644
GIT binary patch
delta 50
vcmX@eJeP5TifA$e1A`?HGXgOjOstjRu~aZJv@$T#HZU?Un5@WX&By=%yix}>

literal 449
zcmY+A&rZTX5XLcj>d~`@G4Y_msoMq-7BKuPhS(~B;(dX&)|B05yBK)_pTO7iS)6KO
z<CpxhyP0qD&Cb{H(PxcxK%5X~#36A>lxh(lRBY2(dj2#s`c<wiPB-`@O_6HF;a*#t
z0&^Q~!<oxm8;enqq#GRWk^*DRA&3Ukus;}&=fPs(%pPML87VAv<5*b9!DrqzdJNeO
z_#SVtI`bJLBhKYpTBcM!ADM?<6Fi?Yzs^WbC<=?Q5vs_9)rP}l8HVsMhyv*Ti@qhR
zN_HZV7)!C`AQg1Ou%D%_Hc3_G;6&3XsJ`gA%o%BArJ|sHP7_=CZm;r8q^bk!7hwu%
zd&_u&t;$yp^ehbqYOOb^N;tGusdZ-A&WH>r+H4CBD*t&FJ--9L*WS5;(;j#i&Ye`!
U(0*u>dk#afk{PYJ?KYj-HydVqZU6uP

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index c3669f7b9..070bfc9f0 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr ""
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr ""
 
+#: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -66,107 +71,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
 msgstr ""
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -184,8 +102,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -193,573 +110,760 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
 msgstr ""
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
 msgstr ""
 
-#, python-format
-msgid "${title} is now visible in the navigation."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
 msgstr ""
 
-#, python-format
-msgid "${title} was added."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
 msgstr ""
 
-#, python-format
-msgid "${title} was copied."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
 msgstr ""
 
-#, python-format
-msgid "${title} was cut."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
 msgstr ""
 
-#, python-format
-msgid "${title} was deleted."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
 msgstr ""
 
-#, python-format
-msgid "${title} was moved."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
 msgstr ""
 
-#, python-format
-msgid "${title} was pasted."
+#: kotti/resources.py:529
+msgid "Folder view"
 msgstr ""
 
-msgid "A user with that email already exists."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
 msgstr ""
 
-msgid "A user with that name already exists."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
 msgstr ""
 
-msgid "About"
+#: kotti/resources.py:525
+msgid "Share"
 msgstr ""
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr ""
 
-msgid "Active"
-msgstr ""
-
-msgid "Add"
+#: kotti/security.py:191
+msgid "Viewer"
 msgstr ""
 
-#, python-format
-msgid "Add ${type} to ${title}."
+#: kotti/security.py:192
+msgid "Editor"
 msgstr ""
 
-#, python-format
-msgid "Add ${type}."
+#: kotti/security.py:193
+msgid "Owner"
 msgstr ""
 
-msgid "Add Group"
+#: kotti/security.py:194
+msgid "Admin"
 msgstr ""
 
-msgid "Add User"
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
 msgstr ""
 
-msgid "Add group"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
 msgstr ""
 
-msgid "Add new group"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
 msgstr ""
 
-msgid "Add new user"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
 msgstr ""
 
-msgid "Add user"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
 msgstr ""
 
-msgid "Admin"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
 msgstr ""
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
 msgstr ""
 
-msgid "Apply changes"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
 msgstr ""
 
-msgid "Are you sure you want to delete ${title}?"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
 msgstr ""
 
-msgid "Are you sure you want to delete ${type} ${title}?"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
 msgstr ""
 
-msgid "Are you sure you want to delete the following items?"
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
 msgstr ""
 
-msgid "Assign global roles"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
 msgstr ""
 
-msgid "Assign local roles"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
 msgstr ""
 
-msgid "Back to User Management"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-msgid "Blank search text finds all."
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
 msgstr ""
 
-msgid "Body"
+#: kotti/templates/login.pt:15
+msgid "Login"
 msgstr ""
 
-msgid "Cancel"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
 msgstr ""
 
-msgid "Change State"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
 msgstr ""
 
-msgid "Change state to"
+#: kotti/templates/login.pt:33
+msgid "Log in"
 msgstr ""
 
-msgid "Change workflow state"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
 msgstr ""
 
-msgid "Click here to set your password and log in: ${url}"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
 msgstr ""
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr ""
 
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
 
-msgid "Congratulations! You have successfully installed Kotti."
+#: kotti/templates/login.pt:83
+msgid "Register for an account on this site."
 msgstr ""
 
-msgid "Contents"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
 msgstr ""
 
-msgid "Copy"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
 msgstr ""
 
-msgid "Could not paste node. It no longer exists."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
 msgstr ""
 
-msgid "Creation Date"
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
 msgstr ""
 
-msgid "Cut"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-msgid "Default view"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
 msgstr ""
 
-msgid "Default view could not be set."
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
 msgstr ""
 
-msgid "Default view has been reset to default."
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
 msgstr ""
 
-msgid "Default view has been set."
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+msgid "Creation Date"
 msgstr ""
 
-msgid "Delete"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
 msgstr ""
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
 msgstr ""
 
-msgid "Delete ${title}"
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
 msgstr ""
 
-msgid "Description"
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr ""
 
-msgid "Dismiss all errors"
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
 msgstr ""
 
-msgid "Document"
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
 msgstr ""
 
-msgid "Edit"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
 msgstr ""
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
 msgstr ""
 
-#, python-format
-msgid "Edit ${title}"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
 msgstr ""
 
-msgid "Editor"
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
 
-msgid "Email"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
 msgstr ""
 
-msgid "File"
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
 msgstr ""
 
-msgid "Filename"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
 msgstr ""
 
-#. Canonical text for ${reset_password} is: "Reset password"
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-msgid "Find users or groups"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
 msgstr ""
 
-msgid "Folder view"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
 msgstr ""
 
-msgid "Forbidden"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
 msgstr ""
 
-msgid "Forgot your password?"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr ""
 
-msgid "Full name"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
 msgstr ""
 
-msgid "Global roles"
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
 msgstr ""
 
-msgid "Gravatar"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
 msgstr ""
 
-msgid "Group"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
 msgstr ""
 
-msgid "Groups"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
 msgstr ""
 
-msgid "Hello, ${user_title}!"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
 msgstr ""
 
-msgid "Hidden"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
 msgstr ""
 
-msgid "Hide"
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
 msgstr ""
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
 msgstr ""
 
-msgid "Image"
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
+msgid "Group"
 msgstr ""
 
-msgid "Include children"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
 msgstr ""
 
-msgid "Invalid value"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+msgid "Assign role"
 msgstr ""
 
-msgid "Item was added."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
 msgstr ""
 
-msgid "Item was renamed."
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+msgid "Filename"
 msgstr ""
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
 msgstr ""
 
-msgid "Log in"
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
 msgstr ""
 
-msgid "Login"
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
 msgstr ""
 
-msgid "Login failed."
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
 msgstr ""
 
-msgid "Logout"
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
 msgstr ""
 
-msgid "Make ${state}"
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
 msgstr ""
 
-#, python-format
-msgid "Maximum file size: ${size}MB"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
 msgstr ""
 
-msgid "Modification Date"
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
 msgstr ""
 
-msgid "Move down"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
 
-msgid "Move up"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
 msgstr ""
 
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
-msgid "My preferences - ${title}"
-msgstr ""
-
-msgid "Name"
+msgid "Edit ${title}"
 msgstr ""
 
-msgid "Name and title are required."
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
 msgstr ""
 
-msgid "Navigate"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
 msgstr ""
 
-msgid "Navigate Site"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
 msgstr ""
 
-msgid "New name"
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
 msgstr ""
 
-msgid "New title"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
 msgstr ""
 
-msgid "No change"
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
 msgstr ""
 
-msgid "No changes were made."
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
 msgstr ""
 
-msgid "No content items are contained here."
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
 msgstr ""
 
-msgid "No name was given."
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
 msgstr ""
 
-#, python-format
-msgid "No such group: ${group}"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
 msgstr ""
 
-msgid "No users or groups were found."
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
 msgstr ""
 
-msgid "Not Found"
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
 msgstr ""
 
-msgid "Not registered yet?"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-msgid "Nothing was deleted."
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
 msgstr ""
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
 msgstr ""
 
-msgid "Owner"
+#: kotti/views/form.py:174
+msgid "Item was added."
 msgstr ""
 
-msgid "Password"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-msgid "Paste"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
 msgstr ""
 
-msgid "Preferences"
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
 msgstr ""
 
-msgid "Progress"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
 msgstr ""
 
-msgid "Register"
+#: kotti/views/login.py:282
+msgid "You have reset your password."
 msgstr ""
 
+#: kotti/views/login.py:154
 #, python-format
-msgid "Register - ${title}"
+msgid "Welcome, ${user}!"
 msgstr ""
 
-msgid "Register for an account on this site."
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr ""
 
-msgid "Rename"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
 msgstr ""
 
-msgid "Rename ${title}"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
 msgstr ""
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
+#: kotti/views/login.py:68
+msgid "Username"
 msgstr ""
 
-#, python-format
-msgid "Reset your password - ${title}."
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
 msgstr ""
 
-msgid "Reset your password for ${site_title}."
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-msgid "Save"
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
 msgstr ""
 
-msgid "Search"
+#: kotti/views/login.py:212
+msgid "Login failed."
 msgstr ""
 
-msgid "Search Results"
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
 msgstr ""
 
-msgid "Search user(s) / group(s)"
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
 msgstr ""
 
-msgid "Search users and groups"
+#: kotti/views/login.py:82
+msgid "Register"
 msgstr ""
 
-msgid "Search..."
+#: kotti/views/login.py:89
+msgid "There was an error."
 msgstr ""
 
-msgid "Select file(s) to upload..."
+#: kotti/views/login.py:295
+msgid "Set password"
 msgstr ""
 
-msgid "Select the new state where all chosen items should be set."
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
 msgstr ""
 
-msgid "Send password registration link."
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
 msgstr ""
 
-msgid "Set default view"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr ""
 
-msgid "Set password"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
 msgstr ""
 
-msgid "Share"
+#: kotti/views/users.py:145
+msgid "Invalid value"
 msgstr ""
 
-msgid "Share ${title}"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
 msgstr ""
 
-msgid "Show"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
 msgstr ""
 
-msgid "Site Setup"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
 msgstr ""
 
-msgid "Size"
+#: kotti/views/users.py:219
+msgid "Active"
 msgstr ""
 
-msgid "State"
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
 msgstr ""
 
-msgid "Status"
+#: kotti/views/users.py:226
+msgid "Global roles"
 msgstr ""
 
-msgid "Submit"
+#: kotti/views/users.py:230
+msgid "Groups"
 msgstr ""
 
-msgid "Tagged with:"
+#: kotti/views/users.py:315
+msgid "Add User"
 msgstr ""
 
-msgid "Tags"
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
 msgstr ""
 
-msgid "That username or email is not known by this system."
+#: kotti/views/users.py:349
+msgid "Add Group"
 msgstr ""
 
-msgid "The resource could not be found"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
 msgstr ""
 
-msgid "There was an error."
+#: kotti/views/users.py:558
+msgid "No name was given."
 msgstr ""
 
-msgid "Title"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
 msgstr ""
 
-msgid "Type"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-msgid "Untick this to deactivate the account."
+#: kotti/views/users.py:533
+msgid "User was not found."
 msgstr ""
 
-msgid "Upload ${number} files."
+#: kotti/views/users.py:324
+msgid "Send password registration link."
 msgstr ""
 
-msgid "Upload Content"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-msgid "Upload content from local file(s)"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-msgid "User"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
 msgstr ""
 
-msgid "User Management"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
 msgstr ""
 
-msgid "User was not found."
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
 msgstr ""
 
-msgid "User- / groupname"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
 msgstr ""
 
-msgid "Username"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-msgid "Username or email"
+#: kotti/views/edit/actions.py:225
+#, python-format
+msgid "${title} is now visible in the navigation."
 msgstr ""
 
-msgid "View"
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-msgid "Viewer"
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
 msgstr ""
 
-msgid "Visibility"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
 msgstr ""
 
-msgid "Visible"
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
 msgstr ""
 
-msgid "Welcome to Kotti"
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
 msgstr ""
 
-#, python-format
-msgid "Welcome, ${user}!"
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
 msgstr ""
 
-msgid "Welcome, ${user}! You are logged in."
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
 msgstr ""
 
-msgid "Welcome, you are not logged in."
+#: kotti/views/edit/actions.py:467
+msgid "Show"
 msgstr ""
 
-msgid "You are here:"
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
 msgstr ""
 
-msgid "You are joining ${site_title}."
+#: kotti/views/edit/actions.py:507
+msgid "You have to select items to perform an action."
 msgstr ""
 
-msgid "You have been logged out."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
 msgstr ""
 
-msgid "You have reset your password."
+#: kotti/views/edit/content.py:38
+msgid "Description"
 msgstr ""
 
-msgid "You have to select items to perform an action."
+#: kotti/views/edit/content.py:53
+msgid "Body"
 msgstr ""
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
 msgstr ""
 
-msgid "Your changes have been saved."
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
 msgstr ""
 
-msgid "Your password reset token may have expired."
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
 msgstr ""
 
-msgid "Your registration for ${site_title}"
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
 msgstr ""
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index 5850420e325f2be73b948478b821d1432d7882c7..368ef2017adedc3d64c59096fe0b5d092352550a 100644
GIT binary patch
delta 1450
zcmXZcPe_zO7{~E3TmP)<X0DdCn{K9NYPxG_shLq>U|m8?v!G%H6)cO?>QEbL3jIUa
zh$xZ{6%i3jO9u~<fnA~kk?K-->0lCsNC&B)?~ffJKkqzm^UO2P%<ISQ2c6L&M>u4R
zIiG9HX8elf=*%-_3)bKoJc&6tVtt5S#^cscHokz{h&%npY{K1`f<2gw{pi4pc0A}e
zVN*chI)My~;!1pjt8fN2p11x*#og=U7NVQ+4m^tcQH4E4ZDb0oaS`jWB;S~|*kv8e
z4;xcRV2nU3PN6FGZHQZdnT*RY8yk=&nHFrqK5WL<IF256qYivP?c71~By?i{vr!vr
zwDGnu4=V^9Lsi_1r8tJ_%sWiQUv|8NDk!(em^2Kcc2tjAunnVl!j3aH8bfWyi(0q=
zwZVg!gyF+Ba2(ajE}X=3Sc2P&<B3Do9@G)^qYAizF1%~sKSm{ffywv^b$2Fg{Im5N
zUSfUood*a1A;gXGVK=HH!*+ZJ*D;Ra5Kf~OJVbRWAcX2bFKXU3>pdj3d4^dyW1T}C
z<v;YXzVXoSL;?Y%yJjn<Vmqp39him#n2uM_gQG~3%p=s1yhmNWSzL{Ounax?(pR(#
z2e2KLXBu6sZ)SN=%YNDyi<rhZfp5}@>8OfxP@O2p6g+?`umyD~JCUho7^^Ub%JT!2
z=QpZTx@c_PcrmPpMjq1f3@Skw_u_NZtzAIvEWaY2a3^X<P3XoBR7cLDj&cOGp_|s*
zs5^5XRme+J{)r0uuhuPN6-~^><><vq^rIh}Q498=zUN!0oxMd}u4(H$>Z}uk@%K5X
z&K02Y)}k(DgMGg*NdFaRCZLH&tfx_(xr#*?#SHv{`kdxaN8zGMb*u#IuoZR25!8Gq
ze@6FU6>8oEOhEnA@UJ?y<h<;OOy+uBHU7$AZJ@F=P#FkBPUY1_M%}(xvHwZde~*up
AvH$=8

delta 1757
zcmX}sUrZcD9Ki7@QlQs@XsJq}WJ?j-(mnSMq_QXU562nwNGs6#P>osc=FY3Id+r?+
z<DWBzRBQWCg(kKM4H}D$4~B%s*7!eajM3QmpouZYG&Vl?&=`|yjM4c0aT_n;J~O|)
zncvKBW|_}^om-k&U7A~^)O3qdrc$cbP%4Zu?8L*^h-dLOycGBiHqrkzuxfMpc`NQD
z9>Z-|z#5##YFxzC_*T%ruvwK<8-e!-)Z-Pr34h01u(Gw>ZwfR~;=2M5VjcYnd<dUH
zS=jd|8@Z0%*tSKfUOa>w@pRyYEhVLHCvcg-gLoZfr9-SrJb*Xj!?*$SNU_vWybsUe
z2>yoeV4TUM0{^1yyt`egD%^z@CQvqbB#0j?(YTSoNt6{YU<Y1C=2U;<8Z_=G_qU@g
zXdkY{F_ay-C<%|@622Vt`?o5^o>USgaUQGjIjq9ci$UNelv19?kMKNh#~cS)gL8rN
zC`Yh}vViw-9exo!{|;s1pHLG0f^v7R1@USomFIQ%4Efat8geP-uo=&wRODjN{~R~b
zzlt+hL3t$M^C%0LL#e<5%D8s}zeM(+e!vE-+)=g><tW40Onw!oaRUJd<t}JkgU3-y
zb_&<x8(53WxE?=7s;s_6Ig)=+E?+&b(yh1y38^^BTl6?i;c=|R3eI~S`Bgm)Daj_3
z2W=<`qZq<Ilob!6RN@hoBY7HSfk#m;<tr!&FXCNz6=j}{cb4aAN2yc<DW*zdNg79J
zNaEK}CRoBa{)lpGTltcmji5~Eq3q~Mtiw|%6?q-yC@-OG=!3w|Q0~lEC>#12W&Udx
z^_S9hM#=*dSV=#LQG5UmoIy!=4&{CR5M?2Mpj@sBek?YjoOKt<^Ffr#9YC4)F_cT0
z51vm)slNnf2*|(_fv=)e=51`pD_D;;{9BaQsS)KUdQmEN2xIsH${Bx(GCtO&R6k}=
z#=VKFP(D5Ubua%FdUk!n_YUh+(Hu;h2en_wd9H2T?-h$V!wUB}ooPK48rFHwFPcMz
zY%Xo?oy-=@QO`C8hV~35ckhYEhX+PRLbKB?&83}2G-7vI9ahw`Li_ib!+I(wGn#Ry
zsBI%^MLJEZ$Bag4+R;dd72$VDr%*IUea9_~J4Mg8jf69n)2`7^-0?p-pVr1bnUzpD
zwGz^4y*uM;9nScDjCQk=PF9<v+G&_zu&>?JqyL9(V|Jk>mg@K1qIQEc8SR?`ZpusN
z+^lWfJ(eqm_K#2c&bXQI{E32XxcQZCp*I>c%FW)buF+>iwuSE1uJ+jsb$G%y_BvyF
TT<R3=4$YpdYhM1dWwGHuZu<XI

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index f3803ac93..b9c13e8d5 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Bienvenue dans Kotti"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
+#: kotti/populate.py:66
 #, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -68,31 +73,25 @@ msgstr ""
 "\n"
 "<h2>Identifiez vous</h2>\n"
 "<p>\n"
-"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</"
-"a> sur votre site internet\n"
-"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de "
-"passe pour\n"
+"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</a> sur votre site internet\n"
+"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de passe pour\n"
 "    votre compte administrateur, celui-ci devrait être <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition en "
-"dessous de la\n"
-"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition "
-"et la visualisation, telle qu'\n"
+"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition en dessous de la\n"
+"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition et la visualisation, telle qu'\n"
 "    elle apparaitra aux visiteurs.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configuration</h2>\n"
 "        <p>\n"
-"            Trouvez comment configurer le titre de votre site ainsi que "
-"d'autres paramètres en utilisant\n"
+"            Trouvez comment configurer le titre de votre site ainsi que d'autres paramètres en utilisant\n"
 "            un éditeur de texte.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manuelle\n"
 "            </a>\n"
 "        </p>\n"
@@ -100,13 +99,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Extensions</h2>\n"
 "        <p>\n"
-"            Des extensions vous permettent d'étendre les fonctionnalités de "
-"votre site internet Kotti.\n"
+"            Des extensions vous permettent d'étendre les fonctionnalités de votre site internet Kotti.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Extensions de Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -114,8 +111,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentation</h2>\n"
 "        <p>\n"
-"            Découvrez tout ce que vous pouvez faire avec Kotti? La License de "
-"Kotti?Parcourez le\n"
+"            Découvrez tout ce que vous pouvez faire avec Kotti? La License de Kotti?Parcourez le\n"
 "            manuel pour plus d'informations.\n"
 "        </p>\n"
 "        <p>\n"
@@ -127,198 +123,21 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
-msgstr ""
-"\n"
-"<h2>Identifiez vous</h2>\n"
-"<p>\n"
-"    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</"
-"a> sur votre site internet\n"
-"    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de "
-"passe pour\n"
-"    votre compte administrateur, celui-ci devrait être <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Lorsque que vous serez identifié, vous verrez la barre grise d'édition en "
-"dessous de la\n"
-"    barre de navigation. Celle-ci vous permettra de basculer entre l'édition "
-"et la visualisation, telle qu'\n"
-"    elle apparaitra aux visiteurs.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configuration</h2>\n"
-"        <p>\n"
-"            Trouvez comment configurer le titre de votre site ainsi que "
-"d'autres paramètres en utilisant\n"
-"            un éditeur de texte.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manuelle\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Extensions</h2>\n"
-"        <p>\n"
-"            Des extensions vous permettent d'étendre les fonctionnalités de "
-"votre site internet Kotti.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Extensions de Kotti\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Découvrez tout ce que vous pouvez faire avec Kotti? La License de "
-"Kotti?Parcourez le\n"
-"            manuel pour plus d'informations.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
+msgstr "A propos"
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
-msgstr ""
-"\n"
-"<p>\n"
-"  <img alt=\"Cinq avions EA300 volants en formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Nos bureaux:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Rue inconnue, Boite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Crédit de la photot:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originalement publié sur\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Notre société est spécialisée dans la conception de pièces foo utilisées dans une grande variétée de produits."
 
+#: kotti/populate.py:125
 #, fuzzy
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -336,8 +155,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -347,8 +165,7 @@ msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"Cinq avions EA300 volants en formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -366,609 +183,939 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Crédit de la photot:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Copyright info</a>.\n"
 "  Originalement publié sur\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} a été supprimé."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copier"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} nest plus visible dans la navigation."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Couper"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} est désormais visible dans la navigation."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Coller"
 
-#, python-format
-msgid "${title} was added."
-msgstr "${title} a été ajouté."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Renommer"
 
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} a été copié."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Supprimer"
 
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} a été coupé."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Document"
 
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} a été supprimé."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Fichier"
 
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} a été déplacé."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Image"
 
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} a été collé."
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Contenus"
 
-msgid "A user with that email already exists."
-msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Contenus"
 
-msgid "A user with that name already exists."
-msgstr "Un utilisateur avec ce nom existe déjà."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Modifier"
 
-msgid "About"
-msgstr "A propos"
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Permissions"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Actions"
 
-msgid "Active"
-msgstr "Actif"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "Lecteur"
+
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "Editeur"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "Propriétaire"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "Administrateur"
 
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Ajouter"
 
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Ajouter un(e) ${type} dans ${title}."
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Téléverser des contenus"
 
-#, python-format
-msgid "Add ${type}."
-msgstr "Ajouter ${type}."
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Définir la vue par défaut"
 
-msgid "Add Group"
-msgstr "Ajouter un Groupe"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Voir"
 
-msgid "Add User"
-msgstr "Ajouter un Utilisateur"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Parcourir"
 
-msgid "Add group"
-msgstr "Ajouter un groupe"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Préférences"
 
-msgid "Add new group"
-msgstr "Ajouter un groupe"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Paramètres du Site"
 
-msgid "Add new user"
-msgstr "Ajouter un utilisateur"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Se déconnecter"
 
-msgid "Add user"
-msgstr "Ajouter un utilisateur"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Réinitialiser votre mot de passe pour ${site_title}."
 
-msgid "Admin"
-msgstr "Administrateur"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Bonjour, ${user_title} !"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/ou "
-"le gérer."
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : ${url}"
 
-msgid "Apply changes"
-msgstr "Appliquer les modifications"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Votre inscription sur ${site_title}"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Etes-vous sûr de vouloir supprimer ${title} ?"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Vous vous joignez à ${site_title}."
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Interdit"
 
-msgid "Assign global roles"
-msgstr "Assigner des rôles locaux"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Identifiant"
 
-msgid "Assign local roles"
-msgstr "Assigner des rôles locaux"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Identifiant ou e-mail"
 
-msgid "Back to User Management"
-msgstr "Retour à la gestion des Utilisateurs"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "Mot de passe"
 
-msgid "Blank search text finds all."
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Se connecter"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Mot de passe oublié ?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Réinitialiser le mot de passe"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur ${reset_password} ci-dessous afin de recevoir un mail contenant le lien de réinitialisation de votre mot de passe."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
-"Rechercher et modifier des utilisateurs (Laissez le champ vide pour les "
-"afficher tous)."
 
-msgid "Body"
-msgstr "Contenu"
+#: kotti/templates/login.pt:83
+msgid "Register for an account on this site."
+msgstr "Enregistrez-vous sur ce site."
 
-msgid "Cancel"
-msgstr "Annuler"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "Rendre ${state}"
 
-msgid "Change State"
-msgstr "Modifier le statut"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Mots-clés"
 
-msgid "Change state to"
-msgstr "Modifier le statut à"
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Vous êtes ici :"
 
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Modifier le statut de workflow"
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/ou le gérer."
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : "
-"${url}"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "Titre"
 
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez "
-"recevoir un e-mail contenant le lien permettant d'initialiser votre mot de "
-"passe, afin d'activer votre compte."
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Type"
 
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr "Félicitations! Vous avez installé Kotti avec succès."
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "Statut"
 
-msgid "Contents"
-msgstr "Contenus"
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+msgid "Creation Date"
+msgstr "Date de création"
 
-msgid "Copy"
-msgstr "Copier"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Date de modification"
 
-msgid "Could not paste node. It no longer exists."
-msgstr "Ne peut pas coller ce contenu. Il n'existe plus."
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr ""
 
-msgid "Creation Date"
-msgstr "Date de création"
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Inclure les contenus enfants"
 
-msgid "Cut"
-msgstr "Couper"
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Si coché, cela modifiera le statut de tous les contenus enfants dans les documents sélectionnés et leurs documents enfants."
 
-msgid "Default view"
-msgstr "Vue par défaut"
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Modifier le statut à"
 
-msgid "Default view could not be set."
-msgstr "La vue par défaut ne peut pas être définie."
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Sélectionner le nouveau statut à appliquer aux éléments choisis."
 
-msgid "Default view has been reset to default."
-msgstr "La vue par défaut a été réinitialisée."
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Aucune modification"
 
-msgid "Default view has been set."
-msgstr "La vue par défaut a été définie."
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "Appliquer les modifications"
 
-msgid "Delete"
-msgstr "Supprimer"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Annuler"
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Supprimer ${principal_type} ${title}"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Aucun contenu ici."
 
-msgid "Delete ${title}"
-msgstr "Supprimer ${title}"
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
+msgstr ""
 
-msgid "Description"
-msgstr "Description"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Visibilité"
 
-msgid "Dismiss all errors"
-msgstr "Ignorer toutes les erreurs"
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Visible"
 
-msgid "Document"
-msgstr "Document"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Caché"
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
-msgstr ""
-"Chaque contenu a un nom, qui est utilisé pour créer une url, et un titre. "
-"Consultez, si besoin, le manuel à propos du format des nom et titre. Vous "
-"pouvez modifier les deux."
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
 
-msgid "Edit"
-msgstr "Modifier"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Supprimer ${title}"
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Modifier ${principal_type} ${title}"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Etes-vous sûr de vouloir supprimer ${title} ?"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr "Modifier ${title}"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Parcourir le Site"
 
-msgid "Editor"
-msgstr "Editeur"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Chaque contenu a un nom, qui est utilisé pour créer une url, et un titre. Consultez, si besoin, le manuel à propos du format des nom et titre. Vous pouvez modifier les deux."
 
-msgid "Email"
-msgstr "E-mail"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Nouveau nom"
 
-msgid "File"
-msgstr "Fichier"
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Nouveau titre"
 
-msgid "Filename"
-msgstr "Nom du fichier"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Renommer ${title}"
 
-#. Canonical text for ${reset_password} is: "Reset password"
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur "
-"${reset_password} ci-dessous afin de recevoir un mail contenant le lien de "
-"réinitialisation de votre mot de passe."
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Permissions pour ${title}"
 
-msgid "Find users or groups"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
-msgid "Folder view"
-msgstr "Contenus"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "Rechercher"
 
-msgid "Forbidden"
-msgstr "Interdit"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Assigner des rôles locaux"
 
-msgid "Forgot your password?"
-msgstr "Mot de passe oublié ?"
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "Nom"
 
-msgid "Full name"
-msgstr "Nom complet"
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "Utilisateur"
 
-msgid "Global roles"
-msgstr "Rôle global"
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
+msgid "Group"
+msgstr "Groupe"
 
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
 msgstr "Gravatar"
 
-msgid "Group"
-msgstr "Groupe"
-
-msgid "Groups"
-msgstr "Groupes"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#, fuzzy
+msgid "Assign role"
+msgstr "Assigner des rôles locaux"
 
-msgid "Hello, ${user_title}!"
-msgstr "Bonjour, ${user_title} !"
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Téléverser des contenus à partir de fichiers locaux"
 
-msgid "Hidden"
-msgstr "Caché"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+msgid "Filename"
+msgstr "Nom du fichier"
 
-msgid "Hide"
-msgstr "Cacher"
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
+msgstr "Poids"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Si coché, cela modifiera le statut de tous les contenus enfants dans les "
-"documents sélectionnés et leurs documents enfants."
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Statut"
 
-msgid "Image"
-msgstr "Image"
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Progression"
 
-msgid "Include children"
-msgstr "Inclure les contenus enfants"
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr "Selectionner des fichiers à téléverser..."
 
-msgid "Invalid value"
-msgstr "Valeur invalide"
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
+msgstr "Téléverser ${number} fichiers."
 
-msgid "Item was added."
-msgstr "L'élément a été ajouté."
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr "Ignorer toutes les erreurs"
 
-msgid "Item was renamed."
-msgstr "L'élément a été renommé."
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
 msgstr ""
-"Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous "
-"pour que l'utilisateur définisse son propre mot de passe."
 
-msgid "Log in"
-msgstr "Se connecter"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
 
-msgid "Login"
-msgstr "Identifiant"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Retour à la gestion des Utilisateurs"
 
-msgid "Login failed."
-msgstr "La connexion à échouée."
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#, python-format
+msgid "Edit ${title}"
+msgstr "Modifier ${title}"
 
-msgid "Logout"
-msgstr "Se déconnecter"
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Rechercher des utilisateurs ou des groupes"
 
-msgid "Make ${state}"
-msgstr "Rendre ${state}"
-
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Taille maximum d'un fichier : ${size} MB"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Ajouter un utilisateur"
 
-msgid "Modification Date"
-msgstr "Date de modification"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Ajouter un groupe"
 
-msgid "Move down"
-msgstr "Décaler vers le bas"
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Rechercher des utilisateurs ou des groupes"
 
-msgid "Move up"
-msgstr "Décaler vers le haut"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "Utilisateur / groupe"
 
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mes préférences - ${title}"
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Rechercher et modifier des utilisateurs (Laissez le champ vide pour les afficher tous)."
 
-msgid "Name"
-msgstr "Nom"
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Assigner des rôles locaux"
 
-msgid "Name and title are required."
-msgstr "Le nom et le titre sont obligatoires."
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Ajouter un utilisateur"
 
-msgid "Navigate"
-msgstr "Parcourir"
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Ajouter un groupe"
 
-msgid "Navigate Site"
-msgstr "Parcourir le Site"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Résultats de la recherche"
 
-msgid "New name"
-msgstr "Nouveau nom"
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Rechercher..."
 
-msgid "New title"
-msgstr "Nouveau titre"
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Mots-clés associés :"
 
-msgid "No change"
-msgstr "Aucune modification"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Bienvenue, ${user} ! Vous êtes connecté."
 
-msgid "No changes were made."
-msgstr "Aucune modification a été effectuée."
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Bienvenue, vous n'êtes pas connecté."
 
-msgid "No content items are contained here."
-msgstr "Aucun contenu ici."
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Vos modifications ont été enregistrées."
 
-msgid "No name was given."
-msgstr "Aucun nom a été indiqué."
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "L'élément a été ajouté."
 
+#: kotti/views/form.py:264
 #, python-format
-msgid "No such group: ${group}"
-msgstr "Aucun groupe : ${group}"
+msgid "Maximum file size: ${size}MB"
+msgstr "Taille maximum d'un fichier : ${size} MB"
 
-msgid "No users or groups were found."
-msgstr "Aucun utilisateur ou groupe a été trouvé."
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Enregistrer"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Ajouter un(e) ${type} dans ${title}."
 
-msgid "Not registered yet?"
-msgstr ""
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "Ajouter ${type}."
 
-msgid "Nothing was deleted."
-msgstr "Rien n'a été supprimé."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Vous avez réinitialisé votre mot de passe."
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
-"Notre société est spécialisée dans la conception de pièces foo utilisées dans "
-"une grande variétée de produits."
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bienvenue, ${user} !"
 
-msgid "Owner"
-msgstr "Propriétaire"
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
 
-msgid "Password"
-msgstr "Mot de passe"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Vous avez été déconnecté."
 
-msgid "Paste"
-msgstr "Coller"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Nom complet"
 
-msgid "Preferences"
-msgstr "Préférences"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Identifiant"
 
-msgid "Progress"
-msgstr "Progression"
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr "E-mail"
 
-msgid "Register"
-msgstr "S'inscrire"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez recevoir un e-mail contenant le lien permettant d'initialiser votre mot de passe, afin d'activer votre compte."
 
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "S'inscrire - ${title}"
 
-msgid "Register for an account on this site."
-msgstr "Enregistrez-vous sur ce site."
-
-msgid "Rename"
-msgstr "Renommer"
-
-msgid "Rename ${title}"
-msgstr "Renommer ${title}"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "Réinitialiser le mot de passe"
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "La connexion à échouée."
 
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Réinitialiser votre mot de passe - ${title}"
 
-msgid "Reset your password for ${site_title}."
-msgstr "Réinitialiser votre mot de passe pour ${site_title}."
-
-msgid "Save"
-msgstr "Enregistrer"
-
-msgid "Search"
-msgstr "Rechercher"
-
-msgid "Search Results"
-msgstr "Résultats de la recherche"
-
-msgid "Search user(s) / group(s)"
-msgstr "Rechercher des utilisateurs ou des groupes"
-
-msgid "Search users and groups"
-msgstr "Rechercher des utilisateurs ou des groupes"
-
-msgid "Search..."
-msgstr "Rechercher..."
-
-msgid "Select file(s) to upload..."
-msgstr "Selectionner des fichiers à téléverser..."
-
-msgid "Select the new state where all chosen items should be set."
-msgstr "Sélectionner le nouveau statut à appliquer aux éléments choisis."
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
-msgid "Send password registration link."
-msgstr "Envoyer un lien d'initialisation de mot de passe"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "S'inscrire"
 
-msgid "Set default view"
-msgstr "Définir la vue par défaut"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Il y a une erreur."
 
+#: kotti/views/login.py:295
 #, fuzzy
 msgid "Set password"
 msgstr "Réinitialiser le mot de passe"
 
-msgid "Share"
-msgstr "Permissions"
-
-msgid "Share ${title}"
-msgstr "Permissions pour ${title}"
-
-msgid "Show"
-msgstr "Rendre visible"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
-msgid "Site Setup"
-msgstr "Paramètres du Site"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gestion des utilisateurs"
 
-msgid "Size"
-msgstr "Poids"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
 
-msgid "State"
-msgstr "Statut"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mes préférences - ${title}"
 
-msgid "Status"
-msgstr "Statut"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Valeur invalide"
 
-msgid "Submit"
-msgstr "Soumettre"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Un utilisateur avec ce nom existe déjà."
 
-msgid "Tagged with:"
-msgstr "Mots-clés associés :"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
 
-msgid "Tags"
-msgstr "Mots-clés"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Aucun groupe : ${group}"
 
-msgid "That username or email is not known by this system."
-msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Actif"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Décocher cette option pour désactiver le compte."
 
-msgid "There was an error."
-msgstr "Il y a une erreur."
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Rôle global"
 
-msgid "Title"
-msgstr "Titre"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Groupes"
 
-msgid "Type"
-msgstr "Type"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Ajouter un Utilisateur"
 
-msgid "Untick this to deactivate the account."
-msgstr "Décocher cette option pour désactiver le compte."
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} a été ajouté."
 
-msgid "Upload ${number} files."
-msgstr "Téléverser ${number} fichiers."
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Ajouter un Groupe"
 
-msgid "Upload Content"
-msgstr "Téléverser des contenus"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "Aucune modification a été effectuée."
 
-msgid "Upload content from local file(s)"
-msgstr "Téléverser des contenus à partir de fichiers locaux"
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "Aucun nom a été indiqué."
 
-msgid "User"
-msgstr "Utilisateur"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "Aucun utilisateur ou groupe a été trouvé."
 
-msgid "User Management"
-msgstr "Gestion des utilisateurs"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Modifier ${principal_type} ${title}"
 
+#: kotti/views/users.py:533
 msgid "User was not found."
 msgstr "Utilisateur non trouvé."
 
-msgid "User- / groupname"
-msgstr "Utilisateur / groupe"
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "Envoyer un lien d'initialisation de mot de passe"
 
-msgid "Username"
-msgstr "Identifiant"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} a été supprimé."
 
-msgid "Username or email"
-msgstr "Identifiant ou e-mail"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Supprimer ${principal_type} ${title}"
 
-msgid "View"
-msgstr "Voir"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} a été copié."
 
-msgid "Viewer"
-msgstr "Lecteur"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} a été coupé."
 
-msgid "Visibility"
-msgstr "Visibilité"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} a été déplacé."
 
-msgid "Visible"
-msgstr "Visible"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} a été collé."
 
-msgid "Welcome to Kotti"
-msgstr "Bienvenue dans Kotti"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "Ne peut pas coller ce contenu. Il n'existe plus."
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bienvenue, ${user} !"
+msgid "${title} is now visible in the navigation."
+msgstr "${title} est désormais visible dans la navigation."
 
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Bienvenue, ${user} ! Vous êtes connecté."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} nest plus visible dans la navigation."
 
-msgid "Welcome, you are not logged in."
-msgstr "Bienvenue, vous n'êtes pas connecté."
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} a été supprimé."
 
-msgid "You are here:"
-msgstr "Vous êtes ici :"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "Rien n'a été supprimé."
 
-msgid "You are joining ${site_title}."
-msgstr "Vous vous joignez à ${site_title}."
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Le nom et le titre sont obligatoires."
 
-msgid "You have been logged out."
-msgstr "Vous avez été déconnecté."
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "L'élément a été renommé."
 
-msgid "You have reset your password."
-msgstr "Vous avez réinitialisé votre mot de passe."
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "Décaler vers le haut"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "Décaler vers le bas"
 
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Rendre visible"
+
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Cacher"
+
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Vous avez sélectionné des éléments afin de les traiter."
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre "
-"mot de passe, afin d'activer votre compte."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Modifier le statut"
 
-msgid "Your changes have been saved."
-msgstr "Vos modifications ont été enregistrées."
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Description"
 
-msgid "Your password reset token may have expired."
-msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Contenu"
 
-msgid "Your registration for ${site_title}"
-msgstr "Votre inscription sur ${site_title}"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "La vue par défaut a été réinitialisée."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Vue par défaut"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "La vue par défaut a été définie."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "La vue par défaut ne peut pas être définie."
+
+#~ msgid ""
+#~ "\n"
+#~ "<h2>Log in</h2>\n"
+#~ "<p>\n"
+#~ "    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
+#~ "    and start changing its contents.  If you haven't chosen a password for\n"
+#~ "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    Once you're logged in, you'll see the grey editor bar below the top\n"
+#~ "    navigation bar.  It will allow you to switch between editing and viewing the\n"
+#~ "    current page as it will appear to your visitors.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Configure</h2>\n"
+#~ "        <p>\n"
+#~ "            Find out how to configure your Kotti's title and many other settings using a\n"
+#~ "            simple text file in your file system.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               Configuration manual\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Add-ons</h2>\n"
+#~ "        <p>\n"
+#~ "            A number of add-ons allow you to extend the functionality of your Kotti site.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Kotti add-ons\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Documentation</h2>\n"
+#~ "        <p>\n"
+#~ "            Wonder what more you can do with Kotti?  What license it has?  Read the\n"
+#~ "            manual for more information.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               Documentation\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<h2>Identifiez vous</h2>\n"
+#~ "<p>\n"
+#~ "    Vous pouvez vous <a class=\"btn btn-success\" href=\"login\">identifier</a> sur votre site internet\n"
+#~ "    et commencer à créer du contenu. Si vous n'avez pas choisi un mot de passe pour\n"
+#~ "    votre compte administrateur, celui-ci devrait être <em>qwerty</em>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    Lorsque que vous serez identifié, vous verrez la barre grise d'édition en dessous de la\n"
+#~ "    barre de navigation. Celle-ci vous permettra de basculer entre l'édition et la visualisation, telle qu'\n"
+#~ "    elle apparaitra aux visiteurs.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Configuration</h2>\n"
+#~ "        <p>\n"
+#~ "            Trouvez comment configurer le titre de votre site ainsi que d'autres paramètres en utilisant\n"
+#~ "            un éditeur de texte.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               Configuration manuelle\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Extensions</h2>\n"
+#~ "        <p>\n"
+#~ "            Des extensions vous permettent d'étendre les fonctionnalités de votre site internet Kotti.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Extensions de Kotti\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Documentation</h2>\n"
+#~ "        <p>\n"
+#~ "            Découvrez tout ce que vous pouvez faire avec Kotti? La License de Kotti?Parcourez le\n"
+#~ "            manuel pour plus d'informations.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               Documentation\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>\n"
+#~ "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+#~ "   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+#~ "   width=\"640\" height=\"376\" />\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<p>\n"
+#~ "   Our worldwide headquarters:\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<address>\n"
+#~ "  Foo World<br />\n"
+#~ "  123 Nowhere Street, Suite 777<br />\n"
+#~ "  Omak, WA   98841   USA<br />\n"
+#~ "  +1-509-555-0100<br />\n"
+#~ "  widgets@foowrld.example.com\n"
+#~ "</address>\n"
+#~ "\n"
+#~ "<p><small style=\"font-size: smaller\">\n"
+#~ "  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+#~ "  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+#~ "  Copyright info</a>.\n"
+#~ "  Originally published in the\n"
+#~ "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+#~ "  article.\n"
+#~ "</small></p>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<p>\n"
+#~ "  <img alt=\"Cinq avions EA300 volants en formation\"\n"
+#~ "   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+#~ "   width=\"640\" height=\"376\" />\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<p>\n"
+#~ "   Nos bureaux:\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<address>\n"
+#~ "  Foo World<br />\n"
+#~ "  123 Rue inconnue, Boite 777<br />\n"
+#~ "  Omak, WA   98841   USA<br />\n"
+#~ "  +1-509-555-0100<br />\n"
+#~ "  widgets@foowrld.example.com\n"
+#~ "</address>\n"
+#~ "\n"
+#~ "<p><small style=\"font-size: smaller\">\n"
+#~ "  <em>Crédit de la photot:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+#~ "  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+#~ "  Copyright info</a>.\n"
+#~ "  Originalement publié sur\n"
+#~ "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+#~ "  article.\n"
+#~ "</small></p>\n"
+
+#~ msgid "Submit"
+#~ msgstr "Soumettre"
 
 #~ msgid "Private"
 #~ msgstr "Privé"
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index 3ad276b27c6796b26f101d871e8ce82f2b336d9a..516ba80c7b5e28481dff87599a4db8cf4accdb75 100644
GIT binary patch
delta 1405
zcmXZcOGwmF6vy#nIqHm~W}45^adgz0v~jYRy)0KPf{1LDAlZvRDiT3T{~M8@7Qzrw
zND#Q_wXj52Qd%vdLW;u05J(hBnTs(n5~RLA<`2Vs?!9yW_nv#s{m-Y9Bkd!nJWhw1
zO>HpSf}t|A2)1Gv2e1^MVhK*W{U699<|$A9UWx1J@5dTEfz{ZLUVMaUIOaNmKKd`q
z%`w)pX$JCe0dp`VkTe(9npp)FVWaC|)c6_nU=JQg2lH_T705j5V0jg0QEb6=*o~TZ
zqrx!@(74CIR(yeqcnLGmf@Xg3Vm20_P8z}{JcupWi&t?9x8c6Z<T_ob0Q*q$`Y{(@
zqcReA+<`CHz`$?ZfuSn1P1uI%cnw+G25}9JVkW*q1^gbLVH}m(+acD#VZL<IH>eF~
z(SzSH6`fx+vS=i*7yqGB)Jp;NU<?(&eGK3TYW@e;SyZMLFb$VnS5VKVQV0EB>>9+g
z^ux)%V=)@4`H<^l)a9B$-HkY2#=ocyI%|`5p*FaJI>{iaL^qMWZ5WlQx2TMKcAZ0&
za1m3vf0nb+jC*JKsFXIM7H&p8*owLX?WhGiQS<w-4)3Dgj(4bl=TL7=8uin75H)`<
z4qzK<y>FPo{+6JTj?3u7RlIu&Bny@5V$|)gLEYwN%)pDN%hZDk>^gFNYzSG(CeefQ
zt_jq^{-8?i-%S0rP>{wR3}Zc>L!IOndT|`}x=o@=@DU3!jtY1Ywb6>}YSQAT??siS
z0C!?3YU5+5b<Wq3e@(c=03Yk-OD7q2`(vnyUr~4DC+dG<85MXo(Q1AnDu7zd#(K=e
zy{LJIPzN}Qdj2#9u&4e=vQ~H8iQ}kRJx47ti^{}2Zbu*azkmm@3ZJ0<SZ1&qy^+y}
lzM{OCx2)8^D-dmHibTVaXe1JQP_{e8ViTc~(T?&&?tkYImnZ-L

delta 1698
zcmXZcU1$_n6u|LYVoaQ9VrrujO?sn=CZ@B_tkJ}YTfdT(#YjR7lE+T6<1%G;#?DTH
z0c9(cmX=bGv>-wd^~FlTfP$1#(Uw9U3hje!(I=ty3ratvrQk#8|77PO{O&!uALpKX
zXBS_4IJKCst-SMsQV-gc+O3qzy{wdlbJ&YFaSMKrt@teIuhU8~MfITk{}^t?Y21l#
z;tsrlYw#OfjgJzaph5o^ttzUW#xnvNu(?C2ChSVwi!ah2#?3gH_(l?c4{M1p;3>S0
zFX3~PM4Gl$57v)q`UPyk%P8X(w^fwVG`=FR2Y*J%xOKZy_1KAP(Zoh{P)?dd2T$Ws
zyo%@WC)|ruoz-<Np(J<>W!w#H#@|sYvRp|5wOvZt1U6wm=5QBYz&iW{$xYqC_4ore
z;IAkN|AY5%8KtzJQ-7Lj3FV}Jplnz}S!&V1RajY1V;zkaJdfK^N^})v;$5u6uTkSe
zl=1&2)^t}Z)r_)1Yhnk={O;ucnZzs>h>uqL6?K<}-1+^)Z&4oC6O^~HjAd-=scvvF
z@e;}gS5QuJ2jz-BMGmW$P%8B&N=2lcVgt$*Zp2l*KedMj4_ghOlynkh;XE2Rhw=vA
zLRs)4%J^$&;uk1i$6qK3H}L7mSFsBvo<$k&;@fxuWxe`W_+x+7LZc4b(ZC(pfHq30
zGbpeBILc?5$9nt_<uNUwBz6mVf9gJxi+YN3*G*(8wxAqr3(6H+SdoRYG!Eb>rtp1~
zlYEA2@G;6~_!Q-i|HDnVjFRw1CdmdJi92yEeG}zs92~%dC>x(eS?7Zk^_Kx35nwHK
z8RaBPN&itYu#RKP8)-!OooGi%JdHAb5G8>TY{YSt3c4ucN+<`IMVbFDYFyYoR=ulx
z$-u`bcl9I60yS2(5>2>|ehNeMuoJ&S`C)mE^5{(a_Dy5+hHMnR?oG#LE^nUlqOu<b
zjy@j7v9GPv{!}{e%^Kt0nJ|jY6Xk-RH;>E|%H~Aq=;0HGb0dci4-JhEpFC;IKWN)p
z>DOu7>9cyRv}GA%qvp6b>&uGfkQ;lBPFr@LY1yW|U)#20_w`yf<3`+aY)(XOP%gT0
z7&&^<o%QuZ7zJN`tPh-}Lp1OX6-usOOihQSSD6wNX54~jPIzv~(SEE~LaQa_==tB;
z2EC(U5PLzg@M$kHhlA-b?*|1(4@~*7F;<+3+@hHcqf*(?!I_nAIg=jL)n=wU&>b0V
j_ZY{#z>CPAqt7||h&$yKS4y+bQ1iFCT5lh0|GW8rz)$Z*

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index 9187bfe22..98f4a2a4a 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Benvenuto in Kotti"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Congratulazioni! Avete installato Kotti con successo."
 
+#: kotti/populate.py:66
 #, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -69,41 +74,32 @@ msgstr ""
 "<h2>Accedi</h2>\n"
 "<p>\n"
 "    <a class=\"btn btn-success\" href=\"login\">Accedi</a> al sito \n"
-"    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una "
-"password per\n"
-"    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</"
-"em>.\n"
+"    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una password per\n"
+"    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
-"    Quando sarai autenticato, vedrai la barra di editor grigia sotto la barra "
-"di navigazione in alto.\n"
-"    Questa barra ti permetterà di passare dalla modifica alla visualizzazione "
-"della pagina corrente    così come apparirà a tuoi visitatori.\n"
+"    Quando sarai autenticato, vedrai la barra di editor grigia sotto la barra di navigazione in alto.\n"
+"    Questa barra ti permetterà di passare dalla modifica alla visualizzazione della pagina corrente    così come apparirà a tuoi visitatori.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Configura</h2>\n"
 "        <p>\n"
-"            Scopri come configurare il titolo del tuo Kotti e molte altre "
-"impostazion            utilizzando un semplice file di testo sul vostro "
-"sistema.\n"
+"            Scopri come configurare il titolo del tuo Kotti e molte altre impostazion            utilizzando un semplice file di testo sul vostro sistema.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration."
-"html\">               Manuale di configurazione\n"
+"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
 "            </a>\n"
 "        </p>\n"
 "    </div>\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            Esistono molti add-ons che permettono di estendere le "
-"funzionalità del tuo sito Kotti        </p>\n"
+"            Esistono molti add-ons che permettono di estendere le funzionalità del tuo sito Kotti        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Add-ons di Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -111,8 +107,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Documentazione</h2>\n"
 "        <p>\n"
-"            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  "
-"Leggi il manuale per maggiori informazioni        </p>\n"
+"            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
 "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
@@ -122,163 +117,20 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
-msgstr ""
-"\n"
-"<h2>Accedi</h2>\n"
-"<p>\n"
-"    <a class=\"btn btn-success\" href=\"login\">Accedi</a> al sito \n"
-"    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una "
-"password per\n"
-"    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</"
-"em>.\n"
-"</p>\n"
-"<p>\n"
-"    Quando sarai autenticato, vedrai la barra di editor grigia sotto la barra "
-"di navigazione in alto.\n"
-"    Questa barra ti permetterà di passare dalla modifica alla visualizzazione "
-"della pagina corrente    così come apparirà a tuoi visitatori.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configura</h2>\n"
-"        <p>\n"
-"            Scopri come configurare il titolo del tuo Kotti e molte altre "
-"impostazion            utilizzando un semplice file di testo sul vostro "
-"sistema.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration."
-"html\">               Manuale di configurazione\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            Esistono molti add-ons che permettono di estendere le "
-"funzionalità del tuo sito Kotti        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Add-ons di Kotti\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentazione</h2>\n"
-"        <p>\n"
-"            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  "
-"Leggi il manuale per maggiori informazioni        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentazione\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
+msgstr "Chi siamo"
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
-msgstr ""
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "La nostra azienda è il leader nella produzione di foo widget, usati in una grande varietà di prodotti per l'aviazione e industriali."
 
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -296,8 +148,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -305,595 +156,871 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} è stato cancellato."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copia"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} non è più visibile nella navigazione."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Taglia"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} è ora visibile nella navigazione."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Incolla"
 
-#, python-format
-msgid "${title} was added."
-msgstr "${title} è stato aggiunto."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Rinomina"
 
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} è stato copiato."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Elimina"
 
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} è stato tagliato."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Documento"
 
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} è stato cancellato."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "File"
 
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} è stato spostato."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Immagine"
 
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} è stato incollato."
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Vista della cartella"
 
-msgid "A user with that email already exists."
-msgstr "Un utente con questa email già esiste."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Contenuti"
 
-msgid "A user with that name already exists."
-msgstr "Un utente con questo nome già esiste."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Modificare"
 
-msgid "About"
-msgstr "Chi siamo"
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Condividi"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Azioni"
 
-msgid "Active"
-msgstr "Attivo"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "Visualizzatore"
 
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "Proprietario"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "Admin"
+
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Aggiungere"
 
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Aggiungere ${type} a ${title}."
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Carica contenuto"
 
-#, python-format
-msgid "Add ${type}."
-msgstr "Aggiungere ${type}."
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Seleziona la vista predefinita"
 
-msgid "Add Group"
-msgstr "Aggiungi gruppo"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Vista"
 
-msgid "Add User"
-msgstr "Aggiungi utente"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigazione"
 
-msgid "Add group"
-msgstr "Aggiungi un gruppo"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Preferenze"
 
-msgid "Add new group"
-msgstr "Aggiungi un nuovo gruppo"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Configurazione del sito"
 
-msgid "Add new user"
-msgstr "Aggiungi un nuovo utente"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Esci"
 
-msgid "Add user"
-msgstr "Aggiungi un utente"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Resetta la tua password per ${site_title}."
 
-msgid "Admin"
-msgstr "Admin"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Ciao, ${user_title}!"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Lo stato del workflow di un item determina chi lo può vedere, editare e/o "
-"modificare."
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Segui il link per resettare la tua password a ${site_title}: ${url}"
 
-msgid "Apply changes"
-msgstr "Applica le modifiche"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "La tua registrazione per ${site_title}"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Sei sicuro di voler eliminare ${title}?"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Stai entrando in ${site_title}."
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Premi qui per impostare la tua password e accedere: ${url}"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Vietato"
 
-msgid "Assign global roles"
-msgstr "Assegna ruoli globali"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Accedi"
 
-msgid "Assign local roles"
-msgstr "Assegna ruoli locali"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Username o email"
 
-msgid "Back to User Management"
-msgstr "Torna alla gestione degli utenti"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "Password"
 
-msgid "Blank search text finds all."
-msgstr "Lascia il testo vuoto per trovare tutti gli utenti."
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Accedi"
 
-msgid "Body"
-msgstr "Contenuto"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Hai dimenticato la tua password?"
 
-msgid "Cancel"
-msgstr "Cancella"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Resetta password"
 
-msgid "Change State"
-msgstr "Cambia stato"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Inserisci il tuo username o email e premi ${reset_password} per ricevere una email con il link per resettare la tua password."
 
-msgid "Change state to"
-msgstr "Cambia stato a"
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "Non sei ancora registrato?"
 
-msgid "Change workflow state"
-msgstr "Cambia lo stato del workflow"
+#: kotti/templates/login.pt:83
+msgid "Register for an account on this site."
+msgstr "Registrati per avere un account su questo sito."
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Premi qui per impostare la tua password e accedere: ${url}"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "Rendi ${state}"
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Segui il link per resettare la tua password a ${site_title}: ${url}"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tags"
 
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per "
-"settare la tua password e attivare il tuo account."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Sei qua:"
 
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr "Congratulazioni! Avete installato Kotti con successo."
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Cambia lo stato del workflow"
 
-msgid "Contents"
-msgstr "Contenuti"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Lo stato del workflow di un item determina chi lo può vedere, editare e/o modificare."
 
-msgid "Copy"
-msgstr "Copia"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "Titolo"
 
-msgid "Could not paste node. It no longer exists."
-msgstr "Non si può incollare l'elemento. L'elemento non è più esistente."
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Tipo"
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "Stato"
 
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data di creazione"
 
-msgid "Cut"
-msgstr "Taglia"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Data di modifica"
 
-msgid "Default view"
-msgstr "Vista predefinita"
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr ""
 
-msgid "Default view could not be set."
-msgstr "La vista predefinita non può essere selezionata."
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Includere figli"
 
-msgid "Default view has been reset to default."
-msgstr "La vista predefinita è stata modificata a predefinita."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Se selezionato, verrà modificato lo stato dei figli dei documenti selezionati e i suoi sottodocumenti."
 
-msgid "Default view has been set."
-msgstr "E' stata selezionata la vista predefinita."
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Cambia stato a"
 
-msgid "Delete"
-msgstr "Elimina"
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Seleziona il nuovo stato per tutti gli elementi selezionati."
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Elimina ${principal_type} ${title}"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Nessuna modifica"
 
-msgid "Delete ${title}"
-msgstr "Elimina ${title}"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "Applica le modifiche"
 
-msgid "Description"
-msgstr "Descrizione"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Cancella"
 
-msgid "Dismiss all errors"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Non è presente nessun elemento di contenuto."
+
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
 
-msgid "Document"
-msgstr "Documento"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Visibilità"
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
-msgstr ""
-"Ogni contenuto ha un nome, che è usato per creare la url, e un titolo. Leggi "
-"il manuale utente per saperne di più sul formato del nome e del titolo. Si "
-"possono cambiare entrambi qui sotto."
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Visibile"
 
-msgid "Edit"
-msgstr "Modificare"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Nascosto"
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Modificare ${principal_type} ${title}"
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr " Modificare ${title}"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Elimina ${title}"
 
-msgid "Editor"
-msgstr "Editor"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Sei sicuro di voler eliminare ${title}?"
 
-msgid "Email"
-msgstr "Email"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigazione del Sito"
 
-msgid "File"
-msgstr "File"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Ogni contenuto ha un nome, che è usato per creare la url, e un titolo. Leggi il manuale utente per saperne di più sul formato del nome e del titolo. Si possono cambiare entrambi qui sotto."
 
-msgid "Filename"
-msgstr "Nome del file"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Nuovo nome"
 
-#. Canonical text for ${reset_password} is: "Reset password"
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Inserisci il tuo username o email e premi ${reset_password} per ricevere una "
-"email con il link per resettare la tua password."
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Nuovo titolo"
 
-msgid "Find users or groups"
-msgstr "Cerca utenti o gruppi"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Rinomina ${title}"
 
-msgid "Folder view"
-msgstr "Vista della cartella"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Condividi ${title}"
 
-msgid "Forbidden"
-msgstr "Vietato"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "Cerca utenti e gruppi"
 
-msgid "Forgot your password?"
-msgstr "Hai dimenticato la tua password?"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "Cerca"
 
-msgid "Full name"
-msgstr "Nome completo"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Assegna ruoli locali"
 
-msgid "Global roles"
-msgstr "Ruoli globali"
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "Nome"
 
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "Utente"
 
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
 msgid "Group"
 msgstr "Gruppo"
 
-msgid "Groups"
-msgstr "Gruppi"
-
-msgid "Hello, ${user_title}!"
-msgstr "Ciao, ${user_title}!"
-
-msgid "Hidden"
-msgstr "Nascosto"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr "Gravatar"
 
-msgid "Hide"
-msgstr "Nascondi"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#, fuzzy
+msgid "Assign role"
+msgstr "Assegna ruoli locali"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Se selezionato, verrà modificato lo stato dei figli dei documenti selezionati "
-"e i suoi sottodocumenti."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Carica un contenuto da uno o più file locali"
 
-msgid "Image"
-msgstr "Immagine"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+msgid "Filename"
+msgstr "Nome del file"
 
-msgid "Include children"
-msgstr "Includere figli"
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
+msgstr "Dimensione"
 
-msgid "Invalid value"
-msgstr "Valore invalido"
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Stato"
 
-msgid "Item was added."
-msgstr "L'elemento è stato aggiunto."
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Avanzamento"
 
-msgid "Item was renamed."
-msgstr "L'elemento è stato rinominato"
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr ""
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
 msgstr ""
-"Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' "
-"per mandare all'utente la sua password."
 
-msgid "Log in"
-msgstr "Accedi"
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr ""
 
-msgid "Login"
-msgstr "Accedi"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
 
-msgid "Login failed."
-msgstr "Errore nell'accesso."
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
 
-msgid "Logout"
-msgstr "Esci"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
 
-msgid "Make ${state}"
-msgstr "Rendi ${state}"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Torna alla gestione degli utenti"
 
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Dimensione massima del file: ${size}MB"
-
-msgid "Modification Date"
-msgstr "Data di modifica"
+msgid "Edit ${title}"
+msgstr " Modificare ${title}"
 
-msgid "Move down"
-msgstr "Muovi giù"
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "Cerca utente(i) / gruppo(i)"
 
-msgid "Move up"
-msgstr "Muovere su"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Aggiungi un utente"
 
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Le mie preferenze - ${title}"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Aggiungi un gruppo"
 
-msgid "Name"
-msgstr "Nome"
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Cerca utenti o gruppi"
 
-msgid "Name and title are required."
-msgstr "Nome e titolo sono obbligatori."
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
 
-msgid "Navigate"
-msgstr "Navigazione"
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Lascia il testo vuoto per trovare tutti gli utenti."
 
-msgid "Navigate Site"
-msgstr "Navigazione del Sito"
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Assegna ruoli globali"
 
-msgid "New name"
-msgstr "Nuovo nome"
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Aggiungi un nuovo utente"
 
-msgid "New title"
-msgstr "Nuovo titolo"
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Aggiungi un nuovo gruppo"
 
-msgid "No change"
-msgstr "Nessuna modifica"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Risultati di ricerca"
 
-msgid "No changes were made."
-msgstr "Non sono state fatte modifiche."
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Cerca..."
 
-msgid "No content items are contained here."
-msgstr "Non è presente nessun elemento di contenuto."
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Taggati con:"
 
-msgid "No name was given."
-msgstr "Non è stato dato un nome."
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Benvenuto, ${user}! Sei loggato."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Benvenuto, non sei loggato."
 
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Le tue modifiche sono state salvate."
+
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "L'elemento è stato aggiunto."
+
+#: kotti/views/form.py:264
 #, python-format
-msgid "No such group: ${group}"
-msgstr "Gruppo non esistente: ${group}"
+msgid "Maximum file size: ${size}MB"
+msgstr "Dimensione massima del file: ${size}MB"
 
-msgid "No users or groups were found."
-msgstr "Utenti o gruppo non trovati"
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Salva"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Aggiungere ${type} a ${title}."
 
-msgid "Not registered yet?"
-msgstr "Non sei ancora registrato?"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "Aggiungere ${type}."
 
-msgid "Nothing was deleted."
-msgstr "Non è stato cancellato niente."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Hai resettato la tua password."
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
-"La nostra azienda è il leader nella produzione di foo widget, usati in una "
-"grande varietà di prodotti per l'aviazione e industriali."
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Benvenuto, ${user}!"
 
-msgid "Owner"
-msgstr "Proprietario"
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
 
-msgid "Password"
-msgstr "Password"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Sei uscito."
 
-msgid "Paste"
-msgstr "Incolla"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Nome completo"
 
-msgid "Preferences"
-msgstr "Preferenze"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Username"
 
-msgid "Progress"
-msgstr "Avanzamento"
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr "Email"
 
-msgid "Register"
-msgstr "Registrazione"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per settare la tua password e attivare il tuo account."
 
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrazione - ${title}"
 
-msgid "Register for an account on this site."
-msgstr "Registrati per avere un account su questo sito."
-
-msgid "Rename"
-msgstr "Rinomina"
-
-msgid "Rename ${title}"
-msgstr "Rinomina ${title}"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "Resetta password"
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Errore nell'accesso."
 
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetta la tua password - ${title}."
 
-msgid "Reset your password for ${site_title}."
-msgstr "Resetta la tua password per ${site_title}."
-
-msgid "Save"
-msgstr "Salva"
-
-msgid "Search"
-msgstr "Cerca"
-
-msgid "Search Results"
-msgstr "Risultati di ricerca"
-
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "Cerca utente(i) / gruppo(i)"
-
-msgid "Search users and groups"
-msgstr "Cerca utenti e gruppi"
-
-msgid "Search..."
-msgstr "Cerca..."
-
-msgid "Select file(s) to upload..."
-msgstr ""
-
-msgid "Select the new state where all chosen items should be set."
-msgstr "Seleziona il nuovo stato per tutti gli elementi selezionati."
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Questo username o email non è riconosciuto dal sistema."
 
-msgid "Send password registration link."
-msgstr "Invia il link della password di registrazione."
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registrazione"
 
-msgid "Set default view"
-msgstr "Seleziona la vista predefinita"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "C'è stato un errore."
 
+#: kotti/views/login.py:295
 #, fuzzy
 msgid "Set password"
 msgstr "Resetta password"
 
-msgid "Share"
-msgstr "Condividi"
-
-msgid "Share ${title}"
-msgstr "Condividi ${title}"
-
-msgid "Show"
-msgstr "Mostra"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Il token per resettare la tua password è scaduto."
 
-msgid "Site Setup"
-msgstr "Configurazione del sito"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gestione utenti"
 
-msgid "Size"
-msgstr "Dimensione"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
 
-msgid "State"
-msgstr "Stato"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Le mie preferenze - ${title}"
 
-msgid "Status"
-msgstr "Stato"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Valore invalido"
 
-msgid "Submit"
-msgstr "Invia"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Un utente con questo nome già esiste."
 
-msgid "Tagged with:"
-msgstr "Taggati con:"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Un utente con questa email già esiste."
 
-msgid "Tags"
-msgstr "Tags"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Gruppo non esistente: ${group}"
 
-msgid "That username or email is not known by this system."
-msgstr "Questo username o email non è riconosciuto dal sistema."
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Attivo"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Deseleziona questo per disattivare l'account."
 
-msgid "There was an error."
-msgstr "C'è stato un errore."
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Ruoli globali"
 
-msgid "Title"
-msgstr "Titolo"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Gruppi"
 
-msgid "Type"
-msgstr "Tipo"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Aggiungi utente"
 
-msgid "Untick this to deactivate the account."
-msgstr "Deseleziona questo per disattivare l'account."
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} è stato aggiunto."
 
-msgid "Upload ${number} files."
-msgstr ""
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Aggiungi gruppo"
 
-msgid "Upload Content"
-msgstr "Carica contenuto"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "Non sono state fatte modifiche."
 
-msgid "Upload content from local file(s)"
-msgstr "Carica un contenuto da uno o più file locali"
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "Non è stato dato un nome."
 
-msgid "User"
-msgstr "Utente"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "Utenti o gruppo non trovati"
 
-msgid "User Management"
-msgstr "Gestione utenti"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Modificare ${principal_type} ${title}"
 
+#: kotti/views/users.py:533
 msgid "User was not found."
 msgstr "Utente non trovato."
 
-msgid "User- / groupname"
-msgstr ""
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "Invia il link della password di registrazione."
 
-msgid "Username"
-msgstr "Username"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} è stato cancellato."
 
-msgid "Username or email"
-msgstr "Username o email"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Elimina ${principal_type} ${title}"
 
-msgid "View"
-msgstr "Vista"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} è stato copiato."
 
-msgid "Viewer"
-msgstr "Visualizzatore"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} è stato tagliato."
 
-msgid "Visibility"
-msgstr "Visibilità"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} è stato spostato."
 
-msgid "Visible"
-msgstr "Visibile"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} è stato incollato."
 
-msgid "Welcome to Kotti"
-msgstr "Benvenuto in Kotti"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "Non si può incollare l'elemento. L'elemento non è più esistente."
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Benvenuto, ${user}!"
+msgid "${title} is now visible in the navigation."
+msgstr "${title} è ora visibile nella navigazione."
 
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Benvenuto, ${user}! Sei loggato."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} non è più visibile nella navigazione."
 
-msgid "Welcome, you are not logged in."
-msgstr "Benvenuto, non sei loggato."
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} è stato cancellato."
 
-msgid "You are here:"
-msgstr "Sei qua:"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "Non è stato cancellato niente."
 
-msgid "You are joining ${site_title}."
-msgstr "Stai entrando in ${site_title}."
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Nome e titolo sono obbligatori."
 
-msgid "You have been logged out."
-msgstr "Sei uscito."
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "L'elemento è stato rinominato"
 
-msgid "You have reset your password."
-msgstr "Hai resettato la tua password."
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "Muovere su"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "Muovi giù"
+
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Mostra"
 
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Nascondi"
+
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Devi selezionare degli elementi per fare quest'azione."
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"Dovresti ricevere una email con un link per resettare la tua password. "
-"Clikkandolo si attiverà il tuo account."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Cambia stato"
 
-msgid "Your changes have been saved."
-msgstr "Le tue modifiche sono state salvate."
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Descrizione"
 
-msgid "Your password reset token may have expired."
-msgstr "Il token per resettare la tua password è scaduto."
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Contenuto"
 
-msgid "Your registration for ${site_title}"
-msgstr "La tua registrazione per ${site_title}"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "La vista predefinita è stata modificata a predefinita."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Vista predefinita"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "E' stata selezionata la vista predefinita."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "La vista predefinita non può essere selezionata."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<h2>Log in</h2>\n"
+#~ "<p>\n"
+#~ "    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
+#~ "    and start changing its contents.  If you haven't chosen a password for\n"
+#~ "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    Once you're logged in, you'll see the grey editor bar below the top\n"
+#~ "    navigation bar.  It will allow you to switch between editing and viewing the\n"
+#~ "    current page as it will appear to your visitors.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Configure</h2>\n"
+#~ "        <p>\n"
+#~ "            Find out how to configure your Kotti's title and many other settings using a\n"
+#~ "            simple text file in your file system.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               Configuration manual\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Add-ons</h2>\n"
+#~ "        <p>\n"
+#~ "            A number of add-ons allow you to extend the functionality of your Kotti site.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Kotti add-ons\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Documentation</h2>\n"
+#~ "        <p>\n"
+#~ "            Wonder what more you can do with Kotti?  What license it has?  Read the\n"
+#~ "            manual for more information.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               Documentation\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<h2>Accedi</h2>\n"
+#~ "<p>\n"
+#~ "    <a class=\"btn btn-success\" href=\"login\">Accedi</a> al sito \n"
+#~ "    e inizia a modificare i suoi contenuti.  Se non hai ancora scelto una password per\n"
+#~ "    il tuo utente amministratore, allora sarà probabilemente <em>qwerty</em>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    Quando sarai autenticato, vedrai la barra di editor grigia sotto la barra di navigazione in alto.\n"
+#~ "    Questa barra ti permetterà di passare dalla modifica alla visualizzazione della pagina corrente    così come apparirà a tuoi visitatori.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Configura</h2>\n"
+#~ "        <p>\n"
+#~ "            Scopri come configurare il titolo del tuo Kotti e molte altre impostazion            utilizzando un semplice file di testo sul vostro sistema.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Add-ons</h2>\n"
+#~ "        <p>\n"
+#~ "            Esistono molti add-ons che permettono di estendere le funzionalità del tuo sito Kotti        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Add-ons di Kotti\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Documentazione</h2>\n"
+#~ "        <p>\n"
+#~ "            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               Documentazione\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+
+#~ msgid "Submit"
+#~ msgstr "Invia"
 
 #~ msgid "Private"
 #~ msgstr "Privato"
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index 75d8f15a2f800fb01bb05ed76a5b515049fec77b..9d47d0caff761e147e5f857d81f212d3f4a80901 100644
GIT binary patch
delta 1291
zcmXZbOGwmF6vy!+iDVRJn2BSlrJ0Rm{~0w>>A{#K6l&Q^aX<-+UTSH%C>bI!2m;AP
z6c&VJi=v`|B%@pv)y^U)lAuK`Dtb_mxUuh#|ApcIx#!-w_ndp?KX=>y#O_Ze$M>7r
zo@}!+9LHMxf%RA(Fw4htSb#U3uiX4kXL^pmUWVGY4=eE&rr{?{!QaklEFzxGvAB`T
zik6x!!YD4r-OeM<vzW^KWgNsCsDmTR%!)CJVLXcEcpX*n8>B{?Mir2e>+cIVgSl}(
zaWxa#P>;v42Yc`{Dq(Y;zws-okQv;D$+SmtBhJSb)CCTrI?#_%977LhP=y4S`}rbq
z23bt(MJ;rrI?;zO@PeCfTH$YKL9NG8i7%lN4x<Wq;Nl77()JeVw*5tQES*~_Up~&o
zcohR}tZ_D?HpWm1&Y%(w;BCBuDzvuHe>b+H_IJAYG%CS09L0xjJ+{*S-eKej>q82P
z+b{zqxPyFbf`<}+ar3{Nb9iHxFrSGjSc-ayDtPE-G3PO7KdLhqT|9!Ti4$0hA2C3F
zD_F&0Ol-o9*oFK|b`Mp^Br3rN)J?yk3Yd1zVmfh3vA>>$>Odi?lN*qa#dxg2^Qiq}
zlKl3RfewC#YRzj*#ecXKlPH^FZ5`@HZKwlIp*q*^97Gj5;?@(GNj&c2Nz_aG4t2qT
zApKY3Eev#E6Y2{ssDnpQ>yKRg9Q78zM<tq9Viv+|)c!hD;SD$+n_YYWRd_e*?>T@v
z=W&T`wFL~mGZDoZRLj<Ls&3wjbvT44aSGL;o%~)qun%dHy(~>!O?|Sks9{&A=0rz(
w@1d^F(B}5uj;g$f7p@3}y^vR#7YSE+k)RjxyrI@Wb&?HDq-Q76a&j~N1MVk}%>V!Z

delta 1619
zcmZwGU1%It6u|LYsI^&A?T5CuiE&y@t4(G*yPIv@X_~f)F%5~PtuarQc9KkniMum#
zX126QyNVB@#S+|x1_hx7>qnqy3K~R(3PM5jL4+!lqJ0qr3sx)GC;umNAAAtP{_eSR
z?>*<9%=~%i;*pQ8Ev>z?M5&PtN)?n+x0{se#mAbJdKyFAh+pC(__Ow|2h;hj+Ch}(
z0m{BQmhcANi_I-cEyH$g0k;s_Evlx-twxzxjVJJaoYr2@evS>ye~;664dvj<LllcA
zFo*A92mXXo&^?Ay+({Ks3K&A!H=>;|YH8x5Ovr}U@CCexF&bQ75}rZX*t#h#q=*B=
zyLEgD8;NI7E^r>D0}I%Vx6s1k!)YNCDETTi1`jZJQ$LtP>BKx<!LRlFX;#aI8GhvX
zXDA){7A4_TlmdR&@g1Z|YGo_!$89JV7(~hU94^ONm4R$LsXc|VaTX=Przi<8;~f5g
z(#n@Mr|-b4DEmLq@h2z=e#8s-2g>tV{^8=gNNs8!DX6BdGLQtnB5Tzhl*Ah!P3POR
zUAT_<1Go%*WT~1$x!J7teeD8DXRhe@I&LMtiM_a<7pIB*>M(;W6EEU!{1D}>{|y_k
zkzJBtEy@ixqZClk+PI2%uYUdvN(YXhbn-ZIl$ynD_!Y|jTO#?@KMdqx)t0tq1xn&P
zZpTiPo5m<NdK=|{k5M|ep#27=(Chm7O<YTSTgQ#<=}Wr?<${N?CW&8WAP1ht0h~cO
z_!n%%zjVCBOyA=BP!jbbf9hF&WdAEDg};un?~IPmp%gxc@_AlH`5OK<Ri9eHU<>`1
z&!mXbvSTPWKa2bDJFMb5`X?{X8+ZWcQChpyy7X4V7b|N~IO&chX8*W3;zqF_2DUK}
zCW&uY*&SIcbI_d%qr`kF_WW_PyXwW}aA+IP%Zfc-7<y&bi^A$uoE-}*nf*h<W>4fg
z3CEaEIEiZ;c`H{mbCzlCF!DLO!)mkgmc>HzpnKFOUF|;$3#L^vb0x#d+a1L=tHi=V
zCr-@a$O+=IlZ26N4E5~m-`n4A^o7+)-{|xv!>oHO+2d6lzbrL$u_f@Tj^~=gu2Zp%
zNyq5?|8f_X-o3ciHtHug>^#&H28kQ!gcELL_6B3&xF2}7@%X5pWcHV<kyAFG45LbH
z8^P3K81KsMG}7TNE7Ru&Zp6)L)^XeDc1GPYoh)UyXX?34t@Y`a<@JW<)%C8X^_NyP
H-B|N4Zo>a=

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 1785694be..66199322d 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr ""
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr ""
 
+#: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -66,107 +71,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
 msgstr ""
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -184,8 +102,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -193,604 +110,777 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} を削除しました。"
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "コピー"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} がナビゲーションでは非表示になりました。"
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "切り取り"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} がナビゲーションに表示されるようになりました。"
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "貼り付け"
 
-#, python-format
-msgid "${title} was added."
-msgstr "${title} を追加しました。"
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "名称変更"
 
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} をコピーしました。"
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "削除"
 
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} を切り取りました。"
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "ドキュメント"
 
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} を削除しました。"
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "ファイル"
 
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} を移動しました。"
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "画像"
 
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} を貼り付けました。"
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "フォルダー表示"
 
-msgid "A user with that email already exists."
-msgstr "そのメールアドレスをもつユーザーがすでに存在します。"
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "コンテンツ"
 
-msgid "A user with that name already exists."
-msgstr "同じ名称のユーザーがすでに存在します。"
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "編集"
 
-msgid "About"
-msgstr ""
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "共有"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "アクション"
 
-msgid "Active"
-msgstr "有効"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "閲覧者"
+
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "編集者"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "所有者"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "管理者"
 
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "追加"
 
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "${title} に ${type} を追加する。"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "アップロード"
 
-#, python-format
-msgid "Add ${type}."
-msgstr "${type} を追加する。"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "表示方法の設定"
 
-msgid "Add Group"
-msgstr "グループ追加"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "表示"
 
-msgid "Add User"
-msgstr "ユーザーを追加"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "ナビゲート"
 
-msgid "Add group"
-msgstr "グループを追加"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "設定"
 
-#, fuzzy
-msgid "Add new group"
-msgstr "グループを追加"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "サイト設定"
 
-#, fuzzy
-msgid "Add new user"
-msgstr "ユーザーを追加"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "ログアウト"
 
-msgid "Add user"
-msgstr "ユーザーを追加"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "${site_title} のパスワードをリセット"
 
-msgid "Admin"
-msgstr "管理者"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "こんにちは ${user_title}!"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフローの"
-"状態を変更します。"
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "${site_title} のパスワードをリセットするにはこのリンクをクリックしてください: ${url}"
 
-msgid "Apply changes"
-msgstr "変更を適用"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "${site_title} へのアカウント登録"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "本当に ${title} を削除しますか?"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "あなたは ${site_title} に参加しようとしています。"
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "本当に ${type} ${title} を削除しますか?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "パスワードをセットしてログインするにはこのリンクをクリックしてください: ${url}"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "本当に以下のアイテムを削除しますか?"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "表示権限がありません"
 
-#, fuzzy
-msgid "Assign global roles"
-msgstr "ローカルロールに割り当て"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "ログイン"
 
-msgid "Assign local roles"
-msgstr "ローカルロールに割り当て"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "ユーザー名またはメールアドレス"
 
-msgid "Back to User Management"
-msgstr "ユーザー管理に戻る"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "パスワード"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "ログイン"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "パスワードを忘れた?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "パスワードをリセット"
 
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
 #, fuzzy
-msgid "Blank search text finds all."
-msgstr "ユーザーを検索して変更する (空文字列での検索で全部表示) 。"
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} をクリックしてください。パスワードをリセットするためのリンクが書かれたメールが送信されます。"
 
-msgid "Body"
-msgstr "本文"
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr ""
 
-msgid "Cancel"
-msgstr "キャンセル"
+#: kotti/templates/login.pt:83
+#, fuzzy
+msgid "Register for an account on this site."
+msgstr "まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
 
-msgid "Change State"
-msgstr "状態を変更"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "${state} にする"
 
-msgid "Change state to"
-msgstr "変更後の状態"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "タグ"
 
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "今の場所:"
+
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "ワークフローの状態を変更"
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"パスワードをセットしてログインするにはこのリンクをクリックしてください: ${url}"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフローの状態を変更します。"
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"${site_title} のパスワードをリセットするにはこのリンクをクリックしてください: "
-"${url}"
-
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワー"
-"ドを設定して下さい。"
-
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr ""
-
-msgid "Contents"
-msgstr "コンテンツ"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "タイトル"
 
-msgid "Copy"
-msgstr "コピー"
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "種類"
 
-msgid "Could not paste node. It no longer exists."
-msgstr "ノードを張り付けできません。何も存在していません。"
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "状態"
 
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "作成日"
 
-msgid "Cut"
-msgstr "切り取り"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "変更日"
 
-msgid "Default view"
-msgstr "デフォルト表示"
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr ""
 
-msgid "Default view could not be set."
-msgstr "デフォルト表示は設定できませんでした。"
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "配下のアイテムを含める"
 
-msgid "Default view has been reset to default."
-msgstr "デフォルト表示は既定値にリセットされました。"
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "チェックすると、状態の変更が選択したドキュメントや、その配下のドキュメントのすべての配下のアイテムに適用されます。"
 
-msgid "Default view has been set."
-msgstr "デフォルト表示が設定されました。"
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "変更後の状態"
 
-msgid "Delete"
-msgstr "削除"
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "新しく設定する状態を選択して下さい。"
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "${principal_type} ${title} を削除"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "変更しない"
 
-msgid "Delete ${title}"
-msgstr "${title} を削除する"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "変更を適用"
 
-msgid "Description"
-msgstr "説明"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "キャンセル"
 
-msgid "Dismiss all errors"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "ここにはコンテンツアイテムが含まれていません。"
+
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
 
-msgid "Document"
-msgstr "ドキュメント"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "表示状態"
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
-msgstr ""
-"それぞれのコンテンツには名称とタイトルがあり、名称は URL を生成するのに使用し"
-"ます。下のフォームでは、その両方を変更することができます。"
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "表示中"
 
-msgid "Edit"
-msgstr "編集"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "非表示"
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "${principal_type} ${title} を編集"
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "本当に以下のアイテムを削除しますか?"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr "${title} を編集"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "${title} を削除する"
 
-msgid "Editor"
-msgstr "編集者"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "本当に ${title} を削除しますか?"
 
-msgid "Email"
-msgstr "メールアドレス"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "ナビゲート"
 
-msgid "File"
-msgstr "ファイル"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "それぞれのコンテンツには名称とタイトルがあり、名称は URL を生成するのに使用します。下のフォームでは、その両方を変更することができます。"
 
-#, fuzzy
-msgid "Filename"
-msgstr "名称変更"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "新しい名称"
 
-#. Canonical text for ${reset_password} is: "Reset password"
-#, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} を"
-"クリックしてください。パスワードをリセットするためのリンクが書かれたメールが送"
-"信されます。"
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "新しいタイトル"
 
-#, fuzzy
-msgid "Find users or groups"
-msgstr "ユーザーとグループを検索"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "${title} の名称変更"
 
-msgid "Folder view"
-msgstr "フォルダー表示"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "${title} を共有"
 
-msgid "Forbidden"
-msgstr "表示権限がありません"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "ユーザーとグループを検索"
 
-msgid "Forgot your password?"
-msgstr "パスワードを忘れた?"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "検索"
 
-msgid "Full name"
-msgstr "フルネーム"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "ローカルロールに割り当て"
 
-msgid "Global roles"
-msgstr "グローバルロール"
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "名称"
 
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "ユーザー"
 
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
 msgid "Group"
 msgstr "グループ"
 
-msgid "Groups"
-msgstr "グループ"
-
-msgid "Hello, ${user_title}!"
-msgstr "こんにちは ${user_title}!"
-
-msgid "Hidden"
-msgstr "非表示"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr "Gravatar"
 
-msgid "Hide"
-msgstr "非表示にする"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#, fuzzy
+msgid "Assign role"
+msgstr "ローカルロールに割り当て"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
 msgstr ""
-"チェックすると、状態の変更が選択したドキュメントや、その配下のドキュメントのす"
-"べての配下のアイテムに適用されます。"
 
-msgid "Image"
-msgstr "画像"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#, fuzzy
+msgid "Filename"
+msgstr "名称変更"
 
-msgid "Include children"
-msgstr "配下のアイテムを含める"
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
+msgstr ""
 
-msgid "Invalid value"
-msgstr "無効な値"
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr ""
 
-msgid "Item was added."
-msgstr "${title} を追加しました。"
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr ""
 
-msgid "Item was renamed."
-msgstr "名称変更しました"
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr ""
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
 msgstr ""
-"この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自"
-"身にパスワードを設定させられます。"
 
-msgid "Log in"
-msgstr "ログイン"
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr ""
 
-msgid "Login"
-msgstr "ログイン"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
 
-msgid "Login failed."
-msgstr "ログインに失敗しました。"
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
 
-msgid "Logout"
-msgstr "ログアウト"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "本当に ${type} ${title} を削除しますか?"
 
-msgid "Make ${state}"
-msgstr "${state} にする"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "ユーザー管理に戻る"
 
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "最大ファイルサイズ: ${size}MB"
+msgid "Edit ${title}"
+msgstr "${title} を編集"
 
-msgid "Modification Date"
-msgstr "変更日"
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "ユーザーとグループを検索"
 
-msgid "Move down"
-msgstr "下に移動する"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "ユーザーを追加"
 
-msgid "Move up"
-msgstr "上に移動する"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "グループを追加"
 
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "個人設定 - ${title}"
+#: kotti/templates/site-setup/users.pt:34
+#, fuzzy
+msgid "Find users or groups"
+msgstr "ユーザーとグループを検索"
 
-msgid "Name"
-msgstr "名称"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
 
-msgid "Name and title are required."
-msgstr "名称とタイトルは必須です。"
+#: kotti/templates/site-setup/users.pt:49
+#, fuzzy
+msgid "Blank search text finds all."
+msgstr "ユーザーを検索して変更する (空文字列での検索で全部表示) 。"
 
-msgid "Navigate"
-msgstr "ナビゲート"
+#: kotti/templates/site-setup/users.pt:63
+#, fuzzy
+msgid "Assign global roles"
+msgstr "ローカルロールに割り当て"
 
-msgid "Navigate Site"
-msgstr "ナビゲート"
+#: kotti/templates/site-setup/users.pt:115
+#, fuzzy
+msgid "Add new user"
+msgstr "ユーザーを追加"
 
-msgid "New name"
-msgstr "新しい名称"
+#: kotti/templates/site-setup/users.pt:121
+#, fuzzy
+msgid "Add new group"
+msgstr "グループを追加"
 
-msgid "New title"
-msgstr "新しいタイトル"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "検索結果"
 
-msgid "No change"
-msgstr "変更しない"
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "検索..."
 
-msgid "No changes were made."
-msgstr "変更箇所がありませんでした。"
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "付与されたタグ:"
 
-msgid "No content items are contained here."
-msgstr "ここにはコンテンツアイテムが含まれていません。"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "ようこそ ${user}! ログインしています。"
 
-msgid "No name was given."
-msgstr "名前がありません。"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "ようこそ。ログインしていません。"
 
-#, python-format
-msgid "No such group: ${group}"
-msgstr "グループが見つかりません: ${group}"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "変更内容を保存しました。"
 
-msgid "No users or groups were found."
-msgstr "ユーザーもグループも見つかりませんでした。"
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "${title} を追加しました。"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "最大ファイルサイズ: ${size}MB"
 
-msgid "Not registered yet?"
-msgstr ""
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "保存"
 
-msgid "Nothing was deleted."
-msgstr "削除対象がありません。"
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "${title} に ${type} を追加する。"
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "${type} を追加する。"
 
-msgid "Owner"
-msgstr "所有者"
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "パスワードのリセットに成功しました。"
 
-msgid "Password"
-msgstr "パスワード"
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "ようこそ ${user}!"
 
-msgid "Paste"
-msgstr "貼り付け"
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
 
-msgid "Preferences"
-msgstr "設定"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "ログアウトしました。"
 
-msgid "Progress"
-msgstr ""
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "フルネーム"
 
-msgid "Register"
-msgstr "登録"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "ユーザー名"
 
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr "メールアドレス"
+
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワードを設定して下さい。"
+
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "登録 - ${title}"
 
-#, fuzzy
-msgid "Register for an account on this site."
-msgstr ""
-"まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
-
-msgid "Rename"
-msgstr "名称変更"
-
-msgid "Rename ${title}"
-msgstr "${title} の名称変更"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "パスワードをリセット"
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "ログインに失敗しました。"
 
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "パスワードのリセット - ${title}"
 
-msgid "Reset your password for ${site_title}."
-msgstr "${site_title} のパスワードをリセット"
-
-msgid "Save"
-msgstr "保存"
-
-msgid "Search"
-msgstr "検索"
-
-msgid "Search Results"
-msgstr "検索結果"
-
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "ユーザーとグループを検索"
-
-msgid "Search users and groups"
-msgstr "ユーザーとグループを検索"
-
-msgid "Search..."
-msgstr "検索..."
-
-msgid "Select file(s) to upload..."
-msgstr ""
-
-msgid "Select the new state where all chosen items should be set."
-msgstr "新しく設定する状態を選択して下さい。"
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
 
-msgid "Send password registration link."
-msgstr "パスワード登録を送信する。"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "登録"
 
-msgid "Set default view"
-msgstr "表示方法の設定"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "エラーが発生しました。"
 
+#: kotti/views/login.py:295
 #, fuzzy
 msgid "Set password"
 msgstr "パスワードをリセット"
 
-msgid "Share"
-msgstr "共有"
-
-msgid "Share ${title}"
-msgstr "${title} を共有"
-
-msgid "Show"
-msgstr "表示中にする"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
-msgid "Site Setup"
-msgstr "サイト設定"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "ユーザー管理"
 
-msgid "Size"
-msgstr ""
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
 
-msgid "State"
-msgstr "状態"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "個人設定 - ${title}"
 
-msgid "Status"
-msgstr ""
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "無効な値"
 
-msgid "Submit"
-msgstr "送信"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "同じ名称のユーザーがすでに存在します。"
 
-msgid "Tagged with:"
-msgstr "付与されたタグ:"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "そのメールアドレスをもつユーザーがすでに存在します。"
 
-msgid "Tags"
-msgstr "タグ"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "グループが見つかりません: ${group}"
 
-msgid "That username or email is not known by this system."
-msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "有効"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "チェックを外すと、このアカウントは無効になります。"
 
-msgid "There was an error."
-msgstr "エラーが発生しました。"
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "グローバルロール"
 
-msgid "Title"
-msgstr "タイトル"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "グループ"
 
-msgid "Type"
-msgstr "種類"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "ユーザーを追加"
 
-msgid "Untick this to deactivate the account."
-msgstr "チェックを外すと、このアカウントは無効になります。"
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} を追加しました。"
 
-msgid "Upload ${number} files."
-msgstr ""
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "グループ追加"
 
-msgid "Upload Content"
-msgstr "アップロード"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "変更箇所がありませんでした。"
 
-msgid "Upload content from local file(s)"
-msgstr ""
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "名前がありません。"
 
-msgid "User"
-msgstr "ユーザー"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "ユーザーもグループも見つかりませんでした。"
 
-msgid "User Management"
-msgstr "ユーザー管理"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "${principal_type} ${title} を編集"
 
+#: kotti/views/users.py:533
 msgid "User was not found."
 msgstr "ユーザーは見つかりませんでした。"
 
-msgid "User- / groupname"
-msgstr ""
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "パスワード登録を送信する。"
 
-msgid "Username"
-msgstr "ユーザー名"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} を削除しました。"
 
-msgid "Username or email"
-msgstr "ユーザー名またはメールアドレス"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "${principal_type} ${title} を削除"
 
-msgid "View"
-msgstr "表示"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} をコピーしました。"
 
-msgid "Viewer"
-msgstr "閲覧者"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} を切り取りました。"
 
-msgid "Visibility"
-msgstr "表示状態"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} を移動しました。"
 
-msgid "Visible"
-msgstr "表示中"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} を貼り付けました。"
 
-msgid "Welcome to Kotti"
-msgstr ""
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "ノードを張り付けできません。何も存在していません。"
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "ようこそ ${user}!"
+msgid "${title} is now visible in the navigation."
+msgstr "${title} がナビゲーションに表示されるようになりました。"
 
-msgid "Welcome, ${user}! You are logged in."
-msgstr "ようこそ ${user}! ログインしています。"
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} がナビゲーションでは非表示になりました。"
 
-msgid "Welcome, you are not logged in."
-msgstr "ようこそ。ログインしていません。"
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} を削除しました。"
 
-msgid "You are here:"
-msgstr "今の場所:"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "削除対象がありません。"
 
-msgid "You are joining ${site_title}."
-msgstr "あなたは ${site_title} に参加しようとしています。"
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "名称とタイトルは必須です。"
 
-msgid "You have been logged out."
-msgstr "ログアウトしました。"
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "名称変更しました"
 
-msgid "You have reset your password."
-msgstr "パスワードのリセットに成功しました。"
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "上に移動する"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "下に移動する"
+
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "表示中にする"
+
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "非表示にする"
 
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "状態を変更"
 
-msgid "Your changes have been saved."
-msgstr "変更内容を保存しました。"
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "説明"
 
-msgid "Your password reset token may have expired."
-msgstr "パスワードをリセットするためのトークンが期限切れです。"
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "本文"
 
-msgid "Your registration for ${site_title}"
-msgstr "${site_title} へのアカウント登録"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "デフォルト表示は既定値にリセットされました。"
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "デフォルト表示"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "デフォルト表示が設定されました。"
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "デフォルト表示は設定できませんでした。"
+
+#~ msgid "Submit"
+#~ msgstr "送信"
 
 #~ msgid "Private"
 #~ msgstr "プライベート"
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index 82ecfead69876dc6d024723493ca083848b87534..3fa5fa76b9e8d13ce26ec8039d6ef1cddc6c488f 100644
GIT binary patch
delta 1426
zcmXZcT}YEr7{Ku-O3g7#Q#8uCSKH>toW2_=HI2fLk_ucDgkB{!vI{lF(xPBpB?wVr
zL?NRO?<B}_DdbHzl0+0#7$jX(ln?}2AOu1EAKwGw?>x_YKA!iS_iVIpIX-nVE7dC^
zFFYc<u&zv`4NqYdA7C{u8w<Q5wZu&rz&_(ulb^w6@?WqKElXq@9>;7<7|$CoS(1`E
z9*mISPiFX+hwm{TznXXz3y3$Aixgoo>hmDxVl$q>{U$$)A>swJaTSADSs}u^$Whe7
z5)~<t9W<_xppQI4t@N$&1C|hfLM`l%iE|j#O6<iL_Tm&~a1X|PPJt7s^JVY|&Y=tQ
z{334Lnxaum!;cYcMy-4hYcP#E!2&Y3yhh!L-zJ|GaGtwyg?yojvnrkbZq)uZ>Q1$w
zE_@hu-c%P2eX|qz1P4&J##iOM!CusXG2}CmZq)wgjF(X-x?vngHc9TAcpi29OYFc!
zllNAOY-fE5(9kVzK?}Q4-}C|w;~mV!61GDvM+<|v_9j?L+=YC1GK4O?iTQXBwcy8C
zh|f?9euqBRmn9lHk$xe16nW@EpRpcwq9{_l95N=6&62cn9(NM|FmXk#bA$)+BKfnZ
zFYpVsfWPQweOb?eYlZo!9m>#+Rj6mzfO<;~pcXQOY@LjlcmlPs42JO|>H?b?q!y#j
z=RrN%8q{^#F}06ICk?$8*HDk*A?m>ACVquF;2UZIKh5)X^-kd%acv>Y;kn1eerzYM
zMV&Wc@}tJ<_3Xc1ms=$CY!*?s^gHT;TWn{+Qq;;r#txJ3MQ)TNQ46?@I_|D<(&RH3
zAU}utt$fBt{Ab6UEo)@oHj(H<Zk7zAc1)v%Pm#|=mareQxvM&15_O_+)E}ldk?BcS
zd0}Peu~2Iw-jh5%I1p;<NyejA#11!v!gk2sZAHRSI})@bwmmjm)-<*f@J#o6(?$OQ
DDn*tH

delta 1708
zcmXxkU1%It6u|K-w9yQWL{clY`It0mnl_!y>?X$Sq|wdCn#4BkHVL8+w#;_N%{JMY
zFuRGUDf=J<X`gfnv08lb$$$`yBBGSwM;{6*h!QH;7auJ4L0V9$VDW!CS4j4E&zaeK
z&pmf$fAcQPZsc}WRvu95T9Z=!N~u#VN{!+LbntsTgoYW}i${o0V+UT;euR?0jz_Vk
zRjEE4!N>7ctie_7W$pW|s-j|CSSMlPb*#gGupS@UAH{p|5#ocm8<Qy4Phc&c!38Yn
z{Lg3+-$EPrwkg$x&tfw!p%k{-R#A$v+TepV)sHBZ{-ymFA0yt;9u?Av5+BA99L5Z;
z;0A8vAii-RD)1`GeA{>mZ=iuT?c0R|6$X14jAH`Npj7@A9>y)K!COcz>JCaL_8g4z
zo!V}^O}_8{d}nljH_H9fD4p_977kG6tt>N;mcNdl;F~C|8ROvVF^lrW67ra+^C<Vf
ztNj3FqEEF~kglt5bbJ$QiT}WHysPuW>~0_Hs|g0uQV&f$kFwME@MZiGWder-6i3m-
z6L^0o*hsvLJg@2!8u%H?2EIlq_$O?@Ur`GF8{1i5-D4mVwH=9$!bX{3Ogn`#(ThlP
zl&@Vwx~;afH?fzvp7WD@8mV0saT(u6*}$Vb@lrqw?qYq_!JrO%P;MBK3wR9W?4C#d
z)Hyz+kV{DG)VhwZq7=4`aa7&W0tsyrWxf>3(N3bQGmDiJgOGu|7MmzX@dHYQzw7um
z$`@+wsDK8P>+L9ocj-8Z4-%(zJdSDNlPL49>imb=k8S!dugm8o<ZSMuw62bA$bwH`
zJwA<6c}6>@^DD?3r`Avk`U2&9UunP9`EBeVe*@)N*~zOWKT!J<nW$wika(EHMdTG#
z@1Wecg(m)ja+de7h=+Qj3D;02x`Oh<^k>iJy3yJ&76#|Mvt?@{XFcbIr9$94=CPn$
zE|_*KZf6rYZ^@YQ7J{&BO_uV7oHe|dFIh8zW2PsECXT0uMn|X8)6+)vT2o`?Niz|5
zdhISdVcSOLq&4L&6=X_l)Gd3CnXu!%R@}DYNz?9k5{WK5$$iJ&QrVgbUB5K%mV?kS
zi(c8YL-S~4s^oGlpXEOmgt58sDZb(77u~#P&3JB6$_+i&Cu>A$$D9kQcbW!Hj|6_%
z^Y!E}d7+i|&jz`IpLfjuY@uw7dA=7?8Jl{=F^Ao(H_xt<u|6X+zZkmn)-yp^EIFpX
ma6c>!#s|!3IA{+T)$a~8Rrj^jR$puBtZp^$*sL_q?*0#ctNJAX

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index b0e812fba..be9e3e008 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Kotti에 오신 것을 환영합니다"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "축하합니다! 성공적으로 Kotti를 설치했습니다."
 
+#: kotti/populate.py:66
 #, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -68,25 +73,20 @@ msgstr ""
 "\n"
 "<h2>로그인</h2>\n"
 "<p>\n"
-"    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집"
-"할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습니"
-"다.\n"
+"    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습니다.\n"
 "</p>\n"
 "<p>\n"
-"    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 "
-"현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
+"    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>설정</h2>\n"
 "        <p>\n"
-"            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파일"
-"로 설정하는 법을 알아보세요.\n"
+"            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파일로 설정하는 법을 알아보세요.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html\">\n"
 "               설정 매뉴얼\n"
 "            </a>\n"
 "        </p>\n"
@@ -98,8 +98,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti 애드온\n"
 "            </a>\n"
 "        </p>\n"
@@ -107,8 +106,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>기술문헌</h2>\n"
 "        <p>\n"
-"            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이죠?  "
-"좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
+"            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이죠?  좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -119,190 +117,21 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
-msgstr ""
-"\n"
-"<h2>로그인</h2>\n"
-"<p>\n"
-"    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집"
-"할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습니"
-"다.\n"
-"</p>\n"
-"<p>\n"
-"    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 "
-"현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>설정</h2>\n"
-"        <p>\n"
-"            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파일"
-"로 설정하는 법을 알아보세요.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/"
-"configuration.html\">\n"
-"               설정 매뉴얼\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>애드온</h2>\n"
-"        <p>\n"
-"            몇가지 애드온으로 당신의 Kotti 사이트 기능을 확장할 수 있습니다.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti 애드온\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>기술문헌</h2>\n"
-"        <p>\n"
-"            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이죠?  "
-"좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               기술문헌\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
+msgstr "이 사이트에 대하여"
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
-msgstr ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   본사:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>사진 크레딧:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  저작권 정보</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조업체입니다."
 
+#: kotti/populate.py:125
 #, fuzzy
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -320,8 +149,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -331,8 +159,7 @@ msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -350,600 +177,935 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>사진 크레딧:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  저작권 정보</a>.\n"
 "  Originally published in the\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
 "  article.\n"
 "</small></p>\n"
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} \"${title}\"이(가) 지워졌습니다."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "복사"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "잘라내기"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "붙여넣기"
 
-#, python-format
-msgid "${title} was added."
-msgstr "\"${title}\"이(가) 추가되었습니다."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "이름 바꾸기"
 
-#, python-format
-msgid "${title} was copied."
-msgstr "\"${title}\"이(가) 복사되었습니다."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "삭제"
 
-#, python-format
-msgid "${title} was cut."
-msgstr "\"${title}\"이(가) 잘라내어졌습니다."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "문서"
 
-#, python-format
-msgid "${title} was deleted."
-msgstr "\"${title}\"이(가) 지워졌습니다."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "파일"
 
-#, python-format
-msgid "${title} was moved."
-msgstr "\"${title}\"이(가) 옮겨졌습니다."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "화상"
 
-#, python-format
-msgid "${title} was pasted."
-msgstr "\"${title}\"이(가) 붙여넣어졌습니다."
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "폴더로 보임"
 
-msgid "A user with that email already exists."
-msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "컨텐츠 항목"
 
-msgid "A user with that name already exists."
-msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "편집"
 
-msgid "About"
-msgstr "이 사이트에 대하여"
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "공유"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "동작"
 
-msgid "Active"
-msgstr "활성"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "열람자"
+
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "편집자"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "소유자"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "관리자"
 
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "추가"
 
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "${type}을(를) \"${title}\"에 추가합니다."
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "컨텐트 올리기"
 
-#, python-format
-msgid "Add ${type}."
-msgstr "${type}을(를) 추가합니다."
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "보이는 방식 설정"
 
-msgid "Add Group"
-msgstr "그룹 추가"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "보기"
 
-msgid "Add User"
-msgstr "사용자 추가"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "둘러보기"
 
-msgid "Add group"
-msgstr "그룹 추가"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "기본 설정"
 
-msgid "Add new group"
-msgstr "새 그룹 추가"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "사이트 설정"
 
-msgid "Add new user"
-msgstr "새 사용자 추가"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "로그아웃"
 
-msgid "Add user"
-msgstr "사용자 추가"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "${site_title}의 암호를 재설정하십시오."
 
-msgid "Admin"
-msgstr "관리자"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "${user_title}님, 안녕하세요!"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니"
-"다."
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "이 링크를 눌러 ${site_title}에서의 암호를 설정하십시오: ${url}"
 
-msgid "Apply changes"
-msgstr "바꾸기 적용"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "${site_title} 가입"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "\"${title}\"을(를) 정말 지우겠습니까?"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "${site_title}에 가입 중입니다."
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "다음 항목을 정말 지우겠습니까?"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "금지됨"
 
-msgid "Assign global roles"
-msgstr "사이트 전체 역할 부여"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "로그인"
 
-msgid "Assign local roles"
-msgstr "컨텐츠별 역할 부여"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "사용자 이름 혹은 전자메일"
 
-msgid "Back to User Management"
-msgstr "사용자 관리로 되돌아가기"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "암호"
 
-msgid "Blank search text finds all."
-msgstr "비워두면 모두 찾습니다."
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "로그인"
 
-msgid "Body"
-msgstr "본문"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "암호를 잊으셨습니까?"
 
-msgid "Cancel"
-msgstr "취소"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "암호 재설정"
 
-msgid "Change State"
-msgstr "작업 상태 바꾸기"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "사용자 이름이나 전자메일을 입력한 뒤 아래의 ${reset_password}를 누르면 암호를 재설정할 수 있는 링크를 전자메일로 받으실 수 있습니다."
 
-msgid "Change state to"
-msgstr "바꿀 상태"
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "아직 등록하지 않으셨습니까?"
 
-msgid "Change workflow state"
-msgstr "작업 상태 바꾸기"
+#: kotti/templates/login.pt:83
+msgid "Register for an account on this site."
+msgstr "이 사이트에 계정을 등록하십시오."
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "\"${state}\"로(으로) 바꿈"
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "이 링크를 눌러 ${site_title}에서의 암호를 설정하십시오: ${url}"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "태그"
 
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 "
-"받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "현재 위치:"
 
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr "축하합니다! 성공적으로 Kotti를 설치했습니다."
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "작업 상태 바꾸기"
 
-msgid "Contents"
-msgstr "컨텐츠 항목"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니다."
 
-msgid "Copy"
-msgstr "복사"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "제목"
 
-msgid "Could not paste node. It no longer exists."
-msgstr "노드를 붙여넣을 수 없습니다. 그 노드가 존재하지 않습니다."
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "유형"
 
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "작업 상태"
+
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "만든 날"
 
-msgid "Cut"
-msgstr "잘라내기"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "바꾼 날"
 
-msgid "Default view"
-msgstr "기본형으로 보임"
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr ""
 
-msgid "Default view could not be set."
-msgstr "보이는 방식을 설정할 수 없었습니다."
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "하위 항목 포함 여부"
 
-msgid "Default view has been reset to default."
-msgstr "기본형 보기로 재설정되었습니다."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "체크하면, 고른 문서와 그 하위 문서 모두를 바꿉니다."
 
-msgid "Default view has been set."
-msgstr "보이는 방식이 설정되었습니다."
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "바꿀 상태"
 
-msgid "Delete"
-msgstr "삭제"
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "고른 항목 모두가 갖게 될 상태를 선택하십시오."
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "${principal_type} \"${title}\" 삭제"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "바꾸지 않음"
 
-msgid "Delete ${title}"
-msgstr "\"${title}\" 삭제"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "바꾸기 적용"
 
-msgid "Description"
-msgstr "설명"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "취소"
 
-msgid "Dismiss all errors"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "여기엔 하위 항목이 없습니다."
+
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
 
-msgid "Document"
-msgstr "문서"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "가시성"
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
-msgstr ""
-"각 컨텐트 항목은 이름을 가지며, 이는 URL과 제목을 만드는데 사용됩니다. 이름과 "
-"제목의 올바른 형식에 대해 알려면 사용자 매뉴얼을 읽으십시오. 둘 다 아래에서 바"
-"꿀 수 있습니다."
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "보임"
 
-msgid "Edit"
-msgstr "편집"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "숨김"
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "${principal_type} \"${title}\" 편집"
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "다음 항목을 정말 지우겠습니까?"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr "\"${title}\" 편집"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "\"${title}\" 삭제"
 
-msgid "Editor"
-msgstr "편집자"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "\"${title}\"을(를) 정말 지우겠습니까?"
 
-msgid "Email"
-msgstr "전자메일"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "사이트 둘러보기"
 
-msgid "File"
-msgstr "파일"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "각 컨텐트 항목은 이름을 가지며, 이는 URL과 제목을 만드는데 사용됩니다. 이름과 제목의 올바른 형식에 대해 알려면 사용자 매뉴얼을 읽으십시오. 둘 다 아래에서 바꿀 수 있습니다."
 
-msgid "Filename"
-msgstr "파일 이름"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "새 이름"
 
-#. Canonical text for ${reset_password} is: "Reset password"
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"사용자 이름이나 전자메일을 입력한 뒤 아래의 ${reset_password}를 누르면 암호를 "
-"재설정할 수 있는 링크를 전자메일로 받으실 수 있습니다."
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "새 제목"
 
-msgid "Find users or groups"
-msgstr "사용자나 그룹 찾기"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "\"${title}\" 이름 바꾸기"
 
-msgid "Folder view"
-msgstr "폴더로 보임"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "\"${title}\" 공유하기"
 
-msgid "Forbidden"
-msgstr "금지됨"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "사용자와 그룹 검색"
 
-msgid "Forgot your password?"
-msgstr "암호를 잊으셨습니까?"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "검색"
 
-msgid "Full name"
-msgstr "전체 이름"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "컨텐츠별 역할 부여"
 
-msgid "Global roles"
-msgstr "전역 역할"
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "이름"
 
-msgid "Gravatar"
-msgstr ""
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "사용자"
 
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
 msgid "Group"
 msgstr "그룹"
 
-msgid "Groups"
-msgstr "그룹"
-
-msgid "Hello, ${user_title}!"
-msgstr "${user_title}님, 안녕하세요!"
-
-msgid "Hidden"
-msgstr "숨김"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr ""
 
-msgid "Hide"
-msgstr "숨기기"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#, fuzzy
+msgid "Assign role"
+msgstr "컨텐츠별 역할 부여"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr "체크하면, 고른 문서와 그 하위 문서 모두를 바꿉니다."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "내 컴퓨터에서 컨텐트 올리기"
 
-msgid "Image"
-msgstr "화상"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+msgid "Filename"
+msgstr "파일 이름"
 
-msgid "Include children"
-msgstr "하위 항목 포함 여부"
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
+msgstr "크기"
 
-msgid "Invalid value"
-msgstr "잘못된 값입니다."
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "상태"
 
-msgid "Item was added."
-msgstr "항목이 추가되었습니다."
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "진행률"
 
-msgid "Item was renamed."
-msgstr "항목이 재명명되었습니다."
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr ""
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
 msgstr ""
-"여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정"
-"합니다."
 
-msgid "Log in"
-msgstr "로그인"
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr ""
 
-msgid "Login"
-msgstr "로그인"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
 
-msgid "Login failed."
-msgstr "로그인이 실패했습니다."
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
 
-msgid "Logout"
-msgstr "로그아웃"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
 
-msgid "Make ${state}"
-msgstr "\"${state}\"로(으로) 바꿈"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "사용자 관리로 되돌아가기"
 
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "최대 파일 크기: ${size}MB"
+msgid "Edit ${title}"
+msgstr "\"${title}\" 편집"
 
-msgid "Modification Date"
-msgstr "바꾼 날"
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "사용자/그룹 검색"
 
-msgid "Move down"
-msgstr "아래로 옮김"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "사용자 추가"
 
-msgid "Move up"
-msgstr "위로 옮김"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "그룹 추가"
 
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "나의 선호사항"
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "사용자나 그룹 찾기"
 
-msgid "Name"
-msgstr "이름"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "사용자나 그룹 이름"
 
-msgid "Name and title are required."
-msgstr "이름과 제목이 필요합니다."
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "비워두면 모두 찾습니다."
 
-msgid "Navigate"
-msgstr "둘러보기"
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "사이트 전체 역할 부여"
 
-msgid "Navigate Site"
-msgstr "사이트 둘러보기"
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "새 사용자 추가"
 
-msgid "New name"
-msgstr "새 이름"
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "새 그룹 추가"
 
-msgid "New title"
-msgstr "새 제목"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "검색결과"
 
-msgid "No change"
-msgstr "바꾸지 않음"
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "검색..."
 
-msgid "No changes were made."
-msgstr "아무 것도 바뀌지 않았습니다."
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "태그:"
 
-msgid "No content items are contained here."
-msgstr "여기엔 하위 항목이 없습니다."
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "${user}님, 환영합니다! 로그인되었습니다."
 
-msgid "No name was given."
-msgstr "이름이 주어지지 않았습니다."
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "환영합니다, 로그인되지 않았습니다."
+
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "수정사항이 저장되었습니다."
+
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "항목이 추가되었습니다."
 
+#: kotti/views/form.py:264
 #, python-format
-msgid "No such group: ${group}"
-msgstr "그런 그룹이 없습니다: ${group}"
+msgid "Maximum file size: ${size}MB"
+msgstr "최대 파일 크기: ${size}MB"
 
-msgid "No users or groups were found."
-msgstr "사용자나 그룹이 발견되지 않았습니다."
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "저장"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "${type}을(를) \"${title}\"에 추가합니다."
 
-msgid "Not registered yet?"
-msgstr "아직 등록하지 않으셨습니까?"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "${type}을(를) 추가합니다."
 
-msgid "Nothing was deleted."
-msgstr "아무것도 지워지지 않았습니다."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "암호를 재설정했습니다."
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
-"우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조"
-"업체입니다."
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "${user}님, 환영합니다!"
 
-msgid "Owner"
-msgstr "소유자"
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
 
-msgid "Password"
-msgstr "암호"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "로그아웃되었습니다."
 
-msgid "Paste"
-msgstr "붙여넣기"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "전체 이름"
 
-msgid "Preferences"
-msgstr "기본 설정"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "사용자 이름"
 
-msgid "Progress"
-msgstr "진행률"
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr "전자메일"
 
-msgid "Register"
-msgstr "등록하기"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
 
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "등록 - ${title}"
 
-msgid "Register for an account on this site."
-msgstr "이 사이트에 계정을 등록하십시오."
-
-msgid "Rename"
-msgstr "이름 바꾸기"
-
-msgid "Rename ${title}"
-msgstr "\"${title}\" 이름 바꾸기"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "암호 재설정"
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "로그인이 실패했습니다."
 
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "암호를 재설정하세요 - ${title}."
 
-msgid "Reset your password for ${site_title}."
-msgstr "${site_title}의 암호를 재설정하십시오."
-
-msgid "Save"
-msgstr "저장"
-
-msgid "Search"
-msgstr "검색"
-
-msgid "Search Results"
-msgstr "검색결과"
-
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "사용자/그룹 검색"
-
-msgid "Search users and groups"
-msgstr "사용자와 그룹 검색"
-
-msgid "Search..."
-msgstr "검색..."
-
-msgid "Select file(s) to upload..."
-msgstr ""
-
-msgid "Select the new state where all chosen items should be set."
-msgstr "고른 항목 모두가 갖게 될 상태를 선택하십시오."
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
-msgid "Send password registration link."
-msgstr "암호 등록 링크를 발송"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "등록하기"
 
-msgid "Set default view"
-msgstr "보이는 방식 설정"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "오류가 있습니다."
 
+#: kotti/views/login.py:295
 #, fuzzy
 msgid "Set password"
 msgstr "암호 재설정"
 
-msgid "Share"
-msgstr "공유"
-
-msgid "Share ${title}"
-msgstr "\"${title}\" 공유하기"
-
-msgid "Show"
-msgstr "보이기"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
-msgid "Site Setup"
-msgstr "사이트 설정"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "사용자 관리"
 
-msgid "Size"
-msgstr "크기"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
 
-msgid "State"
-msgstr "작업 상태"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "나의 선호사항"
 
-msgid "Status"
-msgstr "상태"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "잘못된 값입니다."
 
-msgid "Submit"
-msgstr "제출"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
 
-msgid "Tagged with:"
-msgstr "태그:"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
 
-msgid "Tags"
-msgstr "태그"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "그런 그룹이 없습니다: ${group}"
 
-msgid "That username or email is not known by this system."
-msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "활성"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "계정을 비활성화하려면 체크를 해제하십시오."
 
-msgid "There was an error."
-msgstr "오류가 있습니다."
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "전역 역할"
 
-msgid "Title"
-msgstr "제목"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "그룹"
 
-msgid "Type"
-msgstr "유형"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "사용자 추가"
 
-msgid "Untick this to deactivate the account."
-msgstr "계정을 비활성화하려면 체크를 해제하십시오."
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "\"${title}\"이(가) 추가되었습니다."
 
-msgid "Upload ${number} files."
-msgstr ""
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "그룹 추가"
 
-msgid "Upload Content"
-msgstr "컨텐트 올리기"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "아무 것도 바뀌지 않았습니다."
 
-msgid "Upload content from local file(s)"
-msgstr "내 컴퓨터에서 컨텐트 올리기"
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "이름이 주어지지 않았습니다."
 
-msgid "User"
-msgstr "사용자"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "사용자나 그룹이 발견되지 않았습니다."
 
-msgid "User Management"
-msgstr "사용자 관리"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "${principal_type} \"${title}\" 편집"
 
+#: kotti/views/users.py:533
 msgid "User was not found."
 msgstr "사용자가 없습니다."
 
-msgid "User- / groupname"
-msgstr "사용자나 그룹 이름"
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "암호 등록 링크를 발송"
 
-msgid "Username"
-msgstr "사용자 이름"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} \"${title}\"이(가) 지워졌습니다."
 
-msgid "Username or email"
-msgstr "사용자 이름 혹은 전자메일"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "${principal_type} \"${title}\" 삭제"
 
-msgid "View"
-msgstr "보기"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "\"${title}\"이(가) 복사되었습니다."
 
-msgid "Viewer"
-msgstr "열람자"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "\"${title}\"이(가) 잘라내어졌습니다."
 
-msgid "Visibility"
-msgstr "가시성"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "\"${title}\"이(가) 옮겨졌습니다."
 
-msgid "Visible"
-msgstr "보임"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "\"${title}\"이(가) 붙여넣어졌습니다."
 
-msgid "Welcome to Kotti"
-msgstr "Kotti에 오신 것을 환영합니다"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "노드를 붙여넣을 수 없습니다. 그 노드가 존재하지 않습니다."
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "${user}님, 환영합니다!"
+msgid "${title} is now visible in the navigation."
+msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
 
-msgid "Welcome, ${user}! You are logged in."
-msgstr "${user}님, 환영합니다! 로그인되었습니다."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
 
-msgid "Welcome, you are not logged in."
-msgstr "환영합니다, 로그인되지 않았습니다."
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "\"${title}\"이(가) 지워졌습니다."
 
-msgid "You are here:"
-msgstr "현재 위치:"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "아무것도 지워지지 않았습니다."
 
-msgid "You are joining ${site_title}."
-msgstr "${site_title}에 가입 중입니다."
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "이름과 제목이 필요합니다."
 
-msgid "You have been logged out."
-msgstr "로그아웃되었습니다."
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "항목이 재명명되었습니다."
 
-msgid "You have reset your password."
-msgstr "암호를 재설정했습니다."
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "위로 옮김"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "아래로 옮김"
 
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "보이기"
+
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "숨기기"
+
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "적용할 항목을 선택해야합니다."
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "작업 상태 바꾸기"
 
-msgid "Your changes have been saved."
-msgstr "수정사항이 저장되었습니다."
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "설명"
 
-msgid "Your password reset token may have expired."
-msgstr "암호 재설정 토큰이 만료된 것 같습니다."
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "본문"
 
-msgid "Your registration for ${site_title}"
-msgstr "${site_title} 가입"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "기본형 보기로 재설정되었습니다."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "기본형으로 보임"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "보이는 방식이 설정되었습니다."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "보이는 방식을 설정할 수 없었습니다."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<h2>Log in</h2>\n"
+#~ "<p>\n"
+#~ "    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
+#~ "    and start changing its contents.  If you haven't chosen a password for\n"
+#~ "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    Once you're logged in, you'll see the grey editor bar below the top\n"
+#~ "    navigation bar.  It will allow you to switch between editing and viewing the\n"
+#~ "    current page as it will appear to your visitors.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Configure</h2>\n"
+#~ "        <p>\n"
+#~ "            Find out how to configure your Kotti's title and many other settings using a\n"
+#~ "            simple text file in your file system.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               Configuration manual\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Add-ons</h2>\n"
+#~ "        <p>\n"
+#~ "            A number of add-ons allow you to extend the functionality of your Kotti site.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Kotti add-ons\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>Documentation</h2>\n"
+#~ "        <p>\n"
+#~ "            Wonder what more you can do with Kotti?  What license it has?  Read the\n"
+#~ "            manual for more information.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               Documentation\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<h2>로그인</h2>\n"
+#~ "<p>\n"
+#~ "    <a class=\"btn btn-success\" href=\"login\">로그인</a>하여 컨텐츠를 편집할 수 있습니다.아직 관리자 암호를 바꾸지 않았다면, <em>qwerty</em>일 수 있습니다.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "    로그인하면, 화면 위 네비게이션 줄 아래 회색 편집 줄이 보입니다. 그것으로 현재 페이지를 편집하는 것과 방문객처럼 보는 것 사이를 전환할 수 있습니다.\n"
+#~ "</p>\n"
+#~ "<div class=\"row\">\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>설정</h2>\n"
+#~ "        <p>\n"
+#~ "            Kotti의 제목과 여러 다른 설정을 파일시스템 상의 간단한 텍스트 파일로 설정하는 법을 알아보세요.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html\">\n"
+#~ "               설정 매뉴얼\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>애드온</h2>\n"
+#~ "        <p>\n"
+#~ "            몇가지 애드온으로 당신의 Kotti 사이트 기능을 확장할 수 있습니다.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+#~ "                Kotti 애드온\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "    <div class=\"col-md-4\">\n"
+#~ "        <h2>기술문헌</h2>\n"
+#~ "        <p>\n"
+#~ "            Kotti로 무엇을 더 할 수 있는지 궁금하십니까?  사용권은 무엇이죠?  좀 더 알아보려면 매뉴얼을 읽으십시오.\n"
+#~ "        </p>\n"
+#~ "        <p>\n"
+#~ "            <a class=\"btn btn-info\"\n"
+#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               기술문헌\n"
+#~ "            </a>\n"
+#~ "        </p>\n"
+#~ "    </div>\n"
+#~ "</div>\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>\n"
+#~ "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+#~ "   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+#~ "   width=\"640\" height=\"376\" />\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<p>\n"
+#~ "   Our worldwide headquarters:\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<address>\n"
+#~ "  Foo World<br />\n"
+#~ "  123 Nowhere Street, Suite 777<br />\n"
+#~ "  Omak, WA   98841   USA<br />\n"
+#~ "  +1-509-555-0100<br />\n"
+#~ "  widgets@foowrld.example.com\n"
+#~ "</address>\n"
+#~ "\n"
+#~ "<p><small style=\"font-size: smaller\">\n"
+#~ "  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+#~ "  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+#~ "  Copyright info</a>.\n"
+#~ "  Originally published in the\n"
+#~ "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+#~ "  article.\n"
+#~ "</small></p>\n"
+#~ msgstr ""
+#~ "\n"
+#~ "<p>\n"
+#~ "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+#~ "   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+#~ "   width=\"640\" height=\"376\" />\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<p>\n"
+#~ "   본사:\n"
+#~ "</p>\n"
+#~ "\n"
+#~ "<address>\n"
+#~ "  Foo World<br />\n"
+#~ "  123 Nowhere Street, Suite 777<br />\n"
+#~ "  Omak, WA   98841   USA<br />\n"
+#~ "  +1-509-555-0100<br />\n"
+#~ "  widgets@foowrld.example.com\n"
+#~ "</address>\n"
+#~ "\n"
+#~ "<p><small style=\"font-size: smaller\">\n"
+#~ "  <em>사진 크레딧:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+#~ "  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+#~ "  저작권 정보</a>.\n"
+#~ "  Originally published in the\n"
+#~ "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+#~ "  article.\n"
+#~ "</small></p>\n"
+
+#~ msgid "Submit"
+#~ msgstr "제출"
 
 #~ msgid "Private"
 #~ msgstr "내부 전용"
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index 82084007fc2e824cf628765a9ccdea98df9b3f5f..3842121b89ab57c771f04b9f31c3e15db9474b86 100644
GIT binary patch
delta 1291
zcmXZcOGs2v9LMp$FluV~=&9ptda0uh-MOWu6-WkRi!3P>!a&Nf5{ob`2*yPVGe|-=
zrO{*Mq9TwA3N5V29*Y7Y0~di*MD$pMyP)r{IWRMy^FR08|2_Y6&YhX&f&KU90<lA8
z))X`=!$;`j7Yt)gE?=y5w&F_SUKd|-j=BCREamz~XCTikiFkvv5>tq`V*%FXS<JF%
z9HAov&)_obck!r;Z=-H}iVgT0S70#TEP@_Z;6bd!VO)i8kfAn@nuwmNJjs}jSp~89
zgF|$vQV;8K7w*Af9Kz421ZNB53Hop|@c=HtDNM$9xD;ox9KWN7*&#DNR?klw9>aCm
z6QiLUMsP9S#YOlSpW$;C_pdhNW0(2SijAWt^a7ReEouU@s63xgd4Aw>TtHQvwkB>6
zbv+iQkx0WwCD?+QSc6)sz0LzTM%<36n7%f?#5t((QPh^~Ky6_QUcgRNo&~4MR>7&r
z1Y(v?LrYkMjIm9qv(SR7qyzQ9)2O}d!vJ1G&Y9gpJzx@5;WTPRKA`TOM@{fIatthC
zeSE76QRmO9Tt^d@G2kR-<0xv0?xQ9!iCUpoE`INvLskA2HIcul3X_Z6Aw^c-JPcza
zD$hAg;`w%-hAO^@8aRSVG=Yuy63J=7;`r-VgNek=sES)r<2zAjqX(0)AGH#L7{C$S
zh&NDYVg_SM^vw<Ug(bv)P>J&il(-zVgq0Y=I@I+J)N9s@8aIf_cLlYj*IoY|)cp@p
zg-jzahW#wDy8nBW9*!r@MOCm3wb#2*@AYx)!kefS%H&^0{XQ!0C>_6=GLc!_urE@3
zs=clI=!ve#&bIFM>X7e6D<V-Z;#GzGXtn2;dA{cj9nRgFU_(!`g5w2w4>JA%J#mHT

delta 1627
zcmZwGTWB0r7{KvU$aRfPn_kpSFDI$CP2yQ+H%Ze@n-Wqr^rB6}_JTf5cE@4r?o6DW
ztu&TyP*4o|P*y~&4_c7+MJ%cIK`6EseCR_TLIsP`7fHnn2tKGUqW`Zuh=NbQbN$Zw
zzB4m__}0;j-!|1gTBg*Iv{C~~sit*G<<P=DEZ{@<X5x8VOaEHZ|2py4WV~a&QvJ+t
zN_-ky=$}lS!*=?w;RZajUe(k}8W$Pp#4m6aE++lEN&h#LjVX2=#MQV4i)e5bhw%b#
z!#nr@uGy#*cT)!CBKuI{9Kz-J?8aK-;NuKPrn9&g-@-|}gLQmNHv(Ko32*~P@D|>W
z9X(35Vj8=!7azr8v~U_V*6}|41Rut$H5#&E2|Mr)Y{TYWrLN<0l>Q<zrM^L_*q<mF
zb#7_|T#IsnUX(cfDEmfmHIAWVd^oX~%-1S3nwdC-65wTAf%7Pto=yA^FVO!OQ+SN)
zONk38>t8~7k~dJE@EpF5mr>%3J<@O=O2T>Mf;HvQkP^-yvDImmZ{ZwDCJQJBeva~%
zH?Rr6$8P)?<$$)$jSRa`O5B68-=JL3Mm{68ALXfiT*vw9m1N+3l)vCJd=T%Vl<+T<
z3$$%%RA?1SzdLa=O6FOVi%g(ocqkb!qCDL!_ThWjieF+2=c}7EB;&787A~O#YTc^T
z6s|;)R7I5EZyuZR1C%#CkFx$U%C~V9TW}Gj61Pz*wuFQDBg!|if!ow1&>#(2umhP>
zyHNsr*p4SqN;roa&!EgNpnL<@upMus#QP5ANq<Pje@EHBtiO>+7xH7N?fq)v-Wwfb
zKr`T?Wbi7=Tfc+yUw?`L{)AGYXLu(WKZVj?7`XIq`;`^7C_L^KVzaksj<`|94+C58
z598R^R%R$Ol$vs9!YDRRRXo3F#;ab%<U?COFDu5pF!V~U7lqZCN~RE&Q<DetW>4fg
zF=5Q(PVCw`XJv;?)-u+J&SmW(Yrx7`77NXkd&1|q+P@YK87pV9gR*cqJ78s5c)+Q|
zCLcLLrR2n6Wb31TS&xU+!V6W$jbgp)MZcVx{-;0Yl^wq%ciGL>z^gi*Yx1sBwsla_
zyZ-0eo&Q;D>-y>RPIpfj#BPur{G1z^CxSv)^aIb<+o%0FHCd`gPRTqOM&$~TXYO??
zqq&{B(Hz|x=$=uX?MqF#fg4c>YIoAs<Ic2OqOdzM+fu4Nr_=SfySp#_l0Mt{H=l9(
AyZ`_I

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index dc6934e49..a9f1760e1 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr ""
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr ""
 
+#: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -66,107 +71,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
 msgstr ""
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -184,8 +102,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -193,608 +110,777 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} werd verwijderd."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopiëren"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} is niet langer zichtbaar in de navigatie."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Knippen"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} is nu zichtbaar in de navigatie."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Plakken"
 
-#, python-format
-msgid "${title} was added."
-msgstr "${title} werd toegevoegd."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Hernoemen"
 
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} werd gekopieerd."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Verwijderen"
 
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} werd geknipt."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Document"
 
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} werd verwijderd."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Bestand"
 
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} werd verplaatst."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Afbeelding"
 
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} werd geplakt."
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Map weergave"
 
-msgid "A user with that email already exists."
-msgstr "Een gebruiker met deze naam bestaat reeds."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Inhoud"
 
-msgid "A user with that name already exists."
-msgstr "Een gebruiker met deze naam bestaat reeds."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Bewerken"
 
-msgid "About"
-msgstr ""
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Delen"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Acties"
 
-msgid "Active"
-msgstr "Actief"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "Lezer"
+
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "Eigenaar"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "Beheerder"
 
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Toevoegen"
 
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Voeg ${type} aan ${title} toe."
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Inhoud Opladen"
 
-#, python-format
-msgid "Add ${type}."
-msgstr "Voeg ${type} toe."
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Zet standaard weergave"
 
-msgid "Add Group"
-msgstr "Groep toevoegen"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Weergeven"
 
-msgid "Add User"
-msgstr "Gebruiker toevoegen"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigeren"
 
-msgid "Add group"
-msgstr "Groep toevoegen"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Voorkeuren"
 
-#, fuzzy
-msgid "Add new group"
-msgstr "Groep toevoegen"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Site Instellingen"
 
-#, fuzzy
-msgid "Add new user"
-msgstr "Gebruiker toevoegen"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Afmelden"
 
-msgid "Add user"
-msgstr "Gebruiker toevoegen"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Herstel je wachtwoord voor ${site_title}."
 
-msgid "Admin"
-msgstr "Beheerder"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Welkom, ${user}!"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of "
-"beheren."
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: ${url}"
 
-msgid "Apply changes"
-msgstr "Wijzigingen toepassen"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Je registratie voor ${site_title}"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Ben je zeker dat je ${title} wil verwijderen?"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Je treedt toe tot ${site_title}."
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Verboden"
 
-#, fuzzy
-msgid "Assign global roles"
-msgstr "Locale rollen toewijzen"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Aanmelden"
 
-msgid "Assign local roles"
-msgstr "Locale rollen toewijzen"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Gebuikersnaam of e-mail"
 
-msgid "Back to User Management"
-msgstr "Terug naar gebruiksersbeheer"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Aanmelden"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Wachtwoord vergeten?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Wachtwoord herstellen"
 
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
 #, fuzzy
-msgid "Blank search text finds all."
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Vul je gebruikersnaam of e-mailadres in en klik op ${reset_password} hieronder om een e-mail te ontvangen om je wachtwoord te herstellen."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
-"Zoek en wijzig gebruikers (laat tekstveld leeg om alle gebruikers te vinden."
 
-msgid "Body"
-msgstr "Inhoud"
+#: kotti/templates/login.pt:83
+#, fuzzy
+msgid "Register for an account on this site."
+msgstr "Nog niet geregistreerd? ${register} voor een account op deze site."
 
-msgid "Cancel"
-msgstr "Annuleren"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "Maak ${state}"
 
-msgid "Change State"
-msgstr "Wijzig Status."
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tags"
 
-msgid "Change state to"
-msgstr "Wij status naar"
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "U bent hier:"
 
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Wijzig de workflow status"
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr ""
-"Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
-
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr ""
-"Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: "
-"${url}"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of beheren."
 
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om "
-"je wachtwoord in te stellen. Deze handeling zal je account activeren."
-
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr ""
-
-msgid "Contents"
-msgstr "Inhoud"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "Titel"
 
-msgid "Copy"
-msgstr "Kopiëren"
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Type"
 
-msgid "Could not paste node. It no longer exists."
-msgstr "De node kon niet geplakt worden. Hij bestaat niet meer."
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "Status"
 
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Aanmaak datum"
 
-msgid "Cut"
-msgstr "Knippen"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Wijzigingsdatum"
 
-msgid "Default view"
-msgstr "Standaard weergave"
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr ""
 
-msgid "Default view could not be set."
-msgstr "Standaar weergave kon niet ingesteld worden."
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Inclusief onderliggende"
 
-msgid "Default view has been reset to default."
-msgstr "Standaard weergave werd hersteld naar standaard."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Indien aangevinkt zal een poging ondernomen worden om de status van alle onderliggende items te wijzigen van de geselecteerd documenten en hun onderliggende documenten."
 
-msgid "Default view has been set."
-msgstr "Standaard weergave is ingesteld."
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Wij status naar"
 
-msgid "Delete"
-msgstr "Verwijderen"
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te worden."
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Verwijder ${principal_type} ${title}"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Geen wijzigingen"
 
-msgid "Delete ${title}"
-msgstr "Verwijder ${title}"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "Wijzigingen toepassen"
 
-msgid "Description"
-msgstr "Beschrijving"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Annuleren"
 
-msgid "Dismiss all errors"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Bevat geen content items."
+
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
 
-msgid "Document"
-msgstr "Document"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Zichtbaarheid"
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
-msgstr ""
-"Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te "
-"maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel en "
-"naam. Je kan beiden hieronder aanpassen."
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Zichtbaar"
 
-msgid "Edit"
-msgstr "Bewerken"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Verborgen"
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Bewerk ${principal_type} ${title}"
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr "Bewerken ${title}"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Verwijder ${title}"
 
-msgid "Editor"
-msgstr "Editor"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Ben je zeker dat je ${title} wil verwijderen?"
 
-msgid "Email"
-msgstr "E-mailadres"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Site Navigeren"
 
-msgid "File"
-msgstr "Bestand"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel en naam. Je kan beiden hieronder aanpassen."
 
-#, fuzzy
-msgid "Filename"
-msgstr "Hernoemen"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Nieuwe naam"
 
-#. Canonical text for ${reset_password} is: "Reset password"
-#, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Vul je gebruikersnaam of e-mailadres in en klik op ${reset_password} "
-"hieronder om een e-mail te ontvangen om je wachtwoord te herstellen."
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Nieuwe titel"
 
-#, fuzzy
-msgid "Find users or groups"
-msgstr "Zoeken naar gebruikers en groepen"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Hernoemen ${title}"
 
-msgid "Folder view"
-msgstr "Map weergave"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Delen ${title}"
 
-msgid "Forbidden"
-msgstr "Verboden"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "Zoeken naar gebruikers en groepen"
 
-msgid "Forgot your password?"
-msgstr "Wachtwoord vergeten?"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "Zoeken"
 
-msgid "Full name"
-msgstr "Volledige naam"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Locale rollen toewijzen"
 
-msgid "Global roles"
-msgstr "Globale rollen"
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "Naam"
 
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "gebruiker"
 
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
 msgid "Group"
 msgstr "Groep"
 
-msgid "Groups"
-msgstr "Groepen"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr "Gravatar"
 
-msgid "Hello, ${user_title}!"
-msgstr "Welkom, ${user}!"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#, fuzzy
+msgid "Assign role"
+msgstr "Locale rollen toewijzen"
 
-msgid "Hidden"
-msgstr "Verborgen"
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr ""
 
-msgid "Hide"
-msgstr "Verbergen"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#, fuzzy
+msgid "Filename"
+msgstr "Hernoemen"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
 msgstr ""
-"Indien aangevinkt zal een poging ondernomen worden om de status van alle "
-"onderliggende items te wijzigen van de geselecteerd documenten en hun "
-"onderliggende documenten."
 
-msgid "Image"
-msgstr "Afbeelding"
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr ""
 
-msgid "Include children"
-msgstr "Inclusief onderliggende"
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr ""
 
-msgid "Invalid value"
-msgstr "Ongeldige waarde"
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr ""
 
-msgid "Item was added."
-msgstr "Item werd toegevoegd."
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
+msgstr ""
 
-msgid "Item was renamed."
-msgstr "Item werd hernoemd."
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr ""
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
 msgstr ""
-"Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' "
-"hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
 
-msgid "Log in"
-msgstr "Aanmelden"
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
 
-msgid "Login"
-msgstr "Aanmelden"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
 
-msgid "Login failed."
-msgstr "Aanmelden mislukt."
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Terug naar gebruiksersbeheer"
 
-msgid "Logout"
-msgstr "Afmelden"
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#, python-format
+msgid "Edit ${title}"
+msgstr "Bewerken ${title}"
 
-msgid "Make ${state}"
-msgstr "Maak ${state}"
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "Zoeken naar gebruikers en groepen"
 
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maximale bestandsgrootte: ${size}MB"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Gebruiker toevoegen"
 
-msgid "Modification Date"
-msgstr "Wijzigingsdatum"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Groep toevoegen"
 
-msgid "Move down"
-msgstr "Naar beneden"
+#: kotti/templates/site-setup/users.pt:34
+#, fuzzy
+msgid "Find users or groups"
+msgstr "Zoeken naar gebruikers en groepen"
 
-msgid "Move up"
-msgstr "Naar boven"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
 
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mijn instellingen - ${title}"
+#: kotti/templates/site-setup/users.pt:49
+#, fuzzy
+msgid "Blank search text finds all."
+msgstr "Zoek en wijzig gebruikers (laat tekstveld leeg om alle gebruikers te vinden."
 
-msgid "Name"
-msgstr "Naam"
+#: kotti/templates/site-setup/users.pt:63
+#, fuzzy
+msgid "Assign global roles"
+msgstr "Locale rollen toewijzen"
 
-msgid "Name and title are required."
-msgstr "Naam en titel zijn vereist."
+#: kotti/templates/site-setup/users.pt:115
+#, fuzzy
+msgid "Add new user"
+msgstr "Gebruiker toevoegen"
 
-msgid "Navigate"
-msgstr "Navigeren"
+#: kotti/templates/site-setup/users.pt:121
+#, fuzzy
+msgid "Add new group"
+msgstr "Groep toevoegen"
 
-msgid "Navigate Site"
-msgstr "Site Navigeren"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Zoek Resultaten"
 
-msgid "New name"
-msgstr "Nieuwe naam"
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Zoeken..."
 
-msgid "New title"
-msgstr "Nieuwe titel"
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Getagd met:"
 
-msgid "No change"
-msgstr "Geen wijzigingen"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Welkom, ${user}! U bent nu aangemeld."
 
-msgid "No changes were made."
-msgstr "Geen wijzigingen aangebracht."
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Wilkom, je bent niet aangemeld."
 
-msgid "No content items are contained here."
-msgstr "Bevat geen content items."
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Je wijzigingen werden opgeslagen."
 
-msgid "No name was given."
-msgstr "Er werd geen naam ingevoerd."
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "Item werd toegevoegd."
 
+#: kotti/views/form.py:264
 #, python-format
-msgid "No such group: ${group}"
-msgstr "Onbekende groep: ${group}"
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximale bestandsgrootte: ${size}MB"
 
-msgid "No users or groups were found."
-msgstr "Geen gebruikers of groepen werden gevonden."
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Opslaan"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Voeg ${type} aan ${title} toe."
 
-msgid "Not registered yet?"
-msgstr ""
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "Voeg ${type} toe."
 
-msgid "Nothing was deleted."
-msgstr "Er werd niks verwijderd."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Je wachtwoord werd hersteld."
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Welkom, ${user}!"
 
-msgid "Owner"
-msgstr "Eigenaar"
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
 
-msgid "Password"
-msgstr "Wachtwoord"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Je bent afgemeld."
 
-msgid "Paste"
-msgstr "Plakken"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Volledige naam"
 
-msgid "Preferences"
-msgstr "Voorkeuren"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Gebruikersnaam"
 
-msgid "Progress"
-msgstr ""
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr "E-mailadres"
 
-msgid "Register"
-msgstr "Registreer"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om je wachtwoord in te stellen. Deze handeling zal je account activeren."
 
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Refistreer - ${title}"
 
-#, fuzzy
-msgid "Register for an account on this site."
-msgstr "Nog niet geregistreerd? ${register} voor een account op deze site."
-
-msgid "Rename"
-msgstr "Hernoemen"
-
-msgid "Rename ${title}"
-msgstr "Hernoemen ${title}"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "Wachtwoord herstellen"
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Aanmelden mislukt."
 
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Herstel je wachtwoord - ${title}."
 
-msgid "Reset your password for ${site_title}."
-msgstr "Herstel je wachtwoord voor ${site_title}."
-
-msgid "Save"
-msgstr "Opslaan"
-
-msgid "Search"
-msgstr "Zoeken"
-
-msgid "Search Results"
-msgstr "Zoek Resultaten"
-
-#, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "Zoeken naar gebruikers en groepen"
-
-msgid "Search users and groups"
-msgstr "Zoeken naar gebruikers en groepen"
-
-msgid "Search..."
-msgstr "Zoeken..."
-
-msgid "Select file(s) to upload..."
-msgstr ""
-
-msgid "Select the new state where all chosen items should be set."
-msgstr ""
-"Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te "
-"worden."
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 
-msgid "Send password registration link."
-msgstr "Verstuur wachtwoord registratie link."
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registreer"
 
-msgid "Set default view"
-msgstr "Zet standaard weergave"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Er trad een fout op."
 
+#: kotti/views/login.py:295
 #, fuzzy
 msgid "Set password"
 msgstr "Wachtwoord herstellen"
 
-msgid "Share"
-msgstr "Delen"
-
-msgid "Share ${title}"
-msgstr "Delen ${title}"
-
-msgid "Show"
-msgstr "Weergeven"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
-msgid "Site Setup"
-msgstr "Site Instellingen"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gebruikersbeheer"
 
-msgid "Size"
-msgstr ""
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
 
-msgid "State"
-msgstr "Status"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mijn instellingen - ${title}"
 
-msgid "Status"
-msgstr ""
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Ongeldige waarde"
 
-msgid "Submit"
-msgstr "Verzenden"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Een gebruiker met deze naam bestaat reeds."
 
-msgid "Tagged with:"
-msgstr "Getagd met:"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Een gebruiker met deze naam bestaat reeds."
 
-msgid "Tags"
-msgstr "Tags"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Onbekende groep: ${group}"
 
-msgid "That username or email is not known by this system."
-msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Actief"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Uitvinken om je account te de-activeren."
 
-msgid "There was an error."
-msgstr "Er trad een fout op."
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Globale rollen"
 
-msgid "Title"
-msgstr "Titel"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Groepen"
 
-msgid "Type"
-msgstr "Type"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Gebruiker toevoegen"
 
-msgid "Untick this to deactivate the account."
-msgstr "Uitvinken om je account te de-activeren."
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} werd toegevoegd."
 
-msgid "Upload ${number} files."
-msgstr ""
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Groep toevoegen"
 
-msgid "Upload Content"
-msgstr "Inhoud Opladen"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "Geen wijzigingen aangebracht."
 
-msgid "Upload content from local file(s)"
-msgstr ""
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "Er werd geen naam ingevoerd."
 
-msgid "User"
-msgstr "gebruiker"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "Geen gebruikers of groepen werden gevonden."
 
-msgid "User Management"
-msgstr "Gebruikersbeheer"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Bewerk ${principal_type} ${title}"
 
+#: kotti/views/users.py:533
 msgid "User was not found."
 msgstr "De gebruiker werd niet gevonden."
 
-msgid "User- / groupname"
-msgstr ""
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "Verstuur wachtwoord registratie link."
 
-msgid "Username"
-msgstr "Gebruikersnaam"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} werd verwijderd."
 
-msgid "Username or email"
-msgstr "Gebuikersnaam of e-mail"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Verwijder ${principal_type} ${title}"
 
-msgid "View"
-msgstr "Weergeven"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} werd gekopieerd."
 
-msgid "Viewer"
-msgstr "Lezer"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} werd geknipt."
 
-msgid "Visibility"
-msgstr "Zichtbaarheid"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} werd verplaatst."
 
-msgid "Visible"
-msgstr "Zichtbaar"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} werd geplakt."
 
-msgid "Welcome to Kotti"
-msgstr ""
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "De node kon niet geplakt worden. Hij bestaat niet meer."
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Welkom, ${user}!"
+msgid "${title} is now visible in the navigation."
+msgstr "${title} is nu zichtbaar in de navigatie."
 
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Welkom, ${user}! U bent nu aangemeld."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} is niet langer zichtbaar in de navigatie."
 
-msgid "Welcome, you are not logged in."
-msgstr "Wilkom, je bent niet aangemeld."
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} werd verwijderd."
 
-msgid "You are here:"
-msgstr "U bent hier:"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "Er werd niks verwijderd."
 
-msgid "You are joining ${site_title}."
-msgstr "Je treedt toe tot ${site_title}."
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Naam en titel zijn vereist."
 
-msgid "You have been logged out."
-msgstr "Je bent afgemeld."
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "Item werd hernoemd."
 
-msgid "You have reset your password."
-msgstr "Je wachtwoord werd hersteld."
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "Naar boven"
 
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "Naar beneden"
+
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Weergeven"
+
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Verbergen"
+
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Je dient items te selecteren om acties uit te voeren."
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via "
-"deze link activeer je je account."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Wijzig Status."
 
-msgid "Your changes have been saved."
-msgstr "Je wijzigingen werden opgeslagen."
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Beschrijving"
 
-msgid "Your password reset token may have expired."
-msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Inhoud"
 
-msgid "Your registration for ${site_title}"
-msgstr "Je registratie voor ${site_title}"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Standaard weergave werd hersteld naar standaard."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Standaard weergave"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Standaard weergave is ingesteld."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Standaar weergave kon niet ingesteld worden."
+
+#~ msgid "Submit"
+#~ msgstr "Verzenden"
 
 #~ msgid "Private"
 #~ msgstr "Privaat"
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
index eb9da4aa1e8d3e4e72530d6845b533938430db89..5bf880ff83c8eb820cf6376f3dba180e86e7f69c 100644
GIT binary patch
delta 1448
zcmXZcPe@cz6vy#9=~(GljhT}^|ICnonapt<Ep^m1At)$nQ5gtH3kl6li*(~eQD76f
z&_xNZ!ipjYgvbhl0*fG1(a2~~5C#<#wGztu{&;uwx#zt1?mh3^``%L0GdkqCf5n?P
zX^e@L8}mNRm}}@wG3HE_F_q*8qQ-2;TUdb$xD{719|JYU<Y5dQJcxzZWAm3WLOg+C
ze2eM0CdN9L88Zp9mceG5a8MJ5a0ABChx;)LkJ-4##{HN}K563#%p`t@$8p-mp;}|A
ziK}oIc40k^)h3L|VX#1A3x2~=^wb$sg5{_J4<HRPM=%3BQ3amD9PG#4IBcE8^Tht0
zZYM`k&pkuUGlM&DF~MLXgH+1Wg=|#pptc~4Mc9Gr%mAu&qZq_7R3VQs6<?w5dxPun
zE6(F@)cn)Db_idi)=B(epbP&{6Qnh`m1f{o;s6HmCT_wPs20CNb!^$@|JZzHqg$Y3
z4WaHUL#@+f^X=Hj`evU^OraKdih5uc1GtQNxQe})8+XsdC0tKDf)0+`{1mDq)3^;6
zQS+{#wlclR?MxQtvA%H_sHJrn#5ii=PSk_ls8idI+QSR>`Y`4bUq==A09E)L7T^~w
zLvOQNNG0mNL&&nG7kwIhXQ0-spb9Z9?t*Ekiv6gCb5Vz_1hsG+wG|yU-;MfO2C)#6
zr~>Yw=AXANp`Z98CW;ySVxS2FyWKaBp$<ti?!^<Rui-Z84QEgVea3A3iCVzh>Q3xK
z6<&xsQ>CcuVN`)pn{R2Q5v3&BN$C6Tu{RDP{~>b`LpX#g@GfdgUSb%RP=$Eg+%w=u
zy-+2p)rV2@o<==?4%Ojt)E3`pOSl!?Bcadb5vrxnQJ=>g>JWWGwbZ-EJzT}8d<|+#
zj-nRm!w4p^3!h*S7Ph-To@Ug2XVHUZ(vuM@80jc?eD%R-bweZ?jzlAok(7$Y$qyBO
Fo&TF_oxlJ9

delta 1798
zcmYk+PfQ$j6u|MfvDgaK*0xZAg40xR37vIjSqdyHr7V;bNI*jHPe{WQ2Hd*LklCS1
zY_g&CLNsd9rXJKDnrJ*U4a&uX^wO9ZO_Z1(#6+9)WU5Bv)rfu{I~q@)-|zkYz2Dp4
z&ehe}*6XpgH_D11#Y9qZk?$WC`Jq{)>>-g)EfG^hZnugY$6t^ksY!`Ej#)f{Q&@}3
zScg}!0oS7VH^^4<09&xGO{5$Lu?)xCq$s;-JQoF~Q8%2!M{xx!@ohYS???T$sK0?V
z#5be<1KdmhFMI(jPL%p{Xwwg|13$!0ymz7~Qca_#U8D*vY{JvnhzqC*UO@^Z?_ves
zKuz!#>iP}r#k-MJoN|f&Bx)tMP}l9|RNdzwCa|_hV;_w((ZKUje;Re+B0hoFQ7dyB
zwRBr(;62ntBrUQF_My%@gnRI5{1!V<53cAEIf@5R&n>2C=s-W}2E(YCj^Ud)g$DkN
z`?0dSRML9XinXA|Pet)@)C8v^=TPV6QO~&)#aGeee0eJhY@=?pD^prfg@@_4px!8p
zc|42yCceT)@H?!-`%!!wwIUTgBFC^6b>AM;pK=tnGS6Zy=gTw=&G=O`a0PYa8>kC!
zqQ2S<)XIDjjo-y1^nXN6@K4m6R-Y89$K&`E4xuIzpw7F7Mf?~mwPE*`O4Eay$N=hr
z!>Acgq8@w}^|75tJ$ME6wO>b#-$bp<9c;i&)C7J*E&btBB^&TD`i)q8l14iX-Ea!^
z=F4~#FXJG7fQ|So>J1O}l@e;kL-gBF4;Vt-_!-p1XHehNOVRiuYJx9E@z?q&L=%Bk
z0{Z`6izePdzC-dQY9e2wCipw*PqH^#`k*wRR%QtG4NRh5C_pXsJE;49g1Y{5)C%86
zz35L_>aQ97K|mkH->4<s(_i{~RO2!FO{gUuLVaAhDE<m+>EA;=U>z;oL<eI7rN8eC
z>WAkt>b%b|hO!>3NYxhu|GYaBnrCLsNjE6ud@pSb`(c<f?1Y_YGiTik<zu50W;Sr0
zkWsVW3Ei}jwCpz1woI$tNZRR?)nX+ri;3pAdm*R0{C}R+X<D6zolK`XOY=sYLTF9|
zj#tQ!I-wt=jj@~`21dVsF7W65LTGd^_UaLd*?%Jm&kcLZM;vc{$(eV}3D;R*m7mWQ
zUi>ebHWu?&rs7@2tnY=c7acL@2Ihb_<Im>2`Lxk-E*F*$x}F<wk6E*CIc<zEu;du6
ziH`EI{8HfL&C`CcP)Hlz;!d}aY3*WX9m&MKOvW}&8kWIuqiywMl15Y0PP03c(q`Oi
fY_Kh>+qR607k379lGV&2n?=dyuJvp2?Ye&en#Bo)

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index 4e05f6355..2d64dd36a 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Witaj w Kotti"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
 
+#: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -68,27 +73,23 @@ msgstr ""
 "\n"
 "<h2>Zaloguj się</h2>\n"
 "<p>\n"
-"    Możesz <a class=\"btn btn-success\" href=\"login\">zalogować się</a> do "
-"twojego serwisu\n"
+"    Możesz <a class=\"btn btn-success\" href=\"login\">zalogować się</a> do twojego serwisu\n"
 "    i zmieniać jego zawartość.  Jeżeli jeszcze nie ustaliłeś hasła dla\n"
 "    konta administratora, domyślnie jest to <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Po zalogowaniu zobaczysz szare menu edycyjne poniżej\n"
-"    menu nawigacyjnego. Umożliwia ono przełączanie się między edycją a "
-"wyglądem aktualnej strony widzianej z perspektywy użytkowników.\n"
+"    menu nawigacyjnego. Umożliwia ono przełączanie się między edycją a wyglądem aktualnej strony widzianej z perspektywy użytkowników.\n"
 "</p>\n"
 "<div class=\"row\">\n"
 "    <div class=\"col-md-4\">\n"
 "        <h2>Konfiguracja</h2>\n"
 "        <p>\n"
-"            Dowiedz się jak skonfigurować tytył i inne ustawienia "
-"używając             prostego pliku tekstowego w systemie plików.\n"
+"            Dowiedz się jak skonfigurować tytył i inne ustawienia używając             prostego pliku tekstowego w systemie plików.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Podręcznik konfiguracji\n"
 "            </a>\n"
 "        </p>\n"
@@ -96,13 +97,11 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Wtyczki</h2>\n"
 "        <p>\n"
-"            Wtyczki pozwalają na rozszerzenie funkcjonalności twojego serwisu "
-"opartego na Kotti.\n"
+"            Wtyczki pozwalają na rozszerzenie funkcjonalności twojego serwisu opartego na Kotti.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Wtyczki do Kotti\n"
 "            </a>\n"
 "        </p>\n"
@@ -110,9 +109,7 @@ msgstr ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Dokumentacja</h2>\n"
 "        <p>\n"
-"            Zastanawiasz się co jeszcze możesz zrobić korzystając z "
-"Kotti?              Jaką ma licencję? Przeczytaj podręcznik aby dowiedzieć "
-"się więcej.\n"
+"            Zastanawiasz się co jeszcze możesz zrobić korzystając z Kotti?              Jaką ma licencję? Przeczytaj podręcznik aby dowiedzieć się więcej.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
@@ -123,12 +120,20 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
+#: kotti/populate.py:123
+msgid "About"
+msgstr "Informacje"
+
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim asortymencie produktów dla lotnictwa i przemysłu."
+
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -146,8 +151,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -157,8 +161,7 @@ msgstr ""
 "\n"
 "<p>\n"
 "  <img alt=\"pięć barwnych samolotów Extra EA300 lecących w szyku\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -176,598 +179,771 @@ msgstr ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "  <em>Zdjęcie:</em> \"Northern Lights Formation\" autorstwa FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
+"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Prawa autorskie</a>.\n"
 "  Oryginalnie opublikowane w artykule\n"
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} został usunięty."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Kopiuj"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} nie jest już widoczny w nawigacji."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Wytnij"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} jest teraz widoczny w nawigacji."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Wklej"
 
-#, python-format
-msgid "${title} was added."
-msgstr "${title} został dodany."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Zmień nazwę"
 
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} został skopiowany."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Usuń"
 
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} został wycięty."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
 
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} został usunięty."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Plik"
 
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} został przeniesiony."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Obraz"
 
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} został wklejony."
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Widok katalogów"
 
-msgid "A user with that email already exists."
-msgstr "Użytkownik z takim adresem email już istnieje."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Zawartość"
 
-msgid "A user with that name already exists."
-msgstr "Użytkownik z takim imieniem już istnieje."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Edytuj"
 
-msgid "About"
-msgstr "Informacje"
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Udostępnij"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Akcje"
 
-msgid "Active"
-msgstr "Aktywne"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "Czytelnik"
+
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "Edytor"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "Właściciel"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "Administrator"
 
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Dodaj"
 
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Dodaj ${type} do ${title}."
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Dołącz treści"
 
-#, python-format
-msgid "Add ${type}."
-msgstr "Dodaj ${type}."
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Ustaw domyślny widok"
 
-msgid "Add Group"
-msgstr "Dodaj grupę"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Widok"
 
-msgid "Add User"
-msgstr "Dodaj użytkownika"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Nawigacja"
 
-msgid "Add group"
-msgstr "Dodaj grupę"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Ustawienia"
 
-msgid "Add new group"
-msgstr "Dodaj nową grupę"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Ustawienia strony"
 
-msgid "Add new user"
-msgstr "Dodaj nowego użytkownika"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Wyloguj się"
 
-msgid "Add user"
-msgstr "Dodaj użytkownika"
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Zresetuj swoje hasło do ${site_title}."
 
-msgid "Admin"
-msgstr "Administrator"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Witaj, ${user_title}!"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub "
-"zarządzać nim."
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Kliknij na link, aby zresetować hasło do ${site_title}: ${url}"
 
-msgid "Apply changes"
-msgstr "Zapisz zmiany"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Rejestracja na ${site_title}"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Rejestrujesz się na ${site_title}."
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Brak dostępu"
 
-msgid "Assign global roles"
-msgstr "Przypisz globalne role"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Logowanie"
 
-msgid "Assign local roles"
-msgstr "Przypisz lokalne role"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Nazwa użytkownika lub email"
 
-msgid "Back to User Management"
-msgstr "Powrót do zarządzania użytkownikami"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "Hasło"
 
-msgid "Blank search text finds all."
-msgstr "Zostaw puste, aby znaleźć wszystko."
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Zaloguj się"
 
-msgid "Body"
-msgstr "Treść"
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Zapomniałeś hasła?"
 
-msgid "Cancel"
-msgstr "Anuluj"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Reset hasła"
 
-msgid "Change State"
-msgstr "Zmień stan"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} poniżej, aby otrzymać email z linkiem do zresetowania hasła."
 
-msgid "Change state to"
-msgstr "Zmień stan na"
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
+msgstr "Nie jesteś jeszcze zarejestrowany?"
 
-msgid "Change workflow state"
-msgstr "Zmień stan publikacji"
+#: kotti/templates/login.pt:83
+msgid "Register for an account on this site."
+msgstr "Zarejestruj się na stronie."
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "Zrób ${state}"
 
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Kliknij na link, aby zresetować hasło do ${site_title}: ${url}"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tagi"
 
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do "
-"ustawienia swego hasła. Robiąc to aktywujesz konto."
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Jesteś tutaj:"
 
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Zmień stan publikacji"
 
-msgid "Contents"
-msgstr "Zawartość"
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub zarządzać nim."
 
-msgid "Copy"
-msgstr "Kopiuj"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "Tytuł"
 
-msgid "Could not paste node. It no longer exists."
-msgstr "Nie można wkleić. Element już nie istnieje."
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "Stan"
 
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
-msgid "Cut"
-msgstr "Wytnij"
-
-msgid "Default view"
-msgstr "Domyślny widok"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Data modyfikacji"
 
-msgid "Default view could not be set."
-msgstr "Domyślny widok nie mógł zostać ustawiony."
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr ""
 
-msgid "Default view has been reset to default."
-msgstr "Zresetowano widok na domyślny."
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Załącz potomka"
 
-msgid "Default view has been set."
-msgstr "Ustawiono domyślny widok."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych dokumentów, oraz ich poddokumenty."
 
-msgid "Delete"
-msgstr "Usuń"
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Zmień stan na"
 
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Usuń ${principal_type} ${title}"
+#: kotti/templates/edit/change-state.pt:51
+msgid "Select the new state where all chosen items should be set."
+msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
 
-msgid "Delete ${title}"
-msgstr "Usuń ${title}"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Bez zmian"
 
-msgid "Description"
-msgstr "Opis"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "Zapisz zmiany"
 
-msgid "Dismiss all errors"
-msgstr "Zignoruj wszystkie błędy"
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Anuluj"
 
-msgid "Document"
-msgstr "Dokument"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Brak elementów potomnych."
 
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
-"Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. "
-"W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu "
-"nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
 
-msgid "Edit"
-msgstr "Edytuj"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Widoczność"
 
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Edycja ${principal_type} ${title}"
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Widoczny"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr "Edycja ${title}"
+#: kotti/templates/edit/contents.pt:79
+msgid "Hidden"
+msgstr "Ukryty"
 
-msgid "Editor"
-msgstr "Edytor"
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
 
-msgid "Email"
-msgstr ""
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Usuń ${title}"
 
-msgid "File"
-msgstr "Plik"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
 
-msgid "Filename"
-msgstr "Nazwa pliku"
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Nawigacja strony"
 
-#. Canonical text for ${reset_password} is: "Reset password"
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} "
-"poniżej, aby otrzymać email z linkiem do zresetowania hasła."
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
 
-msgid "Find users or groups"
-msgstr "Znajdź użytkowników lub grupy"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Nowa nazwa"
 
-msgid "Folder view"
-msgstr "Widok katalogów"
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Nowy tytuł"
 
-msgid "Forbidden"
-msgstr "Brak dostępu"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Zmień nazwę ${title}"
 
-msgid "Forgot your password?"
-msgstr "Zapomniałeś hasła?"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Udostępnij ${title}"
 
-msgid "Full name"
-msgstr "Imię i nazwisko"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "Szukaj użytkowników i grup"
 
-msgid "Global roles"
-msgstr "Globalne role"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "Szukaj"
 
-msgid "Gravatar"
-msgstr ""
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Przypisz lokalne role"
+
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "Nazwa"
 
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "Użytkownik"
+
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
 msgid "Group"
 msgstr "Grupa"
 
-msgid "Groups"
-msgstr "Grupy"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr ""
 
-msgid "Hello, ${user_title}!"
-msgstr "Witaj, ${user_title}!"
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#, fuzzy
+msgid "Assign role"
+msgstr "Przypisz lokalne role"
 
-msgid "Hidden"
-msgstr "Ukryty"
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Załącz zawartość z lokalnego pliku(ów)"
 
-msgid "Hide"
-msgstr "Ukryj"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+msgid "Filename"
+msgstr "Nazwa pliku"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
-msgstr ""
-"Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych "
-"dokumentów, oraz ich poddokumenty."
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
+msgstr "Rozmiar"
 
-msgid "Image"
-msgstr "Obraz"
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Status"
 
-msgid "Include children"
-msgstr "Załącz potomka"
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Postęp"
 
-msgid "Invalid value"
-msgstr "Niepoprawna wartość"
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr "Wybierz plik(i) do przesłania..."
 
-msgid "Item was added."
-msgstr "Element został dodany."
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
+msgstr "Prześlij ${number} plików."
 
-msgid "Item was renamed."
-msgstr "Zmieniono nazwę elementu."
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr "Zignoruj wszystkie błędy"
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
 msgstr ""
-"Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby "
-"użytkownik sam ustawił sobie hasło."
 
-msgid "Log in"
-msgstr "Zaloguj się"
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
 
-msgid "Login"
-msgstr "Logowanie"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
 
-msgid "Login failed."
-msgstr "Nie udało się zalogować."
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Powrót do zarządzania użytkownikami"
 
-msgid "Logout"
-msgstr "Wyloguj się"
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#, python-format
+msgid "Edit ${title}"
+msgstr "Edycja ${title}"
 
-msgid "Make ${state}"
-msgstr "Zrób ${state}"
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Szukaj użytkownika(ów) / grupę(y)"
 
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maksymalny rozmiar pliku: ${size}MB"
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Dodaj użytkownika"
 
-msgid "Modification Date"
-msgstr "Data modyfikacji"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Dodaj grupę"
 
-msgid "Move down"
-msgstr "W dół"
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Znajdź użytkowników lub grupy"
 
-msgid "Move up"
-msgstr "W górę"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr "Użytkownik- / nazwa grupy"
 
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Moje ustawienia - ${title}"
+#: kotti/templates/site-setup/users.pt:49
+msgid "Blank search text finds all."
+msgstr "Zostaw puste, aby znaleźć wszystko."
 
-msgid "Name"
-msgstr "Nazwa"
+#: kotti/templates/site-setup/users.pt:63
+msgid "Assign global roles"
+msgstr "Przypisz globalne role"
 
-msgid "Name and title are required."
-msgstr "Nazwa i tytuł są obowiązkowe."
+#: kotti/templates/site-setup/users.pt:115
+msgid "Add new user"
+msgstr "Dodaj nowego użytkownika"
 
-msgid "Navigate"
-msgstr "Nawigacja"
+#: kotti/templates/site-setup/users.pt:121
+msgid "Add new group"
+msgstr "Dodaj nową grupę"
 
-msgid "Navigate Site"
-msgstr "Nawigacja strony"
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Wyniki wyszukania"
 
-msgid "New name"
-msgstr "Nowa nazwa"
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Szukaj..."
 
-msgid "New title"
-msgstr "Nowy tytuł"
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Otagowane z:"
 
-msgid "No change"
-msgstr "Bez zmian"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Witaj, ${user}! Jesteś zalogowany."
 
-msgid "No changes were made."
-msgstr "Nie wykonano żadnych zmian."
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Witaj, nie jesteś zalogowany."
 
-msgid "No content items are contained here."
-msgstr "Brak elementów potomnych."
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "Twoje zmiany zostały zapisane."
 
-msgid "No name was given."
-msgstr "Nie przekazano nazwy."
+#: kotti/views/form.py:174
+msgid "Item was added."
+msgstr "Element został dodany."
 
+#: kotti/views/form.py:264
 #, python-format
-msgid "No such group: ${group}"
-msgstr "Nie ma takiej grupy: ${group}"
+msgid "Maximum file size: ${size}MB"
+msgstr "Maksymalny rozmiar pliku: ${size}MB"
 
-msgid "No users or groups were found."
-msgstr "Nie znaleziono użytkowników ani grup."
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Zapisz"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/views/form.py:198
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Dodaj ${type} do ${title}."
 
-msgid "Not registered yet?"
-msgstr "Nie jesteś jeszcze zarejestrowany?"
+#: kotti/views/form.py:202
+#, python-format
+msgid "Add ${type}."
+msgstr "Dodaj ${type}."
 
-msgid "Nothing was deleted."
-msgstr "Nic nie zostało usunięte"
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Zresetowałeś swoje hasło."
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
-"Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim "
-"asortymencie produktów dla lotnictwa i przemysłu."
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Witaj, ${user}!"
 
-msgid "Owner"
-msgstr "Właściciel"
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
 
-msgid "Password"
-msgstr "Hasło"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Zostałeś wylogowany."
 
-msgid "Paste"
-msgstr "Wklej"
+#: kotti/views/login.py:65 kotti/views/users.py:270
+msgid "Full name"
+msgstr "Imię i nazwisko"
 
-msgid "Preferences"
-msgstr "Ustawienia"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Nazwa użytkownika"
 
-msgid "Progress"
-msgstr "Postęp"
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr ""
 
-msgid "Register"
-msgstr "Zarejestruj"
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
 
+#: kotti/views/login.py:123
 #, python-format
 msgid "Register - ${title}"
 msgstr "Zarejestruj - ${title}"
 
-msgid "Register for an account on this site."
-msgstr "Zarejestruj się na stronie."
-
-msgid "Rename"
-msgstr "Zmień nazwę"
-
-msgid "Rename ${title}"
-msgstr "Zmień nazwę ${title}"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "Reset hasła"
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Nie udało się zalogować."
 
+#: kotti/views/login.py:330
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetowanie hasła - ${title}."
 
-msgid "Reset your password for ${site_title}."
-msgstr "Zresetuj swoje hasło do ${site_title}."
-
-msgid "Save"
-msgstr "Zapisz"
-
-msgid "Search"
-msgstr "Szukaj"
-
-msgid "Search Results"
-msgstr "Wyniki wyszukania"
-
-msgid "Search user(s) / group(s)"
-msgstr "Szukaj użytkownika(ów) / grupę(y)"
-
-msgid "Search users and groups"
-msgstr "Szukaj użytkowników i grup"
-
-msgid "Search..."
-msgstr "Szukaj..."
-
-msgid "Select file(s) to upload..."
-msgstr "Wybierz plik(i) do przesłania..."
-
-msgid "Select the new state where all chosen items should be set."
-msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Nieznana nazwa użytkownika lub email."
 
-msgid "Send password registration link."
-msgstr "Wyślij link do rejestracji na email."
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Zarejestruj"
 
-msgid "Set default view"
-msgstr "Ustaw domyślny widok"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Wystąpił błąd."
 
+#: kotti/views/login.py:295
 #, fuzzy
 msgid "Set password"
 msgstr "Reset hasła"
 
-msgid "Share"
-msgstr "Udostępnij"
-
-msgid "Share ${title}"
-msgstr "Udostępnij ${title}"
-
-msgid "Show"
-msgstr "Pokaż"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Twój token do resetu hasła mógł stracić ważność."
 
-msgid "Site Setup"
-msgstr "Ustawienia strony"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Zarządzanie użytkownikami"
 
-msgid "Size"
-msgstr "Rozmiar"
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
 
-msgid "State"
-msgstr "Stan"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Moje ustawienia - ${title}"
 
-msgid "Status"
-msgstr "Status"
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Niepoprawna wartość"
 
-msgid "Submit"
-msgstr "Zatwierdź"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Użytkownik z takim imieniem już istnieje."
 
-msgid "Tagged with:"
-msgstr "Otagowane z:"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Użytkownik z takim adresem email już istnieje."
 
-msgid "Tags"
-msgstr "Tagi"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Nie ma takiej grupy: ${group}"
 
-msgid "That username or email is not known by this system."
-msgstr "Nieznana nazwa użytkownika lub email."
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Aktywne"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Odznacz, aby dezaktywować konto."
 
-msgid "There was an error."
-msgstr "Wystąpił błąd."
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Globalne role"
 
-msgid "Title"
-msgstr "Tytuł"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Grupy"
 
-msgid "Type"
-msgstr "Typ"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Dodaj użytkownika"
 
-msgid "Untick this to deactivate the account."
-msgstr "Odznacz, aby dezaktywować konto."
+#: kotti/views/users.py:339
+#, python-format
+msgid "${title} was added."
+msgstr "${title} został dodany."
 
-msgid "Upload ${number} files."
-msgstr "Prześlij ${number} plików."
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Dodaj grupę"
 
-msgid "Upload Content"
-msgstr "Dołącz treści"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+msgid "No changes were made."
+msgstr "Nie wykonano żadnych zmian."
 
-msgid "Upload content from local file(s)"
-msgstr "Załącz zawartość z lokalnego pliku(ów)"
+#: kotti/views/users.py:558
+msgid "No name was given."
+msgstr "Nie przekazano nazwy."
 
-msgid "User"
-msgstr "Użytkownik"
+#: kotti/views/users.py:98
+msgid "No users or groups were found."
+msgstr "Nie znaleziono użytkowników ani grup."
 
-msgid "User Management"
-msgstr "Zarządzanie użytkownikami"
+#: kotti/views/users.py:505
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Edycja ${principal_type} ${title}"
 
+#: kotti/views/users.py:533
 msgid "User was not found."
 msgstr "Użytkownik nie został odnaleziony."
 
-msgid "User- / groupname"
-msgstr "Użytkownik- / nazwa grupy"
+#: kotti/views/users.py:324
+msgid "Send password registration link."
+msgstr "Wyślij link do rejestracji na email."
 
-msgid "Username"
-msgstr "Nazwa użytkownika"
+#: kotti/views/users.py:543
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} został usunięty."
 
-msgid "Username or email"
-msgstr "Nazwa użytkownika lub email"
+#: kotti/views/users.py:551
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Usuń ${principal_type} ${title}"
 
-msgid "View"
-msgstr "Widok"
+#: kotti/views/edit/actions.py:106
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} został skopiowany."
 
-msgid "Viewer"
-msgstr "Czytelnik"
+#: kotti/views/edit/actions.py:124
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} został wycięty."
 
-msgid "Visibility"
-msgstr "Widoczność"
+#: kotti/views/edit/actions.py:183
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} został przeniesiony."
 
-msgid "Visible"
-msgstr "Widoczny"
+#: kotti/views/edit/actions.py:159
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} został wklejony."
 
-msgid "Welcome to Kotti"
-msgstr "Witaj w Kotti"
+#: kotti/views/edit/actions.py:162
+msgid "Could not paste node. It no longer exists."
+msgstr "Nie można wkleić. Element już nie istnieje."
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Witaj, ${user}!"
+msgid "${title} is now visible in the navigation."
+msgstr "${title} jest teraz widoczny w nawigacji."
 
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Witaj, ${user}! Jesteś zalogowany."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} nie jest już widoczny w nawigacji."
 
-msgid "Welcome, you are not logged in."
-msgstr "Witaj, nie jesteś zalogowany."
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} został usunięty."
 
-msgid "You are here:"
-msgstr "Jesteś tutaj:"
+#: kotti/views/edit/actions.py:303
+msgid "Nothing was deleted."
+msgstr "Nic nie zostało usunięte"
 
-msgid "You are joining ${site_title}."
-msgstr "Rejestrujesz się na ${site_title}."
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Nazwa i tytuł są obowiązkowe."
 
-msgid "You have been logged out."
-msgstr "Zostałeś wylogowany."
+#: kotti/views/edit/actions.py:343
+msgid "Item was renamed."
+msgstr "Zmieniono nazwę elementu."
 
-msgid "You have reset your password."
-msgstr "Zresetowałeś swoje hasło."
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "W górę"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "W dół"
+
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Pokaż"
 
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Ukryj"
+
+#: kotti/views/edit/actions.py:507
 msgid "You have to select items to perform an action."
 msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
 
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło "
-"aktywujesz swoje konto."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Zmień stan"
 
-msgid "Your changes have been saved."
-msgstr "Twoje zmiany zostały zapisane."
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Opis"
 
-msgid "Your password reset token may have expired."
-msgstr "Twój token do resetu hasła mógł stracić ważność."
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Treść"
 
-msgid "Your registration for ${site_title}"
-msgstr "Rejestracja na ${site_title}"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Zresetowano widok na domyślny."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Domyślny widok"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Ustawiono domyślny widok."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Domyślny widok nie mógł zostać ustawiony."
+
+#~ msgid "Submit"
+#~ msgstr "Zatwierdź"
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index 983100318f7448a1901efd35e8f14d9347f47fb7..79259d16b21dce3fae437edda93cdb735af33a3b 100644
GIT binary patch
delta 1003
zcmXZbO-NKx7{>88v_@wvb4JVZYcfl7x_IZpP&1W_3|s_RAVj+{5vCv&5nRPh!h#k-
zNG)0hxiAP}uqbL1N{fM{Md6~)MIe+EwTK|1|Kl7O=662dbIyCtoj$snU0A9Jht2Fv
z+^h!|@gRP|6vh)~2e20-Simhfj@3AYwK$FSc+1u2T>TMlroDux@U?4CGI%fbOudC0
z3!S6EqhSVjViEUX2^C-+tMC_Y!@pREu?DkdY{BE0!+yMs+Tb#3!z-xqZ(V)O)xS4{
z<r8k&VRncCDQv@G)WoZ(6W+iW-bDqTbNvgh|FNsTbiP7u_zh~qAFu`2QSoA&QvFRK
z1)Z=1wO}{y!n7N35)0G^UH^0BXG{Dk&^w&PZ>afK8p~cs*0P&eiT6?C=W#ziMUr6Q
zXA0XX{B{GXSX~)tL`^)5?RX6J2J)y36tD&-P;Vtf&3oW1q2_<Zt@s0V(0{I8xqBm{
zp~WdE6|JZ{>O}1<i&}8N^`AwZD37f;g}RbENKCtjit`M4zqX8;zlw_c36-Irs15zW
zYTlnkn#vidLrrK$?YtY4*n<ji8l!j~bp@ADDV;&yqus^|oJTG65S5`t)W%*QAAprm
zU)e|O(yOoG32T82atqdv`!J6IUPGPuNptaHWG&h`FzEG7j0{a)7#sCY3{8&Yl7XMj
bcxm7Bv&kTx^MjNh`2K8f;z;p*q9ghr<X>nX

delta 1306
zcmYMzO=uNY6u|K#8e_(4HJZd|Y_GO{HBOxONd1^3C5ee4m}pEMQo0Z($@rY`G81Md
z!65RgyPz8h2;xQ&N)=Hd3!#g4k?so3!a^&E6-5zBrHg>Yh4z1Rpds+P=YE`f@0t7l
zIB>4@-p@<R7ng_}s}|WKB9GUJ?8epWMH;aMcVQ7L@e(e_D_Dis@MFA%{L2qnypY9z
zVg>z+cm&^M{k=6JpAny^k@EYE&eLJjaR=-05pKan)C9G)A}g=~SK~HZi_O@8hp-bz
zum`_GJ>V<U1OJOU|6LZZWfP4z)RjNn@C!Qj(NVxp@gnNN+o(63!<9IXns^}_f0&Iw
z$>M)9U!xxQE$V?QH;8P;TGV{asN-E_8hXQi)D4HQ9>2*Zq<D(>Y&QM^$ti!MCaPfa
zEY_f|znOUtxvbpBW%w)V{0F!lpCQGSvb9lU4Gn`jA%|Ll4%CGnZpD+RZ(s(s0+;Y3
zyo&l(zDHg6TjnC_`t_ScR$)ErMR#Peja0NOEi|+gJ*eMg0QF?Us2iTn#=k|q(F}fq
z*HAynPsnBD7t}n@k@qaGP}eWvfoR?;)Cz4vJ<wLHVt;XHXa!u<1&2{jK7<CpMoln{
z7G6O81eZ}Ob_aRb@*^(A2dEqUj#{C|s0aHC`GLtI>aT1C4`Qdj`Y&nd1}BiuDigR3
zXE2X<QE&Wo^W0eFORFP}#{7}g?j5y{`*9LPp=%CDX&M-(X}>k-PegHQ_b0_*)b5-t
zCUzlmO?Q7sZ(n;ySJz<o(2zBIth%AR&*XD%v(xD09mg6tY7hETfhM!NywrD1-pS={
zCuisOnq1y>@{JCER-c!ob|Ln{q~xVh?3yE!VPpz^aM}-I&$OnryrjK2?ggc$k!buY
zR)ob#ujtza-y3($L~2_5`r1punx-f&{y*%R+3D(*^1&!f{V?0&q#xVe;Yc(Zghkiv
z9}ZG$pfnkKCHqhmk0-7PC*FriTfW77XtwPP&6YNk+hz6mp&xS-iZJb(PH)&RQJ(`%
hdoB6=Od6ym|Ew9Cziz_$8<Fvol;%`0w@_VW{ReV*%+&w@

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 0405520d6..341c0cdca 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -1,22 +1,30 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"POT-Creation-Date: 2015-10-09 21:02+0200\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr ""
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr ""
 
+#: kotti/populate.py:66
 #, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
 "<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
 "    and start changing its contents.  If you haven't chosen a password for\n"
 "    your admin account yet, it'll likely be <em>qwerty</em>.\n"
 "</p>\n"
 "<p>\n"
 "    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
 "    current page as it will appear to your visitors.\n"
 "</p>\n"
 "<div class=\"row\">\n"
@@ -28,8 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -37,14 +44,12 @@ msgid ""
 "    <div class=\"col-md-4\">\n"
 "        <h2>Add-ons</h2>\n"
 "        <p>\n"
-"            A number of add-ons allow you to extend the functionality of "
-"your\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
 "            Kotti site.\n"
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
 "                Kotti add-ons\n"
 "            </a>\n"
 "        </p>\n"
@@ -66,107 +71,20 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"<h2>Log in</h2>\n"
-"<p>\n"
-"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your "
-"site\n"
-"    and start changing its contents.  If you haven't chosen a password for\n"
-"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
-"</p>\n"
-"<p>\n"
-"    Once you're logged in, you'll see the grey editor bar below the top\n"
-"    navigation bar.  It will allow you to switch between editing and viewing "
-"the\n"
-"    current page as it will appear to your visitors.\n"
-"</p>\n"
-"<div class=\"row\">\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Configure</h2>\n"
-"        <p>\n"
-"            Find out how to configure your Kotti's title and many other "
-"settings using a\n"
-"            simple text file in your file system.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/"
-"configuration.html\">\n"
-"               Configuration manual\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Add-ons</h2>\n"
-"        <p>\n"
-"            A number of add-ons allow you to extend the functionality of your "
-"Kotti site.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;"
-"term=kotti\">\n"
-"                Kotti add-ons\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"    <div class=\"col-md-4\">\n"
-"        <h2>Documentation</h2>\n"
-"        <p>\n"
-"            Wonder what more you can do with Kotti?  What license it has?  "
-"Read the\n"
-"            manual for more information.\n"
-"        </p>\n"
-"        <p>\n"
-"            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
-"               Documentation\n"
-"            </a>\n"
-"        </p>\n"
-"    </div>\n"
-"</div>\n"
+#: kotti/populate.py:123
+msgid "About"
 msgstr ""
 
-msgid ""
-"\n"
-"<p>\n"
-"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
-"   width=\"640\" height=\"376\" />\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"   Our worldwide headquarters:\n"
-"</p>\n"
-"\n"
-"<address>\n"
-"  Foo World<br />\n"
-"  123 Nowhere Street, Suite 777<br />\n"
-"  Omak, WA   98841   USA<br />\n"
-"  +1-509-555-0100<br />\n"
-"  widgets@foowrld.example.com\n"
-"</address>\n"
-"\n"
-"<p><small style=\"font-size: smaller\">\n"
-"  <em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation."
-"jpg\">\n"
-"  Copyright info</a>.\n"
-"  Originally published in the\n"
-"  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
-"  article.\n"
-"</small></p>\n"
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
+#: kotti/populate.py:125
 msgid ""
 "\n"
 "<p>\n"
 "  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
-"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/"
-"Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
 "   width=\"640\" height=\"376\" />\n"
 "</p>\n"
 "\n"
@@ -184,8 +102,7 @@ msgid ""
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
 "<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
-"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg"
-"\">\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "Copyright info</a>.\n"
 "Originally published in the\n"
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
@@ -193,624 +110,801 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#, fuzzy, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} apagado."
+#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+msgid "Copy"
+msgstr "Copiar"
 
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} já não está visivel na navegação."
+#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+msgid "Cut"
+msgstr "Cortar"
 
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} encontra-se visivel na navegação."
+#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+msgid "Paste"
+msgstr "Colar"
 
-#, fuzzy, python-format
-msgid "${title} was added."
-msgstr "${title} adicionado."
+#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:458
+msgid "Rename"
+msgstr "Renomear"
 
-#, fuzzy, python-format
-msgid "${title} was copied."
-msgstr "${title} copiado."
+#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
+#: kotti/views/edit/actions.py:460
+msgid "Delete"
+msgstr "Apagar"
 
-#, fuzzy, python-format
-msgid "${title} was cut."
-msgstr "${title} cortado."
+#: kotti/resources.py:637 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Documento"
 
-#, fuzzy, python-format
-msgid "${title} was deleted."
-msgstr "${title} apagado."
+#: kotti/resources.py:726 kotti/views/edit/content.py:113
+#: kotti/views/edit/content.py:66
+msgid "File"
+msgstr "Ficheiro"
 
-#, fuzzy, python-format
-msgid "${title} was moved."
-msgstr "${title} movido."
+#: kotti/resources.py:772 kotti/views/edit/content.py:141
+msgid "Image"
+msgstr "Imagem"
 
-#, fuzzy, python-format
-msgid "${title} was pasted."
-msgstr "${title} colado."
+#: kotti/resources.py:529
+msgid "Folder view"
+msgstr "Vista de pasta"
 
-msgid "A user with that email already exists."
-msgstr "Esse utilizador com esse e-mail já existe."
+#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Conteúdo"
 
-msgid "A user with that name already exists."
-msgstr "Esse utilizador com esse nome já existe."
+#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Editar"
 
-msgid "About"
-msgstr ""
+#: kotti/resources.py:525
+msgid "Share"
+msgstr "Partilha"
 
+#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Ações"
 
-msgid "Active"
-msgstr "Activo"
+#: kotti/security.py:191
+msgid "Viewer"
+msgstr "Leitor"
+
+#: kotti/security.py:192
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:193
+msgid "Owner"
+msgstr "Dono"
+
+#: kotti/security.py:194
+msgid "Admin"
+msgstr "Admin"
 
+#: kotti/templates/add-dropdown.pt:3
 msgid "Add"
 msgstr "Adicionar"
 
-#, fuzzy, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Adicionar ${type} em ${title}"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Colocar Conteúdo"
 
-#, fuzzy, python-format
-msgid "Add ${type}."
-msgstr "Adicionar ${type}"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Definir vista por defeito"
 
-msgid "Add Group"
-msgstr "Adicionar Grupo"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Ver"
 
-msgid "Add User"
-msgstr "Adicionar Utilizador"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navegar"
 
-msgid "Add group"
-msgstr "Adicionar grupo"
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Preferências"
 
-#, fuzzy
-msgid "Add new group"
-msgstr "Adicionar grupo"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Configurar Sítio"
 
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Sair"
+
+#: kotti/templates/email-reset-password.pt:2
 #, fuzzy
-msgid "Add new user"
-msgstr "Adicionar utilizador"
+msgid "Reset your password for ${site_title}."
+msgstr "Reiniciar a sua palavra passe em ${site_title}"
 
-msgid "Add user"
-msgstr "Adicionar utilizador"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Bem-vindo, ${user_title}!"
 
-msgid "Admin"
-msgstr "Admin"
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
 
-msgid "An item's workflow state determines who can see, edit and/or manage it."
-msgstr ""
-"O estado de workflow de um item define quem o pode ver, edit e/ou administrar."
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "O seu registo em ${site_title}"
 
-msgid "Apply changes"
-msgstr "Aplicar alterações"
+#: kotti/templates/email-set-password.pt:5
+#, fuzzy
+msgid "You are joining ${site_title}."
+msgstr "O seu registo em ${site_title}"
 
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Deseja realmente eliminar ${title}?"
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
 
-msgid "Are you sure you want to delete ${type} ${title}?"
-msgstr "Deseja realmente eliminar ${type} ${title}?"
+#: kotti/templates/forbidden.pt:10
+#, fuzzy
+msgid "Forbidden"
+msgstr "Escondido"
 
-msgid "Are you sure you want to delete the following items?"
-msgstr "Deseja realmente eliminar os items seguintes?"
+#: kotti/templates/login.pt:15
+msgid "Login"
+msgstr "Entrar"
 
-#, fuzzy
-msgid "Assign global roles"
-msgstr "Atribuir papéis locais"
+#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+msgid "Username or email"
+msgstr "Utilizador ou e-mail"
 
-msgid "Assign local roles"
-msgstr "Atribuir papéis locais"
+#: kotti/templates/login.pt:25 kotti/views/login.py:257
+#: kotti/views/users.py:212
+msgid "Password"
+msgstr "Palavra passe"
 
-msgid "Back to User Management"
-msgstr "Voltar à gestão de utilizadores"
+#: kotti/templates/login.pt:33
+msgid "Log in"
+msgstr "Entrar"
+
+#: kotti/templates/login.pt:43
+msgid "Forgot your password?"
+msgstr "Esqueceu-se da palavra passe?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+msgid "Reset password"
+msgstr "Repor a palavra passe"
 
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:48
 #, fuzzy
-msgid "Blank search text finds all."
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Preencha o seu nome de utilizador com o seu e-mail e clique em ${reset_password} para receber um e-mail com uma ligação para reiniciar a sua palavra passe."
+
+#: kotti/templates/login.pt:76
+msgid "Not registered yet?"
 msgstr ""
-"Encontre e modifique utilizadores (Uma pesquisa em branco retorna\"\n"
-"\" todos os utilizadores)"
 
-msgid "Body"
-msgstr "Corpo"
+#: kotti/templates/login.pt:83
+#, fuzzy
+msgid "Register for an account on this site."
+msgstr "Não se encontra registado? ${register} para criar uma conta."
 
-msgid "Cancel"
-msgstr "Cancelar"
+#: kotti/templates/workflow-dropdown.pt:15
+msgid "Make ${state}"
+msgstr "Tornar ${state}"
 
-msgid "Change State"
-msgstr "Alterar Estado"
+#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Etiquetas"
 
-msgid "Change state to"
-msgstr "Mudar estado para"
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Você está aqui:"
 
+#: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Modificar estado de workflow"
 
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
-
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
-
-#, fuzzy
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-"Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma "
-"ligação temporária para reiniciar a sua palavra passe."
-
-msgid "Congratulations! You have successfully installed Kotti."
-msgstr ""
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "O estado de workflow de um item define quem o pode ver, edit e/ou administrar."
 
-msgid "Contents"
-msgstr "Conteúdo"
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+msgid "Title"
+msgstr "Título"
 
-msgid "Copy"
-msgstr "Copiar"
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
+#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Tipo"
 
-#, fuzzy
-msgid "Could not paste node. It no longer exists."
-msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:24
+msgid "State"
+msgstr "Estado"
 
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-msgid "Cut"
-msgstr "Cortar"
-
-msgid "Default view"
-msgstr "Vista por defeito"
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Data de Modificação"
 
-msgid "Default view could not be set."
-msgstr "Vista por defeito não pode ser alterada."
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
+#: kotti/templates/edit/delete-nodes.pt:32
+msgid "Select item"
+msgstr ""
 
-msgid "Default view has been reset to default."
-msgstr "A vista original foi indicada como a vista por defeito."
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:45
+msgid "Include children"
+msgstr "Incluir nós interiores"
 
-msgid "Default view has been set."
-msgstr "Vista por defeito foi alterada."
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Se estiver selecionado irá tentar alterar o estado dos documentosselecionados e dos seus subdocumentos."
 
-msgid "Delete"
-msgstr "Apagar"
+#: kotti/templates/edit/change-state.pt:50
+msgid "Change state to"
+msgstr "Mudar estado para"
 
-#, fuzzy, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Apagar ${principal_type} - ${title}"
+#: kotti/templates/edit/change-state.pt:51
+#, fuzzy
+msgid "Select the new state where all chosen items should be set."
+msgstr "Selecione o novo estado para os items selecionados."
 
-msgid "Delete ${title}"
-msgstr "Apagar ${title}"
+#: kotti/templates/edit/change-state.pt:55
+msgid "No change"
+msgstr "Não foram efectuadas nenhumas alterações"
 
-msgid "Description"
-msgstr "Descrição"
+#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/site-setup/users.pt:105
+msgid "Apply changes"
+msgstr "Aplicar alterações"
 
-msgid "Dismiss all errors"
-msgstr ""
+#: kotti/templates/edit/change-state.pt:66
+#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Cancelar"
 
-msgid "Document"
-msgstr "Documento"
+#: kotti/templates/edit/contents.pt:30
+msgid "No content items are contained here."
+msgstr "Não existem items nesta pasta."
 
-#, fuzzy
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You "
-"can change both below."
+#: kotti/templates/edit/contents.pt:38
+msgid "Select / deselect all"
 msgstr ""
-"Cada item tem um nome que será usado para criar o url e o título.  Poderá "
-"alterá-los colocando os novos detalhes abaixo."
 
-msgid "Edit"
-msgstr "Editar"
+#: kotti/templates/edit/contents.pt:42
+msgid "Visibility"
+msgstr "Visibilidade"
 
-#, fuzzy, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Editar ${principal_type} - ${title}"
+#: kotti/templates/edit/contents.pt:75
+msgid "Visible"
+msgstr "Visível"
 
-#, python-format
-msgid "Edit ${title}"
-msgstr "Editar ${title}"
+#: kotti/templates/edit/contents.pt:79
+#, fuzzy
+msgid "Hidden"
+msgstr "Escondido"
 
-msgid "Editor"
-msgstr "Editor"
+#: kotti/templates/edit/delete-nodes.pt:14
+msgid "Are you sure you want to delete the following items?"
+msgstr "Deseja realmente eliminar os items seguintes?"
 
-msgid "Email"
-msgstr "E-mail"
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Apagar ${title}"
 
-msgid "File"
-msgstr "Ficheiro"
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Deseja realmente eliminar ${title}?"
 
+#: kotti/templates/edit/nav-tree-view.pt:8
 #, fuzzy
-msgid "Filename"
-msgstr "Renomear"
+msgid "Navigate Site"
+msgstr "Navegar"
 
-#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
 #, fuzzy
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
-msgstr ""
-"Preencha o seu nome de utilizador com o seu e-mail e clique em "
-"${reset_password} para receber um e-mail com uma ligação para reiniciar a sua "
-"palavra passe."
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Cada item tem um nome que será usado para criar o url e o título.  Poderá alterá-los colocando os novos detalhes abaixo."
 
-#, fuzzy
-msgid "Find users or groups"
-msgstr "Procurar utilizadores e grupos"
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Novo nome"
 
-msgid "Folder view"
-msgstr "Vista de pasta"
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Novo título"
 
-#, fuzzy
-msgid "Forbidden"
-msgstr "Escondido"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Renomear ${title}"
 
-msgid "Forgot your password?"
-msgstr "Esqueceu-se da palavra passe?"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Partilhar ${title}"
 
-#, fuzzy
-msgid "Full name"
-msgstr "Nome completo"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
+#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+msgid "Search users and groups"
+msgstr "Procurar utilizadores e grupos"
 
-msgid "Global roles"
-msgstr "Papéis globais"
+#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+msgid "Search"
+msgstr "Procurar"
 
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/templates/edit/share.pt:42
+msgid "Assign local roles"
+msgstr "Atribuir papéis locais"
+
+#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
+#: kotti/views/users.py:207
+msgid "Name"
+msgstr "Nome"
+
+#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
+#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+msgid "User"
+msgstr "Utilizador"
 
+#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
+#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
+#: kotti/views/users.py:536
 msgid "Group"
 msgstr "Grupo"
 
-msgid "Groups"
-msgstr "Grupos"
-
-msgid "Hello, ${user_title}!"
-msgstr "Bem-vindo, ${user_title}!"
+#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+msgid "Gravatar"
+msgstr "Gravatar"
 
+#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
 #, fuzzy
-msgid "Hidden"
-msgstr "Escondido"
-
-msgid "Hide"
-msgstr "Esconder"
+msgid "Assign role"
+msgstr "Atribuir papéis locais"
 
-msgid ""
-"If checked, this will attempt to modify the status of all children in any "
-"selected documents and their subdocuments."
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
 msgstr ""
-"Se estiver selecionado irá tentar alterar o estado dos documentosselecionados "
-"e dos seus subdocumentos."
-
-msgid "Image"
-msgstr "Imagem"
-
-msgid "Include children"
-msgstr "Incluir nós interiores"
-
-msgid "Invalid value"
-msgstr "Valor inválido"
-
-#, fuzzy
-msgid "Item was added."
-msgstr "${title} adicionado."
 
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
 #, fuzzy
-msgid "Item was renamed."
-msgstr "Item renomeado"
+msgid "Filename"
+msgstr "Renomear"
 
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+msgid "Size"
 msgstr ""
-"Deixe este campo por preencher e escolha a opção 'Enviar ligação para "
-"registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
 
-msgid "Log in"
-msgstr "Entrar"
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr ""
 
-msgid "Login"
-msgstr "Entrar"
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr ""
 
-msgid "Login failed."
-msgstr "Erro de autenticação"
+#: kotti/templates/edit/upload.pt:86
+msgid "Select file(s) to upload..."
+msgstr ""
 
-msgid "Logout"
-msgstr "Sair"
+#: kotti/templates/edit/upload.pt:94
+msgid "Upload ${number} files."
+msgstr ""
 
-msgid "Make ${state}"
-msgstr "Tornar ${state}"
+#: kotti/templates/edit/upload.pt:99
+msgid "Dismiss all errors"
+msgstr ""
 
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Tamanho máximo do ficheiro: ${size}MB"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
 
-msgid "Modification Date"
-msgstr "Data de Modificação"
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
 
-msgid "Move down"
-msgstr "Mover para baixo"
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Deseja realmente eliminar ${type} ${title}?"
 
-msgid "Move up"
-msgstr "Mover para cima"
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Voltar à gestão de utilizadores"
 
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
 #, python-format
-msgid "My preferences - ${title}"
-msgstr "Minhas preferências - ${title}"
+msgid "Edit ${title}"
+msgstr "Editar ${title}"
 
-msgid "Name"
-msgstr "Nome"
+#: kotti/templates/site-setup/users.pt:12
+#, fuzzy
+msgid "Search user(s) / group(s)"
+msgstr "Procurar utilizadores e grupos"
 
-msgid "Name and title are required."
-msgstr "Nome e título são obrigatórios."
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Adicionar utilizador"
 
-msgid "Navigate"
-msgstr "Navegar"
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Adicionar grupo"
 
+#: kotti/templates/site-setup/users.pt:34
 #, fuzzy
-msgid "Navigate Site"
-msgstr "Navegar"
-
-msgid "New name"
-msgstr "Novo nome"
+msgid "Find users or groups"
+msgstr "Procurar utilizadores e grupos"
 
-msgid "New title"
-msgstr "Novo título"
+#: kotti/templates/site-setup/users.pt:39
+msgid "User- / groupname"
+msgstr ""
 
-msgid "No change"
-msgstr "Não foram efectuadas nenhumas alterações"
+#: kotti/templates/site-setup/users.pt:49
+#, fuzzy
+msgid "Blank search text finds all."
+msgstr ""
+"Encontre e modifique utilizadores (Uma pesquisa em branco retorna\"\n"
+"\" todos os utilizadores)"
 
+#: kotti/templates/site-setup/users.pt:63
 #, fuzzy
-msgid "No changes were made."
-msgstr "Não foram efectuadas nenhumas alterações"
+msgid "Assign global roles"
+msgstr "Atribuir papéis locais"
 
-msgid "No content items are contained here."
-msgstr "Não existem items nesta pasta."
+#: kotti/templates/site-setup/users.pt:115
+#, fuzzy
+msgid "Add new user"
+msgstr "Adicionar utilizador"
 
+#: kotti/templates/site-setup/users.pt:121
 #, fuzzy
-msgid "No name was given."
-msgstr "Nenhum nome foi indicado."
-
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Grupo não encontrado: ${group}"
-
-#, fuzzy
-msgid "No users or groups were found."
-msgstr "Utilizadores e grupos não encontrados."
+msgid "Add new group"
+msgstr "Adicionar grupo"
 
-msgid "Not Found"
-msgstr ""
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Resultados da pesquisa"
 
-msgid "Not registered yet?"
-msgstr ""
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Procurar..."
 
-#, fuzzy
-msgid "Nothing was deleted."
-msgstr "Nada foi apagado."
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Marcado como:"
 
-msgid ""
-"Our company is the leading manufacturer of foo widgets used in a wide variety "
-"of aviation and and industrial products."
-msgstr ""
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Bem-vindo, ${user}! Você está autenticado."
 
-msgid "Owner"
-msgstr "Dono"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Bem-vindo, você não está autenticado."
 
-msgid "Password"
-msgstr "Palavra passe"
+#: kotti/views/form.py:79 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+msgid "Your changes have been saved."
+msgstr "As suas alterações foram guardadas."
 
-msgid "Paste"
-msgstr "Colar"
+#: kotti/views/form.py:174
+#, fuzzy
+msgid "Item was added."
+msgstr "${title} adicionado."
 
-msgid "Preferences"
-msgstr "Preferências"
+#: kotti/views/form.py:264
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Tamanho máximo do ficheiro: ${size}MB"
 
-msgid "Progress"
-msgstr ""
+#: kotti/views/form.py:77 kotti/views/users.py:441
+msgid "Save"
+msgstr "Guardar"
 
-msgid "Register"
-msgstr "Registar-se"
+#: kotti/views/form.py:198
+#, fuzzy, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Adicionar ${type} em ${title}"
 
+#: kotti/views/form.py:202
 #, fuzzy, python-format
-msgid "Register - ${title}"
-msgstr "Registar ${title}"
+msgid "Add ${type}."
+msgstr "Adicionar ${type}"
 
+#: kotti/views/login.py:282
 #, fuzzy
-msgid "Register for an account on this site."
-msgstr "Não se encontra registado? ${register} para criar uma conta."
-
-msgid "Rename"
-msgstr "Renomear"
+msgid "You have reset your password."
+msgstr "Você reinicializou a palavra passe com sucesso"
 
-msgid "Rename ${title}"
-msgstr "Renomear ${title}"
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bem-vindo, ${user}!"
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-msgid "Reset password"
-msgstr "Repor a palavra passe"
+#: kotti/views/login.py:179
+#, fuzzy
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#, fuzzy, python-format
-msgid "Reset your password - ${title}."
-msgstr "Reiniciar a sua palavra passe - ${title}"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Você desligou a sessão"
 
+#: kotti/views/login.py:65 kotti/views/users.py:270
 #, fuzzy
-msgid "Reset your password for ${site_title}."
-msgstr "Reiniciar a sua palavra passe em ${site_title}"
-
-msgid "Save"
-msgstr "Guardar"
+msgid "Full name"
+msgstr "Nome completo"
 
-msgid "Search"
-msgstr "Procurar"
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Nome utilizador"
 
-msgid "Search Results"
-msgstr "Resultados da pesquisa"
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+msgid "Email"
+msgstr "E-mail"
 
+#: kotti/views/login.py:108
 #, fuzzy
-msgid "Search user(s) / group(s)"
-msgstr "Procurar utilizadores e grupos"
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-msgid "Search users and groups"
-msgstr "Procurar utilizadores e grupos"
+#: kotti/views/login.py:123
+#, fuzzy, python-format
+msgid "Register - ${title}"
+msgstr "Registar ${title}"
 
-msgid "Search..."
-msgstr "Procurar..."
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Erro de autenticação"
 
-msgid "Select file(s) to upload..."
-msgstr ""
+#: kotti/views/login.py:330
+#, fuzzy, python-format
+msgid "Reset your password - ${title}."
+msgstr "Reiniciar a sua palavra passe - ${title}"
 
+#: kotti/views/login.py:222
 #, fuzzy
-msgid "Select the new state where all chosen items should be set."
-msgstr "Selecione o novo estado para os items selecionados."
+msgid "That username or email is not known by this system."
+msgstr "Este utilizador ou e-mail não são reconhecidos."
 
-#, fuzzy
-msgid "Send password registration link."
-msgstr "Enviar ligação para registo de palavra passe"
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registar-se"
 
-msgid "Set default view"
-msgstr "Definir vista por defeito"
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Ocorreu um erro."
 
+#: kotti/views/login.py:295
 #, fuzzy
 msgid "Set password"
 msgstr "Repor a palavra passe"
 
-msgid "Share"
-msgstr "Partilha"
-
-msgid "Share ${title}"
-msgstr "Partilhar ${title}"
-
-msgid "Show"
-msgstr "Mostrar"
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "A seu pedido para alterar a palavra passe expirou."
 
-msgid "Site Setup"
-msgstr "Configurar Sítio"
+#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+msgid "User Management"
+msgstr "Gestão de Utilizadores"
 
-msgid "Size"
-msgstr ""
+#: kotti/views/users.py:267
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
 
-msgid "State"
-msgstr "Estado"
+#: kotti/views/users.py:587
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Minhas preferências - ${title}"
 
-msgid "Status"
-msgstr ""
+#: kotti/views/users.py:145
+msgid "Invalid value"
+msgstr "Valor inválido"
 
-msgid "Submit"
-msgstr "Enviar"
+#: kotti/views/users.py:151
+msgid "A user with that name already exists."
+msgstr "Esse utilizador com esse nome já existe."
 
-msgid "Tagged with:"
-msgstr "Marcado como:"
+#: kotti/views/users.py:158
+msgid "A user with that email already exists."
+msgstr "Esse utilizador com esse e-mail já existe."
 
-msgid "Tags"
-msgstr "Etiquetas"
+#: kotti/views/users.py:181
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Grupo não encontrado: ${group}"
 
-#, fuzzy
-msgid "That username or email is not known by this system."
-msgstr "Este utilizador ou e-mail não são reconhecidos."
+#: kotti/views/users.py:219
+msgid "Active"
+msgstr "Activo"
 
-msgid "The resource could not be found"
-msgstr ""
+#: kotti/views/users.py:220
+msgid "Untick this to deactivate the account."
+msgstr "Retirar para desactivar a conta."
 
-msgid "There was an error."
-msgstr "Ocorreu um erro."
+#: kotti/views/users.py:226
+msgid "Global roles"
+msgstr "Papéis globais"
 
-msgid "Title"
-msgstr "Título"
+#: kotti/views/users.py:230
+msgid "Groups"
+msgstr "Grupos"
 
-msgid "Type"
-msgstr "Tipo"
+#: kotti/views/users.py:315
+msgid "Add User"
+msgstr "Adicionar Utilizador"
 
-msgid "Untick this to deactivate the account."
-msgstr "Retirar para desactivar a conta."
+#: kotti/views/users.py:339
+#, fuzzy, python-format
+msgid "${title} was added."
+msgstr "${title} adicionado."
 
-msgid "Upload ${number} files."
-msgstr ""
+#: kotti/views/users.py:349
+msgid "Add Group"
+msgstr "Adicionar Grupo"
 
-msgid "Upload Content"
-msgstr "Colocar Conteúdo"
+#: kotti/views/users.py:465 kotti/views/users.py:71
+#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
+#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
+#, fuzzy
+msgid "No changes were made."
+msgstr "Não foram efectuadas nenhumas alterações"
 
-msgid "Upload content from local file(s)"
-msgstr ""
+#: kotti/views/users.py:558
+#, fuzzy
+msgid "No name was given."
+msgstr "Nenhum nome foi indicado."
 
-msgid "User"
-msgstr "Utilizador"
+#: kotti/views/users.py:98
+#, fuzzy
+msgid "No users or groups were found."
+msgstr "Utilizadores e grupos não encontrados."
 
-msgid "User Management"
-msgstr "Gestão de Utilizadores"
+#: kotti/views/users.py:505
+#, fuzzy, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Editar ${principal_type} - ${title}"
 
+#: kotti/views/users.py:533
 #, fuzzy
 msgid "User was not found."
 msgstr "Utilizador não encontrado."
 
-msgid "User- / groupname"
-msgstr ""
+#: kotti/views/users.py:324
+#, fuzzy
+msgid "Send password registration link."
+msgstr "Enviar ligação para registo de palavra passe"
 
-msgid "Username"
-msgstr "Nome utilizador"
+#: kotti/views/users.py:543
+#, fuzzy, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} apagado."
 
-msgid "Username or email"
-msgstr "Utilizador ou e-mail"
+#: kotti/views/users.py:551
+#, fuzzy, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Apagar ${principal_type} - ${title}"
 
-msgid "View"
-msgstr "Ver"
+#: kotti/views/edit/actions.py:106
+#, fuzzy, python-format
+msgid "${title} was copied."
+msgstr "${title} copiado."
 
-msgid "Viewer"
-msgstr "Leitor"
+#: kotti/views/edit/actions.py:124
+#, fuzzy, python-format
+msgid "${title} was cut."
+msgstr "${title} cortado."
 
-msgid "Visibility"
-msgstr "Visibilidade"
+#: kotti/views/edit/actions.py:183
+#, fuzzy, python-format
+msgid "${title} was moved."
+msgstr "${title} movido."
 
-msgid "Visible"
-msgstr "Visível"
+#: kotti/views/edit/actions.py:159
+#, fuzzy, python-format
+msgid "${title} was pasted."
+msgstr "${title} colado."
 
-msgid "Welcome to Kotti"
-msgstr ""
+#: kotti/views/edit/actions.py:162
+#, fuzzy
+msgid "Could not paste node. It no longer exists."
+msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
 
+#: kotti/views/edit/actions.py:225
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bem-vindo, ${user}!"
-
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Bem-vindo, ${user}! Você está autenticado."
+msgid "${title} is now visible in the navigation."
+msgstr "${title} encontra-se visivel na navegação."
 
-msgid "Welcome, you are not logged in."
-msgstr "Bem-vindo, você não está autenticado."
+#: kotti/views/edit/actions.py:228
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} já não está visivel na navegação."
 
-msgid "You are here:"
-msgstr "Você está aqui:"
+#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#, fuzzy, python-format
+msgid "${title} was deleted."
+msgstr "${title} apagado."
 
+#: kotti/views/edit/actions.py:303
 #, fuzzy
-msgid "You are joining ${site_title}."
-msgstr "O seu registo em ${site_title}"
+msgid "Nothing was deleted."
+msgstr "Nada foi apagado."
 
-msgid "You have been logged out."
-msgstr "Você desligou a sessão"
+#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+msgid "Name and title are required."
+msgstr "Nome e título são obrigatórios."
 
+#: kotti/views/edit/actions.py:343
 #, fuzzy
-msgid "You have reset your password."
-msgstr "Você reinicializou a palavra passe com sucesso"
+msgid "Item was renamed."
+msgstr "Item renomeado"
+
+#: kotti/views/edit/actions.py:465
+msgid "Move up"
+msgstr "Mover para cima"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move down"
+msgstr "Mover para baixo"
+
+#: kotti/views/edit/actions.py:467
+msgid "Show"
+msgstr "Mostrar"
 
+#: kotti/views/edit/actions.py:468
+msgid "Hide"
+msgstr "Esconder"
+
+#: kotti/views/edit/actions.py:507
 #, fuzzy
 msgid "You have to select items to perform an action."
 msgstr "Terá de escolher items para executar a ação."
 
-#, fuzzy
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so "
-"will activate your account."
-msgstr ""
-"Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua "
-"palavra passe."
+#: kotti/views/edit/actions.py:464
+msgid "Change State"
+msgstr "Alterar Estado"
 
-msgid "Your changes have been saved."
-msgstr "As suas alterações foram guardadas."
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Descrição"
 
-msgid "Your password reset token may have expired."
-msgstr "A seu pedido para alterar a palavra passe expirou."
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Corpo"
 
-msgid "Your registration for ${site_title}"
-msgstr "O seu registo em ${site_title}"
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "A vista original foi indicada como a vista por defeito."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Vista por defeito"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Vista por defeito foi alterada."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Vista por defeito não pode ser alterada."
+
+#~ msgid "Submit"
+#~ msgstr "Enviar"
 
 #~ msgid "Private"
 #~ msgstr "Privado"
diff --git a/kotti/templates/deform/tag_it.pt b/kotti/templates/deform/tag_it.pt
index 636fd7dfb..cd9d32cd8 100644
--- a/kotti/templates/deform/tag_it.pt
+++ b/kotti/templates/deform/tag_it.pt
@@ -1,5 +1,5 @@
-<input name="${field.name}" id="${field.oid}" type="text"
-  tal:attributes="value ','.join(cstruct)" />
+<input name="${field.name}" id="${field.oid}" type="text" title="Tags"
+  tal:attributes="value ','.join(cstruct)" i18n:attributes="title" />
 <script type="text/javascript">
   deform.addCallback(
     '${field.oid}',
diff --git a/kotti/templates/edit/change-state.pt b/kotti/templates/edit/change-state.pt
index 24d217070..e48eccad6 100644
--- a/kotti/templates/edit/change-state.pt
+++ b/kotti/templates/edit/change-state.pt
@@ -21,11 +21,11 @@
             <th i18n:translate="">Creation Date</th>
             <th i18n:translate="">Modification Date</th>
           </tr>
-          </thead>
-          <tbody>
+        </thead>
+        <tbody>
           <tr tal:repeat="item items">
             <tal:block tal:define="url request.resource_url(item, '@@contents')">
-              <td><input name="children-to-change-state" type="checkbox" value="${item.id}" checked="checked" /></td>
+              <td><input name="children-to-change-state" type="checkbox" value="${item.id}" checked="checked" title="Select item" i18n:attributes="title" /></td>
               <td><a href="${url}">${item.title}</a></td>
               <td>${item.type_info.title}</td>
               <td>${states[item.state]['title']}</td>
@@ -41,9 +41,13 @@
         <span class="help-block" i18n:translate="">
           If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments.
         </span>
-        <label class="checkbox">
-          <input type="checkbox" name="include-children" value="include-children" /> <span  i18n:translate="">Include children</span>
-        </label>
+        <div class="checkbox">
+          <label>
+            <input type="checkbox" name="include-children"
+                   value="include-children" />
+            <span  i18n:translate="">Include children</span>
+          </label>
+        </div>
       </fieldset>
 
       <fieldset>
@@ -51,12 +55,16 @@
         <span class="help-block" i18n:translate="">
           Select the new state where all chosen items should be set.
         </span>
-        <label class="radio">
-          <input type="radio" name="to-state" value="no-change" checked="checked" /> <span i18n:translate="">No change</span>
-        </label>
-        <label class="radio" tal:repeat="transition transitions">
-          <input type="radio" name="to-state" value="${transition['to_state']}" /> ${states[transition['to_state']]['title']}
-        </label>
+        <div class="radio">
+          <label>
+            <input type="radio" name="to-state" value="no-change" checked="checked" /> <span i18n:translate="">No change</span>
+          </label>
+        </div>
+        <div class="radio" tal:repeat="transition transitions">
+          <label>
+            <input type="radio" name="to-state" value="${transition['to_state']}" /> ${states[transition['to_state']]['title']}
+          </label>
+        </div>
       </fieldset>
 
       <div class="form-actions">
diff --git a/kotti/templates/edit/contents.pt b/kotti/templates/edit/contents.pt
index f3f5f4683..7e80522c6 100644
--- a/kotti/templates/edit/contents.pt
+++ b/kotti/templates/edit/contents.pt
@@ -35,7 +35,7 @@
           tal:condition="children">
           <thead>
             <tr>
-              <th><input type="checkbox" id="toggle-all" /></th>
+              <th><input type="checkbox" id="toggle-all" title="Select / deselect all" i18n:attributes="title" /></th>
               <th i18n:translate="">Title</th>
               <th i18n:translate="">Type</th>
               <th i18n:translate="">State</th>
@@ -47,7 +47,7 @@
             <tbody>
             <tr tal:repeat="child children" id="${child.position}">
               <td>
-                <input name="children" type="checkbox" value="${child.id}" />
+                <input name="children" type="checkbox" value="${child.id}" title="Select item" i18n:attributes="title" />
               </td>
               <td>
                 <a href="${request.resource_url(child, '@@contents')}">
diff --git a/kotti/templates/edit/delete-nodes.pt b/kotti/templates/edit/delete-nodes.pt
index a97d1696f..fbb9a601d 100644
--- a/kotti/templates/edit/delete-nodes.pt
+++ b/kotti/templates/edit/delete-nodes.pt
@@ -29,7 +29,7 @@
             <tbody>
             <tr tal:repeat="item items">
               <tal:block tal:define="url request.resource_url(item, '@@contents')">
-                <td><input name="children-to-delete" type="checkbox" value="${item.id}" checked="checked" /></td>
+                <td><input name="children-to-delete" type="checkbox" value="${item.id}" checked="checked" title="Select item" i18n:attributes="title" /></td>
                 <td><a href="${url}">${item.title}</a></td>
                 <td>${item.type_info.title}</td>
                 <td>${item.state in states and states[item.state]['title']}</td>
diff --git a/kotti/templates/edit/master.pt b/kotti/templates/edit/master.pt
index 36791f960..74c9ce6ce 100644
--- a/kotti/templates/edit/master.pt
+++ b/kotti/templates/edit/master.pt
@@ -13,7 +13,7 @@
     <!-- Fav icons -->
     <link rel="shortcut icon" href="${request.static_url('kotti:static/favicon.ico')}" />
 
-    <more tal:omit-tag="" metal:define-slot="head-more"></more>
+    <metal:headmore define-slot="head-more" tal:omit-tag=""></metal:headmore>
 
     <!-- 'edit_inhead' slots: support third party injection of things that
          go into the head -->
@@ -28,9 +28,8 @@
 
   <body class="view-${request.view_name or 'default'} ${api.body_css_class} logged-in">
     <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
-    <div metal:define-slot="editor-bar"
-         tal:condition="request.user is not None"
-         tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+    <metal:editorbar define-slot="editor-bar" tal:condition="request.user is not None"
+                     tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
 
     <div class="container">
       <div class="row">
@@ -38,9 +37,9 @@
           <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')" />
           <div tal:replace="api.render_template('kotti:templates/messages.pt')" />
           <div class="inner-content">
-            <div metal:define-slot="content">
+            <metal:content define-slot="content">
               <h1>${context.title}</h1>
-            </div>
+            </metal:content>
           </div>
           </div>
       </div>
@@ -49,6 +48,6 @@
       </footer>
 
     </div>
-    <more tal:omit-tag="" metal:define-slot="js-more"></more>
+    <metal:jsmore define-slot="js-more" tal:omit-tag=""></metal:jsmore>
   </body>
 </html>
diff --git a/kotti/templates/edit/rename-nodes.pt b/kotti/templates/edit/rename-nodes.pt
index 08e2b5942..d243c6610 100644
--- a/kotti/templates/edit/rename-nodes.pt
+++ b/kotti/templates/edit/rename-nodes.pt
@@ -25,6 +25,7 @@
             <label class="control-label desc" for="${item.id}-name"
                    i18n:translate="">New name</label>
             <input type="text" name="${item.id}-name" class="form-control"
+                   title="New name" i18n:attributes="title"
                    value="${request.POST.get(str(item.id) + '-name') or item.name}" />
           </div>
 
@@ -32,6 +33,7 @@
             <label class="control-label desc" for="${item.id}-title"
                    i18n:translate="">New title</label>
             <input type="text" name="${item.id}-title" class="form-control"
+                   title="New title" i18n:attributes="title"
                    value="${request.POST.get(str(item.id) + '-title') or item.title}" />
           </div>
         </fieldset>
diff --git a/kotti/templates/edit/share.pt b/kotti/templates/edit/share.pt
index 1589b2602..4c8b59f37 100644
--- a/kotti/templates/edit/share.pt
+++ b/kotti/templates/edit/share.pt
@@ -65,7 +65,7 @@
                 ${entry[0].title}
               </td>
               <td tal:repeat="role available_roles">
-                <input type="checkbox"
+                <input type="checkbox" title="Assign role" i18n:attributes="title"
                        name="role::${entry[0].name}::${role.name}"
                        checked="${role.name in entry[1][0] and 'checked' or None}"
                        disabled="${role.name in entry[1][1] and 'disabled' or None}"
diff --git a/kotti/templates/edit/upload.pt b/kotti/templates/edit/upload.pt
index 43c131401..ebb11228b 100644
--- a/kotti/templates/edit/upload.pt
+++ b/kotti/templates/edit/upload.pt
@@ -70,8 +70,7 @@
                     style="width: {{f.transfered.percent}}%"
                     ng-class="{
                       'progress-bar-info': f.status == 'uploading',
-                      'progress-bar-danger': f.status == 'cancelled',
-                      'progress-bar-danger': f.status == 'failed',
+                      'progress-bar-danger': (f.status == 'cancelled') || (f.status == 'failed'),
                       'progress-bar-success': f.status == 'complete'}">
                     {{f.transfered.bytes | bytes}} / {{f.size | bytes}}
                   </div>
diff --git a/kotti/templates/login.pt b/kotti/templates/login.pt
index 8eb17ba2c..8008b2348 100644
--- a/kotti/templates/login.pt
+++ b/kotti/templates/login.pt
@@ -78,7 +78,8 @@
             </h3>
           </div>
           <div class="panel-body">
-            <a type="submit" class="btn btn-success btn-block" href='register'
+            <a type="submit" class="btn btn-success btn-block"
+               tal:attributes="href request.resource_url(api.root, 'register')"
                i18n:translate="">
               Register for an account on this site.
             </a>
diff --git a/kotti/templates/site-setup/user.pt b/kotti/templates/site-setup/user.pt
index b28cc9e30..446d46a7f 100644
--- a/kotti/templates/site-setup/user.pt
+++ b/kotti/templates/site-setup/user.pt
@@ -6,7 +6,7 @@
 
   <div metal:fill-slot="content">
     <div>
-      <a href="./@@setup-users?extra=${api.principal.name}"
+      <a tal:attributes="href request.resource_url(api.root, '@@setup-users', query={'extra': api.principal.name})"
          class="btn btn-default">
         <i class="glyphicon glyphicon-circle-arrow-left"></i>
         <span tal:omit-tag="" i18n:translate="">
diff --git a/kotti/templates/site-setup/users.pt b/kotti/templates/site-setup/users.pt
index da5f83689..33a524a60 100644
--- a/kotti/templates/site-setup/users.pt
+++ b/kotti/templates/site-setup/users.pt
@@ -82,11 +82,11 @@
                 <td>
                   <img src="${api.avatar_url(entry[0])}" alt="Gravatar"
                        i18n:attributes="alt"/>
-                  <a href="./setup-user?name=${entry[0].name}">${entry[0].title}</a>
+                  <a tal:attributes="href request.resource_url(api.root, 'setup-user', query={'name': entry[0].name})">${entry[0].title}</a>
                   <span tal:condition="entry[0].email">&lt;${entry[0].email}&gt;</span>
                 </td>
                 <td tal:repeat="role available_roles">
-                  <input type="checkbox"
+                  <input type="checkbox" title="Assign role" i18n:attributes="title"
                          name="role::${entry[0].name}::${role.name}"
                          checked="${role.name in entry[1][0] and 'checked' or None}"
                          disabled="${role.name in entry[1][1] and 'disabled' or None}"
diff --git a/kotti/templates/view/search-results.pt b/kotti/templates/view/search-results.pt
index 3cb6733f0..538dec371 100644
--- a/kotti/templates/view/search-results.pt
+++ b/kotti/templates/view/search-results.pt
@@ -9,16 +9,16 @@
     <h1 i18n:translate="">Search Results</h1>
 
     <dl id="search-results">
-      <tal:repeat tal:repeat="result results">
+      <tal:results tal:repeat="result results">
         <dt class="search-result">
           <a href="${request.application_url}${result.path}">${result.title}</a>
         </dt>
         <dd>
           <p tal:content="result.description"></p>
         </dd>
-      </tal:repeat>
+      </tal:results>
     </dl>
-    
+
     <p tal:condition="not:results">No results were found.</p>
 
   </div>

From 306104ccc15a6606b2f8ccdd894590c93e272e34 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 9 Oct 2015 23:18:40 +0200
Subject: [PATCH 356/600] Remove unused parameters from upload.js.

---
 kotti/static/upload.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/kotti/static/upload.js b/kotti/static/upload.js
index 297f14f24..040846d5c 100644
--- a/kotti/static/upload.js
+++ b/kotti/static/upload.js
@@ -61,7 +61,8 @@ function UploadController($scope, $http, $log) {
             endpoint: null
         },
         callbacks: {
-            onValidate: function (fileOrBlobData) {
+            //onValidate: function (fileOrBlobData) {
+            onValidate: function () {
                 $log.info("onValidate");
             },
             onSubmit: function (id, name) {
@@ -71,7 +72,8 @@ function UploadController($scope, $http, $log) {
                     $http.get(
                         $scope.endpoints.content_types,
                         {params: {mimetype: file.type}}
-                    ).success(function (data, status, headers, config) {
+                    //).success(function (data, status, headers, config) {
+                    ).success(function (data) {
                         var contentTypes = data.content_types,
                             file = {
                                 id: id,
@@ -98,7 +100,8 @@ function UploadController($scope, $http, $log) {
                     });
                 });
             },
-            onUpload: function (id, name) {
+            //onUpload: function (id, name) {
+            onUpload: function (id) {
                 $log.info("onUpload");
                 $scope.apply(function () {
                     $scope.files[id].status = 'uploading';
@@ -114,13 +117,15 @@ function UploadController($scope, $http, $log) {
                     $scope.files[id].transfered.percent = Math.round(uploadedBytes / totalBytes * 100);
                 });
             },
-            onCancel: function (id, name) {
+            //onCancel: function (id, name) {
+            onCancel: function (id) {
                 $log.info("onCancel");
                 $scope.apply(function () {
                     $scope.files[id].status = 'cancelled';
                 });
             },
-            onError: function (id, name, errorReason) {
+            //onError: function (id, name, errorReason) {
+            onError: function (id) {
                 $log.info("onError");
                 $scope.apply(function () {
                     $scope.files[id].status = 'failed';

From 50bdaf41451e648af7832a1202671e6157a20979 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 10 Oct 2015 01:31:03 +0200
Subject: [PATCH 357/600] Replace browser-cache.txt with equivalent webtest
 tests.

---
 kotti/tests/browser-cache.txt | 136 ----------------------------------
 kotti/tests/test_cache.py     |  79 ++++++++++++++++++++
 2 files changed, 79 insertions(+), 136 deletions(-)
 delete mode 100644 kotti/tests/browser-cache.txt

diff --git a/kotti/tests/browser-cache.txt b/kotti/tests/browser-cache.txt
deleted file mode 100644
index 3bd4e92fd..000000000
--- a/kotti/tests/browser-cache.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-Caching browser tests
-=====================
-
-Setup
------
-
-  >>> from kotti.resources import get_root
-  >>> from kotti import testing
-  >>> tools = testing.setUpFunctional()
-  >>> browser = tools['Browser']()
-  >>> root = get_root()
-
-Some convenience functions:
-
-  >>> import datetime, time
-  >>> def parse_expires(date_string):
-  ...     return datetime.datetime(*
-  ...         (time.strptime(date_string,
-  ...          "%a, %d %b %Y %H:%M:%S GMT")[0:6]))
-  >>> def delta(date_string):
-  ...     now = datetime.datetime.utcnow()
-  ...     return parse_expires(date_string) - now
-
-Add a file and an image:
-
-  >>> from kotti.resources import File, Image
-  >>> image = testing.asset('sendeschluss.jpg').read()
-  >>> root['textfile'] = File("file contents", u"mytext.txt", u"text/plain")
-  >>> root['image'] = Image(image, u"sendeschluss.jpg", u"image/jpeg")
-
----------
-Anonymous
----------
-
-Cache HTML
-----------
-
-We define different caching policies for different kinds of items.  A
-document:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.headers['X-Caching-Policy']
-  'Cache HTML'
-  >>> browser.headers['Cache-Control']
-  'max-age=0,s-maxage=3600'
-  >>> d = delta(browser.headers['Expires'])
-  >>> (d.days, d.seconds) < (0, 0)
-  True
-
-Cache Media Content
--------------------
-
-  >>> browser.open(testing.BASE_URL + '/textfile/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Media Content'
-  >>> browser.headers['Cache-Control']
-  'max-age=14400'
-  >>> d = delta(browser.headers['Expires'])
-  >>> (d.days, d.seconds) > (0, 14000)
-  True
-  >>> browser.open(testing.BASE_URL + '/image/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Media Content'
-
-Cache Resource
---------------
-
-  >>> browser.open(testing.BASE_URL + '/static-kotti/base.css')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Resource'
-  >>> browser.headers['Cache-Control']
-  'max-age=2764800,public'
-  >>> d = delta(browser.headers['Expires'])
-  >>> (d.days, d.seconds) > (30, 0)
-  True
-  >>> 'Last-Modified' in browser.headers
-  True
-
-POST request
-------------
-
-  >>> browser.post(testing.BASE_URL, '')
-  >>> 'X-Caching-Policy' in browser.headers
-  False
-
----------
-Logged in
----------
-
-  >>> browser.open(testing.BASE_URL + '/edit')
-  >>> "Log in" in browser.contents
-  True
-  >>> browser.getControl("Username or email", index=0).value = "admin"
-  >>> browser.getControl("Password").value = "secret"
-  >>> browser.getControl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-
-Cache HTML
-----------
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.headers['X-Caching-Policy']
-  'No Cache'
-
-Cache Media Content
--------------------
-
-  >>> browser.open(testing.BASE_URL + '/textfile/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'No Cache'
-  >>> browser.open(testing.BASE_URL + '/image/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'No Cache'
-
-Cache Resource
---------------
-
-  >>> browser.open(testing.BASE_URL + '/static-kotti/base.css')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Resource'
-
-===
-404
-===
-
-  >>> browser.open(testing.BASE_URL + '/this-isnt-here')
-  Traceback (most recent call last):
-  HTTPError: HTTP Error 404: Not Found
-  >>> 'X-Caching-Policy' in browser.headers
-  False
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index e66b15de6..528468bb1 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -1,13 +1,34 @@
 import datetime
+import time
 
 from mock import patch
 from mock import MagicMock
 import pytest
 
+from kotti.resources import File
+from kotti.resources import Image
+from kotti.testing import asset
 from kotti.testing import Dummy
 from kotti.views.cache import set_max_age
 
 
+def parse_expires(date_string):
+    return datetime.datetime(*(
+        time.strptime(date_string, "%a, %d %b %Y %H:%M:%S GMT")[0:6]))
+
+
+def delta(date_string):
+    now = datetime.datetime.utcnow()
+    return parse_expires(date_string) - now
+
+
+@pytest.fixture
+def cachetest_content(root, filedepot):
+    image = asset('sendeschluss.jpg').read()
+    root['textfile'] = File("file contents", u"mytext.txt", u"text/plain")
+    root['image'] = Image(image, u"sendeschluss.jpg", u"image/jpeg")
+
+
 class TestSetMaxAge:
     def test_preserve_existing_headers(self):
         response = Dummy(headers={
@@ -76,3 +97,61 @@ def test_request_has_no_context(self):
             set_cache_headers(event)
 
             assert chooser.call_count == 0
+
+
+class TestBrowser:
+
+    def test_cache_unauth(self, webtest, cachetest_content):
+
+        # html
+        resp = webtest.app.get('/')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache HTML'
+        assert resp.headers.get('Cache-Control') == 'max-age=0,s-maxage=3600'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) < (0, 0)
+
+        # media content
+        resp = webtest.app.get('/textfile/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
+        assert resp.headers.get('Cache-Control') == 'max-age=14400'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) > (0, 14000)
+        resp = webtest.app.get('/image/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
+
+        # resources
+        resp = webtest.app.get('/static-kotti/base.css')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
+        assert resp.headers.get('Cache-Control') == 'max-age=2764800,public'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) > (30, 0)
+        assert 'Last-Modified' in resp.headers
+
+        # post
+        resp = webtest.app.post('/', '')
+        assert 'X-Caching-Policy' not in resp.headers
+
+        # 404
+        resp = webtest.app.get('/this-isnt-here', status=404)
+        assert 'X-Caching-Policy' not in resp.headers
+
+    @pytest.mark.user('admin')
+    def test_cache_auth(self, webtest, cachetest_content):
+
+        # html
+        resp = webtest.app.get('/')
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
+
+        # media content
+        resp = webtest.app.get('/textfile/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
+        resp = webtest.app.get('/image/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
+
+        # resources
+        resp = webtest.app.get('/static-kotti/base.css')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
+
+        # 404
+        resp = webtest.app.get('/this-isnt-here', status=404)
+        assert 'X-Caching-Policy' not in resp.headers

From 52b630dcbf8f3565ec6d70b5894289b18409cfbc Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 10 Oct 2015 01:49:22 +0200
Subject: [PATCH 358/600] Replace browser-errors.txt with equivalent webtest
 tests.

---
 kotti/tests/browser-errors.txt     | 45 ------------------------------
 kotti/tests/test_httpexceptions.py | 16 +++++++++++
 2 files changed, 16 insertions(+), 45 deletions(-)
 delete mode 100644 kotti/tests/browser-errors.txt
 create mode 100644 kotti/tests/test_httpexceptions.py

diff --git a/kotti/tests/browser-errors.txt b/kotti/tests/browser-errors.txt
deleted file mode 100644
index a28ecf618..000000000
--- a/kotti/tests/browser-errors.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Kotti HTTP Exception browser tests
-==================================
-
-Setup
------
-Create references to some useful tools:
-
-   >>> from kotti import testing
-   >>> tools = testing.setUpFunctional()
-   >>> browser = tools['Browser']()
-   >>> ctrl = browser.getControl
-
-Tell the zope test browser to not raise errors for HTTP exceptions:
-
-   >>> browser.raiseHttpErrors = False
-
-Open the front page:
-
-   >>> browser.open(testing.BASE_URL)
-
-
-HTTP Not Found (404)
---------------------
-A 404 Not Found view results in a nicely formatted, albeit plain page:
-
-  >>> browser.open(testing.BASE_URL + '/non-existent')
-  >>> 'Not Found' in browser.contents
-  True
-
-The not found view renders similarly for authenticated users.
-
-After logging in:
-
-  >>> browser.open(testing.BASE_URL + '/login')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-
-We should see the error message when visiting a URL that does not exist:
-
-  >>> browser.open(testing.BASE_URL + '/non-existent')
-  >>> 'Not Found' in browser.contents
-  True
-
-
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
new file mode 100644
index 000000000..2712d6a54
--- /dev/null
+++ b/kotti/tests/test_httpexceptions.py
@@ -0,0 +1,16 @@
+""" Kotti HTTP Exception browser tests """
+
+import pytest
+
+
+def test_404_anon(webtest, root):
+
+    resp = webtest.app.get('/non-existent', status=404)
+    assert 'Not Found' in resp.text
+
+
+@pytest.mark.user('admin')
+def test_404_anon(webtest, root):
+
+    resp = webtest.app.get('/non-existent', status=404)
+    assert 'Not Found' in resp.text

From d363cdf00b62aede33255c2747ba92b5297f30bd Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <p@2015.dev.dobrogost.net>
Date: Sun, 11 Oct 2015 18:00:31 +0200
Subject: [PATCH 359/600] Restore '--statistics' and '--no-wrap' options when
 invoking gettext tools This brings changes to Kotti's own i18n.sh script (PR
 #453) to scaffold.

---
 kotti/scaffolds/package/i18n.sh_tmpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kotti/scaffolds/package/i18n.sh_tmpl b/kotti/scaffolds/package/i18n.sh_tmpl
index 16815b793..ef01877d3 100755
--- a/kotti/scaffolds/package/i18n.sh_tmpl
+++ b/kotti/scaffolds/package/i18n.sh_tmpl
@@ -30,12 +30,13 @@ if [ $# -eq 0 ]; then
 
     echo "Update translations"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/$DOMAIN.po; do
-        msgmerge -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
+        msgmerge --no-wrap -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
     done
 
     echo "Compile message catalogs"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/*.po; do
-        msgfmt -o "${po%.*}.mo" "$po"
+        echo "Compiling file $po..."
+        msgfmt --statistics -o "${po%.*}.mo" "$po"
     done
 
 # first argument represents language identifier, create catalog

From 8a71df60de62914f87396577faebd0ad74a9f153 Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <p@2015.dev.dobrogost.net>
Date: Sun, 11 Oct 2015 22:03:25 +0200
Subject: [PATCH 360/600] Extract texts for translation only from project's own
 domain. This prevents needless extraction of texts in overridden templates.

---
 i18n.sh                              | 2 +-
 kotti/scaffolds/package/i18n.sh_tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n.sh b/i18n.sh
index 9c20a61c7..eaa917db7 100755
--- a/i18n.sh
+++ b/i18n.sh
@@ -26,7 +26,7 @@ fi
 # no arguments, extract and update
 if [ $# -eq 0 ]; then
     echo "Extract messages"
-    pot-create "$SEARCH_PATH" -o "$LOCALES_PATH"/$DOMAIN.pot
+    pot-create "$SEARCH_PATH" -d $DOMAIN -o "$LOCALES_PATH"/$DOMAIN.pot
 
     echo "Update translations"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/$DOMAIN.po; do
diff --git a/kotti/scaffolds/package/i18n.sh_tmpl b/kotti/scaffolds/package/i18n.sh_tmpl
index 16815b793..6dccae401 100755
--- a/kotti/scaffolds/package/i18n.sh_tmpl
+++ b/kotti/scaffolds/package/i18n.sh_tmpl
@@ -26,7 +26,7 @@ fi
 # no arguments, extract and update
 if [ $# -eq 0 ]; then
     echo "Extract messages"
-    pot-create "$SEARCH_PATH" -o "$LOCALES_PATH"/$DOMAIN.pot
+    pot-create "$SEARCH_PATH" -d $DOMAIN -o "$LOCALES_PATH"/$DOMAIN.pot
 
     echo "Update translations"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/$DOMAIN.po; do

From ffd113bda0501c04270bd0d3dba9f2b386282980 Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <p@github.dev.dobrogost.net>
Date: Mon, 12 Oct 2015 10:16:26 +0200
Subject: [PATCH 361/600] Updated polish translation.

---
 kotti/locale/Kotti.pot               | 376 +++++++++++++--------------
 kotti/locale/pl/LC_MESSAGES/Kotti.mo | Bin 17556 -> 18002 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po | 365 +++++++++++++-------------
 3 files changed, 370 insertions(+), 371 deletions(-)

diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 418439c35..83ed5c403 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2015-10-12 10:15+0200\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"
@@ -136,15 +136,15 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: ./kotti/resources.py:511 ./kotti/templates/edit/rename-nodes.pt:8
-#: ./kotti/templates/edit/rename-nodes.pt:42
-#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:458
+#: ./kotti/resources.py:511 ./kotti/templates/edit/rename.pt:31
+#: ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/templates/edit/rename-nodes.pt:42 ./kotti/views/edit/actions.py:458
 msgid "Rename"
 msgstr ""
 
-#: ./kotti/resources.py:512 ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/resources.py:512 ./kotti/templates/edit/delete.pt:24
+#: ./kotti/templates/edit/delete-nodes.pt:9
 #: ./kotti/templates/edit/delete-nodes.pt:50
-#: ./kotti/templates/edit/delete.pt:24
 #: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:443
 #: ./kotti/views/edit/actions.py:460
 msgid "Delete"
@@ -207,30 +207,6 @@ msgstr ""
 msgid "Upload Content"
 msgstr ""
 
-#: ./kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:21
-msgid "View"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:44
-msgid "Navigate"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:55
-msgid "Preferences"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:60
-msgid "Site Setup"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:71
-msgid "Logout"
-msgstr ""
-
 #: ./kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr ""
@@ -260,6 +236,30 @@ msgstr ""
 msgid "Forbidden"
 msgstr ""
 
+#: ./kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr ""
+
 #: ./kotti/templates/login.pt:15
 msgid "Login"
 msgstr ""
@@ -268,8 +268,8 @@ msgstr ""
 msgid "Username or email"
 msgstr ""
 
-#: ./kotti/templates/login.pt:25 ./kotti/views/login.py:257
-#: ./kotti/views/users.py:212
+#: ./kotti/templates/login.pt:25 ./kotti/views/users.py:212
+#: ./kotti/views/login.py:257
 msgid "Password"
 msgstr ""
 
@@ -316,6 +316,52 @@ msgstr ""
 msgid "You are here:"
 msgstr ""
 
+#: ./kotti/templates/edit/delete.pt:9
+#: ./kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr ""
+
+#: ./kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr ""
+
+#: ./kotti/templates/edit/delete.pt:19
+#: ./kotti/templates/edit/change-state.pt:74
+#: ./kotti/templates/edit/delete-nodes.pt:45
+#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:78
+#: ./kotti/views/users.py:316 ./kotti/views/users.py:350
+#: ./kotti/views/users.py:442
+msgid "Cancel"
+msgstr ""
+
+#: ./kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr ""
+
+#: ./kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr ""
+
+#: ./kotti/templates/edit/rename.pt:11
+#: ./kotti/templates/edit/rename-nodes.pt:13
+msgid ""
+"Each content item has a name, which is used to create the url, and a title. "
+"Read the user manual about proper formatting of name and title if needed. You"
+" can change both below."
+msgstr ""
+
+#: ./kotti/templates/edit/rename.pt:19
+#: ./kotti/templates/edit/rename-nodes.pt:26
+#: ./kotti/templates/edit/rename-nodes.pt:28
+msgid "New name"
+msgstr ""
+
+#: ./kotti/templates/edit/rename.pt:25
+#: ./kotti/templates/edit/rename-nodes.pt:34
+#: ./kotti/templates/edit/rename-nodes.pt:36
+msgid "New title"
+msgstr ""
+
 #: ./kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr ""
@@ -367,7 +413,7 @@ msgid "Select item"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:40
-#: ./kotti/templates/edit/change-state.pt:45
+#: ./kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr ""
 
@@ -377,32 +423,23 @@ msgid ""
 "selected documents and their subdocuments."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:50
+#: ./kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:51
+#: ./kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:55
+#: ./kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:64 ./kotti/templates/edit/share.pt:83
+#: ./kotti/templates/edit/change-state.pt:72 ./kotti/templates/edit/share.pt:83
 #: ./kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:66
-#: ./kotti/templates/edit/delete-nodes.pt:45
-#: ./kotti/templates/edit/delete.pt:19
-#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:78
-#: ./kotti/views/users.py:316 ./kotti/views/users.py:350
-#: ./kotti/views/users.py:442
-msgid "Cancel"
-msgstr ""
-
 #: ./kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr ""
@@ -427,43 +464,6 @@ msgstr ""
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: ./kotti/templates/edit/delete.pt:9
-#: ./kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr ""
-
-#: ./kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr ""
-
-#: ./kotti/templates/edit/rename-nodes.pt:13
-#: ./kotti/templates/edit/rename.pt:11
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You"
-" can change both below."
-msgstr ""
-
-#: ./kotti/templates/edit/rename-nodes.pt:26
-#: ./kotti/templates/edit/rename-nodes.pt:28
-#: ./kotti/templates/edit/rename.pt:19
-msgid "New name"
-msgstr ""
-
-#: ./kotti/templates/edit/rename-nodes.pt:34
-#: ./kotti/templates/edit/rename-nodes.pt:36
-#: ./kotti/templates/edit/rename.pt:25
-msgid "New title"
-msgstr ""
-
-#: ./kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr ""
-
 #: ./kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr ""
@@ -538,14 +538,6 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
-#: ./kotti/templates/http-errors/notfound.pt:6
-msgid "Not Found"
-msgstr ""
-
-#: ./kotti/templates/http-errors/notfound.pt:7
-msgid "The resource could not be found"
-msgstr ""
-
 #: ./kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
@@ -595,6 +587,10 @@ msgstr ""
 msgid "Add new group"
 msgstr ""
 
+#: ./kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr ""
+
 #: ./kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr ""
@@ -603,8 +599,12 @@ msgstr ""
 msgid "Search..."
 msgstr ""
 
-#: ./kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
+#: ./kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: ./kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
 msgstr ""
 
 #: ./kotti/tests/testing_view.pt:11
@@ -643,82 +643,14 @@ msgstr ""
 msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr ""
-
-#: ./kotti/views/login.py:154
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr ""
-
-#: ./kotti/views/login.py:179
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so"
-" will activate your account."
-msgstr ""
-
-#: ./kotti/views/login.py:244
-msgid "You have been logged out."
+#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:378
+msgid "User Management"
 msgstr ""
 
-#: ./kotti/views/login.py:65 ./kotti/views/users.py:270
+#: ./kotti/views/users.py:270 ./kotti/views/login.py:65
 msgid "Full name"
 msgstr ""
 
-#: ./kotti/views/login.py:68
-msgid "Username"
-msgstr ""
-
-#: ./kotti/views/login.py:73 ./kotti/views/login.py:269
-#: ./kotti/views/users.py:199
-msgid "Email"
-msgstr ""
-
-#: ./kotti/views/login.py:108
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
-msgstr ""
-
-#: ./kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr ""
-
-#: ./kotti/views/login.py:212
-msgid "Login failed."
-msgstr ""
-
-#: ./kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr ""
-
-#: ./kotti/views/login.py:222
-msgid "That username or email is not known by this system."
-msgstr ""
-
-#: ./kotti/views/login.py:82
-msgid "Register"
-msgstr ""
-
-#: ./kotti/views/login.py:89
-msgid "There was an error."
-msgstr ""
-
-#: ./kotti/views/login.py:295
-msgid "Set password"
-msgstr ""
-
-#: ./kotti/views/login.py:323
-msgid "Your password reset token may have expired."
-msgstr ""
-
-#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:378
-msgid "User Management"
-msgstr ""
-
 #: ./kotti/views/users.py:267
 msgid ""
 "Leave this empty and tick the 'Send password registration' box below to have "
@@ -747,6 +679,11 @@ msgstr ""
 msgid "No such group: ${group}"
 msgstr ""
 
+#: ./kotti/views/users.py:199 ./kotti/views/login.py:73
+#: ./kotti/views/login.py:269
+msgid "Email"
+msgstr ""
+
 #: ./kotti/views/users.py:219
 msgid "Active"
 msgstr ""
@@ -813,6 +750,93 @@ msgstr ""
 msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
+#: ./kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr ""
+
+#: ./kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr ""
+
+#: ./kotti/views/login.py:179
+msgid ""
+"You should be receiving an email with a link to reset your password. Doing so"
+" will activate your account."
+msgstr ""
+
+#: ./kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr ""
+
+#: ./kotti/views/login.py:68
+msgid "Username"
+msgstr ""
+
+#: ./kotti/views/login.py:108
+msgid ""
+"Congratulations! You are successfully registered. You should be receiving an "
+"email with a link to set your password. Doing so will activate your account."
+msgstr ""
+
+#: ./kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr ""
+
+#: ./kotti/views/login.py:212
+msgid "Login failed."
+msgstr ""
+
+#: ./kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr ""
+
+#: ./kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr ""
+
+#: ./kotti/views/login.py:82
+msgid "Register"
+msgstr ""
+
+#: ./kotti/views/login.py:89
+msgid "There was an error."
+msgstr ""
+
+#: ./kotti/views/login.py:295
+msgid "Set password"
+msgstr ""
+
+#: ./kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr ""
+
+#: ./kotti/views/edit/content.py:38
+msgid "Description"
+msgstr ""
+
+#: ./kotti/views/edit/content.py:53
+msgid "Body"
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr ""
+
 #: ./kotti/views/edit/actions.py:106
 #, python-format
 msgid "${title} was copied."
@@ -887,27 +911,3 @@ msgstr ""
 #: ./kotti/views/edit/actions.py:464
 msgid "Change State"
 msgstr ""
-
-#: ./kotti/views/edit/content.py:38
-msgid "Description"
-msgstr ""
-
-#: ./kotti/views/edit/content.py:53
-msgid "Body"
-msgstr ""
-
-#: ./kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr ""
-
-#: ./kotti/views/edit/default_views.py:79
-msgid "Default view"
-msgstr ""
-
-#: ./kotti/views/edit/default_views.py:107
-msgid "Default view has been set."
-msgstr ""
-
-#: ./kotti/views/edit/default_views.py:112
-msgid "Default view could not be set."
-msgstr ""
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
index 5bf880ff83c8eb820cf6376f3dba180e86e7f69c..3f10715bf1061826d8e2a4edb8556a4d2cdb765e 100644
GIT binary patch
delta 4280
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

delta 3869
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

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index 2d64dd36a..fa21d933d 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2015-10-12 10:15+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -197,14 +197,15 @@ msgstr "Wytnij"
 msgid "Paste"
 msgstr "Wklej"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/resources.py:511 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:458
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
+#: kotti/resources.py:512 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:50
 #: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
 #: kotti/views/edit/actions.py:460
 msgid "Delete"
@@ -267,30 +268,6 @@ msgstr "Dodaj"
 msgid "Upload Content"
 msgstr "Dołącz treści"
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Ustaw domyślny widok"
-
-#: kotti/templates/editor-bar.pt:21
-msgid "View"
-msgstr "Widok"
-
-#: kotti/templates/editor-bar.pt:44
-msgid "Navigate"
-msgstr "Nawigacja"
-
-#: kotti/templates/editor-bar.pt:55
-msgid "Preferences"
-msgstr "Ustawienia"
-
-#: kotti/templates/editor-bar.pt:60
-msgid "Site Setup"
-msgstr "Ustawienia strony"
-
-#: kotti/templates/editor-bar.pt:71
-msgid "Logout"
-msgstr "Wyloguj się"
-
 #: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "Zresetuj swoje hasło do ${site_title}."
@@ -320,6 +297,30 @@ msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
 msgid "Forbidden"
 msgstr "Brak dostępu"
 
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Ustaw domyślny widok"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Widok"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Nawigacja"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Ustawienia"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Ustawienia strony"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Wyloguj się"
+
 #: kotti/templates/login.pt:15
 msgid "Login"
 msgstr "Logowanie"
@@ -328,8 +329,8 @@ msgstr "Logowanie"
 msgid "Username or email"
 msgstr "Nazwa użytkownika lub email"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:25 kotti/views/users.py:212
+#: kotti/views/login.py:257
 msgid "Password"
 msgstr "Hasło"
 
@@ -374,6 +375,44 @@ msgstr "Tagi"
 msgid "You are here:"
 msgstr "Jesteś tutaj:"
 
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Usuń ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:45
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
+#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Nawigacja strony"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Zmień nazwę ${title}"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
+msgid "New name"
+msgstr "Nowa nazwa"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
+msgid "New title"
+msgstr "Nowy tytuł"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Zmień stan publikacji"
@@ -413,10 +452,10 @@ msgstr "Data modyfikacji"
 #: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
 #: kotti/templates/edit/delete-nodes.pt:32
 msgid "Select item"
-msgstr ""
+msgstr "Wybierz obiekt"
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "Załącz potomka"
 
@@ -424,37 +463,30 @@ msgstr "Załącz potomka"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "Jeśli zaznaczysz, zmiana obejmie status wszystkich potomków zaznaczonych dokumentów, oraz ich poddokumenty."
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "Zmień stan na"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "Bez zmian"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:83
 #: kotti/templates/site-setup/users.pt:105
 msgid "Apply changes"
 msgstr "Zapisz zmiany"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Anuluj"
-
 #: kotti/templates/edit/contents.pt:30
 msgid "No content items are contained here."
 msgstr "Brak elementów potomnych."
 
 #: kotti/templates/edit/contents.pt:38
 msgid "Select / deselect all"
-msgstr ""
+msgstr "Zaznacz / odznacz wszystko"
 
 #: kotti/templates/edit/contents.pt:42
 msgid "Visibility"
@@ -472,37 +504,6 @@ msgstr "Ukryty"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Usuń ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Nawigacja strony"
-
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
-msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
-msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
-
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
-msgid "New name"
-msgstr "Nowa nazwa"
-
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
-msgid "New title"
-msgstr "Nowy tytuł"
-
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Zmień nazwę ${title}"
-
 #: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "Udostępnij ${title}"
@@ -538,12 +539,11 @@ msgstr "Grupa"
 
 #: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
 msgid "Gravatar"
-msgstr ""
+msgstr "Gravatar"
 
 #: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
-#, fuzzy
 msgid "Assign role"
-msgstr "Przypisz lokalne role"
+msgstr "Przypisz rolę"
 
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
@@ -577,14 +577,6 @@ msgstr "Prześlij ${number} plików."
 msgid "Dismiss all errors"
 msgstr "Zignoruj wszystkie błędy"
 
-#: kotti/templates/http-errors/notfound.pt:6
-msgid "Not Found"
-msgstr ""
-
-#: kotti/templates/http-errors/notfound.pt:7
-msgid "The resource could not be found"
-msgstr ""
-
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
@@ -634,6 +626,10 @@ msgstr "Dodaj nowego użytkownika"
 msgid "Add new group"
 msgstr "Dodaj nową grupę"
 
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Otagowane z:"
+
 #: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Wyniki wyszukania"
@@ -642,9 +638,13 @@ msgstr "Wyniki wyszukania"
 msgid "Search..."
 msgstr "Szukaj..."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Otagowane z:"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr "Nie znaleziono"
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr "Zasób nie został znaleziony"
 
 #: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
@@ -682,78 +682,14 @@ msgstr "Dodaj ${type} do ${title}."
 msgid "Add ${type}."
 msgstr "Dodaj ${type}."
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "Zresetowałeś swoje hasło."
-
-#: kotti/views/login.py:154
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Witaj, ${user}!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Zostałeś wylogowany."
-
-#: kotti/views/login.py:65 kotti/views/users.py:270
-msgid "Full name"
-msgstr "Imię i nazwisko"
-
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
-msgid "Email"
-msgstr ""
-
-#: kotti/views/login.py:108
-msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
-msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
-
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr "Zarejestruj - ${title}"
-
-#: kotti/views/login.py:212
-msgid "Login failed."
-msgstr "Nie udało się zalogować."
-
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Resetowanie hasła - ${title}."
-
-#: kotti/views/login.py:222
-msgid "That username or email is not known by this system."
-msgstr "Nieznana nazwa użytkownika lub email."
-
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Zarejestruj"
-
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "Wystąpił błąd."
-
-#: kotti/views/login.py:295
-#, fuzzy
-msgid "Set password"
-msgstr "Reset hasła"
-
-#: kotti/views/login.py:323
-msgid "Your password reset token may have expired."
-msgstr "Twój token do resetu hasła mógł stracić ważność."
-
 #: kotti/views/site_setup.py:6 kotti/views/users.py:378
 msgid "User Management"
 msgstr "Zarządzanie użytkownikami"
 
+#: kotti/views/users.py:270 kotti/views/login.py:65
+msgid "Full name"
+msgstr "Imię i nazwisko"
+
 #: kotti/views/users.py:267
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
@@ -780,6 +716,10 @@ msgstr "Użytkownik z takim adresem email już istnieje."
 msgid "No such group: ${group}"
 msgstr "Nie ma takiej grupy: ${group}"
 
+#: kotti/views/users.py:199 kotti/views/login.py:73 kotti/views/login.py:269
+msgid "Email"
+msgstr "Email"
+
 #: kotti/views/users.py:219
 msgid "Active"
 msgstr "Aktywne"
@@ -846,6 +786,89 @@ msgstr "${principal_type} ${title} został usunięty."
 msgid "Delete ${principal_type} ${title}"
 msgstr "Usuń ${principal_type} ${title}"
 
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Zresetowałeś swoje hasło."
+
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Witaj, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
+
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Zostałeś wylogowany."
+
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
+
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "Zarejestruj - ${title}"
+
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Nie udało się zalogować."
+
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Resetowanie hasła - ${title}."
+
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Nieznana nazwa użytkownika lub email."
+
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Zarejestruj"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Wystąpił błąd."
+
+#: kotti/views/login.py:295
+msgid "Set password"
+msgstr "Ustaw hasło"
+
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Twój token do resetu hasła mógł stracić ważność."
+
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Opis"
+
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Treść"
+
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Zresetowano widok na domyślny."
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Domyślny widok"
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Ustawiono domyślny widok."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Domyślny widok nie mógł zostać ustawiony."
+
 #: kotti/views/edit/actions.py:106
 #, python-format
 msgid "${title} was copied."
@@ -921,29 +944,5 @@ msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
 msgid "Change State"
 msgstr "Zmień stan"
 
-#: kotti/views/edit/content.py:38
-msgid "Description"
-msgstr "Opis"
-
-#: kotti/views/edit/content.py:53
-msgid "Body"
-msgstr "Treść"
-
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "Zresetowano widok na domyślny."
-
-#: kotti/views/edit/default_views.py:79
-msgid "Default view"
-msgstr "Domyślny widok"
-
-#: kotti/views/edit/default_views.py:107
-msgid "Default view has been set."
-msgstr "Ustawiono domyślny widok."
-
-#: kotti/views/edit/default_views.py:112
-msgid "Default view could not be set."
-msgstr "Domyślny widok nie mógł zostać ustawiony."
-
 #~ msgid "Submit"
 #~ msgstr "Zatwierdź"

From 0a7dc4106f06d070ce89e23ef8c427bb7af5e5e3 Mon Sep 17 00:00:00 2001
From: Joseph Rawson <joseph.rawson.works@littledebian.org>
Date: Tue, 27 Oct 2015 16:29:17 -0500
Subject: [PATCH 362/600] added list method for newer versions of filedepot

---
 kotti/filedepot.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 1f96d10bb..f920257ae 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -283,6 +283,10 @@ def exists(self, file_or_id):
         return bool(
             DBSession.query(DBStoredFile).filter_by(file_id=file_id).count())
 
+    def list(self, *args):
+        raise NotImplementedError, "list() method is unimplemented."
+    
+
     def _get_file_id(self, file_or_id):
         if hasattr(file_or_id, 'file_id'):
             return file_or_id.file_id

From 82d91444e184dc9f87c4c39adf0ff9f585fd3e51 Mon Sep 17 00:00:00 2001
From: Joseph Rawson <joseph.rawson.works@littledebian.org>
Date: Tue, 27 Oct 2015 16:46:46 -0500
Subject: [PATCH 363/600] handle xhr requests when searching for users

---
 kotti/views/users.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kotti/views/users.py b/kotti/views/users.py
index 886ab3e2f..c222d29be 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -87,8 +87,14 @@ def search_principals(request, context=None, ignore=None, extra=()):
             entries.append((p, list_groups_ext(principal_name, context)))
             ignore.add(principal_name)
 
-    if 'search' in request.POST:
-        query = u'*{0}*'.format(request.params['query'])
+    postdata = request.POST
+    if request.method == 'POST' and request.is_xhr:
+        postdata = request.json
+    if 'search' in postdata:
+        if request.is_xhr:
+            query = u'*{0}*'.format(postdata['query'])
+        else:
+            query = u'*{0}*'.format(request.params['query'])
         found = False
         for p in principals.search(name=query, title=query, email=query):
             found = True

From 9f98e94809a327b06a4b19d03f478ed73473f4d5 Mon Sep 17 00:00:00 2001
From: Joseph Rawson <joseph.rawson.works@littledebian.org>
Date: Tue, 27 Oct 2015 17:29:23 -0500
Subject: [PATCH 364/600] pep8 fixes (I still like the deprecated raise
 error...)

---
 kotti/filedepot.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index f920257ae..0a3a524e3 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -227,8 +227,8 @@ def replace(self, file_or_id, content, filename=None, content_type=None):
         Given a :class:`StoredFile` or its ID it will replace the current
         content with the provided ``content`` value. If ``filename`` and
         ``content_type`` are provided or can be deducted by the ``content``
-        itself they will also replace the previous values, otherwise the current
-        values are kept.
+        itself they will also replace the previous values, otherwise
+        the current values are kept.
 
         :param file_or_id: can be either ``DBStoredFile`` or a ``file_id``
 
@@ -284,8 +284,7 @@ def exists(self, file_or_id):
             DBSession.query(DBStoredFile).filter_by(file_id=file_id).count())
 
     def list(self, *args):
-        raise NotImplementedError, "list() method is unimplemented."
-    
+        raise NotImplementedError("list() method is unimplemented.")
 
     def _get_file_id(self, file_or_id):
         if hasattr(file_or_id, 'file_id'):

From 0f6c9b0a7f552f3f0b0db0809352331012fd3031 Mon Sep 17 00:00:00 2001
From: Sebastian Brass <brass@xo7.de>
Date: Wed, 28 Oct 2015 15:24:46 +0100
Subject: [PATCH 365/600] In ``workflow-dropdown`` replace hard-coded
 permission check with individual permission checks for each existing
 transition.

---
 CHANGES.txt                          | 2 ++
 CONTRIBUTORS.txt                     | 1 +
 kotti/templates/workflow-dropdown.pt | 7 +++----
 kotti/views/edit/actions.py          | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9e7ecfae7..7841d8419 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,8 @@ Change History
 ------------------
 
 - Add simple, default ``not found view``.
+- In ``workflow-dropdown`` replace hard-coded permission check with individual
+  permission checks for each existing transition.
 
 1.2.1 - 2015-10-07
 ------------------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 469df72db..3eb9a1e89 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -104,3 +104,4 @@ Contributors
 - Martin Peeters, 2015/02/21
 - Davide Moro, 2015/04/02
 - Matt Russell, 2015/09/27
+- Sebastian Braß, 2015/10/28
diff --git a/kotti/templates/workflow-dropdown.pt b/kotti/templates/workflow-dropdown.pt
index dd5b8b6a3..03b02bcc6 100644
--- a/kotti/templates/workflow-dropdown.pt
+++ b/kotti/templates/workflow-dropdown.pt
@@ -1,9 +1,8 @@
 <tal:block>
 <li class="dropdown"
-    tal:condition="current_state and api.has_permission('state_change')"
+    tal:condition="current_state and transitions"
     i18n:domain="Kotti">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown"
-     tal:condition="transitions">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
     <span class="state-${current_state['name']}">
       ${current_state['title']}
       <b class="caret"></b>
@@ -19,7 +18,7 @@
   </ul>
 </li>
 
-<li tal:condition="current_state and not api.has_permission('state_change')">
+<li tal:condition="current_state and not transitions">
   <a class="state-${current_state['name']}">${current_state['title']}</a>
 </li>
 </tal:block>
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index fe0de6c03..bd89ad0eb 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -573,7 +573,9 @@ def workflow(context, request):
     if wf is not None:
         state_info = _state_info(context, request)
         curr_state = [i for i in state_info if i['current']][0]
-        trans_info = wf.get_transitions(context, request)
+        trans_info = [trans for trans in wf.get_transitions(context, request)
+                      if request.has_permission(trans['permission'], context)]
+
         return {
             'states': _states(context, request),
             'transitions': trans_info,

From 070e4c518bbfa0f426b0647c79dd34234d5ecc4c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 28 Oct 2015 17:24:54 +0100
Subject: [PATCH 366/600] Upgrade requirements.

---
 CHANGES.txt      |  1 +
 requirements.txt | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7841d8419..60addbc8a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Change History
 - Add simple, default ``not found view``.
 - In ``workflow-dropdown`` replace hard-coded permission check with individual
   permission checks for each existing transition.
+- Upgrade requirements.
 
 1.2.1 - 2015-10-07
 ------------------
diff --git a/requirements.txt b/requirements.txt
index 070a5ebf8..96fbc836e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,26 +1,26 @@
 Kotti==1.2.1
 Babel==2.1.1
 Beaker==1.7.0
-Chameleon==2.22
+Chameleon==2.24
 FormEncode==1.3.0
-Mako==1.0.2
+Mako==1.0.3
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==2.9.0
+Pillow==3.0.0
 Pygments==2.0.2
-SQLAlchemy==1.0.8
-SQLAlchemy-Utils==0.31.0
+SQLAlchemy==1.0.9
+SQLAlchemy-Utils==0.31.1
 Unidecode==0.04.18
-WebOb==1.4.1
-alembic==0.8.2
+WebOb==1.5.0
+alembic==0.8.3
 appdirs==1.4.0
 bleach==1.4.2
 bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
-fanstatic==1.0a5
-filedepot==0.1.1
+fanstatic==1.0a6
+filedepot==0.2.1
 html2text==2015.6.21
 html5lib==1.0b8
 iso8601==0.1.10
@@ -28,7 +28,7 @@ js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0a2-3
 js.fineuploader==3.3.0
-js.html5shiv==3.6.2-1
+js.html5shiv==3.7.3
 js.jquery==1.9.1
 js.jquery-form==3.09
 js.jquery-maskedinput==1.3.1
@@ -42,7 +42,7 @@ js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.1.5
 kotti-tinymce==0.5.4
-lingua==3.11
+lingua==3.12
 peppercorn==0.5
 plone.scale==1.3.5
 polib==1.0.7
@@ -56,13 +56,13 @@ pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
 pyramid-tm==0.12
 pyramid-zcml==1.0.0
-pytz==2015.6
+pytz==2015.7
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
 repoze.zcml==1.0b1
 shutilwhich==1.1.0
-six==1.9.0
+six==1.10.0
 transaction==1.4.4
 translationstring==1.3
 usersettings==1.0.7
@@ -72,8 +72,8 @@ wsgiref==0.1.2
 zope.component==4.2.2
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
-zope.event==4.0.3
+zope.event==4.1.0
 zope.i18nmessageid==4.0.3
-zope.interface==4.1.2
+zope.interface==4.1.3
 zope.schema==4.4.2
 zope.sqlalchemy==0.7.6

From a5901733e890ef3762ff4885da14674c2621524f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 28 Oct 2015 17:26:18 +0100
Subject: [PATCH 367/600] Bump version.

---
 CHANGES.txt      | 2 +-
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 60addbc8a..1657d7543 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.2.2 - unreleased
+1.2.2 - 2015-10-28
 ------------------
 
 - Add simple, default ``not found view``.
diff --git a/requirements.txt b/requirements.txt
index 96fbc836e..1ea538d66 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.2.1
+Kotti==1.2.2
 Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.24
diff --git a/setup.py b/setup.py
index 1ba18c505..ea6bcd17c 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.2-dev',
+      version='1.2.2',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From b241c662d9dac6143837452261918c9f063d081e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 28 Oct 2015 17:29:02 +0100
Subject: [PATCH 368/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1657d7543..34165825d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.2.3 - unreleased
+------------------
+
+- No changes yet.
+
 1.2.2 - 2015-10-28
 ------------------
 
diff --git a/setup.py b/setup.py
index ea6bcd17c..bab36b2a9 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.2',
+      version='1.2.3-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 573c18abb54223f30fb6b9c2029e76dbc6b97fc4 Mon Sep 17 00:00:00 2001
From: Joseph Rawson <joseph.rawson.works@littledebian.org>
Date: Sun, 1 Nov 2015 19:51:56 -0600
Subject: [PATCH 369/600] rename locale/keep file in scaffolds

---
 kotti/scaffolds/package/+package+/locale/{.keep => +dot+gitkeep} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename kotti/scaffolds/package/+package+/locale/{.keep => +dot+gitkeep} (100%)

diff --git a/kotti/scaffolds/package/+package+/locale/.keep b/kotti/scaffolds/package/+package+/locale/+dot+gitkeep
similarity index 100%
rename from kotti/scaffolds/package/+package+/locale/.keep
rename to kotti/scaffolds/package/+package+/locale/+dot+gitkeep

From f95f1e143ba0d986ad60a0409a63c01efd8b2e0f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 8 Nov 2015 20:55:24 +0100
Subject: [PATCH 370/600] Use Kotti logo as favicon.

---
 CHANGES.txt              |   2 +-
 kotti/static/favicon.ico | Bin 1406 -> 1150 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 34165825d..6042c2318 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 1.2.3 - unreleased
 ------------------
 
-- No changes yet.
+- Use Kotti logo as favicon.
 
 1.2.2 - 2015-10-28
 ------------------
diff --git a/kotti/static/favicon.ico b/kotti/static/favicon.ico
index 71f837c9e27a57cc290a775b8260241d456582e9..702ceec66ed93f561438dcf6eb5e23342ff1d4f1 100644
GIT binary patch
literal 1150
zcmbW1eN59w7{`BRZqX_7R=U|N+5TXzNWuhMGNXe4ODDPrG6lpr6etBL?*+z-o4glP
zqEm)!1{7nEg_p{J%CrhYaG;D=(UlgMF(TVETb5;UfqwRDO_%N8-R17Nd+xs9yWI19
zPY{-g)yYW^``3ho<$@p;1VJt~(ItAG`9&iL;+pHKXU#SjJH%qKSXf+Kv<{gz8cA0x
z@$!5fH;D^wQYoGu>rf}gaqsSwZI5-Y6=N%+U0PbQ4GRm4SmW%BvsVc6j~dvN(#e*n
zllX)bB9$vxx!RFK`8imT77=6Ruwx@5qi|UL0!hvN#9jygil2C|9=0EwC+yQ(L=_LS
zP2GgBaxGz@@7vC^-=Vmq6c>l*(Va@7@@g-MeUI_0G_kp0l7Ko;)ci?s#SFW&Q|vAO
zp5<#^B|kUY#$hs<kh)1IP2WjV<pE9|&nBhM$j;^ke3E<c%N``4)`H?31lKPSc3!+w
zl^JL0D@=@ylBvnT*JCZsCsj05#iOfEMBCj(^1uV$J~4-HOdFeG+VMX$h2r>Qw$}VX
zqz+{MN|Kb(Z1CQQCf1*!j(qy{hZ(<7$<W9}n&y9@X!=(I`=1bedYFKeF8pG21SWJ4
z`pGSPc2(HoB9qBDqS?l`jcN2YXEAiOm^%YUXrCSB!oqJv7#^|xho|f{J|(>CAzLd(
zP~?rVS=EHAn-nX)JUIwMoeIPGWCq&v7`s-;&5;J`7k;LCa-Q(UIo@r3NXX6Ki5UKi
zP(AqOjf!|TynWu{;0GJHa(X}d+E{uUQ~B=eJSMIk<}33cTH_<i2JchS_W*V4EHRDK
zq<23dD76-kb?#(l<+4%kO6O-$v{vom${D4|k;d&y8hZLar($M~1pPfy^(G4Y?xVf&
zBXuU&vikt4*!`HyW?qs?C{OaE?N~T%R*o;@=(&)>U`qyPCJbcWHj>yif$GvYsoitL
zH4NY+d6~(Haa#_QmT7TZA#ko}2dzhU({eO|&YBpm*D2ApmytC-&c2p@RG06NVVGux
z%$<VV92?f2zfm7X^Wt*?We4A(<HQ~=SMTGSFJkFC8&A!Uj)K`)qMO=TCXo@g<G=Z9
z=O`)FiW*pjx4WbGrf-UI38X4RfhInPHx&LjxQP16{rI1A?fGxDcKw>oGo++xSnuhD
cRMf6jzjFC{)XI2Kzjtlef9u!&5By*IHz38k<p2Nx

literal 1406
zcmZQzU<5(|0R}M0U}azs1F|%L7$l?s#Ec9aKoZP=&}eKW1$hQXJ8K3_byWuK^<Nll
z_kUwBF*0B<1!7hf7KZ=-|1(%ynlbEn@r!|nn~R~PrHx_hlP?U@AN*o)cX4FU*VSh5
z@o;0%Uip$CCL)xf<i<~ir%#_Tym|A6LC49TK}1-HK|d^$!PMB0Av`#ML0U?JL3`at
zhV9RPFf3oblEMG{PX=9GJqA4>4)pUzxN(#<8UmvsK;IDHKmiOqXh0GT$f5y8Mn(lr
zPEIj#Ai)ddFf%g)`Eo2Q!azQdBPb}Sz$wKF1QMLQK#sJuG@G&_7$~s=Ib0wh3I<>%
w6A18w0hlQO2J+n8d=Qop8c;z43^FJH7?vVPfPvuvGXp~dBk4g5(gV^90E$0CbN~PV


From 9aac89e5e113c7c61d692b0f3a2f0ea31339e0c3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 9 Nov 2015 10:09:42 +0100
Subject: [PATCH 371/600] Add Kotti logo and icon to static assets. Move
 favicon to separate template to make it easily overridable.

---
 CHANGES.txt                       |   2 ++
 kotti/static/favicon.ico          | Bin 1150 -> 1150 bytes
 kotti/static/icon-transparent.png | Bin 0 -> 47713 bytes
 kotti/static/icon.png             | Bin 0 -> 44334 bytes
 kotti/static/logo-transparent.png | Bin 0 -> 61821 bytes
 kotti/static/logo.png             | Bin 0 -> 55715 bytes
 kotti/templates/edit/master.pt    |   8 ++++----
 kotti/templates/icons.pt          |   2 ++
 kotti/templates/view/master.pt    |   1 +
 9 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 kotti/static/icon-transparent.png
 create mode 100644 kotti/static/icon.png
 create mode 100644 kotti/static/logo-transparent.png
 create mode 100644 kotti/static/logo.png
 create mode 100644 kotti/templates/icons.pt

diff --git a/CHANGES.txt b/CHANGES.txt
index 6042c2318..5918f99c0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Change History
 1.2.3 - unreleased
 ------------------
 
+- Add Kotti logo and icon to static assets.
 - Use Kotti logo as favicon.
+- Move favicon definition to separate template to make it easily overridable.
 
 1.2.2 - 2015-10-28
 ------------------
diff --git a/kotti/static/favicon.ico b/kotti/static/favicon.ico
index 702ceec66ed93f561438dcf6eb5e23342ff1d4f1..cd1cc8e97aaaf211f79d632a02a61b0f070f54fc 100644
GIT binary patch
literal 1150
zcmah|drX^E6u$%leBXzCQkJxKl-HaJTb#2XG%IfqhGP&N4jlukfw3ZNX0sWfFkwT6
zJYo?`kjTJ6#>O)gCeMv(-CRL}OeQ9<0s;wcIzx;CKQAmH{%3B^eVlvG@1Do+5Mo1z
zKtSlMAZd1lxDY~iQ=uxVd7`HaA@oknJ&~>Rf2J4r?IRJ9k+#l4fgkH=|0&BoHNo-3
zzfpO}a!!*h<5(>b3sq{h+HQ}J&$cB1B9%&sySs;g<+u+-GR1--Fa>*#*Wu-iR;b>p
zf-){2Udnjzo#jg$#}v9LT*W(FB&4aSiOA)0;^E=RXB-`CefB=PcHGd8qb-l1E?z*0
z{x3up&mtzrj9A?uLNzszJrl6bFieA+n?k(#Z%fNn8<ypA_wJUj>kE=`q0@-;fh7c2
zJb)^H8bMWS2-mM7y3~rpMH4u9#)zk%Q*UrAQ<R*XY%3BwD<vYH^;}vME*GcZv+8_g
z^-mzKc@E06W~g*y2&!B~cnuI$yMfr+e-N5~8+_@mMQ0&T&9Gcqpzki!T}(n#Wg4y-
zPNAf?8=1p1Q0u3m%)EgBZ9f9@?jfvn8BtY#;t<8~ipT=Zvw>sT(KGLaqQB`hM!NEF
zcc>U9OEVf~=aD!05RrYqBBFW}AvFFViWQnYfar5(D36qY)@Vw|=a!34N29O)ByL_m
zi#uNz;0JRBx_-HfFXmQo?A9_~9s2{Xeg8Y++aBPR(s6|6THyb7Bb<ag9t(Kfa-lX1
z#?LhvXwc%Db{$3s&%-p<i28XeE{!iDvCWE@u0_P(dW0jURm8Ub4L_X;oJjhZ=Fy@}
zP@=se5xoWthOfMf?>cp`3|+w0`zDn9G=~DS6*<FJWOU3zb8QCcZ3_s?Hh|%HQw+nE
z1?^YhtHQ%*FHgjc8Vzo4VsyNZK9d2ZQ&Y(7yN}H7pOG^-gCf%$E}54Q^5zLJjt&Nq
zSVHUPWX;tCp!s4vI?9i3VGK8FG18_(jim?gnJ1Ca`y;f*d&n|Q<Cwk+BAMHwSja!n
z-`{6L`JLnKAz3TU3P$sVIJA|$fu8CV41Af6>s=+tvD`+g@eVYdV@RqWgu8F>h7-#a
zrlx9a<vVv0PcJV%<z&tC6eBm)9}OQJLhC09=&njaPu&TW4_-mG`CGhhxD18wfpwOp
z{8cDKGMQ|vkEBu=@$mHIQ$KQPEb~G8U7<~Q356#^@Nsq|PG!WvFa99JuJT2i@AK{o
zH<61(LPkbLw)^k}+P~r9VU*7jUk69FlD-=k@Yof~j}_|c1Y>Wn7xMW2DwWF4$J=|`
YZpML-AzMN|wAohu?`HGurp>19zlrPnTL1t6

literal 1150
zcmbW1eN59w7{`BRZqX_7R=U|N+5TXzNWuhMGNXe4ODDPrG6lpr6etBL?*+z-o4glP
zqEm)!1{7nEg_p{J%CrhYaG;D=(UlgMF(TVETb5;UfqwRDO_%N8-R17Nd+xs9yWI19
zPY{-g)yYW^``3ho<$@p;1VJt~(ItAG`9&iL;+pHKXU#SjJH%qKSXf+Kv<{gz8cA0x
z@$!5fH;D^wQYoGu>rf}gaqsSwZI5-Y6=N%+U0PbQ4GRm4SmW%BvsVc6j~dvN(#e*n
zllX)bB9$vxx!RFK`8imT77=6Ruwx@5qi|UL0!hvN#9jygil2C|9=0EwC+yQ(L=_LS
zP2GgBaxGz@@7vC^-=Vmq6c>l*(Va@7@@g-MeUI_0G_kp0l7Ko;)ci?s#SFW&Q|vAO
zp5<#^B|kUY#$hs<kh)1IP2WjV<pE9|&nBhM$j;^ke3E<c%N``4)`H?31lKPSc3!+w
zl^JL0D@=@ylBvnT*JCZsCsj05#iOfEMBCj(^1uV$J~4-HOdFeG+VMX$h2r>Qw$}VX
zqz+{MN|Kb(Z1CQQCf1*!j(qy{hZ(<7$<W9}n&y9@X!=(I`=1bedYFKeF8pG21SWJ4
z`pGSPc2(HoB9qBDqS?l`jcN2YXEAiOm^%YUXrCSB!oqJv7#^|xho|f{J|(>CAzLd(
zP~?rVS=EHAn-nX)JUIwMoeIPGWCq&v7`s-;&5;J`7k;LCa-Q(UIo@r3NXX6Ki5UKi
zP(AqOjf!|TynWu{;0GJHa(X}d+E{uUQ~B=eJSMIk<}33cTH_<i2JchS_W*V4EHRDK
zq<23dD76-kb?#(l<+4%kO6O-$v{vom${D4|k;d&y8hZLar($M~1pPfy^(G4Y?xVf&
zBXuU&vikt4*!`HyW?qs?C{OaE?N~T%R*o;@=(&)>U`qyPCJbcWHj>yif$GvYsoitL
zH4NY+d6~(Haa#_QmT7TZA#ko}2dzhU({eO|&YBpm*D2ApmytC-&c2p@RG06NVVGux
z%$<VV92?f2zfm7X^Wt*?We4A(<HQ~=SMTGSFJkFC8&A!Uj)K`)qMO=TCXo@g<G=Z9
z=O`)FiW*pjx4WbGrf-UI38X4RfhInPHx&LjxQP16{rI1A?fGxDcKw>oGo++xSnuhD
cRMf6jzjFC{)XI2Kzjtlef9u!&5By*IHz38k<p2Nx

diff --git a/kotti/static/icon-transparent.png b/kotti/static/icon-transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..043d34278c6ff36036ecff52e5bc3697e2d92beb
GIT binary patch
literal 47713
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

literal 0
HcmV?d00001

diff --git a/kotti/static/icon.png b/kotti/static/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..72e18972873dacab7bcde466c8d802277e72bc13
GIT binary patch
literal 44334
zcmV))K#ISKP)<h;3K|Lk000e1NJLTq00A!m00A!u0ssI2o4nAE006A@Nkl<ZcmeF3
z18`hh7{||Uv}jhz#;$GK95=<YJ)XzGvu)e9ty-~dtg=qp?EAlaX3yNI-Mh*6YkT**
zr;YQQPn)Vjp%7CTL@10r7PkleGbTf&Qi<z9Cj$8iBa}omBNSjA=<n|r0Y@B)+oM>@
zIjnL(tyasgf<ym-5O{z?HWG5dI0qyS3Y<=7ZEdZ~<*Ki*$4Ns&gWK)y?d`3uu9mx3
zQ&ZE|*T-XlR;$g<&X)T*dh}>qEfz~!S{i&CF=7P%&8ShMbUIy>1P<lFLAstbIf*k{
zsS+aH3DY?H!&FvQR#a4Ub#;}Ll-O*xwzf9m*qMfVo0XN7kdQEP<jB<2R9y4&@}i@o
z;UvEbNKUdbf)gM|h}S34+1Ux}N=r+ts;UqO@stA;g^<XcV<g6o9gCzI6B831Mx;<O
zlWdHD94Pd|73F0?LBW<STlVbPvv==a<Ukf_puU|vdGhq>)91{Y1505hmlIc!Hpxt~
z@!TT}1l&OA=lA>n{PWLU5`~3@xMc$cgTXLi!h~tlrp=r=bMD-^u@cc?)Dom6*?4Xw
z6b6F2y1Ji!`suH~{@Sr)2RCqF12bpLn6Yfxvc-!Rr>CdK#l?xVDH0|l$i}lEAve(L
z_5SwTZ~y%B&o96H(%jt41}m7;E|gfXU_qP&X?X^1q@GZ8gTY`h5D5JI^UvRY`|Yp4
z{@T;iBmO0U@$9NqtJbYshdNfH(TGx(raoljsnRdOGa;Ao_uqeqgs4cd5@f`Yv0ANb
z*RF+@=rEzBJX?~JWaG(Hq`W7DgxCtc`|i7+efAkvf{Zx9k?e*I8#Zm)gxzMGM6?8@
z%46F|9zsHq3{i!C^UXK!zyJRB?b{h~3ZQ$OKY#w_&70S(S%Z}(oa7bkVY*7Pkr3k<
zNQjAOSy|Z|Z@lsK*I!dbdfFSy{QUe&F1aKpCx<tdd~Zokl8r1R!HZH<r0@_ciWgse
z5eq{`oXJ$VdiCn7ufBTf)TumGawl<4HV#twgob<Q^Z7pc<dauleYK>dgb`<p>C>lQ
zd+oK$moL}pbV!xLNwRS;dWd9bx7*)(>#f&cf4#M}l@aHHVZ(-9dg-O-op+wWU>HPB
zl8wAS<dahLgs;8!8tPJ-lqzKUdj0j+UwGk#dcA&tJ4rU;BNh1&9=`L=JI_A*tkRyw
zO<)mn!wolJBf@J}jClssjE8KL&uOr<z~&GhD!eYG+7(W&U%y`D$;jS?kd53!-Xg+7
zuh;wCci-K2-+gs;bu1Df#*Q6(=bd-XnKK7Y^0})@f^3Y`Q4RKon3on77T$5k9b2|+
zVG)AHV2;)3<CD@68&fh>Q8BR^ZG2)XQ>(S+M7=SQf$;aGnm<S_7LNE|xoz#eJx+wq
z_69V{`}+btU9IduzpJA;=<UI879n64a@%dUjTkWkwJV(D%_P|vNhy(!YT#j8Tie4A
zKm5T5AD~iYiX>JSuTMxZB&X}m$%f=iO}x>Nngyv;_;t|#0mpA;v6=_czXeisu$Cg`
z|3V#(x|?c(9!F1StE;`Kr=uCJ_WHd{kwC($uDS}fYhq#|_LGtEgaNWKB*8~D9*^gx
zmtK1E$tRWeV-^~t#h8+9O3O8+WEnGZ<Mc)q3o#Y<NiA~SK`ILULI`EP2^9~UA!X<P
zf31azxaI!_kKz^i91dG^mA$#n)>vh0sSETtn370INxA8!n>KFTC~qdoM&+s~O4EXZ
z0(|B6?c2wcfgvRe`kAwaC+3aO4lywxmx@~>m+HiQ!y}IltD-oU$7&{2Wa5;c<Bz-B
z)>g5vv$m|Ou@d={DTDd*=cD-_IdUYNRN};yY~<4#o)R4n$77E@hOBtbOVc3<$(G#F
z3E89mWA7ZG99g<Jp4%CFCgZhjJlnQy+qP}nw(WUuZST(7HZt|yv$cD_`uDln?4FZO
zKIE}dsjkk>>EHY>E7k3~d*MviXe1sJ|6^$|%%$c5+V`x*N)BUoY&P&lLYCPG6#<Go
z1QhvZLTfA(WuEN(+Er_&4(&H}RKJ;HhOA7rX0ow*$t9O?5l=xu0gsjFPMXG)OCm>2
zxefn{E3Qak)Req%S<^NZtvc6q>YG~}kq5*Q;_(0kiqHd;m*4?9a_0e8x+?mFlr*(O
z6g_!`=ahSvdSk~jzhLT=i35I}HE!74`mx3|r0Pe_C-mHN&pkbR_Ov3&9U&<OGEJkE
zL^e%1kAKG<cW{kc3L&iR)VI1_&&=F>G$zp-<kv_D0Rg02q}GllbSYsONEs4~mmpd^
zL?0FB8AfO9yLR=mmE-Dum^A2**%MMz+{>!S(H;K%TT)UYo@AQFR0d8tTGOvzKQ5}`
zGr5!f<0C3*+`6VypPG(+vU3Yu_T<?I6jAHq2V+qBbQF<u2W)jW9W50_WsNg$Z)KmJ
zRZEtS`SaWQ!GFw|G$ti!NiOH$|JoEtQtJfLG)gYf22MF@`tZXKC)rEPFRiTZ)VE2G
z9XT<$;qf&Niez!Hf<|PF-<MP4G(^H1UL{-+%AMW8$UGrh@+lM)iTr47E`G*cLhJX>
z%UTyHTGlLY&f1j|-+p7*pWhE%ws2vRJ;@tyyz#^nPh?M$Mbh>$r)f-5z{chh`G5@e
z=9Af&?}anUTXk;MXV*xxc0TJ-UP`J^Ne{|6roO2mQ<7X^{K%@kxy*|~3hRg&`R7ST
z6!8=F&CQNh6)$d?KfNSpL1xBk+2oghX1?|E$gzV)CeyLx<0LtN$Hz&sNU|r%K&EL7
z+&bklH<rYYKKh7DG?LbvpOKT-w8xH3`|i#aGWHo3KpbNd#7%JyjmRB|3uh2TSNbeh
zR*mdvV;V$**%&)dLN6H)g%YzGqOV9Iu89G9C?jmD%a*n-m|BrHE9^y``-p^w7B61$
z&{L!T`g*{cRV$K~lVl)w+if=%$pG^oX&P->pHbu-1_x}Od+xbp8Ko7Cd+pM+=Z;=R
zrhObW>rs!s=+2?w2*k$9H<DlaEMc+ZG&mnWdja#X9@bdsE%g<pt6COJZ&WZNE4;$~
z0cE|PVG~-lYTZk3kN^DbzmsFWvLs%1*<}}9bdl|rOnj_0O{29=*-_+B&Dm$4ogC}5
zsHR!VZT6{Z-^0G#A{0rpC+$#B6z7n4F=WIz6jJRN)RIRALZh&Z7!^R#^Q<HTPGWEh
ziaLIZ1#5CLqb(xyS{K&mWiMKPM_B|xAmeZ@^Y4B!>D?Cx%$}NzLV~^a+KWY!dnRo{
zk`YbQm@r3C(uwDud+w}Rvy#AJ+no-Hv}i8~k)-YIOJC|DK8mjVSQKSz%e6nLh`bT{
zjU=-$50|Sr$r9B$l(Bwoq<CfL()#KG#>p4U@vx?c-*sG7V_diO>))n5{oo(-f<KzQ
zMT-{CKmR<ZC8cU7O=DslMgBTb{>id|%2)<^$HL0St#>%EvTau$t0)Q|8j5;49_&fg
zIh3n}JggAF9pqEUMIfX)ikJk6k0{Rb{hO4}?^ZG{FMF}vNkNff@b7$BE1REuSO3Bz
zf6kvZBj{M`{rBI0*kOm+SSuz!(ll;)k&P{OyXKl}_*~Oq{ll`VRy!V8)1jC97-E$Q
z$y2Y!NHM91AgTHWX$jqLRCXYqfIDa?ZVqOo%`59O!VPUIXLl?eo#Cx^@H2MolT%{^
zMKFWqLXk=nGVgsk@x_OKUL5dAC>LLRF;@r_78Wv`YFsBxV|)~CkqtNLpK-<+fwm@c
z^-POx_i5I5cgK>1&?5<%N-Y~{6bWLIF*J5hdD;a<%Qo5Fjd4-rIpZcdh%gGH#csqT
z+^~}a17W3G{0xV!cQIY7rnD*^OB6+MwR9Of#_No|zxQw1G-%C|4Aw>)9({h;$FKad
zc6ESX>~-LQ2R`)BL$)DHjq9Xoj9>4@8O761J1w|V70C<NcG<e!ZbyW(bJR`<a<Yhm
zB4KJ?kG@DWmE>vl)v1zNk%JX*u@sU=x~PIG#!n>b84kH?PFA!>ReiJK@%|VOrZ0V|
z5d+96cQ?i#Nm{ma_4Rku)qPVJ=xLFBVl~HgI2);#2c&6KQMC1L95_Aw^wWcj*+iOm
zXt(<j`4zRGY{vc7O$4={*iIoR+VPg7NNAA?g|ShztU9TZ5E*+BDM>=GVc~Q6RgtvT
zs_cyD){Q3A6i)OLWn2`+KviP1#)y4jU+{1vs>c3#__dK=Amb*?yXu;sr;VKu+;Ka6
zRA<MI9XYNOKhT<{(S}bM#jn2liZdDPGzQadU(jyXBdR<1_2&=BQAG)LI+Ccj-Xl3g
zAg9VLVmgOFhrd0FHqo_+BoHJC^?4p`62)-X^r@ZLym;J(^_qrC;ex7!AfdPbHC9a7
zu$_G6-BHin|8+oyYa|lkOf@%2+VX&yK&EN5Rp1;xefQmWFTM2AfJ#rf!n@rbM`q>~
z@)*GY1r(Tc6v0pvH_t_y5Lz`(gS=tQs*>b@%axc-oSeQoPkL2qm)aSf%7y}p3b%+H
zQiq}3ICZdO!j6X-TC`;OC0G11tZr~XfmS|Lp3CSsuA>8)rjb!(Rb&*oE9&a2uV#@9
z;0TOJ$Gwh;wCE`8xv@<Qme~KrZhDdl@&pYrLFKVC#;(-NS|YuF-yb|RuG8wl#}gC{
zWMX6<$Ho|2s)F+hij69kZd=hW?5%NPKRSxSD*B3|)e_4wu0Y$mIVW8iwgdaekR87M
zW6~YheYJeyf*=msdFrXB`0FKEA#K}7nnuX)+iz&&lfU_Jw;=Aq{T6L^JIo7bVeU>)
zlu)PU{$aLG>p3LoGlYG>tX29Og(NLh3knH7q@rv9xX2df0OO*VpBLSuNnK9nQjF_>
zDS%3dV~n+8Hj)5lF;L-SfC#T#wdS&GeyRKZ?;v_3x%G#SY_$r>nU6G$8&I_QeJ*9<
z^WB2*5<BjFd_|kCYC|A~Cy}VwD5AO|idagDT8aT%>G4GcwtL`iI*K}4&Ugz^q;S}5
z-(+-6K|NT!@lf<<FGzPLH4`^1NtYOj6OZ5h^r!K6T=i+fkF;Y+y!-CExetpgS_R1e
zUmC?gUA%blU3cB}*kg|c5jgE~(5aa@`I7x|%sx`PF33+NiD!f&CU1IbD9CQ204y(Y
ztjCA20?yuB#|cp+zz+gMh$~RkxO~yJm397<3&CPzhgu~nrdokjV~nr#+@r9|r!i2h
zgFA%g%wKZG*<aL;8kcY&*%spi1Q<v$S^pnt6cpJ&<x{{Cjv}{QwBGT+X1#X{k&gti
zFG)cNRZ%2SP!#s!we~A0qH`D<Me>Ua$tT1th2|@25mc~TW5#$gGaB}8)~_IYp@Sl-
zqA{R^aYCuESTj&@5_Yg7Twp@?JvrdbXTE8Ou1oBr!b))Jsi(5ZDnS0<(I_Z#^FA94
z33k(qO1m9$79U&ch9Ak1M9dQkqYxAYsUeaRoltSW@x+2wRZF$n9i^{7q^1J_Asnk%
zIy=S>x3;OA+q+@_4>S~2N70K162&NC6%-|WBRk-I`7I3g3>`J~tkd6LzGzWm6_ULq
z{v!0$0-2H86hHfl{GDwHN3pC~+ir)Pospfp*(gHfQyy+03Q)v!g_3V{0VZd)n%=~>
zl&(buMfoU*W&B2AA{m2hW@kn_6;HtE60i#R8H2SrdR3}nmh8MIhG<w~t!Q79R>7kj
zA=0fw^UuFL^ORFQtRFKzflnhBvT|AZp@$wyM3VOSztBb-L1h&AYuoszkicXH5jE|z
zd)r+O;bANk2{|EuAd=K$)Ck*uMdTcXB*+#zN~?!+Fk~wCLdXRi$xP_T$-Iu=X0%PU
zt(xDnyq|os%}y$Mngxrj`ZF0ucD6$>%%!N8m|M@OHVT;ryD(}D@eQxI<-2d+{W-B|
z4-V<?x8HuLDh$X-Vc{Epvv*?iiWyls9rr!4s$KUG7@2+)kv(_`b``044uWI@qNp}=
zC<Oz8qIh=-itwvs)BP6YR--G9WqcH~GEB#!aa)QaNwk&FevgeJehNd3oF^V;SoR>p
zkHxysx`y?^AB*BT6O9^P(XiUAUCk@*xTJmePB{<U{$q6QnuI(*tPp%+@@ucXw)4(A
z6Ook8{cmccl!G&h-+%x8Nhh6@z-Gm){G#sv;_fZr9J#Kv@8>zUsw6efOpj^oLDQI-
zal=bt#`mK)oGdxZ%*;$-W^!W2pdop^X2xM?6xBUnZ8Vb3@9L^$t9!v)o82wTk{Z%~
zJ?9>H&MV$NdB}Q$qW#m0sG^XOW*UQ{{ez<++&Vl3MsI`X8^hzJ)nAy<xl3&vMfM+$
z>W?BB$MUGPy9#0Cph|`%jT(-V^fc~3sX#YCRW(h!6v9Dr^&kQDKCfxBruByAzS&&#
zwf(+2)7(?fXL3JNXWsM*K&W2xCO}XD-ty$0U;FUx+Tx1&?i9jU>`*%Q+;fYYmW%oS
zI2z56R58L|j7JsAYYQe<tk-F3`qWpwvv5^J$P8igna=>laE>q>{|y)uF(EMnfMX5-
zL=fHDbE}a$tMH}=y{#yW4ijsO1zXPy1(Mx}x0L12KcYyb?u(a9C^isP6DkK!&^C%~
zQUZVp3MmS&>ZzLN^=56CUzpQsqgku_dR6z#)Sp;v?x^~DPEZvD;T7n7T|wLCgO07o
z@0;E8D_?8Ou3TPc?b@}U|NQ5-Zrxfmm)r5HXFZL<=x{M4b?2RTzWBv2UcnXL<7*E;
z^)>G*jZB!o2NK$rgD_kSyS*840VinLvnWP8PQxa<{ytRpX?7l?%VTeQ060MXB9)9-
zL6Yn(BvNqX^sY0ezZ*kQ7|q#0Am;G_Evy-+svtylQR~%aeIZ}iQG0Y(W81u6SkML5
zb~l=f4S}!(mp~Hx`EsBtsdhrrgP@uW))RAc@B311_p<+}?6gN=O1OUg`eOXb3@AU_
zX*7l!#Xv@}O|eK@t>C=k)DcIW`pS1CX$Hd&ZC6;=I#ED$M-#*P1T8tVS{I<mXc6BY
zO_ii7DHwoaS0NPuL)}z@O9rA8p+apE7^(mz?nVX6EeHj&#J_06w@0#l7R6Y54VU!S
z5U|ZmyTGGhOW(XU{o?k<?0jQxSMAQH>W?nwwH!H`%>(SY6qN97)pxO11(o0u-FTR9
z)ZhKp>Qj%cn6<~n7hnAT_rJfG`Di%?{LjhablOmhA*mHa@t~tmIpM|sj}tM#*bcJL
zbkvk92y!5bL1K1*7mhI6yF;??HXGy0Vd6hEXj$n4Nm8wsKxmQ^t9;Ph2ZR42+_+|@
zu(~nwA1^9u`_0wF_r2T-1*Aeik7m6%m(=$?QoCnYbH|?Qqm9~pJt;Fu!31e0=>dUl
z3!MVKjUoj~b)W}?u98Yhq~w7_Yu5xs+wD6U@Xv2<y!(@-`|eqpok-VRcU|HC@<)I4
zM<UYl)Oq&PXiAI44)<%WxdtnA9d^=rMfWKgR~w)`p|2XYq>=WI4-pv*eJ=>c`)RBy
zMxs-Out*T*TAl3#!D7dqjFB?!XcqdbpB>{0rIoZ1Y$@?u$L<ZD9M9PpljOc#sp1p_
zv{~I-pWW4b{Go;0w%7OOg%T=J8o}5asy6_)?nzZZ0VI+E>HtZ`vt&BuWQwHZ(o(jj
zl8%&F8kKa6u0m#sb0R6=i8j-K`utO`sQ>SuzWke4ej6)s6;@2eqR1lADk7%l@vMzh
zRkej;k*9jsyWWKrx;CHpBU>)`5d<j4i;5Am3@}oJuxG`dvZGN&GOQ^Gd!A0y1`tIt
zGBj-7B{rKMQ9|>07|n8E>zosATC?Yj>2D205g@r_{|y}}ioCI~v%dYI#eaKp?w;9v
zv5}ORWB>usp?!Hlx2r;!3Cj+WWrvp2qo!PCwUe<V6DgNao=UP+;u3g>C!o+=H5WkD
z+d7k({1Spc^&4OP!iT=TQllP4&Et8`d)|LSiZ%JqF@3x3w%ZEPUnwV>qo4DN^`~Au
z07by6V&Gdt#8oj!pT>Pt8MiaGD6-9+dCY*sXxmL3Cu>3wZ4hVtK8~Vo9!L^@-1z-6
zpr{yCLW`n+i861@JifU7{_0JSF6?OL%{;3hon%Y>oC=^h0EKH67+sQ1XKqcIBb993
zXnEBk$><?2t*CQ!Wf3A5=7eveQAOPog#GVKl>p+yTseS0`h_1_clhYv{O)J5?5oje
z6e?0UQ51O{5wRJaXPGv(P<-sM$BMDe71?k~aa&*X`gO;j0|p~bQB{nXWe8)lRF-Ok
zrTyz}p%59@ASB+iYByCGF#6bPFc<<JTvQyq;7x>a2Py%HjcfLuz2=*PYKH79n*^9Z
z(OBHR@bJBJH$PO}UUMb51aOcRFCG-v%E!18;j(01IXh-eI(~3zY?NcuNqLPRMc#xq
zp`J=;4pq{d4@2pjz0trKM9t1g{^MtF`JJEpI9B31{q)m|W|fxZoOABkN2B+?wKL-_
zZ+S~m>tB(sw_{)My2DRCKPdNE6#EwyO(+*jg!VyEKp4F3^v04X($*fMesHw2{IrcY
z=01udms*D!EA+>9X_PYm{B^gEmUqRoqk~bTO6uzi)$O;=Tz!A_i5e3mB>;dY1@KUa
z<}RBmCDW;lk5!JH&Q=|fR#q{q(2dX&c@w_cDVqwUla-B$9tS;$9$$0)lYjl@U;gfA
zuoBlB-}uJg|NY;eoSd|6<<AZpRkf8wEu5ZLYJm9Y=e}yg>6e&1f>p(KR&<~$2Fs)*
z=H_Nknk3`A+2jksc)=s)2N%K?4>B!^<kL|<8EAoHvQeAY>_2n*X7hCh&u7>gk1}cQ
zzjx-AyZ3%~8{jJ?dIbP_2f$^7q~#40=`qvU)S6`KuypibL4v$V&7mHeA83oS0ks;a
z5QrXIpc<)ELI5==#-aVSzqt1OfAuA-#8r3&y#DpCZ+Qifd={J=?Q!vj8*V5P#4D4w
zx!^|&6pa?x?G#oT7^sSg4CC{@0g6F^FF<j?q+%RJhN5FCAQUjfEKDJphZ(A0d_0PQ
z5(di~vsAZ^-;aoJn~p$>gq2N6^L%FE$vgLd^{(okT3SLvdZkw+NV7vrZmd#1b!~ao
z=A@9p@;LDWQtOLARXV+L?6$3j`l~TnX4{y@Xm}f5C3;K)wEOyBeb=ScYV+g&bUBuN
z6}gWSPdxFo(@ql+)1&j>TO0E{FM4i@<6@DCDxAWx>}$hW&ufik*uh`x3dQJnR16h>
z5fnpZ75i6c2C2BDjel5sjJLK5B%U&5KZB_O25_M-<A5F==dga&+&OD+c!raTEfgzx
zW9R%GH}1Z28<0yvfvC7_JgpqNCRu-QY4suL#1T$P&>Y^=E10+4R)JUtxt;1*GAK1l
zsAlzm0ay*dMpPBRJAU=cU-{V8E3(!6OJDkuIY9omrO_1nizTOpyFu}NW7*ds$DMiN
zkNvMu*-SMej$+)oG*&rekYzE^YM^uR5(O=#{cDf*B?h6kJ~C1~jNe<i6oaN|a0qv4
zm=~g)`R5*X+jwbbpOK6HsZ?fpZTJ40uHE;Yoe-2pO4($Z95z-y;fT`sdKsN8phOe&
zHK^~=x6b8ysZ&5~AR0bF&4Ws~&O1_jMzNGcH_fi_2VUm&#c%n*|M}JmSV9(iD1PHN
zexo=*u6PA9`48#~FUqFNLeb0(pYS7ZHtboAvNM5$Q4}!NKofB^wkTRvw8R4xC_wwQ
z;<ZP62(^bmyJ=@Iim|Fje4Zmj(f0XJ^sw>S@$znHI7Aj&-7sX;J2!vVH}>ALZ}P~=
zbjx&h$W*p^Q&KrZC_oPHQC(zP_rv*ppl4>v=)akWF*^YS@StmZ=FsAMpy!SX?L@1D
z`aG{|D}zMmTtX!6k0Jf!zr6l=KR)}|{mV5nFT7YUz4X#zKctA53gmx38e7}l?!No(
zqU{FDzACHMp7QdyQzTYYGyud<jJv`OM3Ls)Xb1B{6cM6mzm`SOBGg;kAa!8%V(E$n
z<6~9|6|hG_kvTnn{2@RC6bZqSC;}8;D{VP>{bor^C62778%47rzHWnUg%UIeKx3Z(
z2Lu~(l(0q|tp^<-6e!etk9;1D+&7yC{wZJ7d;#@2Eqd<e^X6=hYOebi)gL&DDisQ-
zGe*_mNGg++q{NT@(J?>%|IX~$v2&TxUtzud^{;<@<Hn8d2iJeINY#`yis6i6UEVFX
z+_HSz#k1acS!HT%;Mf+;#L$W)DTq}vC=r8Tf}lb{AuWn_atfg;+Li!|Jt4hg{z9mB
zRgvsXnGUi-W$$X%L21=URfEKaRrAG(k%qJZm5kt+>M}Bc0>0j5Dc%*(K^_W=VuyPH
zwEa&csHE3gzPQ^j%;eR2vsu%;p^N*P+iUg57yQ1OU9=8DbC3dhsB!&J^IK4Mo6hMV
zs=$-`_WpmL*tWRrX}%Y|=tYG{PEAdjg2#UY8f^z$QPL>fewOcZBT0JZ>wdCWFdVZ#
zr9AENsGyQz8Md_9QiRRfgp>Xf)c4KFGuWv}F6qy2dxPSmPw~QId<zwOwuqbV*6z3?
zDkcA%L%%m(+7_M(;|_6z8Wb61U$7*KfvKYl?<IjapD&`Z=<__U?`zC$Z#=QPv7?T9
ztvQqX*@iAC#KVD3m~_Gq)0f))4vpElBf|U+Nc+v==Et7+#gFb-zVTe)a@aDqTB&$7
zS@9UPFo46dudUB}^~50?VKXIA2-}AcTi-V$<sphNBBlg57{$=R&7epU)VOP-MKRuh
zIuOO^a}Y-{vic^vdCK$yI?;9G3*)6715sq>mS8LqN+7x*)o7^(_Hb=boQlhvbAIOW
z#@zl!ZD0L?9gPQOb+HLL<~WdaNx+1hG~ZQw2bLNpwRNY`m0Z{P!nRXF)J{u7&pTq>
zYhO6>;V&=O<m%Ud{nszJ;DRk%wyadVnyjqVP2qF1{H;>!PCD<fR>MtSQ*ef^YK&?o
z4PcC*NQn+og*hA8k|sb2iDJxq)vVL#NvklXa={wqpzs*1i!%;X3J6H5#?z{;7iOs*
zJNiIiUP^GuRI1fD`_|#mqwVV>pxw7k;4+10vzFKA>vIoPAKBjAKBxN@>f7pC&zV9p
zFahC_w&l!qKNr+|44J_*wbLZ3-TEa>hKMSVu!KX9!vF8&HFrLtx81(1j81VV`_13{
z&A<H1zic_^ko?b&RO5NnB1SDX<6U;yWmw)damf0!-t@B+f`RpL<oIX)k#<tiwzMsc
zV#FCWLcYmmT0wRKL=K9!RVYl8#?E-=o&*M`Rl`8k+_$d)MG+h}xp2YS>#c)m-=gAR
z`_mBM&<PF#kTTNLc|ZG9eSUv^+vC;mZS(t^$cbE$f=Ot*s;#$buL7|3589wq&|Svb
zYer`}b+o5!N%NvcBY*7&pV;x#Q&`^hk&k@jg)e+zG2yZNet=}93XG3G{&?{@vHZ-<
zsYMdiq9`T~vHxhm3s5ws77`Xk;wTEGZ~D|8&Fm4*pcpwQS|hcvcP?&=%BUA3?c*_q
z<Bq0+prbWQ^OMIPAQ=NG?nE4^NdQZgCAB@d;xhH>^O?o%->=^Hc=M6j{HaAq&IFPQ
zoZ2@FlS$6LzZFF&)%4$!Kzk}um}om|BNkdJY%xV(k~(0PCV%;|@i+YQzWVZ_x%a*A
zeP^9@R!bh8bN`jvsH&}6e^C-$W`U99X|I0w>W#-nR59M(ElZ&oR_X_$2!Kx$#ojo%
z&v?``Mv-95moZY`AAq7gVG1@*Eu1}l1E4{XGJJ=pg`)KF9d}4Z@_c`D|IXU(`xd_a
zxZhbr6`Fb`fDHgZ)i{c6QoBRRD$pFr0pG6gcQaGsDyb5Fp$>@2-x5JLQKy<C?Not-
ziVEcG4?gzmA9)PRyNYG_#p;SyKfrS2F<FtBsbZpk`L+J_XFjJu5x~+YT2&;-7>c$U
z5J%C9i@`5Mk>P^zpc^h?5N<=qh`W?clS=gQ_}m6#R;clb<nT?(i9dGqVL*xY|6uS2
z|0Nf>nRV=RaE_3?zQ6j!ZMFNJsNb{K@2ey6Oa&t#NVVY8#`X3=Uq3K`h4g^o1`_8c
z%jw!ux^{$>5hi1TR7BV=VA3T3wAnBOI1o@Me4cv{fNHa<z6Re!eE~UYd-8lS*V%f3
z@$-*bf9<&=*MH+4EaNIRj=t`7uPdgmoO4N%{HN1sk~hVAspW5696#iUqb_-wtyNeQ
zqy4CHCt^#BJt)TN`@oV##jw~AeHvl`sy*Eeiz54+2??=3z#tSwxOS{DHS##MPb$@l
z?~<w**&*jDxmNR;Cl`0$TfO-azoV{oMdDeqVYEdtjBhoEHc5(1rrC7ajg(j_l@A|H
z#;09*ZIX;qC?XJo8KqU|U^oBdVROr-xFM?kfIk2MuYiZofgGyvts*4~UK_soH!s?C
z$;)PUE~BBk(P;e2ul!2kZqe$ME3W_CNYx~7ilMJ%&P=(qboN_*ZhXzb21VPq8Ap-5
zt~T+aVq`puB1`yXL~=IfFcM+j9CYoLix4Nm&PjkzyY0qCxj~9GTv-#YpeiN)(u41s
zsysfhzHj&(SX4~moC1w~4=z4<&*FEs=}eVkKHFn`1%R~hLryxvK@%x$noN(HcG*-`
zsw88prM%j?iYTB8_1(SB+OcQ#VN<yI4g)4lR+eqIX=>2400-c%?T<e9qTkM!SAi@j
zXf3)LI-Qd&KY3GZY+ml*;w3LNC=v)!jP6MZw*SUF<Kie<Rg5}rL{PM+&@fm<KNQKR
zmBv66DH5~2F%^ygMS{`QR6-m))|jk3(Ssr_CxcP6xmGu#$ZPu_T)g+r+HE`i{yJUG
zjKQf=6}D0j6<-JFvV%(;OR^2C({=00V~4q<f+TaU1a;6HK4-ITyXV>s=+XjIAPNm8
ztwIzDXzPFNsDK9mMduylfD|<W9JhAeJAdvafA*W7!ZNNu`IA3+=}TYQ+R94uKSLXB
z=S`8kdH1{D{fSR}0?W9jH=l6&tKMO)pJ>Zjq}{0)UF2r9j^WU-HRfl~^%gBEJ{=SV
zK!_qqji_RPqHXgD@QW{mi_LZjp<%PQ1Ob~6&>slny;CEP039pYpj^qp_5HRVEhJ--
z)MvLXK79M)jgMods;PqES`I5p+5qX)YqGkMowO!9=#Xq;l^Z)aagzc<o2p6`&;!w#
z3@d=P=AjXL4pqD9kqBR92b4QEs@?MCMX&sedv3o2%edbA-uM3e&;NXp&Ka&dCs|HQ
zYT=Apn1w8JkIe}``X*beAnozU5)dwOv;O=s6yrt35JjUe169%V_t?W92#^swDkEG5
z%fYi60bPs)q6`@})OKHZ(0D#I@)(0Q-ms`R7)3xNt>lfF`A5FHc-;f}wmMvn5@=8X
zEQ-wM;l?s|P?jA%S>CuQ8#^p1k29&zJ9-b_1Qh5LBH95YWAlxj?3tRa9#D<%a#ezc
z$u@rMyqvUKbIHyW)`$P;Rp*>@Z*v(tcK-1n|FPIEQ!bZ>>&~I74p-GE3~vfof@S)n
zZhhWs)}MYc>?T9nGZtYp<H7QMtBSTY&Z5|Trhtf}D52ZUU=+=B7^t~~K0IN-8AC3-
zmv9{iqxTlYP?J%~^y2CJrbZqL+TWr@#ijOANv1BV@4jRHySLZw*h3GbEh&?*e4j&`
zKrS*>E}gi#vhlEN^@gOhmUM)N2atyq&T!~B@Ym?6i)yHfYD)fw&$a*t6%W<;_;UN^
zw?A;@pZvxrv5c#LqG;6~uG*0d-IDsvZ+>%`C{7)IWPze7q76ooLJd(2?N38hR9zZH
zOTp7Zv30K+AVh=z0K;#4s*KEb1nUAA1f|xxxKA?xNvs*EPmDZD2sl(xkpPHf)Yo^-
zKm47AD<09gsw995^P~WM9cVx%vuxvN`OFQaiS_BoT1iH!UNxuB0R^<D!fBf5?9v-;
z_ZElH(!8ptk5}!fl419aCD6(vmFS!^-Os)8d7t>;cb<6oVGMf}2e)^;;~j-XK$0ZS
zR34MzQmI9av9O=QGA@^-C%otluoXYr;y@&4LxV(r6iuE+6(qy~OQ|9eDJsS*8Kk|B
zS(P%nd_SCW3}!WCsRr>deM*7@Dv%JA6Mw?U!;ac#b0d3I5l~qD6o;f#-+TYu4d1Na
zw}<eOcAh8zItfxVB|B!Ubkw1xbw_05M@TXvEur)cw1@ghKn;p**4ojfb+s}6k*aJ1
zMledU&6Tw%wXzutdP(#&3Q(yDphEfRM_zaF1;4A_4_)mj%&h+W&;PtNX+?77X$+S2
z-~59M%eXe4`@+%bLt&#Mwm4CQD29K^wt<F#cAjZb3~O>Uj2Ttbfkj2rnA*Y_28IDM
z_~scz+;Ny#3PlWqB7o_Uf3GpxKi_E1CdgHrRCB6=#V4+tyZoMfPn7~XSXR}ebu!G3
z8!MlBTzPDr8(A$#p*dB7-0))$t5$;pP{e9l4`2ikBw!+jd<MVvc!%0wbNGbbnJ@DA
zgEqh6fB(n_|K^Jr_9~WJz4M*#Jo)64pQ$`1LkMHxK()*Q<LK&xH=qB*Ky<}B!-c`|
zN!y6S1rW>=+XEpXk#dNsYD7||@uFg&e&%m{2^0sYVsuu+qR99zQ~_*}hK^8_Qh&ne
z<05&ys2E4ls$$8bId{*si&s79YjttPSI>*)Xf7gMT^T)ddgPc5>EsrdOz?nEHW>tp
zai^&OMqSFknBDx1f`m0z&~O$ksIE{|DWD>RHmKhOW_!Q=o)>)n<2TRj**&y87S)cT
z^4DqxAi2UcT4B8U>Z`x?t#4r&*HM?eSSV!AEMgQ7qW^kuLurU&TlyHbp4%zpa6HN~
zD~JTB7CDO|Bgz&>k&Kk-Eq>9*0}l@Ne<2HDY)+0m+@<T8p_t`<arTyLs^5H!&AM~a
z*-xxhfjYO^jlXE)=wX|Z@xw$$h*l$Mrz*%LP2VD(i@HS42B4i~RVpk<3|?j0_!Ue*
zCkHIdq0m+)7VtLxL%3c(N0X7?|Ff6A^^O0CVXtBtYax$koN-2)rcYlUlOcq$;2z7k
zRvmHF!N;5)Ly?h<7Ys)4Y2_rCkuWG4FEt5*RVzdiYXqlJNP}X0gkk`SJ;TKD3Wuqy
z3~mMpo@~KxrBY8Ac~s~lD8|R5EQ;l3WB2Th*VJy=jwGiO5L9Xd%_>WqN6TlgA30=e
zS~;loCWJzp7JJnIMd@EZR6<PWYk&K2@&GeVs7g4c101MicdA2up63m;esJ~b7d3B6
zGDc>qIpK2k6qmZR-BJfAp@4$Op&synrvl)s&b{alPq^{^JMJF31Xy5F6g-~M=`nex
z%{MpRc;l_N-ny(s8ZUe;*`sE`-<VCcEP<kdHe%1AfQzAsJ}8=mjzv-8g~6B+xFv^V
z(C8CK(N-*?IU%EAX2y!PUDbT`=}LXF@+iTlH>qeV8L9X4vo~B*yLB59FCrlF8hnG<
z!R5*499fy(l8qipBrRPbd{5Oxg~pQxSYqvQyl+<7Hp?l~B@h9<`iA-@^IRLb_dahf
z_~s0Y|65;Z)bnPwhPgTjg;zR2sQ^)+s6H2_NE2ws`;i1e;Yf*6N>gSf2V}^`=qd%e
znM*|k0Lj1mo0mT4!r#HL*H^ysmHY0y@1&DXvZu%8(rAUTC~W-0Kl}rhaUFij1ryWj
zU}|S(7$QJ1I5$!Z!=x<&7{C}9aG3WWP*g<Zp8Zi|>poU6B%?!yp|}YcMBI_|j4hc&
zhdf}xE~oyuk;k3n0g418l?*GabgDXg>-DwUw@d2jL~}G|P}($BKI4dy^~WcbwZf!5
zQ|L(my--OnpM;pOu-6n^$pi<=Q3)i2NUn8X+ogq9Rjujs0=PM?@2zj2Z$44gMicGU
z9fkV3XC11(Yeu4gbl0;|XbfA;__9k{XiDnZ10n5?s>~%*BiU5CA<fRe<kXw4y=`cD
zENrZP@ArPs%HwirwBs7Z%KqZeh+(g!R6hFBmqeCzTNJ|#r-8}}n?*5lZUiKTB50o$
zQN;*~1~aRQ3Sk^YTDcbniJBOS2RMwUXBhVA7?8rRzN(Z@jXVtVc)X|>v8{89+i$Gi
z^su-bkbD+0noPcQOJ&0`>DW3#1Z<;d>jwhH&xgUi1Wj$~!4y(r;#8Z+J#yb@>}W1L
zS)bY8oL$h`V!pH9+*Ly(2LR+~U0xwJ=%u>OC$KjK7^ML1*(#L-glcC}8BKU7B+v71
z4Oi=}@Gak4t5Tu(<#Q`Pa#J>Rch1K@{_(==ab#q~Hp(rx7e`fFlT$?-USV5|VXrOc
zz38Y*USd?y=$?^-hz*=MQbttKOdeYlBc|ZAs>pCT@jw(MzUM>YY0`L0jeU;Ilrl`o
zJmW0@<y0?P^YH4C`z@<W<ZSFrMzgkS@25Ure{zu!aY^a4>Csb<%O;Md%cwb3+Ibp#
zF(}hSs)A~UD%2ftl9CZ5Nv>60*x6j1ZC0OZ?A=qpf4{Fa*igUN(1t2NAqiEbwg-{f
z4leBZ(*Y1g`|8a3E43$3CPkqJ+OEx<b@$NDTY3D_m5*M2?cEsmDrhXWcT7x7WLdUc
zZL~BN;~Jm)+~+Xtl~zVKp8I?&bc0Y7bJnv88Fy`qyXFYvdoqSbF=FTzN0Eb3B-_mN
z&FcsTplGJcrYnu&#0Wm!^r^XLUfY%LRlsFiCPpthuDoiiBozYCCY8M?5)w7)59<4E
zK`Oyz>QoeYv)Y`$tFdoqeQtlgeYWw~oX+QPIn}EN99n=01fmutwi{<`p`wK%U~6M$
zs#>9JKUtIzlS85ca2C`y$#%}h;b+cYb=5b@jan5$UBzDHx4-@El}aT^5)oMeZEP8(
z7JhYwfh2~#j=bo{j=b>4%`eaBUJr_9H9rTml3El&ID=mlMcR~U8~4E|3V^sOl6^!h
zc-*RJWM+RrC#t!R%4Rv!3#T4gJ$7#|il*josWGib5Y4N#g{K7KvQ<fCl1QPAz$$LQ
zrW%<14G(}tmXTI+Kc@?O8`T}P{SP<p+T&;HI+y!KuHwau(j(~Yrx@y?Y6`)sY+>4F
z$!c0#8r$C$C2S<OwG8uez#cUPfObd1^w+-r=ohZK3&UQ8y>Q`E)3RM1UK{QDx5AyV
z@Wxt>{nVy&USOmtKv66b21N`&F<jX_2*t3d7@t(MC>p;G#Ecs;2t^~O15ga473PI;
z6zw}qmYP$e4_WMlNl&RD?uA2mx^j7Z69|z6UV#S8Gy9<!EBXNxxC%r7G>Ry6*AtET
zU5)#9H=kV8S`E2&M2`ehPe9ca<wZ=_O*dt(raPy@lKm5~j;ji?Gj}EsrJA2w&99Pd
zbJtr1*490L>io5r-}q2{Sb2Q^```bDH@u-Gk0h6+jRlIcv$G%m@P~`-=gXKUe#z$Z
zf5ezf85AQ<{-#K7QKSG-RkQ>9mTkrsZwxFd4pK!Law6(Sn@a6lrnk$f7}+EhG_sLo
z&{=L0LZwtMn0jP-^xk+;F=9(agJQ>{pM82_%w<rF@tGi<%vr_4?#9BS)h8ZpJi6EK
zYWl^7`kd-PVY}&Eo%T4j+EM=aF4vAK!cKC<oL&KQ)C|h|4ph;=zJnUNwVU$k?_T@x
zC%$^ua(d;8MLLDc<I<&$<mm`wQP?oan_*6j8_s$zjU<|3^`Ono_SPWk0?xQ9_H+A|
z_<c}RBt*46JK6I=$=G^RRa?mj8RpU{8G|A$=k^?E@6m&z9T>x!QnMH-1_2H-1rI^8
z|0^-lj80iX?RG?_a499p{bF<9?bVsb8h7r>x6k?cDm@P<p>#!$khZcJA7nGiPlyJ`
zX*I`TCjdaGiCVk-1WQHCe4{D=g=<G6hEEj`qH21e)Fz_v_OsS}?&|W;@>t+=-g)Ph
z%jKm@9m&(l-`soey~X_0@ZRC4T#%%taC3cI_h?bHUNvH4R)eDTFAc0Z7$_v8s%Tzr
z4vMNV6m1|0(5yIC4Nx?+L<$nYaF_@!=K;52S9-8&inLG8lA^}ABXKp$VSGJCKpJB^
z6(a#E`z#26Qjkvgd_k*w>ih3peBi14(YbtoRr8$Q(+N@qK-kv{9H5cB608-fRkdz^
zf{`!#ab(T2AON)4B1?P@1yyPJqyq_BsT4v%LT${T-CWM(#N?&tZ2H=DcMaVMP}o=v
zEOjIU!_=bxrZB_u!w#5;OE#VP9Q&J(%b-Qkj9Jktq+u!a!eK9ph}ZOqe)gxtU=(3(
zSY@e$VsIaz*u`%Eih=7?&`!`2#-he}UmHbxev3?)447|>pa^P!qK7)VGF;jFh339H
zYWp54408PLd95}ep!XEON!VL#t;9QzY4^aOR8lnNPp1G}TfTDm9Q5s|)w6}Mx{iA>
zWTY$;8ByH0(s-f@HKLa<`ue_HTHlF>ujct&71F7B7)u`>xc9)jP9OjJ4WdJVP^4Wx
z{pn8^bB{|ev`Pkssl{s4;*Buub?9+tl*d<rWJ~o4C@3z1q9G*s$9Pz4>4>A)GrGaB
zk`WmiZetLsWROseBNt!f)^_2Ir(}ZiNr+-l_Mkv}P%LM9{Kz&Zb&H}Qjd;c=200rG
zl|nt-I1=Y;`x^UiUwGt^#(n$qz4NT+@L&qCO+{zIsRu>C?9H-gcRQihF6I;B6}|y9
zh$bL(V`(y(FjIg`vSe)~T~l(|D3eJ_$&tcTgh~fOgd&96V<)K0n|UXy*W9ab5YqIy
zYQyJ?%<H~BmwPPkT*Pc$p^AL{>h-6dy#LnQ?isohpm3C1I+v3S?7#Wi*S=P4{}|dn
zeDk?4H0xKo(r5D?5%y>|=G#}bb<ikT{CEjQ*PDjjaAb5QBUYJc--nM|oAPMSx6!Jn
zSKl|f98*OD_H<Tsr9Lc3)G%f{3l!SAF`#LzSI)jT#-|FBGF+A~ZmaEjuzvr;^#^zB
zOao1Yw1QGVZA5Nc$<?9=02W08N;)Wj*7$NxRfUS?P(W5!MmCSgsuI(Rq~+p&TxEi#
zi9|-FHK-vV6N&?z#M^_24v5y&1Gc=O>Q&*X{(%0f^M~h(JXi0VRc*}v&Y^h0ONXSf
zFp;|b_S-MK@WPg<T%5*%Vd`f-^O@!B2_HM?aKoMzw0P_)HfJ974!0-*>_w3s6zyJ|
zP;VuOq7>|-a^~SUqT%^4T;#?GNCRs6;cD^d0kV|pv6Y>vtM|ghNKrB9jeFWCDj=gM
zCBC+Iar?j3?tG~E;EYxq&>Rj(A!Z~L5<8$K(lfLKN;fF=3O@@pz*6QW95R(sDcdxf
zteJM{RGL&I%aDvZHzpKP0D>t=!b8cf69Iv|d;U~ozS=EI=I#I9)v`(`A%s&&I=^a{
zb*x+!dhq#En~yyHj{E;@$kv>~(yiFoQRH$4&=?iQMx#-9G+uYzbr|;AaOQJ^Y-fNX
z8CXRz))!71Vu@Z=G#V7O3#DNohGJ;!Eg(2xJc>QL+1T$KsBE!ozYPvXk*3Wx>TNZd
zHdl>2Od`0fK9I5alP>r<;wY-8j3BGz&E55F_buLafAfLeey&ac&h#4h07yg@-6*A_
zv&coOPz7?yo0?9KB*#|V_;@lomW)m$rD^9TBmpHADU;58WOyj30-txA*R?&V*fwY&
z)c7E)sh=pIhD0#@AW>?o1giGO(*xNj_r9OI<o|uckThO?`Q=3m&FJW;$>qfBjqx&L
z(S-gpKl3vf>MD&*UHYCsaAdbsNJ?}kaoFKaYo-WN42pIzl0DmONOn;SRFqwMY5$Ey
z5gd#nDdA}~K#^7z!=fUW+y)ofg=|I{P3J(C=mir`O^@Fhjsn`cNzD3!aQ$;O24E$V
zQLpvJzV9#Ge}Chi{eEv1$mz`Mx~K;znw^T~BSLfN0+EXwOOWNshKX!*p?=e8R*~|A
zOD4sY$P!5kp-S)3;!4FzS$HH>5Dq3iq-re%Y!nakDmAYXLp9n~t7;Fmt$$nf^+Qg4
zTWxWE=u$_qqP$<>F<E-dzsSrEpT9Z&Oh*FY#71O2cr^JLCS9bz%ea|JwkS$aZzKCV
z&4e|;_@rV`3j{({j7=dEzyK5noHhky@B|!`6$AbcSq|fsjL6hK`_=cm_TExKI#Qpz
zf8mkuHEw&t@2#o#OhB6PD2gG?lqEYqtb<n|2b<!X&^p|zN_t!+Sv8RzwkjDpG|dY9
z%92zLd{+cjpdP+SuNdGDKtPSu+vQb=l~1+b{&O-?)UmUgG_R{j`Nglk=oA0?RSb0%
z%cGw2oaYp94W=;&Q;X!y&{k9=H=X%I@dg^(FG_;(=I?kjDua0|={ia=&@}+z*)r_O
zwx&<ESrkMZ#h6E<K`uZsw7rR=XkQp;GYHT{{K&IZk1Fp;-Qto(#o$Dk7?$HG9w>yT
z<LYOt+izL?&OOaXX0*{@3URhbBot^*($y-o&!O`GL`G9oP}w?}9)4(AUggSDE?eW=
z2uadW74U$n=G4$@#2o56j$#@xLnKxeEl8@?GmeDX`YH&kpH=_~q8EFTAQV6U?n{QI
z@v5t?DvA`*V08eEMK-mN$D#8#BU5WZ#(Qf>ka59`%wfb=2)FU16^H2Vx9-#-VXZrs
zK#{#DngbsN3Z?bnh<kH9V<ogGib+BSs{vLOC&tkS2*!(w)@s1!YzCm{!4lGPWB#$l
z2fkJN?slE2!+FWV{xt{?sZT(2sE0O0>qrh7b(>1*^hCPuprmq8noUSLCXxY;1iU~S
z)OxJFE@o7vY{N&|gJSq{jjJMIO;fSd_AF9~P>N}{25g<$yye)VAGrJ8A-LGKZClYu
zQv|C;;jvd9lO@8`!f9vtWsIj>WV>X@VAYfnt;o62+Czo^%AyFu9@@wdMVgalWZcQv
zSw-zn$q+^JK7CbDI1oScWII(1qqnvMYgrX!&L3C#cVV>YQ-YBO)WJnX+gCH{#npD)
zyl~6EXKUE-EQd?~4gaRDOZpss5r8mr+41AqQHN!fX*aSqNhaya;u1ihp77A7S#(3o
zPmj^K*rq(FcJU&qR{xE>AspLK&=edKbngS~&8w8%T8OHVO1AX#vY)&3f4}+Op?g;Q
z1*=KFqJJ@4{GIQ7XXqLKLykM$MiimhR6p-Vi6~_JU)h~h0t0wY^-?vgMu_#$2@$2a
zkIe6f^Bgf0`3zAE`*JLPc6z1lmD)ZrngT}r{4)SW`=A^1TAhFVy6Tm8>)t98pxpB+
zyQy0Q0yLpHoAYo}Ww*IpK6*{Ec70Y}os`zlmBExPzqY&yGzoxV*Q<p}U^)~{D@0&v
z-2I`fC05)WOWWgBZB?|ku{0$|!@v1a?bL`Gt>#P4Is2{h55x84Tz~!bh13-^sw&BN
zPSpxykxeaH2j2SDw+@-V*?Q(_uY9XXBZf}?HsKk}?-Mk2VG>|C`WT`p);5lI=E?@B
z3{V6h&UP0t>ZBY5s01S$Y0P1=UrpcO7n9J~?y9bAns-Z6y<mLj+Oh8eAY|}TR2u=t
z)2D<R&FkCe9{N`G>IYG6GNZNkj|^iufrp<1=wu=-opMlV-J!|ox}>y9+_*^6j#+Ja
zU1NhFjF8YKKEy*qp#~7~ELJP3fH^D1R2NWPa+Q^RTN}aZ`EUBY@7(a+p>sJ!8$gj+
z4Z7qc8m89kb>n|CL^kz|$aX|4TsF#74f<3eOQC3_&!E`RD|63*X5My@n?eH=?I*KA
zQCd&Y=vJwi61MLxit$|QAQVBYN%N_Z2LX@+QA|2YA48F(0D@$)F?Z+O_pYv8`2g!p
zsgMo~Q4|OPQUnk`1Ffd%`ti{hZJB(@1rsM+I(pC<rLj#(Iwb(|DtrT)(=r1)0L4D`
zIYjJ15;Wx*`?DB$Xx}yn*a^q>`-cGnX{jT{xSmVT2S>N4_MW$&g<-ENue`F+XcV9g
zh*VXzMPs3-Lx-t{9(%eeSC}y&GU!Gj0IEP$zr$7=n)@I?HB}7rk~a3{ExLuxuqTd@
zCIXW(4OKB52)30Bg;-UTIEwL@Q$iHuCad8#4x}lzmiMJ@&ep6+L{T(<M*URLAt~4P
zet+Q`-)h{q56D@TzWa{_+Mr(qykuL)$|r74Ck{)?hq!c#0KA890BYfn@Nb!n+Y_r9
z+OQ-m05XAU=V#WgeulFqG<w=OD+)!e5<-Jml#C2*+Jmbppx}k4ot<R=)T|Ga=DhaW
zYcIR(vI4Zg4Iqg+H5NT}Me+wjT?ZX`5=CN_!$@yUAeaG)WONESI2<C}es5Qi+nNC_
z@AgYr7~=M)3=^Ida{`Z|Xo%82+)~7Tm3WA2>mqB@!ujSw`{#=RD2AyHs~$+o)nX6a
zHQ#PNx=#`?l}OT61Oya1N4O*{R#2UBcxmd$v~n1vEO79(HY$v{8>4soB5bNtEs8<*
zG9cLnr$_TD?Z<x`B(hzPRWn}IeIa|bI{ah_ikXwy*qP^_`i*ObnKb<V_rG5(Tr9jf
zf}^AKhN;bF^QN0_8h)Dbgmb{arY&&Sx0y=mQ=$+O?677jB|AJ*XiJk8MWZvON@-9O
z)5{ZozI~ivCmJH{U?xpC(}N=IJ!uOSlyHq)2(vhXU|UyHr$?3cm6BPIAZ?^-evqV#
zBJDb65H{uI;6`eD?wG&on|Xm^2BtA5I1vzj9=hKphmViGeCxz>E*L%JqHO#qN=dxJ
zR{>j~V`n3Eh+?3$Y{!ITm?(lUBCsyjYAaw*br^PN(*fEpMf%o%ga;~|G_k0SAdD;v
z!SL&n?I-ZvZ$D#btJNEBxS;?o7*tH6a~nf1W^`HUpkq!pg4VC7XpVR$!4X~AAKzvZ
zyqi%-l4fQ(p5Yugo4@2DH`sJ*D4X#&v_c%6r5fC}x+=}5Oe!@t9+j8}ZLShweCUb*
z^^UnKzmq>YBW2hMoSl9`4nG4~Qz@Oju6)E%+1MuM%1}Xbk$vnNl?ar?q7vV!NC~I=
zZKkyMn}Y{Hr9zEn0?>Bx%#jJ8Pz75|!j$!GBY6|5Q~*9=Af$HG17Nos768fTpL7;w
z$ce`yFZ0ruzBH(FB+-G!p=%pchi#;F{*I#<n^ZL7Y0deALNje}2^iKHpcq*m%AhaC
zU>RF)8o|=)IuJQbhIF;xSz|qPORxSXXr7QbY%R_F|Kz<#oMXq8?)iNu?gfyps#tU)
zsUc-Z%21U0IjP-iJKk@``~7eBv+n((H{*A+n(f%<{d?VNwj8}JvWhI0&q@P(O~e^w
zWg^cnZk+;#x2?LPC3V!zzy%V>KfZ`#2gMlR8Wh<n5&+L)7e;CN-t3?KVfysIP|VM7
zDo7JBgwgk(9DV1-!G&)WgU1NfSOdDIka5R$>UkYpPrcHjd-M!!wKy9<SNsgYf<o)o
z56weusH!nFKu|=)nWhSmha5Z#4kT=m2%)rSkd#0(3jxWTnMtV%P0&avfQ!SuZ+!1t
z@BQ@c9;7TgXf#dJ@pBX%VO-L<M6q`W&XZq%RX}iUbw-hVADa`)%-@(RWZu(zg#t2P
zzn_Ri(p5ZL?`AOOy^m$RUB`1OX1@~GWh$=b-U9HcL345Y<IFgjWvT?yuB}TNmQif(
zPu_g3dG8?X01uayqi6%nrFd?%^*6sYy7cv8^qjCbJs%Q^3@V4TET=JV2$##Au=DU-
zx5#iF2uK+~2qMJ>Iz?=>j!1~9O6?KaX=<CMjoLPdwJH<|5U4_<rUXjnz0lJcg#&<c
zdQl1~2ST33tc7hB!@w;G!$5{mCQ*bTWe_j|6)m9cfA}B$wcqJQ<Bc0PKKbO6W!2*i
zH2zV#!9DxR-*6haNyeM~$VJiSPESQo6+wWecs8e>AGqEMiq3M|KIJF^8`Gn#$8sJk
zmy?$7T31W51)<QFhvQ*!1S1XXR`qvL%tOh!mC`cq?T6JL?8|8N;pb4LDL5Jof8*KF
z*S<O2ds#xsn4pX92H31Jx#qCD|IGH>_9&srBeP5kj?Oz$gH(;NJ;v;?sTbPDn8s))
zv98;LDoxu2P%G3iEmCR}G3mTfGh=6#QdOrrkIG7Ai-KE$B4HpDpddm?89-T#3K<Ot
zgMe}<VLQlBLKu!l96kQ;{~N#XJOADPhF)VCBDZWvuB!P?H4jgH?X}nX_DFqd_pzs7
zd4>=7Fcstpjomgl=Erw4`)GlwG;@HVXuCTvy3J_@?g<*{)bkcoW#dFPq3A`HyDmyI
z4OniMEq<bm=cZJW4`nJcS9j9$*%O7bo!$Ap#s71KL0M)XL4b;>k@BUTt?z$xc<I$J
zyu<{?+B5o#<Ee8CJ?5fhX9-Js3TN6bLxiESNpT@<6YE7=-)U#}+G?R`5ht^Ft4`BK
zQv($=lA1Q9xVopZ1St@30E$4f4@0$cSj|eUuJ*ev=1~=O0!dAPp540&fdyFxDMYDA
zA|n|-wJqiDQ;_Z5-PvT)kH-J<zx*%l=m-=YPvc^-Sejq^Zc|^$(tj!DA?!F6*-4M;
zBs6AL)=dgY3LN!Y%~jQUU6^3O52?xZisxuDPru^E{C%$`vi~fZeUw1Q6)A$3hts7n
z8j5*W!<-Wu9GPkbm7*TMGyl8qvW?uyeyRyNqwEexzxCYq^REtezd{ZW>#QeS&ZN3I
zS>46#UbK|_01--gs{N{|ZT9s<0H>)rjML-#?gG^;-mBucf+!IbfF_8L5ds;ldikZZ
zcWULSwC+cK1tka+N(I652CV|YnK!b401u`CJi8bb&?dzi8Wn;xWxKxs?gRQ)zx%>J
z|Ghq&)n(_!rfJNq3KSg^&in7bKj{TJfX83>rrE^kmW0b|`Z`r@j9wQ-OTse4P8MjE
z^>fTS3iILfUXEh!ob3J*v<SaEkj+Pt8-N$P?TXvXPs-Kgsj|Ja6h=P$E``lbMcc{-
zZ4YNZeM|4vvXh&kYoH0`i#uDt_{!+gx5Dr##2RV7vFDUJ;c2!qZxlz^Mzln+r4rFr
zsX1N>V4NK^^=vtBZjR&KTANlEQ5O*bEFoKfl1R$)d!C|a0%)fRQmqoXoH7MDhbr5*
z06e>w@F7zwStwMp&s|o5wE|60D3kzy>+9`5@0E9W?b@|vH2B4f7f%HvqcNovW9)5B
zCHdsnzr&TSP+=f3Po&EJz}Zzur)r}Urqylgl$}$(^3$GE(L*r{BKL~80YXa+;96A_
z`#bbe6cRp)I32}_FiuA0L5^Y|uo*?06XfFH&E}`KIZB42B8@3~!>!+be)#2=hP&S;
ziFUTuYHCkK*zi~KTnP(EAO{eMX{z&2+xnoM-EHn4>iu!tU&O=uRO2)y1jvBg1JVjA
z0#IreYp-etcc^{xq^k2_fFzX2OwQdqh;{gYQ+ND)nqV6x#c#g!%<tg+eqP5P|M<tx
zJ@?#la=KY9I)}#IeT#RWcxJf0<7_X9j=nHw&mlI;y#kPHUS4BkMM5@T)83SsaQXI|
z%z%^`a<eeHHKA}Geh!K>6rH;fc%o>RCq@9wCDDn+Swn?{Sly`p;0h2K&fW~Ifhr8X
zu{ZqwOIw$IAq+1wHb@O9-d<GraGx5tr+})N3KZZF<v`IeHqGMGW_G8o_S@Ts?X78?
zRC*MFh!Ro~0&vw7HL0#p>^1^mRyok~-%!96tJwxyS2LSSe#ABuX$~#zEXW$OGT_-~
zpWD4~VRC%jZ?pPu{+s`%Ph;D*%d+A<yZL|lYX;1t>rk2enf@7ytGU%R&is(MkiY<U
zeDp46ZbNUU7NhtrO$|lc21C5c0Cpzyor<|C5<piK2}r<;!|75OeH7`ZM|FQ`3D8s>
zf84x3mR(RpYv=;u@$JEHJ~w({c}jdiFhV;6mGqS`zi1zT(=?8R0#cGCLJ`|>n%-`z
zTg~)dd;5O-*>O5<&?ZGfDY6SNYZQgFdQ%EOnV(b*MZl>EqH3*jAl?2`2C%L^LCx==
z3gEm|IXa$g&0YfuRZt)yOzzLV_QI2IyxE7wx88coB67}YRMpeA{vUnxQO{)m=U)Q-
zB>lXhzxnsQR)Sm;c0-sd=B-FGXno9>I}h1eL!0M2SQkZ-zWt_Cp4>lG=Bh}L>@ENx
zc%q1xwytHKj694YmqcbkZMIBeyx)F!0~#rkCSbA5f!Z7X!YjjzFNeXGm=@46D1IkK
z=c4zdRy|+~MTrM)iF$m!ncZkU-EZ%V)BRc(kpnOQ+g7UCIKc{!(A`kM%CtgPji{U#
z5bTrVDl8}WYFPPj6I=7aScea)LON=%r#Dcgbub9U^k{Z?>-gJG>l<&P$9V6(_k0?c
zSKod2-TtLFp8v)<5(bj0<5V;(#bESJrna{w&AX6S?Ddt<o9Bv}@#2QdF}t3j=yvlb
zHhUl;!N||jFQgN}gKrLJTZ4OsqA90rpdxd3FjYs*n`4UTREigN27lv)ttVbCc3vce
zaS9}$2a35ApK=xkDUO$3ly-KtIl5bacsJc$XdP9P422f}UA^_z=Tu<~t;B70%~FM#
zSzjDiN-$Od0WCu^lgjM9&d!P~WVOH=)a7mK6fhsA6f!?v9NavvXU(gZ%l{pH#<D~4
z{rmUN4LJgsdt=$wAH7C7+TMHeSpurs$?XLJctum0I}#-;Ok+IK%g4{=+*FB};KM|9
z+w~Dpssm3}?|hSS$neYN-Mi%*)XXp|D|b;5FKm6%QAI#DqDX>-?KBj^Ql2Wy?_ApY
zcV6E6mw$El%fDXkenVozb^;^-e<Tz+K(PZUQ#`JY-kRO{7n9fj@#LSsKK}<-<L6^&
z!>tr{1p!ddTs<rQ1ZdA?s+gh3JXE4vwmpDBJj1#WLfWz6Y)-LH-_=$7cr)8SV3r{%
zWihSp-#Dr!HGo$xKPe);YmmnnSJq#cL3MR#>|?^owwIYf!z9k{>`g+tG15Y2kprZN
zZBFc{Mz0bvnW31w`zS!S8WppkQ!<k&V>pAyDgy}EL6LxiqNySc#nsEt{X2pD#&A9=
z_e~WuKR#%GOh&g*&hKE6mWnXEy!WsCVDDFcb@%JPxpeD`Y_XXF5$r^7+M~`$&YvaE
z&nO@P#ib<DEN)EqfA9G7e=`2Pe?Ix!@6~VLN(U8pl8lG~gdhO|5uww<k~xZJA3Q1M
zk~*CTob0C}|3WoPyL9DjLAd&83qvvcFp$S}(mZJrWC`K@>xYZ+*+z0ygr}c*8okES
zrx;^A-K-XWEHqwt^4ZmSh&hUWW2vkiViu&BHv?bejmRq$n_8OGIA$0aiuTB?DL)+-
zsW49{H$I&Ne*$YvsU+BmQ|Ea&kv;ly5%*3^sY-<G+rshn6LyxSQ+<$$VQ+ZxZvctf
zA}#>6;;WmSie5czLUtffjcImeF}+q@z0rPlKiyq0fJ4YYRJ&2R0x=a*0=eNT!2E~E
zy9;M;tMxo3iIC-?+6fccCP&R~lZC3ATatDh)iW2Q_4HBNJHsF(t7*M|{a}7v!Co)F
z`poXl&(ULi_~C~+jjMCx)vH(0YwUgLdB^Co)=uM?Bk1h@1iq6nXWgBz$)?ZTq@KCe
zciFor+OwD{DggfuUYxoa%n3O^F_s5JIB$xT?Va47GtdlF!yG`1c(i&>Q2^MCB3%?Y
zLNQ2j-p;Q#<D2y-pVU_lFpel8d-=nK78|3IeQeepk=EW6P=ab887Efx1Ta;!#iZm0
zUNx&}{?R%pK5T`9XM!gvk3<o`*B+1kN)In%$Io}F#koPXuIpu7c~AGob6?F069ZJu
z(=|HMVh*FTcbmCaqq8L;JNdnk+z)Ls<5!n*f`Vvl<hx(eO~=d@bhf_erX6=vjs3Jn
znmN^8^5xL(jXraa#a{b;JAnB;{qw9vi<wyC6me1Hh@m*)aB{VtUTZ$M(R_TEszyq3
z&)(f`-dVO&r`_HB>|RiTWQQ~;%+YX;;`x`@>4L1L1}U1|0Z@GyMM9lo$_k4?v2a!d
z5GQBF>xU1c2;jxNfL>!Mfn9BkF@E~#r%luJi^93|%vYuJ_LF{YaprbVzhm4(swKH4
z$gb0~>lo$THW<u0cVyYd3T3A0&WY5~XK|3pQ8eeOvFhx5?d#y1!+L9Q*YRW+B+Q|t
z<Mad9bYjd=^ySe8ON0^Pw3=LPj;~ekT#YwoY1(iHVaI~PEukhqS7^?s+Hu4xl;q~q
z><fG)q;_i!W+^pb%sOfxj0%_tg{rwd&K9JVbd#!305Gvtg2{pbgaTkOsrK!xm>Uei
z7cX4~(68R{d_GSpscHcrJs7<`jiZZ?m%{<zc{0wBkj!K%R6q>N)3s_=AA-!PMS1vn
zZEEZ=Mj9mfk8<k8G%L^5Fe7X?=G!O{dlnkle$udA%&bA(-{tYpE={R~lI{l8D9)uU
zw}N>!sXWrSHYXTh2^lD2oL{TQA1vOw)_ycrjT|6c1XS!nAPj@7QzCO_2%bw50nN^e
zgm6VhUbWb~^Ri;oP}c+`+B2wqFId>SQqSFwr&kjgpnB#|q%D3hw{~`tptJE}X+d2~
zYSopSCffH3fhR^gqwVd*Y}O+_?#h)bPe1+i0~%NEjphCoy~fUk%Uu*j^0|AIqtkjZ
zcf&c2*$CgOLFVf-^UTW04yRr)ZE>zG>ocMJlLa243y(t4v-yQnVJz>ND*7nqQsxQt
zW)wFh4GY3nLQK`Idh&5~(xd87r>*RO1#<7XV_{R09X`3LwPE6>rvD0s9W@~q^KAj>
z<awb@O#qk@0O6p(Ac!cbOp4T^3>*$vmQs)f7(h_UMv`WqmL@?3gvcR5z!I+%5?ew7
z65CoA2h+vPN>q1t%Gk675<(&ps9=gn08)D5$;;QT&H9Cp|KJBdFd9=zy^F+cU3$Xn
zVDn&v0Q=_bCJ-xB%xIqb338RQeWL;odo|ega1dGc<NDG#tHqhklb}~S$3piu_qVZ#
zA0I`s)8_}5!qUfh)mKFiDw{LE==TZd|6dekq$06Cs3%vd>mN67-qvx=0p%i)I?pAb
zK4eN}$H0{Znpt;#A}fRI95o41KqFMZ6qEqT?STx+FaT4<02z(K_8@F&Kr31c<7#h{
z$RIpZTOsofs)4EjP#`HxgU<{{30f+Nr1k!|o*zDTp-MXnf{~hZfg)1c6xzt9Mcc;I
z)XzS#b^Th;7=V;grj08TPM;)W-()HRRr}L(`-NIup`Et@x+>T0ECo=g8OENuRUYl8
z&-&SEw<fNi<l$tBbX}BYT5?#m_X7m8)8V&Hgz-LX{IQ_OwLbm)rxb?m6c^3-y~T}>
z>(_6b_${^&b_l?U<hJLbD&TK}ObN|=3im_O^SLU}3M60<WT+B??2d}96b6-Smr@LZ
zXvrvSh#G8GDa?@s5rHWb)V!;4I)6gDE=Yp;s@oilN?9N&_9uf|$4D)<U^Z7}%Lb5?
zS}37VRZ)HUdA{~z^sCB|(U?-YdGls(8m(SnC%2f)v?^mZ_hcAi>;#>W*@hEbiK>uh
zZZ$A+icB`SxlEgRCjI^ySw@I^H!}<yX<3AwuZjRJg|s*Nl(Z7vUZWdvy+#g-3^{fF
zPL){?$`X)feziLOu=&YH%_ma~A(zbQ$Do;N<>`f{X?d1|B_)QAdqx2$SGQ7tL}UV3
zmSJa0LK8~JGP-@M4N^;B5l}#h2^5yx#0VwyjG}V_vj#ibZ82a5SevUY34)k#^BA|s
zXkz!>r4~qF0ti}W^EaNWdmD1PG~T;+uWumE)90|{0^!s(hI3+~kiNq(GlJq_%oGTn
z>vTfl90#Lgp0T;z$aPnGF{OEsorj{+XfczjSBBMAdG}1C|M*etc8$$_5+xW?yWdQ%
z&EI{edG`=aBNqSwngz;qN%jM6VJ4V!k_+S0_@@%05t@imDS&L1gFTkJQd}s@fFO0?
z0!)IMXrQO~Wuk}G+=w#LvP$7Ax4y#PVh~V35CnCL>xZ~EMNAK&NQ-5+&gB5{(qjYk
z8h7s8>DpA6y;J)J;yec-;Wzhp=enYd-Jn3DnxF#%b8@^+;BH6_E&Rpg*RQ8aFDf-#
zz|NgJS!5JL(Sg|{-PpYx;?D58Fk*H0FM?vm+3I3OAn9EM0fCfBn|5|>e(SB~N7vKc
ziaX#1Ab}9e_p>3{c|f!BGn9NKVRs;)E1OMPy{(~?y)q0nTpX1bnqr8-35GMl1gm}n
zNU%IZu5?vRh3yw4vjj_!7Wd;^%<85>!GJ(aYg|9T!5m3l6ipxU`HQ=Iy=goR04Vgq
z7>~#OvNxnC20ItBG-<LMYGXSzV}%blZ1WP4Oy#n?dj%<(sWA_uF%-R<8(sO$AHt7b
z9<YCB$LmN(OV8G37zy#sVYNND1DIj&3!_N-{zEz!4aG1>?eXI9&BYt<H}4$D7UVLJ
zHlSz`XO8_!JF0JYNI(>&pbQM@<Q%w-u*354(I6}eSwJ+PfzFYDZt-u;;K_vD=<<F?
z%ewS-tu}`Qh~WMdH;yo=kTm0P6N&)8v9p6-<LKx}RZSaj-@c7rqa1FX5t1FI@>Xy}
zx6?4#{q6G3-gddGatiPaMbaym+G*+mc*ccCMy1jTh0ENYq}OUH`|=eMzADm@Zt{}E
z-4kJKS828CI~83N`Dj-@y^HpN6e?vqzqYK<vG_Y5>!Jx439dM_d^^cQD!QqhS?>fZ
z%x&gVRUoM*a4_U{2m^%6+k?F(Y==QWAq(OVP$-yIVrxnWYPPMli!_Hs{(I%f*(KO%
zQ(@&K6%arIlH&FeZjLdl-HskPzs`JjFbG8%+Xi2793CE4Rb|?EaBzTLW3aVrC#UQU
z*iftAw8g0P9fn>A4(xm-^uxhc*4FOMmX29<O(7{m(K|HS=Fb!1+{|mNX0i{wJgj#H
zcMWTZ?^L9BP*er^1yK|*D5W01H-GoF`p5S;)Nmm`)aCY1VsoS$3|RtD0UA*R6yRPt
z*r6={_la^47C|aXBqmgGB#T)OU4us@hrmP8KPUpwM>R`D2oPe?;Px@@PEoah*Yd-`
z&zbM+?i?Q;_TXrl<+uz0_@mNTj&?E>DOtjX<XKdf^4=9qziUPJI^j1A&!pD;`VL(=
z=brT?Tb!575_X)5eAt!G{BPAz%)F;IyCCV}@CMn~NAB{IPwWP&PR|)#gJJ+nWm_G;
zIsL~!jMt{z14|c0=dT~<_ZM1kZU}6ws<X+6yO4{+!KGAODhFjMWVW)11F5UJ;JGEH
zTi}Dt#LZaMhq?wpyAk^Ayc^8cgaQDL=D2l?`!gi%g`&-Ocenb{xZJGTPWAZsxTiMm
z>}Jx}d7Zkl*W_Jm=u{=;7pi3A7-tP0*a~|28T5{Pp8MKQj>|iNyJ4$2ik@@>W=b90
zLS7o&D@Eh0BI#Ai;iE}rnRHqoy*v4Pf0*_c@;Hb!D0;sh!G|5G2?_xMiLh6O5yGXd
z!Bep)QV}3Hg62oQyl3Oum+kgH&LRXld^!@US>-sZI}{W4rza?mE7<6XB7lp_Z`SMR
zF_r+@PPI3U!=1g{il8vhwq+_3Fy(Txs_D7)oQ%Y5b4z*#Pm2-Ac+Tl^1H{e0?}oy$
z!>VSMUeAowWi|hZNnDcj;KbN$P(s(gPp*5EbCHliiU*6MpUwW>yXjyNE-(ug@KDVB
z``r)<MG{Sb0>e=lsO*i3OR2m(91Pk*rXZ*hsu?Ga{?nl@n<#AmNo*n`ZwpDUStlWa
zd4t<y+#REeUmV5Uma`g{b_?_x%gyPTHUgMVr@haOxfh$6vkc7VS>Ao7a;hNdyZAg5
zeIuu%gnW3{y85?yK+TQ`zz>C^6IzffIVtXIBPC0$uwB$QPlWLfA$fh-UMSK>F;m63
zzqtR}^zU5JMIA2Wn;3urZ~|GC-uX}!NCiOID~ln*6WfE!u^6Th5O4qmAV_}FmSyz1
z<v*y|LD92XsjlYgIM%w^o|->J5G3Gm{@|cE0r)5s9pv1(4L*KB&}+=+bJNCtxl{l`
zS#~pjJo}9}PK7MW&8hoD7c-juhMRo)R>fCycydR)@#(ae6X(0KYt=X8#M@EB4{X>y
z5yl&VF-MU(iW{AZS?Ni?{3!(T0LA^^pZ=|@+SXy4K&BoHAiF4beEI^>1WkaH9E7kP
ziYHJ$JsJ*TkSURfv?8zzQr8TV*)~^DdB63BU2A4Rbswc>J|z)|TCqRD&0|a}_$U%U
z4-^4x4bg8b77L5T=}n^)gS;_n)<=~#eQ5Khk8beBP7gMx*<0RY!&>0v8Oi2RAh{_N
z&Yb=vojqr69q<;IZe_A>e%Gwh(ksKo(v+I%!$uT)m`?#n&@`zIe>D4lKGD>Kt!^YQ
zitJHtrXrH43V?87BwH+>U7BZ_K>^_*^gI%cphC0PZ>A>e+UU3+EYxo0KQz(|=1!;$
zfz_Q=GYeK8i(}Opr!8(B;Ux4_on3lQ6m7mWQ1luxMgYY*nmx6#C`}2yws20rM6=&0
zKnF$NtZIJ$%=chH*nl6>?U+&pX1#Yq;j%q5-39cIqmI=lNAbbfmAE&&Ev)UATX%f2
z(F?`J;_$WU-@2l)3EPr!*hSH^F9V2zli1O+d`!YK+gn>RkqHrz0PQ}h($i;K!5kPf
zpW2Bb<FIQHMYe0TyJ0nQ2cv)hiKIA~<MTrtF95<v@eA2(oOvNcudzHTnl`FxPZ}iv
z=%#M4W3%bDxNzr&9~~^6#9{^V0&s3~QsdU(al}obvZ1O!n1{mIf;@Pg%ur+=C$<vC
z`qY%_#g6z72l>TO6jhxc{do4b-ql4FwgsC}v^PjwKnj*YwnO>s*6`_6mNDQS0O&b7
z-ArP3cdE=((T!8{1Kf38S|%Nv4dC@K7h=)k=JAOtwh7=Li}}=@?~W4Ce-x)2_U=nn
z3`c%9n|y!B?px%Mvmzs(+g3E+_z|v~!L8$_$XWHA{>&CQ$G_aVs|vE?-)BdqiQGcF
z8V^p4cLHl>k6V{COgim1HlWA=NHu<Y{&(KcSrzug8o=c>*BlfR6vC}CTpAXSbMz${
zggIFw+8qo<dsFNKf%?^1{pcB8W%oOMkC?R*cUaAwidkJ_AyUHr9M=ypUO@3DiXsRh
z`i<FaX4;6}BTpa(!1WbtR%R7~IeyHS+Y!rna87ZW1JiBHXuQ%-q*$@wEO72@<Yy@Q
zO4vy*fnER3NmS|$PZj--{fn7T&1o~JXYbAa;qRw|Dm=ChMMARkA;_{QE(`|Gm&3~_
z!<3q!fWl0gPUTGnbLzTDRb3Qqp2vJU+~!Vy-&A8xMF9x{^9G+E<L)Xe>Q5L&0DGf9
z({tlsxc$&>-B8pFv#j}s%@qu8vr*s3pEVH|`?=lFw99R;pG6>K$sEK66utPHycv1!
z(l8Va^=(Nz!#f4reCyrqO_rhPgpY4TF~s`Q`RhMS*Jt4gLCRG(N6{R=Q6OQdhl6K^
zqi0eP7DUa|d3GfM$9|i60?oMcurYz1URSw4N*@l9^h%+U8SM(YLm--{cPG3##?*`d
z?(bAwha!L?;E#dE(P-53E^TWcRHj;P%my8Sa-(5v?sz!-9vfZXy3N6Sfe*R&E#L>}
zbU#h9bBA>=>|0A=Ebnyr$-@hM6m5UFDO7;N7!T*SUTc1KAdh9`GmJy0kAL8{luIMc
zSEMZFL=824qHRhEIEO~K?d9k!aL<8Gp#wFizv{!MWjap(P(W1==D2al!$qDb{6}{x
z`tuCqzQa1kk^S!yQv=#@N(uYdnkL?~*zUYjn(Ncg6FST=<H~8Ljy2sz-^}CY@}&Np
zv<xar7B=90?~vWZPFUdXK=k79ULlLTz$&wC^O~wQ^qq=1ie=Jze)!Y*|MMAl6#`oj
zyi{j`T4-SL#P;Z=Vz^Za7D!HZNZuZ!%Z35t*){<$&6lG2QP4rrg3;H;%9TO}Oe?*4
z;?rl<=0T_Zor;?g)%<$jVcNL8y^X$uPHGQUVA9KJ@B_p%ER7<s^buWgb8b%fMLM|Q
zIO?_ZU{-I=(z*P=1OL19d&9+cZc5ExjDsRKRwB-}f`w9>={wawc%MU+qKl#<N?LMf
zIQm+-^;9at5j5W^`%*@4W9Oh~JLjC$uK#dzSyzHtf`8^n3}lt`?jdfEF<G!xN4`kA
z()DC0luD-6Z<j!YJv;##K~f0NirtAQph9rfOkrB}Byw+Wk7U6IBZPonL))04LN7$d
z=Fa8(A5JYsbL;2XYV76~`j%2l7^dIIjXA6N0{99q-M`JQ0;3~&1TYfa9qb1#EIcJI
z-{#j`^e?(70+hDCGk^E(xIYVznPJ0MMF8cnygc0cb~z{}f{5gmKX!D?-ITJEK4QK>
z#{g>?1a?u~1Ec`(6Z``a1Z~9Kx!yX);T&~KntKgkQi1@f2?|x9LD?p%N>V_PVxnr&
zq>wp=P*Gr>g2Fzdx@FrU6evQLFt8O`0wbvd5<(D>SzV(4_@kd2n}y>rbmm4~?%}Wu
zJ@=umlijn^I-Gog<DV%ZNcZWmId>#SF>n7060Z!Zr7*fmV#BA78&F&o1y5;F9sIcd
z;hhY{!t*qUuow<r+}VDnF2WJjglYr--P4^9aQ0kYZeb=|eg|cRdQz!M2?zpJJ(}~*
z1p8A=YmzDwleEf2Xw(E&DC>6lAJk2XO|4PqQr4+#z_!s8HMS|H*fzCj1m+;<N1?A0
zX0^LnCBaaHa!?G4yY~z98aq2XB+t%`W!aPIwyra@9EYJFYUA%M{dPCL@4?yTWu%$y
zG?P<f)s201l+e#4_FWO4{YC*|K)o=!Q_8|^bg`-Y6gQwq0EI%E+12Xrf66_jm@0Nr
zOwdpiJA=_HTcZoppbgUMM*frLnZ!9!zWpZeAD#u^YyK$jxg1?pvA0zUD0I@KgDLJz
z(&3_sA*P|G*d!jcTa&g}EZSyXsm7KmrM5|kDWw)ECU72Per`JuLWrR_XCSz9d)<bm
zBF1_aYs}`=AKi-6f2SIoDo-i$I}LjQoc=iwYkA0TNLiEckqe#gFCoO-jRvsWO_e|w
zMdtEob_*v%^3`FrQ{J^hm$xDJP!z6b(m;^Z9Lzs@BOWb^ONJuZMG-|&KE1d7EewjW
zXoBV_dNP#@zY<Qq47DqCBoujWVfP%E9UyZ9tYo381Sl#2N#eAw_v`u1W^!{mYhn!J
zv^}e^Sk!G@QzsyC-Vp!|*pLWhA%M8Z^+GW}U=;!Yvzq8N27|%bx$%!;#i{0#&Y92^
zMe#7xj%5XOi${@uvOirEeZ9^1oUUcaOW^RE854d4k1^R@Fcd6LjD^hIP=OV{2HS>8
z#Euk~(6nro(fs6I*ySTpgkUQSpWoen0fihfonG9GqAyc`|0u`nn4KzNyVgg?vO;kB
zNDWa+1vSNbGCaDg2k+lIym2&-($t7;iZKNqLm+~ZD~GMP)h%7**l95F1yRf%e!Nih
z8l%z3tT-1gT<A&T_$X^C>gW%>zKgWE-<i}cg$nwSZrQUFx%UEIg@2ggN34jB0Ze;j
zw-PZy_?uFHYc1p}gT-k{xO^`P&@mn=lwj8<ZYVzdTmq4{x?cV4ZN$iJLV>`Cm?>m?
zF#5*U){_gtoXJgJ^1K>qD``Qe)>Dz2efrF>*WAj<&Mqh<)ubV&?FW;#Zg&@V_4t$9
z_pg6;cz>SS1Sp6g7?3C*LPQ?+YOwP{*P!Unfz65vOy+IRo{Nt?c6M$Qk>x+oYt-|p
z^OnNzKq`-J&~LUJ-y}m{Lj5lS`X@{$C10u5cFOmQxK0ayft$2}l6qlyuav1dEnveX
z0ULW}*i^uvsXY<K_hxcYA?zNa6HpW<?!<47Mx#S&OU(|=>rl+TKG;<}?@<;W;Fizm
zCJGZM6iE>@A!(@7#ky|eL7gJoiPi`6$$0<hU_7}uRZRkh;K#dqC^AE?CyE(wYfuC+
zp4I3zmU7rn8yy;L^QkMbQYGoxZwRb8WD?pf@R+r9%zNgjDoK#y)ikpO==9HUe1-nD
z*0tGqkzkU$UhGw`OsN2U6!S^0ie#P+4X}eEAxeq$jr#R#C=v?~#j+UuOMBa2M;Y!x
zLG2XU*=)a2?;;5Jg-r8=CL5B6{{<yf%a}$nHccAVlVN*ntc&}gAjQ~DX4A#--O172
zNs5WwSS`*z**{$rZ8jOt&}&@2eA#I1uZ@ct>8P3KgxF+~$+t6}a{@jR#tgjX!K5qN
zq*n^Wr09`Z|Gs;}cjX6QZ@6!!RNs@~7-;FqV?G3clF-;rKaE%CvPa~P(j>A~4qx8e
z`O;iCM*@+f$c-(lEVJ7;>f~v@KsP5iYsCQok~AbmtrwdXaevXyrJab*j#z*Nq?Fj!
zljHfpt>el5JjLXk+T3@^Me&Q;Y<v`5jGc#%kH@`f6p^!?>avz&Pa0<v-@&*UMT!9Q
zvJ;&wdq3OQ|BSlFKi9wm0POOKwWM`XWDcL8tC=KTIjNO;582r0Kh)KP&R<!VpCYw~
z&2&H2ZP?8`fr=tLHrW2o)@Wx+t&r?ZG5$BBn12{*k8%>^yef$#6#`{MNNE@&s%p2s
zGfU&K)=+K9xfI|wrC?K~!@J{yo8$4p3{jDDVefZ;6nlFzHk*8!*z_oE3}AP6*KDdJ
zFI~D+mSvB69I>hE*?hRYO@jlJb;-m8AKoR=5jT62+`^3neDA#1JSVgCdO6AzntOwu
zM|7>HQM{1;61X(HU&`24=6Bs(^bLeFGEvod9Ix!lwxOsLLdxg%c3#GyIEF^5w>`*F
z^cJ{5r};%2d6h&8pg@rnt!^*cA|A!&D6|I?#u)=ZP#}ef5I|Km$2Vt(x5u;NMT&{a
z%_!Q_{@J4l;%GiaukrZfkBf+T|3zeZsb53Yqg$Up{o+e7<eV(W>}&_ZC5jmaCNQr3
z#!gZ>ifgyHe)&^?>+LsLi}Kv7W_&vKn{N&4Q&Xy`sEZ%hF`4^o9ez?mycf-+nF`q*
z3||~>Ka~Q<NN(dyhqTQo+V0fRQZ-M8D49^kC{5h14z#^9)w)VmLn4$^f&@#71Wh`d
zREKvb<9oBkv`#Ups^kavKT8zt`esMS=i}qv2GuT&Pd@o%KN_b8cYv3CKfdeJ=jIq4
zKQ6~LrMh%wO0*$M%Xf;pO6XklTfqqsh>OF+QpQA%s*$`&9-RY<^QbU*Z16Xqum9eM
z6k#dFa~HP0k_N?$XrP->^gj=8|D0cROsS-(N~_y-8=3>wcVap^Ku8Qifee%okVPRZ
z&{XO8aB{-o;Vf1$wh4fM?2qD~q*HOT$p_bG6Z9I-JoAjvC=bS$zx?Gl-+Z&jy~g)$
zI;rmBVVPB_a`1zfQIWgmK<7;8Ku*#vifvcH?rXNgpzm36Pm=c2EY%p_98}xoZLZ(c
zftz-!*bphIF%*|}FaJXQuT_{X%AI)`j>(ARTTOk@BYmS0d_GCZk`EyOV;Z)pTpW(t
z+vBu&poBqXB(SdYg$NZ`Eb8MM^P_u{`M7H87ODGY`em^H+&C3MpX!^l61~O}y$}LP
zi;P=dLa%Xj@22nK+oXOr-|SS}u%+}D_}>Wb9sCo+1{7UUU71oZj}C|7_|YaFY(|mT
z9JI|cwfmg?aGRgv!fIs~#kHOcB5&yDB-F!ILIedAXws#o(&~0-Zyh5YGYAAyC`15I
zC_+MFyA;Fu(cyG*uvkp%rfRc41OI*h^XOE3)co^9^c&AT_ne4iG(P|Q^XN5Z2lqS_
z4HDlA?}p1c4BOOahRhfEQVBXoP=`-A7fEim-{kXe4r)vA-;k+Df}2Y=`sH&%id9;?
zRn(t*#ksQ`z<FQqHI)Q16!S(j+V$@jF@-wqF76}Vt>RGyL>7v$YVgQ#{-Ia1cCzH~
z{%kf`Ea#_Ai~cD7SvnQhJ;jZCHF}LDdZvx?V7&0c3+Oeb_wUeEzuY0=OOtaZlx*?(
z;2xJQ*F58Wu_`FE@N&OrhC>|<Mek98cx-e$2*(?flI%BdP~3RDqylI@Di&{%(XSNl
zZ!hzA%~3_?QTC)n(hG|^R5wDreTbAmNB~F$Nk}080W@`-PpYL7E>WCKs-})u4F|=a
z1E=DKWjF8aqu2P_*S;nXhFNiXYvc6rUfZT}5L`hc{d1tNgg&?MQOro&WWVA1Xgdcg
z0lix})+x#Pd9hq9PmG(L78^Vnn=;}#)aDvye@Ja8&OJ>Dvl_MB9G>b6tSG|C$#A~c
zd^U?mb8Q<bR<a-D+-4kGT}-Pbe#Zy%`Efm;EV2&dU0)}EKAei1Ogr=WY&P!W`ad<<
zSVk3q({rPUq?GUlM~d<A^G~1r>Q{Y-gllmTucF+hv_`rOgMoa3vAPyT|67=J7x+r(
ze(XX#F&dA;5!T7tW)!i$XE=v39_ixEqCJApufOE&Z#TUX&we9?f_2=j$5MUP>d`$&
zVh|QWfCT{okYcK;W;SUiM~lhPd@-(1&7{C)6n~DKih#fDo%?suYdrPTQ^Vnqq@5c{
zjz*&|ed$X#Zrtc`$Gg`)Skfo}9)%(|gvGfiZm#L}s6O6nRgoJ#8JQ~5yNE|MB>Q?<
z?UZ*m>zh5?L(!hrMX^*wt=<mvE7r?o(;ja#iVpu&lx^CY-!Ge6RXiAT0G3KCdWjU#
z)XjWWPmULp!zG7{wuzE|oBAmJd^#2VWx)G~bMzX|KKpD@6e42UC?X+*uYBbz{b;=Z
z`NtU;Ya2q@+{sk*%`-lV7Mtx`hWu2ojpZ{kZ|AzA!{S+eo*IpZ#o=aA@+C3n(?bym
z$|5#bIDeB&aG>3w$pki|NC0fog~d@>e=<+=2?N4#)g2j#DaDwod0gUmd@vgy&D;7+
z2{)l=lb<`M;+nP$AKVl48ZW;1;;9LzOXJHgzx;c@_j^6=czEkN=w$0|tXSor+x<LX
z$G@)%;p(EzyZ$QoZ`FlL9DZy8H+?2ApO{i_+vED6h=)+jFS5|M&)LsHoI&!HUm&Q!
zb1E8&j5=IY7pjk|xWCV#NO^uLL5#6lG)pBMA1=lR^SWy7<J^qm&%IO8MG@fDTQl?;
zFTM0q2qDu(l0{K0f6&wAc>8k)zZ}I4fdS&j;<yX))7>TmkGP@-f7j~Y)_at9l6-P>
zycEWsPDNX3#nQX(2bQWSRUd@<_Sy10J?e{~=&wu|RPE0E6QtV*V3eV#BB{oh7Sr}b
z2@mI{gaApbMe#3~Q_)2+0XIIsg<j)Z-}+Wg<4PO9{q1j~*H}yrr}vNcp19<jWFF;k
z=VlwMkD_0>!(-J&F~?pN!t7BSoQf{Vz*ox?Vf6KFvnRuK%I8ZU0JXU$^Pf>G$VQ`U
zW)xKb09_Onq$op^cIUUH`FyTb#Q~sfnm9SG#!CVZ7V~M{)G=?m*dN88Q>UVv7k=&j
zo!B=0Y0P%2s{nxI5Bix^0o?rXjlCy+ZFRGaRrImBTAX;h){WcR4MC^A|HFTq*V%6z
zs=qXvY=vWN_GE0%Irg<qN<Fcoz8=~I!Uhx__v4!Vvq;kI`FyzesMVuMVyv5XvR@w^
z%qNG7*|erQ);1SK3jabo6&(~w{Ne3;=rxvh)1^(-r*WBQ_0_L_^~#kiJ??w!qqkrF
zrC*ar*>c3U<!nZAV<{?s0lFxv=6@W%tAkukyh9`XM*$Cnac6L=2a0|_2`5sgM2cFy
zAFAtqai?r9s(B`)!um^*1kGT?vWmO&>oUK3G@s1J<N5K?Vm@h_Iwn<3D&QAJ@h_-T
z5!tXGy>T=2HsPEbRE<UeB2t#+E3drLkH)2w!_Ro~%AYDAAcelrajnp8vIe=ykV1AJ
zr1@?cuE4^(=s5kK9?kQpRNpG&tD=u$#v~Y0a}|rX1q#C3YWmx1Cr;PGR*TdWhxdlJ
z{_ytEoymN*sH-+6)dWpy85RDv#4!8I<5UFvAHDl=Pi_3pcfRvT8jGTM_0?DZ&;RrP
z>|<8F`DxQMgJJ1qD*BEJRVA4*yeUwI<od{-yo0I&?2ty-MevbD-xLU*61tT*o-dl6
z!A(NVKjAZJy(?{jf?SUx$TFp|&fhGXNv4HRfRA$eLkTDYJG)kGQXJPhYmaY-t5=#^
z*C%Y+bTZT>Z8M60X`G7gvmcC)5AXMkiTmq+{jaa1arxuEt>c=T@4xfHcfUu!l@0tf
zrA)H?1&>CN-A(C=H9r%|dETrGwruojkY3OnpBYU@;c&Aj1BR+y-<<wms3KKYLVX=f
zSwC;sM6JHCl7Yc~K~-oK<D^NGHXYaTxK5Eb_Xk(6)zk69S`PL{@h^*0(Y37p_|E6(
zHALk5-~YZx<I2hLz3+W*I2=}0p91FB-uV5meD8a}$`cr9U)|Q;6iQ`Yywr`wvA)F$
z(l^5ShsNxW-f6@y+3{(8(5dy$wv=0#z6tr|qS+nX6u^aQrNl5z_H8QGCJk9BfS@c>
z`xzH+NURW$qbOK)gQWz}Zk6h&RZP<u$90;uY1(2DPcFt(>)`6$;`+@gQY?Z4iI3u6
zcBi6)Vgf+?<d&e<SlVco#i>qBI1Y^>G8&DRN5`N1<R^U$Ial7n=4|7&PDO4?M1=i?
zlThtevdOw`Y|u9V&Q?|d=8qC5RMlkX+0krNOtMEghq@fp?9+YN)@ufRWze+1;)Bo}
zLIB9w-GmZ?Jt$F|looB8CtaM#V4O9m(g~1NWTQA81!v9ZgPX;@d$Yh4$jvDJ<#sA2
z015@5On_C!Qwk}A0>EqU_dGQIwZHb)%CZdhIil#a=2-rCxu_qF2cKV?9nW_zY-gSf
zr?fF$(L28gg1%n_>sfUKR!^T-GsW?o7GxJ%d(`O+Myjmt{-vVb9o!{aWOY!L2<taY
z$gLxG<1^uvvpp&UnvbQvA_XYL*=1F25$mXRjEktVm=??bv^qZlQtOoJ=*U#TgW2eV
z&t*KB7NWA=XZRQ0si+DllCGAib2ubf4hLE+M_B|E1qx~@F{ln%QI*5u<NZ7L@BWc!
z6p@_9+^qUbzw}H0>;L+{_PD!hy84sfd*wI(<(!RN2^A2m1<5ae>gQx+tgbIl?4H3X
z+@PQ94~;Ku%}2%lI`e6!idKE};ZrLhtKuPnBtXazabK%9B+WHyteey%ZIaGYoVRHa
zb&=BI!K6*HcE=b)xOKF3<$BXr)j$CFr2R#8DuRd!sz@NfP=+8PK}vxz6&gVnqpfmK
z4h9?)7%~k*wWXDY7EqB^xH=I~3u=HWm0JA|KfR8=;|D+ZfgKuM8jGU%<zN2g-Z22z
z-uU6G|MI^EKxEZ=nvNk<p}Bj|#m`j9M{)HJ1$?O7qo&s|P_Q0aKmYi-6JfkXB=0Dw
z>>R0VBQC4AC9E!n^P@FX^#r)2TEzCaKKzl~ydrHA=kWx*DxDBGZ$Y^Dfs_s#f|kW+
z2iw;^o2M8Hflu1czf&>k*<5uccS-;Vp&Sf%M}tAB+fol%qbQeSP_hgd6zxC}*b=kz
zD)Cl27Rkyo+cjN1z5c_W#okpLzy9^F7eztRqj41ju<Qcx-S2+)XFvNHzWBKD!5j1O
zxEu^9q)3p!AOJuF%DG9$=mM1rD^;unA1))X@`d<~qTD|NBVDuotwjP5`B_oL!!N&>
zy@2N)_!yaOPzC318|wieVAj;<bfs!iO-PCd6HPI-O=_#<e>65RrN#ay`r+$?@m#6)
zV!HS_7c&&K{P^D1=Qn21SO|NVPi@VgGpAxwXhKwiQj|f2g|J913Msd@M#I7GAnk-|
zo0Uo%3JoCzNd=Usz?$9S$!hzQtVOIsSKC=;KWbBa<E@_BxU{AY27?fSOQRhfmy3Sm
zH-4iZjrC&o;UD~qr@#7gC{K3VVNitP!GA&_g-}Go$-mO6G*Wb>8A3v6TDszs;x*_G
zegsc8$^H9!I$s4Iz|5+TQbLlDyb>JA^Z0}(L);tQ2~4Yd&}n+33NRr;fux$^333{d
z9<Uc1ZR^<9Db^<hE+=h$CZl0cH;d-8Pj(L%TA26ci=#Mr=ho=nogBrVH>aX10H(7E
zRH;A_im)}>9?6N^Ni2qg;qpIa+zBYPA!n4C5OSuEE!bL{Rwz{cJ*^Grkl*>||8xCX
zQ&;FUe(Se>%MOhmjb_OCm;dE|`FDT!chPIyc>iaYpM9aN>M9HWkPw1|5Q-oV_*@Pt
zAN(_fqAX5+S_H~+aMkFBAdwWL$f{enS%YX%J2c@G5?RG_<A+vWk>t7Rf@c?3_lNxy
z@EXMt0G=OBM{=l|R6!7$6cGTRDYY6~P3d&<;D2K}r7pEN<uI9{B^NzF<b>M&J6rqv
zWCAvAN?kUHDh}SgQJ$DjB?jTool`NLCU7Z(gmNH5L<wQIv$MMsF3Nlq>JZv;z*1t#
zNGyN_0YIq$5)@{ep+YzMC$srR6aoAX|ETWmY5eWq{_XWNn%8l;Q(YE2zI(S%ae>d@
zf8*8P{P#PXLrtko%C>E)hkb@Z5fUe8mW6}|hu08JSbae6gNtV@<8&=4BI%4<2|^`E
z3PqtLxq|tW&lP?~omh_uJK(K$A}J*hNPwzBm4KcMP@&M2(j`_bKAg9AQi^y$U5f1)
zX{lMxMezVsW63pmI4A;O5ogETzf&|V3LizGbJ6za1*&%N_KouXy@f~$<ez`1qADPW
z2?|C<pbWOQcDH1g)nFL5wuhI7%@!(=aS)IcDp0F}Jf$ve(zO04x_4+}`X@j96urih
zuVv?(?9jM6@+$IC*Y&}{!GH7L{5OB=Z~ZOw8o&0R{kM;Q`D*|+wG;Oj2xVno6bW)l
z?5TK4IJpvv;sL{az^I(fPpKB3%^wU|O<?tuZKA4FoYIDbQ-V$jOed3+;@SVElr*N8
zPDX6wcc1+9)hDh7wA9nvB&bpqTtk{eg45<-LSm?IULAh&aX@saBV;`rf&U+SZviH`
zaqaP*Q&p0>hiQ4&UUa->$R@st+2O<xcsKNJ;B&wfX1)$HGn3gb97D*=j=k$;rkUBn
zW{_0$YOOC?N8jvfrqu&|Gyh!BXrvC!uTP!xKUK$7)~4QrC{i-hO+}?aDAXFMMHwn)
zTTN|EohjKuT!&H1#+2n#3}y)ck^ngb6(wXMD8{`qKA3OVx&2k2+yFJ{&2N75XFvPd
z_V#wmvLdl@j4*23wprKKOk>~Hb=`|sV9b{<9_|4R8dR`^Gz7@t0e%F4W3aE`ts{IC
zwm9BAdq0SZ2GmdeV@rx+03+k&JjskuA&FH3icl5S=Kc`H8D}a6NubohLXy}`=`LHR
zm}+iz+M84>a~T#W1sa?{pa6pfXAm>gM7RomN`fLDX|ejFyEy<PPa5NC3{uCMeUARE
z>rT4h5&)8%ndDGKu}{qBs_wzgRD}S>^ppck7)8RQQYxRdibcYr7>ox+Us~IqMA0G|
zaR!-+T7y)mH4sV(f##NUM=R@Ou4BoRgK5SY2t*)3eMMuKIDj5^xJ!m&^!kV>3Mub?
zU{B3sjL$gZj2IdtsiRrfo^r}5wKe5bi}}(0yLygVInKZS_y-a|m5l1>%_iGh+CJ(~
z1$v?=MxDSYia>x+SuW`8h|Lu+h&L4@C@O2qfz<GD)uI}4`b|ZR2pWVs_&=8Iq?>6o
z)2;2!+%!)!j}gxzI<W9i2ZfdxNMcZoO%4;3Pa{8GyJI`|Jg7-$opn}IQ&Z?|#M5XV
zbsXo#FMe@tG#c%B;-NW5uZl+^a+xIPC0KusAKI1OLtUxrL{S_&JcjoI6aj_SvXn{X
zia_-QoD3s^La`k~>EY1|r3!JHO+^l%6%r(bU|VNXmsx^3vN?rKjN6nG4J2ag#mB4Q
znQ22Y;-r1^HV(Dw!V537ZJV(udQlo9KF7ruU;LTRe5SU=YTuT%CqL(9cDgCaqO`tm
zCFj!w#uXi-HkF{0p%`i234XFHT`AI$QN{(>6F`v=<jD4nruzq~R4YoR%~aF?T!KR4
zq@322?r5{;HF+uKSxi|7hyuff=)`K9@y|~Iis7$v#p2^@ch$U1ectn)7g?qO4=nK0
z#?Xj}<^^-^>Y6oc9(w4Z+O|9H+wjP$HRm?eqBI8D6<s5pP9;P!LRume3DHWaT!t1(
zK*wz=0uYLdkiopwH{en&DVYXSQRrY*iiEMw?o^i}I-5zW<=a-p0zmz*0;q~`5(7!C
zC?<3=;y>{HclXv7qKu5q*xcM4^)_N@G%q-g^THRtur?Zv_N;qw)icgb#7y!<Y5hJb
zW$_iA!#0&fM^TJ56=P6DAcXo}N#{o`!3i6WsTiI%gqgCvt4~W`Fgn$yqL3gJIO$Y#
z8aoe0LN{fbU??d7K@AE(WAHTSaVLI}>nTMsK5x_-Zv5*Y)GCwxMVG0uG=@IMMHgN4
z$xnW=wr_&`aDS$Muj$K~35(L?e6H*s>~bnZ*U8BM@|2rIBFcQ$&gCfyZ^omj2^KwP
z`vKyXJ)2FPsTfp8HDJ26X>PObY$F|x=TL5=#;~h1>P93%ak@;!F@C&x*S35nTk|s2
zcpC;QLde8u48o(Cfo!U=wH-iiwCk~ZyB95uTa-2cpDD&yc8sK$0$q0$0VosI5{wSn
zTmp-AGD3W?s;phZq?q$8ssI6D(ovKOq#{nrYD&}jon%f*G&#~DnqbgD5r)tyLNWMh
z%1|`=@+~gZsu#TA1>rKa78)JLdFe}ES~HFNHa>ddc^9Qx+8WJNjNUXEV^^vIT8~Xy
z5)_dt&``)&g)*QXFNzd|CcPtUbkMViLNd9gqSirj2+eIRJ<YPag|s_<+5#4AI8xz@
zQ4}YZ_)Wj57*qJ^%Z@($$PTDg1|<Vju-Sk7G)5PzpZe6N3WWkpTuRCvkKTRac^5Wx
z{l+3{Ro9@yB<MPriqV^dNVlwW8O!Hj#h8jAiV8`8Hq|%C^})+YG!-=<7eJ`h+R7Gn
z(e5;Fwxvapf(+ZT$3PL|YcMm<RE+<SD{rkmV>Hu>&ph+YV3}GYjh1C~baWVp<eF=)
zfts}Qv3piO`+3ZE8pl+O-aMvfFbIrwFcqVG5{*<9b5=HwM8}wl0qO)al0wzlKcu)P
zY-_SiMG2q;0%cuY_PlnS+svCSZUs}Z0uG}tTs(@6WhzEKq+F@|>2EusR{i&X|92{t
ziY!wjB5*_nZ2+%+^{b&)`PGUkuHpoPUT|H*TNC9o7DdMr2LmIOHJFNHqDT&*s0p>C
zU&N7NOK?JC@=x-wD__#xLs%;LmZc};WQ6-3V^Q=aDzw@=n~po$K5>y;-sN>T!opyq
z=9Hj_(}W@(_Cwxx&z_oxZCIA|%2&QJT&C6%8^guwsi&T5PCZ_~em&HrZI9f!a?RNY
zq!CQT=*?xFLp@HF=z5rnkx+?LA;?^omWpJY`6mMfR$tZ`&3cR}Qg2gHX%HHau#QgK
z6lvx*`)#(Spg`;BqBI`GhBg(WFLKU*^@o0_Ri^8E(V|5LB}A;9#-NsCBJ8VP^{Sd_
zEM<oGZT#oaC#;$AregFaA^O;^A)CrNn2OPx2!wI3g1L<23b0~P46bOV#QKILQHoNm
zuc;_BC`DRYokiVbPK#)_eRgQi?vYW%@LuDaieta{g~v9RiUp`u2A^P=nux}5vHJ3t
zzx;Eb`&_A1f||7P?pu#O;pqT4!%fA=_0zfryHgbeo!rTYq6jDnfnt_r^GMXVN<oAa
zxV3MDR9)Ahx{gkU(%?(5)6U{<>!^0#=5R(7h8!LiMFeOZQ!xRGT<|YnHv+Y4$&w`z
zo3X~cF|6g7Ly=$cidR6bDvl2BdE()TCyiLIq;V`1(P*qEgKMyfI>rP>A}0Yw4a`zr
z1v0}H_kl(7!?93A6hMaZB$wkBsV9oQ0*Q3)+@_P3kYjti&NOEzQH_ZrP7jJWohSmr
zrykf+v*T~{y4SrfolYBw5HTr@VR*ds(n|xlYtx3i{tQ|tG!-Y6&&ZQYyGFWGC0aKW
z1JW?ORQXYwFCgf+sw@&jO|alu1EV0NAQ*8n#;AHl%BN$Z2pW9}&CRKmOPmwui-m1|
ziV9R3^%(dC7vn_{Yeo_4>hI&&FpvF#W538b|JwBfP^-)o#@D>&HIe#F?JL!=mSbkk
zJ^%U7ulYcLa&C0jx(8OA`s{|N-w>i#cMYVes*9-@C5_siSAlHCas{C=C<Z^flJ$?!
zO37ucKBl5jNC=%f$64B=dQ3b70SfTQ@cd_(ijgNjaQD_E8Kdzd%n?&z{U&K_47YTc
zXnWaZmjOV6@OX=s5)%cz7=I%9`Zl<^qH}0&kTDuz%u13>2t`0mh$@U)#R5eIBx)*#
zp*W0V3P`rhhO+`uu|p5kh@#TKB|0f*#bRgmd_J#<Gd(^Ou}&!B^rDF4N741XAKcUn
zwaQRqR+M4=CSh!hhDS3`?zGcRt9c7@C7;>y;NOlr^94zQ-V~Vrl*r?|2W%?p;$%bz
z(J|ZiD<nH=RefL(-)hIe6>K0!eAi1^Nu3O#0FZU}q?UEddCi=m02#?PYj83eb*Eyi
z1@g|n?W~l`P^-)qsHIDnhJi78Y>bA-%P+q?QFy%jR<~4`^!iP3v(})xtRoYYQtOIh
z5Yvc60>x2U$RntD6cIGAY>8%aoKZ-MqCm$<EnR4@ULY2>aHi{pB1W(4WGarcC18?J
z%oK7zxp@a9kbxx{7!$_ENG-?op_>G9$Br8RRSMr*f7hR%@siif7*lbKQRl~ZA8@Fs
zkEs~7?=8ivkjYq84m1Wuf(R7KJ`Uzl3u)2XO+}?aY1+~096bl;H~S8iAS0hPYbr*6
z`;uSo6M_Rk&F9|)(@?|OXY$w>4Uc9^$UENg4oILK|GXzVuz!+Fi{wpn%R7hWq{|e?
zhAM($z~OjNM8GFAMv~7XYJzbnB1la~ODtEA6!lpDR%4uu;69gt)Lt+zecTecu+4MG
zgiyq~qKFem5vK*kTlVaH;Gu1hK<|3jyUb}+k-(Uo#%OrF<dREPuU-wcN-Oo~pRb=8
zregH-3DL*(45X;6hp8BOOB3SweigDKj_VTwheZ(&l~OB`4i_o+1tm3@ib25!Qt8yP
zMfS1tc$ec_N`Z?0XEbXnMwZ!H!(~4nf&@D6yz|V);Ha^Ye5D$x<pkmJZEt(q6<1sV
zwQ6YJ4$};<?4)N-`A)@{n@4qw&P$aLbgd{J;iMcQ36a^1lgksW0LO4LB1}r4xdP4R
ze1<x<d^!e-3M7z@j`Y&GdVZ^K0Vg8*Au&!yJc^CDQ!$>>&potm|K2`Gp!dAzJti>5
zIQ|J~Gz!{Q&8ElieCInGH*SPl_2{iPEIj4}C*3@aregFa!iha5W0dtV6(esEONuJZ
zW>}R2jX^Q^wa4jD0lAQAHen}2NI=FG^*Bqqb$7}mS`iibwwpB-$3`(%Dtz*%iBL2>
z;>LQ2&lnS~RKq@U!@Z#&638tV|9R_;(`qV4QC!+?0%H+Dle(Z7u_77Og$&8(5ES4T
zreY*%)WC)cELY?Xg$bdk0JsDz<t$%dKW)C4lX8hX5{k2?B7{S3DFB1#|7^Ectw60J
zghT^l;@B7;9?h|kNxVm+osZwY{NythtUPWScM=00x;k-Aze8nhPDadI)aKmNnNiF2
z35z?)9}yUqJvvlG;VXwtz{yY=q{OB+XZakqq{Cw%h<pkbv!<dE!4Or@!MI)IU~y$}
zfxle)*uxKR2Y@6VqdBBMJ}@SyF;ZOpzz05H_E16sJ^068UwGvwEIT!|i_$SrJgV(r
zV59&^O~tW_IzX7r4qEvv0~L=VfK+6pNQwn+Q9XVXr3R%)Pj_m`T%6zJGA)T7`y}H3
zteuKM+#{fnNM&gWN=c!xs#C6@+!KOxsWsQSRIYsZ$9o`w3>WWv-}~YNV{#fJ#Z?m?
z&p!KX^G#qnR}<{*7+U-H->-SmE2rxuj_`9#U`$h0A5$^%0Cjxsk=%$KWQ?(s7#Wm3
zGMq!nh0VrmDhdgjvUxrB$_1+37E}g7{y)-GqyPv(+*3e&?HKBO-xpH5%62(=RbO%;
ziS(6}QX4cuNdWPQzpXDPXh{vWYZ$vB42)AmV-OzAcfiL!_OUzfyt7)ZLao~Tz~2@h
zd(y(?$4#;6|I}Mc+A|B&MFgGL$%s5aNYH4PA7%Lhf{I5GKx#Ttv<fB8=y;tBA%R-f
z!nvm3&2O`P5HLX$8-J%F1t2JaDosEtAuz9+d|&#W?;8juR9#d;O5(|b=qargf=dvP
z1T{9iXXmE-9^L{8WV*xO{qA>%9^=%}7-XxC<Cwmjx4!kQW-NIU`|;kJesb|UJ{ePA
zjp1`bnPl|WC-)r880(5+@RkO&eD0I%2&;NP<0ml!!?J4)<w0`cSmQuZ1DD{Wt)u3r
zmUj3l8iQiwqEU}OMF0|BqpxjOFzyRikutZdCiHp2Md5KReWkUbj{IvkpF%{2fd5`(
zDwm6&|HEELCbLF0lik8y#ZyXS*tvSuRaf13<Bk3O{ZOkah3o^r{l&SjxngQe#mKK0
zx8@e43kbRnPDb=CRLoMDVV28MCC5|05y}KcQYdnZ#-peJq=HnFS)E!7JAFs{Ac4UD
zSyM4c|1?3V8EWlGTJUYx<vz!vAijr!bBT%@0+mEkr9sIW5m1xEC!8Ae`)=P}EtepH
z%)wD+^OV6M2#ixrW59_CkDZ;JrU}S=F+c+C+3@K0f8KM<)6brKQ!(;ECNTCoR89hl
z8mOhjlYz0~6FQEes07L`9m;Dh47zbnh6X92xz$;@fG%kFEh#_)f&X)+B01zhc;I**
zak(-9u;NPBlde*(tF`a}{NQm!Wf1^60gv%lYu9hyv=fr)!yo>z*;pI~#_6GvQfj^r
z%(ueLH{V?I{G31!|MA*+M<3HMXF+1qA|A!?l?5%ig-rztPz#DNho%xjEt&5pg&flw
z@UZop5JjQsP?;7>f{}5cs7Y(Py=p$0*XA=J0pd|?q~lKs07VG|6&{R%!tz{E<)mn6
ztV*GMF16%>AZLL)44UACn^6H_-_U_y-L?yo$uz^9d+xcWt{L>fO%IJ>ublZ-`0Qst
z`;wQuBuP1k``#Vbe&?bqKTa)s@=V3Zb0^Q~OH)-JQ!xrK^@R^vQ%d!L#-RwH2^L&7
zngb;SV{xXUChcv`s)abO#Uoq=4>z`{7$$NAxwd>kJWrQ}U8*S0S5=`sPjSJuMgT<+
zC?cbg5d{-Q(Q~Ws{>@e)I3!SaclXs-Uu_J(z}1*e8bi0kteZ{e>Q}z<6-c1$K<~Z(
z-%rnd)#a09Dn@=iuO)wUa~?q_H5H?8A%ND*l7$0SE=Q#V7K0)nNKG<Da<G(2;!*5u
zPpw>F{`I@aHG#%A6)7mBps^xZsRCsWi&awbBp1S0TKYc0;CvuJqQlQhh$3kHf!nr@
z4i7^zedHq_F{i>sU5(^4CUiSYIp>yJZrQwfGbGT?wGYl&vf}tNpEnt%V&vDS&*`&?
zOlT@b-wLcQ!no#iWQ2JhP#_pL@q&?3g$-sw3YlVYD0ZZdS)k{(c;IP*4QnbQ06|44
zm(1h3<k`iFtZ*n*wQGLX09pfTiojTuuH+~hegEN&>(+0FWIE@Zb4&wF)YV8%V?rQp
z+cpzBKL7d8n?XEEsYD6nEjRQmUN(Q(G4(YSBT3`D=KP|j9HOp=sTd&*;b19skmmD5
zC}PE+NC<LGhl;dR_APd#?NL%4L~+#uIEW(G1RKp%L<r`H0Dw@eP^AXHqD#vMITS8e
zigSX%C=vu9houV%Kr$2`+_m+FziftNG8GeZ$goM%B9p_XpT?kh^_kCn<{RJm#-IG;
zCy+o&iogH*TbI23lg;g&33gh=AbUzrUy8|kn2Hh7G$0dPKxTxwE}?NKB5I2H3LDOA
zP>RySqX@LaptwlSYj(lcjbthYF_{7f%NJ1P^vQ*&F8ZWe<$?>P6rg4l2n*jzf?{Mj
z5dATq&wTQCyCAXN``-5&zdf>vae8TtHm|<_{qO(BKmM_M_ijj_YB7KNPriK7RUfyU
zR9#HP$gk(5i%VNG6m%V&jHpooVA&!&$O>6YDqz6_V^bZLQb&qdE^+G!C~DGiux#@r
zid;8>sTf8=1R$=o@+Dp7R-vL?*IX#+`GA@rB7n_e=!!!zJ|u?!-*er!-n22HyJ)m#
z&6+p8=}nR1&9u`P?and%L8djw98AtRhXl$D?7!o>?>+Z*?;wOGHx(l{Pnp~65H$%X
zYCy&%$Lx^hdO%}P41g<^=}1m%C6Pv*j1a~47H8#rJ-^ulU(aw;F^q%)ndDG7SQpg=
zkLD}F_k1C=M#&H?`maZE{3yme8H=J4^2*<>A3QJs$z*1RfAy<hZEtT64aONqW4QIv
zoI&u;cfRvWU-}Xx)837b-T%8^o%!-NBs3KxH+z~&%UZGsI=QJBjf#L^**rIB<?>WW
zVA1kv^eqHmv*7|MmN^|0MF6R>wb@>=0Oz-R!1ata6@!K~M6OxUBPEyQD^N0#(AC^8
zQ$!@dC=f7;MKN-n0LAb}4Ij9D!_Mt{AhAC2iBBAR?6D?q4A!VKj>gD(_3dweyXhu>
z<dH`pnKnJ}x0cTCQ_jCIiK!U5dD@)b6czO_6_G@CZ6oDU(CjFyx<KMk1VBdfWj0jQ
z0FsS)60ySOCVTk;GQZ8IT!WsGI~5Utf<__~bvY?`r08O{4ArXOLMtU11t+Xd)qrBs
z@@XLa{=@4ZeQX;5B=`DFyGwL}e?5d+YpAz`5an`t%a$!>M{+QtJfSXl?UgG}dsYl<
z<3q7KReHsWwGI(=Fcl*xf(AS7=0@qRtxl;#tQZstK@Y9%gKXb`Z-GJ_14SogEnQ$8
z-R;{#f}UZfVh{-d6=GG`B_HyxWrBRcC7$b{)`&nTki!I0gegVww;LY+=5Mz{Vl7_0
z`1adxHwL3w0|tR{=ElZALA#tOH<|kHl~-N~iFL>IKVVL3+3}~>U@AuVJaulbO=LYx
z#VCpdm{1CGL(Hub7C~{WQT`P3Winb&pcGPwqNtHDYvCMwaTm9x1U++1#ehQ)XbAyD
zVO6Sfv}zSgzArq^IVE5bjPe$bV)$77QT)r+b#+0J5MpW~3l=Oe_Cb&?HUN!b0{OC+
zz3l$`@4x1nYap4F6o382H(vDS_boo=#0i;-k(*tq@`{6{R7`3rMo<huwH&`NOmn%Q
zlo~UDm4L6<P@YsO+@jG3v_>R!LASN6ho?0MHDgRg0)W7QReW0TS+1z^9;sA>5G6{0
zVz45GdZ3uxR1Ac7@7(l-$dTa*PJ%OM7Ka-(8iU4gZig{OKl#Z|nxo~`u3eiP$lHGM
zm5VO_=)7gC#&0S{u21dhPg4Opxv3aI5dkRI5_7|L#RZH<Q8O}HqM0I~l1QV2+yF>V
zyS;p#Xd)cM%rF%x3S?4%fw1V3;S!ds+;t^@wyA;e@Vt$YC{BT?7ziKTz5P=+ZdFP`
zVwscR%(>pdMvV}~#-K4YJWNmR_rL%B7r*$$qobpcOoID=`r+p<y5ggAmn;XIaLZg*
zs=BIe7<7G1#pqki;>A%bo25zujeOJ?Wg%a&OrDg>KEo)A0!T-zsodyxM}R-wrXm3V
z<eF7|EckZ5C^Igrl&VrIir~=bD^cE}C{B^782rEWy}Lhj{RSa8B-XNJ%f9iAZx~}E
zv@{xw#$df_!uqOJtG@NEZ@vEYuTSVe8u@PJkKh07i{JA8`Ad(PXv^Fw-MuL$044!N
zKtUAA46$kzh>k%K04d28=ty3nmh|5<Os+89Y#lwHcBMV=^>mtw3?vdEY0+Z^7fmoM
zm4)vKjh;h+MPG^X7HaBE#o+&~+qdg|bwbg^!yo+M2MZT24EIbm7>$tx@`4L4Fl%np
z#R`e#RZ4&S-e+HO*#{RcUp@YoxelkY(ga4RgQ+;iTXu>Uvn-#ZLdLhkQS_AY7_s7V
z=igD38kj{F_mD-cK9zDxos94XA|NOv6~Rg#8!bWBCFOioYE1xa7X8@dDAw6j1Pt0x
zKX${W<R}I*#mG}nJvB@h8<NII0%?W?Y}l~jPk;IoBo_DFKYsVKFTC_UM;&*{I9IAC
z_w=<`5_COG#VEj3fWpk635<jw;1T<85H%$uc{Wm1M5*u-gZ&wRbbhzJyhkz+pr+hZ
zM9`Ef1x3k96&xy?b*b-qQfp~bWB`EiC{DYn2mp6(+wiHI!dx+_-u&h_o5r$e2V8^F
z7$%Udt*vI|-P_xnyrL82khlEkOV5AfJC~pIj93)gY<G40Fle37R2(~&Qj3?e#5n#^
z#kax{@B|wzLbWOx4Ic>hXJAK{y`%>m!huh%sYrrU)-HJ@Tc#sr$QOj*WrEtGfYFbF
zcoe6}R0M!qHb4HQn<HjMq774~?Z*7+hUsF%(-;70*4(C|W43o(eDTGGNk}Xy#jQX6
z>iMs}Z1oxE9=U#Fwriv*Pi`uX<>M2HN@a%9RS!`|V`=nZ&;&Cjnk_1#B_;pnE~eA=
zQQdejT@)H|s!T-+iV!Za<g*di8qSJhRVdC`q)a+CiZjbp1b}PSt^e^K>W1R+#~=U0
zAO6r(ZlXJh8=c0mqGM`Pzxc&3UjFiz=W;nnEUnbvula6nsQ+0Pz4mZUW4rCG?ii|*
zsTiS41GU{s&dz3;5b<591YBv2<gika7CrQU1R#{o>!S19C6Q{1Ohp2K=qgrlO{~U&
z5_+YoQi@WvEWjAUW5$_^p!FB-*?ikwn;}%<o*VOrYEEPfDmRD-ldmZtK6*re8Tk66
zAN|O29H^82`Pbjw{)=xYDaS18oZQ{pME!VEal$AXQ9(7$4ADw;oL#AzlBtVG0QuAh
zl%^f6){-veppSa;XDSlZ6gkjQ*V;MiZ0glJ4|rawLQ&ZaDM^YV))U1smjKa+rQq-W
z<GS1K+5mNu**9-cT)upHeC4JAV`H?Z+$_hx@P#j!eI8IJZF}_Iaz69oH@`pK-1<}$
z4`z%VgLQH;A`fUnZBfi)Hba#nGzLY&up-%L9^9(1$e{<M!c@wPb|bB65BcPpih+43
zfE9c?QlJO&P%2j`s1zNGu?QP8)l@8(idX!0!@fQHp-!?a%M>_F%!rQDXjmHKORTSY
z)vE>u29kRoq58IOy75aNyy)_ebk18Cu3As%?r))@?kEOtDWX+wC{?M1yOxhIl~EHM
z$<fiW#DkY%R78zrPCH%DCYe-|Ybp{@NXvo^maGFgRV;GU!X|(i57LY^755Ddy!$s>
zMu&&$`1fgc0-EVEF-6oyU#UibG<7P|XJl*-sGoAf1J`}weLL4Z6#QYf*zQRk17mPf
z1B&4o{qQDr+-lLvjM!2E#-IoUs@xjRgX=1r9QvEo3fr3PMP29+AJnAHR3xAYR+ZIX
zayAcI+k4$Y-nBqjbQ~yR9Z|%DC`SIp{CV@*OMmh}1jU5<%x6Ahc1uOiDQ^7O7_-SE
z@H{^Bp%1yPYtl%llep*p>4#rD{kfN%dCC8KT6bR)<@GTYqd6f;ih6X=s<?m}NciN~
zvu-pcqeWUMDbzAVOKBh$o!3FS(mu#ZGZhI)P4e9C%d^3(aH~~^BGSV%)(EDeQtAu$
zZu!ey+n}y8W`;S{$^2P{Mbt*3F}ddf0RQ{H|68e4lJE0~)OALBcc1a8i-e+#sKlmX
z1Vs(h@hf?j%~GkxKFL2)O6B%Q9;>ckhoT%Pg<WmdoHor+f}R9Zk$^^YH5)A2`?HYG
zS1C~`c0|S+!BjMf;yeDdb?5e75K-cpHkVy?SpsXZF;}W#MJE8#_&KJcW6phqx@zy{
zb#Hmg_kZ-DUlz`hOvSNKBoLVd9^n%eg3b=xl?tLFBxb+{5;|Na*^&e}^sv&vY-?Tz
zwx>CWSX1#3e(@*<&k&GEvYxYb(AnH8^7)EGl!Y~+h!aH-ClAHP_U?Yw&mO2die?wC
znI#igi(w~fBge)BKmvf-#3`lx!yo<t^;0o3{P_=m_x=kn{PI;NEKF4ZbWNsW^gbcB
z>s76h5u!vaiiBWAu#v3xJYmzPx*DXbmCkKd3}l^6MGTBYI#hOc4@0R~VN_dmEXEqj
zR8&HK`N8eC-mxC)t+%}8E#|!NWGFU1jp1A!17ufM*LT1BUE8+JbRDRlv{HBd{`VKI
z+jRA(FL};lXr>Ypq6nxgst5b2TcuzWGhjnAGBiqa6+u8h)zz?U*4;*$91mn&cPb(%
zLW(}ypG)<Qc#``z1;m6XPXA8D!O@X-{eIhlzCNh8OdZh_FAR!_xAQkXjUkX>gf!)>
zpa1;lP*)A?*?!ff-+INRul(rC7kAk%qMm@05rLN2Zly$W8B3`6u~QVvzBOC`&r=K!
zfuJ=sr)YPxxv4<c6GcI2rfTmTCYfA?p>$~U`9?Gqf3<GYFK-EE*VI`b{NM*oVc+D6
z0g8zDA5CLq@*Dt|Sy#sD`ObH~19cVm-0Qyki-+z$?V}%g?s*HanemCD7+fogYIv}@
zR6$UHF#|RfB||xqFH3?75il&J5;~_9+tLzv{Y*uQo}_&_vpUt4VkKn(Vw8b~GZizr
z+z0=%Yx~xnlTk$c_{TqP#&QP>)I%uF(irBD21rCSi}+M36^y&8uXb&C?6Nm(deLiM
z{+a(-(PLErbxip*a!oAHuQ;Q_L<%4=C;|nSvrHa*Pcm|-Ur#D%X?5CKzye+$Cj(Iv
zEDLLI*4jTLCHK;H_{`Kh8HrKEpx~^2zHZxfw`~!EPX>yn?c{Z@d!31jNpr=<uc^iq
zb<7dYX2OASJ|<%w?|bg=es;}sF1`Nx9axgi1W*J(#&l+om8%FkcI*@~I#gh}vO-WH
ziW&e3>ul0pX$h)6C@MlSzO!xE+0*Bu@*FmeC<f)+q$utj9(dg^ANtjw)=vhC20zpI
zW=^7*{<6)~oTr*lQcBPBN~Mx1v6@qog9)v57iH}13opF-EhnsO<|!iLP}GDt72%Ry
z8=PF8A^;w7S<A2}QyY6>c+?A8UIK|HPb+@fVluzgCtN2r6%i$pQP0^vNOQRgBbtVf
zHKwWP`TXk-@4D@dCtz}9_Vk%EHO@Z!Y*U_ySp2iG@vxmbfe(4fC70ZE(@pc|&z}_L
zg}CFlzkT7WzWu(NhDLdd&}6K=$YIzdnh}*7vPu;SaVR26qyu?;GGhe9e+&QJ?X<f|
z5v7xwiUb8A2a3+d{Un<yTTv7n%~S+^<Hk)d{r2A`4@I+^@3+7G?Rn>&7vF6&8yh21
zN^#E1<?`08Tg?)G$BrE^X_~)u<-0z3@vB#-+bAcf$LKFd%T*k=J&`IEQ7gbBZt$m2
zmiC7IWH`qes_>vmp)lRztX>EU+C1=+l}{;hMf;2PwgXDI9%JF74QVPq-oO7Vf9>nr
zzaJ(|r=NcMkAM8*rAwCvlTQN_XK9=mkV1$`rPANuZ;mH12PMN~>ZE6#^WL{V>p2T)
z3lRi$h@z3U)1`sk&3pGU;m2-e)Hd!IN$u*Bf^$ZL-=GGNK#!W|96OI&AV4K?GSEl1
zFK_Sc=fdY<qS%P0;y^z4g}Zy#uG<WgDKk0aYhU}CS*9L&2=Q!9HKz6z?1wZPv9G=M
zT2t3aW<|#6iTm$*{e$<McFy@9zVeJS=R%qa1_6^+)vG$$5vn*~42nRZ<T;~x;6kvc
zOkxxYT3W2RZJJR9JQ0eXW_yg2(eG&~0u&p<RE(fFoX>y#k^cK1+%VaHLZ;>I-S2*P
zU@F#*;%saTq_vh(x~^;LI;K;{OlwVE*NH9goPOSOKYGQ}|EmYmgtJttd|;2WcMp?3
zAu+p(mBn_A+PnHV=fa}FO$Y+x(gmqi^SG@!s9H_M0L4OTcb{uev?u^Ho~f8CmB0Q-
z-(B}5&ky6b@SA>;7rfvF2E|0C;w+63AeB<S@0&F8@y8!GtJb}H_rfHL+0L5tp7Wl!
zoc^r2+TOLcxsag%fJZ_REi8J@6MdM;`4-V(S}7H2X-+*Y7!odOMUkMV*xvlXsHl{%
zNQ0S*2zVf$`{CNbyYAaqr{fi4&X_WX+^=4}I@mWHIvKMx*0Zi-(#Qh`4qSEBRd?KR
z2TX}hIOD8KU)1?O-Ci18ON+x<l!&Mp**@&-9uSfXMh=ZTmcW+Jw^q&J%v{P^Q3R7K
zIy?J(kep2=ipiY}LN@gG{_v5^`X{!)l*pWbYW)44o*vUrlAvZYOJiJ+6hfGlYOz=}
zdHFZL`Ax$oOo^5pbNox6fAoirgEr;bAW*9aiohW6r8oBJT;3<B5&kvALO@%qvwAVi
zY39InO*<9Q$Ah`zt`NlrF%=b|f7`z4nukjJcJGEMk-_hyAN^>!X*hYJI7?%E8tMDK
zNh2S8@Ilia5Ug6KMy;JaXI}8k_nwJoIG&|A0~r=CC8OI$?0pA>2m&Js{^JD&bonA@
z`5a+O4jLzXx)cEqt$kT%=K)^}ZY4o+%8oxpk}DOj*)nk31A9vO988tW>ePHepLEhm
zW_22D8cvSlERFFB(nu2|hlhth_OXxMc;k&QwL0e1HJ4m4=UppFm##991XYnc>-J;5
z=rhy-iU8nC?C5AZev#~Qd=O9riX5rg9<{xns{qBBY$_s3jd$$Y`rGw<(}vAcTz<dw
z(n~-5;SZb2jR}vIWreHLSsJHq)#|#gDee5`H@`8x=D~@{Q>m7Yu4kP2jQ{7E^wkSt
z-w^ipdmwxgmQpn+Vy|4lR`hTR64V4y1dx;*C^(z@weUQP&QMcP0|6xK5A6H%Zhqe*
zJIcj8Os&lHs4su{%jchez6ps*SEsWyCa<-c($3DEJ58_oJ@?!L)1mgBxu^fvnsXN8
zX=%lTk6NMDzJ#uh)YBG1x8sA-6Gc%o94w_aA0TeIV$HmriW&(3**ehs$35P?kL@XB
zMqxT+PFwuq7r$tL430kySEsWyPG`$bU`U$NuFMX}q(L%)I_EAp<>{xKx)9E4vux?D
zSm-S4@@&OHPw@CthNIQgmI0c}mmNBDOhwd$NGTuf-Fwd<z5lV@xshR*CK&>+zWQo2
zs5fW<kJe6SX`J@bj>#nV@855#YJdLopJ7^Mr_w8qKY7h5bKZCgIm7XpmIO6wji6&u
z)C}_?y?uZTjZ|!+5vSKwM2!eQvc=q=_6<L}Pi=Z)vlM)Ko3vj0+Si($`({Uh$r2+4
zn^_uXR**EA<ZZXzW|%Y$t}p}CJ%90vV^^*@K7HW|>#SC7YyU|y0l`Q|Ngz;B&embp
zKUkd}6cIH9VGxINnY#wF>khCj+xKUO24Dtg<;s=DOFZ+;GtJU87+DjB#910=XeMcb
zq?s&WPH{JD*Qh5st!i%TSbFTSCmq|pW~sVhp7k_aS|A{R4m1+r`e1LJnN&kTQk())
z5dlC$u%!yi<>C{C(#D)#zqhh;+s<ma1T#h^44Shu%(+sXot@@-re}$>G=@Pk*s^S@
zJ7%Err$7DaNaN0of^)&qOOHN!&g!GcSxc=G+o;XcdwX5q^B6%u4bd&hx)xIr$&;*y
zw@C1NlWF$~wJ}@RI>Pq$<@@&Sn@RXZ_hA?V!_18`A<?$&hAEuR(ijHGaN&B(Ew`BJ
z&Ti8Y(g<3(?3k98=AJp7i+h}A=C(W5q88f{-m;F)CSExNng)ns8J(cdeSdGI;@d6z
zbEA1_=RGo*<^6;CLa{WkZx1wrjHhp^HP3$bvkixi;{?NM0u*OyY`p3Y=iD%v&*y*o
z)1R6%Q3{0uG`<$ET#X=MEcw1aXh>^(nIetZ3>A#2F)3nXX*x?|1NRAp$)stX`t`4W
zZLVQfGgams7PC{woC0pP2nSWu=z!r_8XG;C44Lfh?KMnZcinZK=fSLIl1vyhJ>O<P
z&D^<jO+0iQXX>k_v!_%|(MbX(_b}hPrb=!`@%;boodc_+aTvwlFEDX!+qTWPR<8Lv
z6DP0Z+D2O2wwYV~+NVy}zQc2>cbwjS_dNPP_x$<uL_yqdGf*HL0wMcW7(DLQtsA$g
zh8;Hc#*!@X$R`=8%VaXUckg!Wnnw=#vzSh&J9q9Jeh7pWOEspkyqJ9b`gJy&W&2Jp
zYdlulwrw~47f)*D&@`4Olhj?meEGt(05zW0?uA(NE!MAJ&mnzQ%fq2sh~m&RmM@d4
zyHeM|DvumFvSrH_PK3Z}VzubveU3h{Ab0B2sT512e`pR(V+~BIKN(iZR)L*6cXE`u
z`SY$8l{1`h<;s;EJ9d;A)>AJvjaD#;Re~i}36>{Mo+N^0ysoh$uNDT#4#icgR!y2T
zsiGM+y^n7iZIxijuDbpE_a8cRsNSvT7RZ6$^5x6t&!0~RzoHpBC^d~OQ0Wnt1g?Ab
z?BUSX#fujctAcPmAY8I!$)ZJzD3gX0+6+x&t5~J5M8c8?7A$#L&JDw{W5>>!GY1G6
zF2x2B5Jp<)%+NHpdIXCC%UCCQ=FAy}dyXGJ&e&a29_rVx-}LFzsg82R27^FsP)=ww
zG>y4-%P9GXOnQ~4PoE~Yyng+9=@nzUcke!Y_;3j1f08mfQ_%*IAvBHom#_>nm1IIA
zE0`}`x^(5rmD{&(7ilUuV#J7%BS(%NJ$mBAiDZLH1!aTI2~A@`8>T!{0qxJ9KLPUQ
z&6{`b+<EZe!J|iyh;Ng^6AOa-_U%g)I$*$nAw!1Xgj7U@pFFVmY|u2COazb>om2iv
zh6$NOw)gJcd;k9Zr%#`tlyBy8GNxzGp0wj>LI56nE*MzjC=<Miy>LIC*aJ;tY1*dr
zyMhAR&!0a(d-e=08PI$3<Oyp;p!CCs5B!!jKQCUqNE)Nwy?e*%3UWLqLh-$>UAwa7
ziS!QxOr=utI<8VsS4IYC8Vx5`@C!t1WL1*Q@?5`-C*VrZ3orzh70+r0Lc*ycV3K$<
yd#2H<nbI012;(YMjBM4}6OeJO_(Uo+@T`9u8U|933*n3a0000<MNUMnLSTYvN*SsE

literal 0
HcmV?d00001

diff --git a/kotti/static/logo-transparent.png b/kotti/static/logo-transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b799940546a9176bb9459ba0f1b2ec50ffa6e46
GIT binary patch
literal 61821
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

literal 0
HcmV?d00001

diff --git a/kotti/static/logo.png b/kotti/static/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa66c5970872ef030f208d719331a7d95a56a954
GIT binary patch
literal 55715
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
H@a+EpaqagO

literal 0
HcmV?d00001

diff --git a/kotti/templates/edit/master.pt b/kotti/templates/edit/master.pt
index 74c9ce6ce..4c0b4314f 100644
--- a/kotti/templates/edit/master.pt
+++ b/kotti/templates/edit/master.pt
@@ -2,16 +2,16 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      tal:define="page_slots api.slots; dummy api.edit_needed"
+      tal:define="page_slots api.slots;
+                  dummy api.edit_needed;
+                  has_location_context api.is_location(context);"
       metal:define-macro="main">
   <head>
     <meta charset="utf-8" />
     <title metal:define-slot="page-title">${api.page_title | api.site_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="${context.description | ''}" />
-
-    <!-- Fav icons -->
-    <link rel="shortcut icon" href="${request.static_url('kotti:static/favicon.ico')}" />
+    ${api.render_template('kotti:templates/icons.pt')}
 
     <metal:headmore define-slot="head-more" tal:omit-tag=""></metal:headmore>
 
diff --git a/kotti/templates/icons.pt b/kotti/templates/icons.pt
new file mode 100644
index 000000000..c9a85d706
--- /dev/null
+++ b/kotti/templates/icons.pt
@@ -0,0 +1,2 @@
+<link rel="shortcut icon"
+      href="${request.static_url('kotti_icons:static/favicon.ico')}">
diff --git a/kotti/templates/view/master.pt b/kotti/templates/view/master.pt
index 13e0eedb7..5757295ba 100644
--- a/kotti/templates/view/master.pt
+++ b/kotti/templates/view/master.pt
@@ -12,6 +12,7 @@
     <title metal:define-slot="page-title">${api.page_title | api.site_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="${context.description | ''}" />
+    ${api.render_template('kotti:templates/icons.pt')}
 
     <more tal:omit-tag="" metal:define-slot="head-more"></more>
 

From 4c41f18bc680de6a8bfb2d40a00b7e95b12bc553 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 9 Nov 2015 11:19:03 +0100
Subject: [PATCH 372/600] Add more badges to the scaffold's readme.

---
 kotti/scaffolds/package/README.rst_tmpl | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/kotti/scaffolds/package/README.rst_tmpl b/kotti/scaffolds/package/README.rst_tmpl
index 572154b5c..db36f4065 100644
--- a/kotti/scaffolds/package/README.rst_tmpl
+++ b/kotti/scaffolds/package/README.rst_tmpl
@@ -3,14 +3,27 @@
 
 This is an extension to Kotti that allows to add foo to your site.
 
-|build status|_
+|pypi|_
+|downloads_month|_
+|license|_
+|build_status_stable|_
+
+.. |pypi| image:: https://img.shields.io/pypi/v/{{package}}.svg?style=flat-square
+.. _pypi: https://pypi.python.org/pypi/{{package}}/
+
+.. |downloads_month| image:: https://img.shields.io/pypi/dm/{{package}}.svg?style=flat-square
+.. _downloads_month: https://pypi.python.org/pypi/{{package}}/
+
+.. |license| image:: https://img.shields.io/pypi/l/{{package}}.svg?style=flat-square
+.. _license: http://www.repoze.org/LICENSE.txt
+
+.. |build_status_stable| image:: https://img.shields.io/travis/{{gh_user}}/{{package}}/production.svg?style=flat-square
+.. _build_status_stable: http://travis-ci.org/{{gh_user}}/{{package}}
 
 `Find out more about Kotti`_
 
 Development happens at https://github.com/{{gh_user}}/{{package}}
 
-.. |build status| image:: https://secure.travis-ci.org/{{gh_user}}/{{package}}.png?branch=master
-.. _build status: http://travis-ci.org/{{gh_user}}/{{package}}
 .. _Find out more about Kotti: http://pypi.python.org/pypi/Kotti
 
 Setup
@@ -36,6 +49,11 @@ please create a new issue in the `tracker`_.
 Development
 ===========
 
+|build_status_master|_
+
+.. |build_status_master| image:: https://img.shields.io/travis/{{gh_user}}/{{package}}/master.svg?style=flat-square
+.. _build_status_master: http://travis-ci.org/{{gh_user}}/{{package}}
+
 Contributions to {{project}} are highly welcome.
 Just clone its `Github repository`_ and submit your contributions as pull requests.
 

From b1ccbe0f1620da95c40215d39e7218c2691dce63 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 9 Nov 2015 11:40:04 +0100
Subject: [PATCH 373/600] Fix accidentally slipped in copy and paste error.

---
 kotti/templates/icons.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/templates/icons.pt b/kotti/templates/icons.pt
index c9a85d706..3b63219f0 100644
--- a/kotti/templates/icons.pt
+++ b/kotti/templates/icons.pt
@@ -1,2 +1,2 @@
 <link rel="shortcut icon"
-      href="${request.static_url('kotti_icons:static/favicon.ico')}">
+      href="${request.static_url('kotti:static/favicon.ico')}">

From 5d9788779080a4632aca5e5b479707787bf6eb19 Mon Sep 17 00:00:00 2001
From: Sebastian Brass <brass@xo7.de>
Date: Wed, 11 Nov 2015 11:32:26 +0100
Subject: [PATCH 374/600] Fix permission check in
 ``kotti.views.util.nodes_tree``.

---
 kotti/views/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/views/util.py b/kotti/views/util.py
index 26bcbe390..44fe8661a 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -422,7 +422,7 @@ def nodes_tree(request, context=None, permission='view'):
     item_to_children = defaultdict(lambda: [])
     for node in DBSession.query(Content).with_polymorphic(Content):
         item_mapping[node.id] = node
-        if has_permission('view', node, request):
+        if has_permission(permission, node, request):
             item_to_children[node.parent_id].append(node)
 
     for children in item_to_children.values():

From 270262f5bb7ec41ad8d4801327a76f059b065621 Mon Sep 17 00:00:00 2001
From: Sebastian Brass <brass@xo7.de>
Date: Wed, 11 Nov 2015 13:15:31 +0100
Subject: [PATCH 375/600] Add change note. [ci skip]

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5918f99c0..4f2863acc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Change History
 - Add Kotti logo and icon to static assets.
 - Use Kotti logo as favicon.
 - Move favicon definition to separate template to make it easily overridable.
+- Fix permission check in ``kotti.views.util.nodes_tree``.
 
 1.2.2 - 2015-10-28
 ------------------

From 798895742de4e0335350bf7f43c896929d23be4a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 26 Nov 2015 20:26:37 +0100
Subject: [PATCH 376/600] Bump version.

---
 CHANGES.txt      | 2 +-
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4f2863acc..9fe90bb9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.2.3 - unreleased
+1.2.3 - 2015-11-26
 ------------------
 
 - Add Kotti logo and icon to static assets.
diff --git a/requirements.txt b/requirements.txt
index 1ea538d66..614b60916 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.2.2
+Kotti==1.2.3
 Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.24
diff --git a/setup.py b/setup.py
index bab36b2a9..fb8e277a7 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.3-dev',
+      version='1.2.3',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From ae6436f50bb53b50c0350e0eccaeb3bd029a3773 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 26 Nov 2015 20:31:29 +0100
Subject: [PATCH 377/600] Bump version.

---
 CHANGES.txt      | 5 +++++
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9fe90bb9d..e3f8d1c1b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.2.4 - 2015-11-26
+------------------
+
+- Fix broken packaging of 1.2.3.  Sorry for the inconvenience!
+
 1.2.3 - 2015-11-26
 ------------------
 
diff --git a/requirements.txt b/requirements.txt
index 614b60916..e36abb341 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.2.3
+Kotti==1.2.4
 Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.24
diff --git a/setup.py b/setup.py
index fb8e277a7..a41595de9 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.3',
+      version='1.2.4',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 86087973a6ba05d07463d556e2ba43ddcb76f3ee Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 26 Nov 2015 20:33:27 +0100
Subject: [PATCH 378/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e3f8d1c1b..7cd9abbb0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.2.5 - unreleased
+------------------
+
+- No changes yet.
+
 1.2.4 - 2015-11-26
 ------------------
 
diff --git a/setup.py b/setup.py
index a41595de9..7d42c77d0 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.4',
+      version='1.2.5-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From dbf9bd06be54262848dd21569a22755f660ea81a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 11 Dec 2015 00:58:30 +0100
Subject: [PATCH 379/600] Remove minify from development requirements.  Upgrade
 all other requirements to their latest respective versions.

---
 requirements.txt | 19 +++++++++----------
 setup.cfg        |  9 ---------
 setup.py         |  4 +---
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e36abb341..b3b8f147e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,9 +9,9 @@ PasteDeploy==1.5.2
 Pillow==3.0.0
 Pygments==2.0.2
 SQLAlchemy==1.0.9
-SQLAlchemy-Utils==0.31.1
+SQLAlchemy-Utils==0.31.4
 Unidecode==0.04.18
-WebOb==1.5.0
+WebOb==1.5.1
 alembic==0.8.3
 appdirs==1.4.0
 bleach==1.4.2
@@ -19,11 +19,11 @@ bleach-whitelist==0.0.7
 colander==1.0
 deform==2.0a2
 docopt==0.6.2
-fanstatic==1.0a6
+fanstatic==1.0a7
 filedepot==0.2.1
-html2text==2015.6.21
+html2text==2015.11.4
 html5lib==1.0b8
-iso8601==0.1.10
+iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0a2-3
@@ -40,21 +40,20 @@ js.jqueryui==1.10.3
 js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
-js.tinymce==4.1.5
 kotti-tinymce==0.5.4
-lingua==3.12
+lingua==4.5.1
 peppercorn==0.5
-plone.scale==1.3.5
+plone.scale==1.4
 polib==1.0.7
 py-bcrypt==0.4
 pyramid==1.5.7
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==2.4.1
+pyramid-debugtoolbar==2.4.2
 pyramid-deform==0.2
 pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
-pyramid-tm==0.12
+pyramid-tm==0.12.1
 pyramid-zcml==1.0.0
 pytz==2015.7
 repoze.lru==0.6
diff --git a/setup.cfg b/setup.cfg
index 6de0e9b9f..e018a8925 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,12 +19,3 @@ markers =
 [aliases]
 dev = develop easy_install Kotti[testing] Kotti[development]
 docs = develop easy_install Kotti[docs]
-minify = minify_css minify_js
-
-[minify_css]
-sources = kotti/static/*.css
-output = kotti/static/%s.min.css
-
-[minify_js]
-sources = kotti/static/*.js
-output = kotti/static/%s.min.js
diff --git a/setup.py b/setup.py
index 7d42c77d0..83c0bec23 100644
--- a/setup.py
+++ b/setup.py
@@ -72,9 +72,7 @@
     'zope.testbrowser',
     ]
 
-development_requires = [
-    'minify',
-    ]
+development_requires = []
 
 docs_require = [
     'Sphinx',

From c9e6bc1769d339f233384642b351b9acf01c645e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 10 Oct 2015 01:31:03 +0200
Subject: [PATCH 380/600] Replace browser-cache.txt with equivalent webtest
 tests.

---
 kotti/tests/browser-cache.txt | 136 ----------------------------------
 kotti/tests/test_cache.py     |  79 ++++++++++++++++++++
 2 files changed, 79 insertions(+), 136 deletions(-)
 delete mode 100644 kotti/tests/browser-cache.txt

diff --git a/kotti/tests/browser-cache.txt b/kotti/tests/browser-cache.txt
deleted file mode 100644
index 3bd4e92fd..000000000
--- a/kotti/tests/browser-cache.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-Caching browser tests
-=====================
-
-Setup
------
-
-  >>> from kotti.resources import get_root
-  >>> from kotti import testing
-  >>> tools = testing.setUpFunctional()
-  >>> browser = tools['Browser']()
-  >>> root = get_root()
-
-Some convenience functions:
-
-  >>> import datetime, time
-  >>> def parse_expires(date_string):
-  ...     return datetime.datetime(*
-  ...         (time.strptime(date_string,
-  ...          "%a, %d %b %Y %H:%M:%S GMT")[0:6]))
-  >>> def delta(date_string):
-  ...     now = datetime.datetime.utcnow()
-  ...     return parse_expires(date_string) - now
-
-Add a file and an image:
-
-  >>> from kotti.resources import File, Image
-  >>> image = testing.asset('sendeschluss.jpg').read()
-  >>> root['textfile'] = File("file contents", u"mytext.txt", u"text/plain")
-  >>> root['image'] = Image(image, u"sendeschluss.jpg", u"image/jpeg")
-
----------
-Anonymous
----------
-
-Cache HTML
-----------
-
-We define different caching policies for different kinds of items.  A
-document:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.headers['X-Caching-Policy']
-  'Cache HTML'
-  >>> browser.headers['Cache-Control']
-  'max-age=0,s-maxage=3600'
-  >>> d = delta(browser.headers['Expires'])
-  >>> (d.days, d.seconds) < (0, 0)
-  True
-
-Cache Media Content
--------------------
-
-  >>> browser.open(testing.BASE_URL + '/textfile/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Media Content'
-  >>> browser.headers['Cache-Control']
-  'max-age=14400'
-  >>> d = delta(browser.headers['Expires'])
-  >>> (d.days, d.seconds) > (0, 14000)
-  True
-  >>> browser.open(testing.BASE_URL + '/image/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Media Content'
-
-Cache Resource
---------------
-
-  >>> browser.open(testing.BASE_URL + '/static-kotti/base.css')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Resource'
-  >>> browser.headers['Cache-Control']
-  'max-age=2764800,public'
-  >>> d = delta(browser.headers['Expires'])
-  >>> (d.days, d.seconds) > (30, 0)
-  True
-  >>> 'Last-Modified' in browser.headers
-  True
-
-POST request
-------------
-
-  >>> browser.post(testing.BASE_URL, '')
-  >>> 'X-Caching-Policy' in browser.headers
-  False
-
----------
-Logged in
----------
-
-  >>> browser.open(testing.BASE_URL + '/edit')
-  >>> "Log in" in browser.contents
-  True
-  >>> browser.getControl("Username or email", index=0).value = "admin"
-  >>> browser.getControl("Password").value = "secret"
-  >>> browser.getControl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-
-Cache HTML
-----------
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.headers['X-Caching-Policy']
-  'No Cache'
-
-Cache Media Content
--------------------
-
-  >>> browser.open(testing.BASE_URL + '/textfile/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'No Cache'
-  >>> browser.open(testing.BASE_URL + '/image/inline-view')
-  >>> browser.headers['X-Caching-Policy']
-  'No Cache'
-
-Cache Resource
---------------
-
-  >>> browser.open(testing.BASE_URL + '/static-kotti/base.css')
-  >>> browser.headers['X-Caching-Policy']
-  'Cache Resource'
-
-===
-404
-===
-
-  >>> browser.open(testing.BASE_URL + '/this-isnt-here')
-  Traceback (most recent call last):
-  HTTPError: HTTP Error 404: Not Found
-  >>> 'X-Caching-Policy' in browser.headers
-  False
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index e66b15de6..528468bb1 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -1,13 +1,34 @@
 import datetime
+import time
 
 from mock import patch
 from mock import MagicMock
 import pytest
 
+from kotti.resources import File
+from kotti.resources import Image
+from kotti.testing import asset
 from kotti.testing import Dummy
 from kotti.views.cache import set_max_age
 
 
+def parse_expires(date_string):
+    return datetime.datetime(*(
+        time.strptime(date_string, "%a, %d %b %Y %H:%M:%S GMT")[0:6]))
+
+
+def delta(date_string):
+    now = datetime.datetime.utcnow()
+    return parse_expires(date_string) - now
+
+
+@pytest.fixture
+def cachetest_content(root, filedepot):
+    image = asset('sendeschluss.jpg').read()
+    root['textfile'] = File("file contents", u"mytext.txt", u"text/plain")
+    root['image'] = Image(image, u"sendeschluss.jpg", u"image/jpeg")
+
+
 class TestSetMaxAge:
     def test_preserve_existing_headers(self):
         response = Dummy(headers={
@@ -76,3 +97,61 @@ def test_request_has_no_context(self):
             set_cache_headers(event)
 
             assert chooser.call_count == 0
+
+
+class TestBrowser:
+
+    def test_cache_unauth(self, webtest, cachetest_content):
+
+        # html
+        resp = webtest.app.get('/')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache HTML'
+        assert resp.headers.get('Cache-Control') == 'max-age=0,s-maxage=3600'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) < (0, 0)
+
+        # media content
+        resp = webtest.app.get('/textfile/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
+        assert resp.headers.get('Cache-Control') == 'max-age=14400'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) > (0, 14000)
+        resp = webtest.app.get('/image/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
+
+        # resources
+        resp = webtest.app.get('/static-kotti/base.css')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
+        assert resp.headers.get('Cache-Control') == 'max-age=2764800,public'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) > (30, 0)
+        assert 'Last-Modified' in resp.headers
+
+        # post
+        resp = webtest.app.post('/', '')
+        assert 'X-Caching-Policy' not in resp.headers
+
+        # 404
+        resp = webtest.app.get('/this-isnt-here', status=404)
+        assert 'X-Caching-Policy' not in resp.headers
+
+    @pytest.mark.user('admin')
+    def test_cache_auth(self, webtest, cachetest_content):
+
+        # html
+        resp = webtest.app.get('/')
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
+
+        # media content
+        resp = webtest.app.get('/textfile/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
+        resp = webtest.app.get('/image/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
+
+        # resources
+        resp = webtest.app.get('/static-kotti/base.css')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
+
+        # 404
+        resp = webtest.app.get('/this-isnt-here', status=404)
+        assert 'X-Caching-Policy' not in resp.headers

From 8b8777a517ea25d2f517e139d9b8401c10ff3459 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 10 Oct 2015 01:49:22 +0200
Subject: [PATCH 381/600] Replace browser-errors.txt with equivalent webtest
 tests.

---
 kotti/tests/browser-errors.txt     | 45 ------------------------------
 kotti/tests/test_httpexceptions.py | 16 +++++++++++
 2 files changed, 16 insertions(+), 45 deletions(-)
 delete mode 100644 kotti/tests/browser-errors.txt
 create mode 100644 kotti/tests/test_httpexceptions.py

diff --git a/kotti/tests/browser-errors.txt b/kotti/tests/browser-errors.txt
deleted file mode 100644
index a28ecf618..000000000
--- a/kotti/tests/browser-errors.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Kotti HTTP Exception browser tests
-==================================
-
-Setup
------
-Create references to some useful tools:
-
-   >>> from kotti import testing
-   >>> tools = testing.setUpFunctional()
-   >>> browser = tools['Browser']()
-   >>> ctrl = browser.getControl
-
-Tell the zope test browser to not raise errors for HTTP exceptions:
-
-   >>> browser.raiseHttpErrors = False
-
-Open the front page:
-
-   >>> browser.open(testing.BASE_URL)
-
-
-HTTP Not Found (404)
---------------------
-A 404 Not Found view results in a nicely formatted, albeit plain page:
-
-  >>> browser.open(testing.BASE_URL + '/non-existent')
-  >>> 'Not Found' in browser.contents
-  True
-
-The not found view renders similarly for authenticated users.
-
-After logging in:
-
-  >>> browser.open(testing.BASE_URL + '/login')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-
-We should see the error message when visiting a URL that does not exist:
-
-  >>> browser.open(testing.BASE_URL + '/non-existent')
-  >>> 'Not Found' in browser.contents
-  True
-
-
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
new file mode 100644
index 000000000..2712d6a54
--- /dev/null
+++ b/kotti/tests/test_httpexceptions.py
@@ -0,0 +1,16 @@
+""" Kotti HTTP Exception browser tests """
+
+import pytest
+
+
+def test_404_anon(webtest, root):
+
+    resp = webtest.app.get('/non-existent', status=404)
+    assert 'Not Found' in resp.text
+
+
+@pytest.mark.user('admin')
+def test_404_anon(webtest, root):
+
+    resp = webtest.app.get('/non-existent', status=404)
+    assert 'Not Found' in resp.text

From 8be754feb1f1d23d96b7811e7389439ed8fb017c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 11 Dec 2015 01:49:11 +0100
Subject: [PATCH 382/600] Replace browser-search.txt with equivalent webtest
 tests.

---
 kotti/tests/browser-search.txt |  88 ---------------
 kotti/tests/test_search.py     | 199 +++++++++++++++++++--------------
 2 files changed, 116 insertions(+), 171 deletions(-)
 delete mode 100644 kotti/tests/browser-search.txt

diff --git a/kotti/tests/browser-search.txt b/kotti/tests/browser-search.txt
deleted file mode 100644
index 1a060b2c9..000000000
--- a/kotti/tests/browser-search.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-kotti search browser tests
-==========================
-
-Setup and Login
----------------
-  >>> from kotti import testing
-  >>> tools = testing.setUpFunctional(
-  ...     **{})
-  >>> browser = tools['Browser']()
-  >>> ctrl = browser.getControl
-
-  >>> browser.open(testing.BASE_URL + '/edit')
-  >>> "Log in" in browser.contents
-  True
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-
-
-Add some documents
-------------------
-
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Document 1"
-  >>> ctrl("Description").value = u'I am the first Document'
-  >>> ctrl("save").click()
-  >>> "Item was added" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/document-1/'
-  True
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink(url="/add_document").click()
-
-  >>> ctrl("Title").value = u'Document 2'
-  >>> ctrl("Description").value = u'And I am the second Document'
-  >>> ctrl("save").click()
-  >>> u'Item was added' in browser.contents
-  True
-
-
-Search the documents
---------------------
-
-  >>> browser.open(testing.BASE_URL)
-  >>> ctrl(name='search-term').value = u'Document 1'
-  >>> ctrl(name='search-submit').click()
-  >>> browser.url
-  'http://localhost:6543/@@search-results'
-
-
-  >>> u'<p>I am the first Document' in browser.contents
-  True
-  >>> u'<p>And I am the second Document' in browser.contents
-  False
-
-  >>> browser.open(testing.BASE_URL)
-  >>> ctrl(name='search-term').value = u'Document 2'
-  >>> ctrl(name='search-submit').click()
-  >>> u'<p>I am the first Document' in browser.contents
-  False
-  >>> u'<p>And I am the second Document' in browser.contents
-  True
-
-
-  >>> browser.open(testing.BASE_URL)
-  >>> ctrl(name='search-term').value = u'Document'
-  >>> ctrl(name='search-submit').click()
-  >>> u'<p>I am the first Document' in browser.contents
-  True
-  >>> u'<p>And I am the second Document' in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL)
-  >>> ctrl(name='search-term').value = u'the second Document'
-  >>> ctrl(name='search-submit').click()
-  >>> u'<p>I am the first Document' in browser.contents
-  False
-  >>> u'<p>And I am the second Document' in browser.contents
-  True
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/kotti/tests/test_search.py b/kotti/tests/test_search.py
index 25f7ea8ee..82ef50c1f 100644
--- a/kotti/tests/test_search.py
+++ b/kotti/tests/test_search.py
@@ -1,17 +1,23 @@
 from kotti.testing import DummyRequest
 
 
-def create_contents(root):
+def _create_contents(root):
     from kotti.resources import Content, File
-    doc1 = root['doc1'] = Content(title=u'First Document')
-    doc11 = root['doc1']['doc11'] = Content(title=u'Second Document')
-    doc12 = root['doc1']['doc12'] = Content(title=u'Third Document')
-    file1 = root['doc1']['file1'] = File(title=u'First File',
-                                         description=u'this is a file')
+    doc1 = root['doc1'] = Content(
+        title=u'First Document',
+        description=u'I am the first.')
+    doc11 = root['doc1']['doc11'] = Content(
+        title=u'Second Document',
+        description=u'And I am the second.')
+    doc12 = root['doc1']['doc12'] = Content(
+        title=u'Third Document')
+    file1 = root['doc1']['file1'] = File(
+        title=u'First File',
+        description=u'this is a file')
     return doc1, doc11, doc12, file1
 
 
-def create_contents_with_tags(root=None):
+def _create_contents_with_tags(root=None):
     from kotti.resources import get_root
     from kotti.resources import Content, File
     if root is None:
@@ -35,79 +41,106 @@ def create_contents_with_tags(root=None):
     return animals, cat, dog, monkey, gorilla, monkey_file
 
 
-class TestSearch:
-
-    def test_search_empty_content(self, db_session):
-        from kotti.views.util import search_content
-        request = DummyRequest()
-        results = search_content(u'teststring', request)
-        assert results == []
-
-    def test_search_content(self, root):
-        from kotti.views.util import search_content
-        from kotti import DBSession
-        from kotti.resources import Tag
-
-        request = DummyRequest()
-        doc1, doc11, doc12, file1 = create_contents(root)
-        results = search_content(u'First Document', request)
-        assert len(results) == 1
-        assert results[0]['name'] == u'doc1'
-        assert results[0]['title'] == u'First Document'
-        results = search_content(u'Document', request)
-        # The frontpage contains 'Documentation' in its body!
-        assert len(results) == 4
-        assert results[1]['name'] == u'doc11'
-        assert results[1]['title'] == u'Second Document'
-        assert results[1]['path'] == '/doc1/doc11/'
-        assert results[1]['path'][-1] == '/'
-
-        animals, cat, dog, \
-            monkey, gorilla, monkey_file = create_contents_with_tags()
-
-        tags = DBSession.query(Tag).all()
-        assert len(tags) == 6
-        results = search_content(u'Animals', request)
-        assert len(results) == 6
-        results = search_content(u'Cat', request)
-        assert len(results) == 1
-        results = search_content(u'Primate', request)
-        assert len(results) == 3
-
-        # Tags were included in general search by modifying the pre-existing
-        # approach, wherein searching first worked on title and description,
-        # then on body, so that the search order became:
-        #
-        #     first on title + description
-        #         then on tags
-        #             then on body
-        #
-        # So we test here to assure search results come back in that order.
-        # Searching on 'Animals', we should find all 6 content items, and the
-        # first item should be the Animals folder, found with a title hit, and
-        # the other items were found via tags.
-        #
-        # Note: this ordering is done to have some method, but it does not
-        #       necessarily constitute a specification.
-        #
-        results = search_content(u'Animals', request)
-        assert len(results) == 6
-        assert results[0]['name'] == 'animals'
-
-    def test_search_file_description(self, root):
-        from kotti.views.util import search_content
-        request = DummyRequest()
-        doc1, doc11, doc12, file1 = create_contents(root)
-        results = search_content(u'this is a file', request)
-        assert len(results) == 1
-        assert results[0]['name'] == 'file1'
-        assert results[0]['title'] == 'First File'
-        assert results[0]['path'] == '/doc1/file1/'
-
-    def test_search_content_without_permission(self, config, root):
-        from kotti.views.util import search_content
-        request = DummyRequest()
-        create_contents(root)
-        config.testing_securitypolicy(permissive=False)
-        results = search_content(u'Document', request)
-        assert len(results) == 0
+def test_search_empty_content(db_session):
+    from kotti.views.util import search_content
+    request = DummyRequest()
+    results = search_content(u'teststring', request)
+    assert results == []
+
+
+def test_search_content(root):
+    from kotti.views.util import search_content
+    from kotti import DBSession
+    from kotti.resources import Tag
+
+    request = DummyRequest()
+    doc1, doc11, doc12, file1 = _create_contents(root)
+    results = search_content(u'First Document', request)
+    assert len(results) == 1
+    assert results[0]['name'] == u'doc1'
+    assert results[0]['title'] == u'First Document'
+    results = search_content(u'Document', request)
+    # The frontpage contains 'Documentation' in its body!
+    assert len(results) == 4
+    assert results[1]['name'] == u'doc11'
+    assert results[1]['title'] == u'Second Document'
+    assert results[1]['path'] == '/doc1/doc11/'
+    assert results[1]['path'][-1] == '/'
+
+    animals, cat, dog, \
+        monkey, gorilla, monkey_file = _create_contents_with_tags()
+
+    tags = DBSession.query(Tag).all()
+    assert len(tags) == 6
+    results = search_content(u'Animals', request)
+    assert len(results) == 6
+    results = search_content(u'Cat', request)
+    assert len(results) == 1
+    results = search_content(u'Primate', request)
+    assert len(results) == 3
+
+    # Tags were included in general search by modifying the pre-existing
+    # approach, wherein searching first worked on title and description,
+    # then on body, so that the search order became:
+    #
+    #     first on title + description
+    #         then on tags
+    #             then on body
+    #
+    # So we test here to assure search results come back in that order.
+    # Searching on 'Animals', we should find all 6 content items, and the
+    # first item should be the Animals folder, found with a title hit, and
+    # the other items were found via tags.
+    #
+    # Note: this ordering is done to have some method, but it does not
+    #       necessarily constitute a specification.
+    #
+    results = search_content(u'Animals', request)
+    assert len(results) == 6
+    assert results[0]['name'] == 'animals'
+
+
+def test_search_file_description(root):
+    from kotti.views.util import search_content
+    request = DummyRequest()
+    doc1, doc11, doc12, file1 = _create_contents(root)
+    results = search_content(u'this is a file', request)
+    assert len(results) == 1
+    assert results[0]['name'] == 'file1'
+    assert results[0]['title'] == 'First File'
+    assert results[0]['path'] == '/doc1/file1/'
+
+
+def test_search_content_without_permission(config, root):
+    from kotti.views.util import search_content
+    request = DummyRequest()
+    _create_contents(root)
+    config.testing_securitypolicy(permissive=False)
+    results = search_content(u'Document', request)
+    assert len(results) == 0
+
+
+def test_search_functional(webtest, root):
+
+    doc1, doc11, doc12, file1 = _create_contents(root)
+
+    resp = webtest.app.get('/')
+
+    search_form = resp.forms['form-search']
+    search_form['search-term'] = u'First Document'
+    resp = search_form.submit()
+    assert 'I am the first' in resp.body
+    assert 'And I am the second' not in resp.body
+
+    search_form = resp.forms['form-search']
+    search_form['search-term'] = u'Document'
+    resp = search_form.submit()
+    assert 'I am the first' in resp.body
+    assert 'And I am the second' in resp.body
+
+    search_form = resp.forms['form-search']
+    search_form['search-term'] = u'is a file'
+    resp = search_form.submit()
+    assert 'And I am the second' not in resp.body
+    assert 'Third' not in resp.body
+    assert 'First File' in resp.body

From 9f7d4a9ff6b0a93ac4aaa68bfe7d04fa166d98c6 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 11:15:35 +0100
Subject: [PATCH 383/600] - Completely revise Depot integration. - Make
 kotti.resources.SaveDataMixin more versatile in that it now supports a
 data_filters attribute (or even a completely overridden data attribute) on
 subclasses. - Add migration script for that. - Move all image related code to
 the new kotti_image add on package. - Fix broken upload type selector. -
 Create RFC6266 compliant content disposition headers for non-ASCII filenames.
 - Add request.uploaded_file_response method.

---
 .gitignore                                    |   1 +
 .travis.yml                                   |   1 +
 CHANGES.txt                                   |  32 +-
 development.ini                               |   4 +
 docs/_static/callgraph-served-by-kotti.svg    | 504 ++++++++++++++++++
 docs/_static/callgraph-served-by-tween.svg    | 121 +++++
 docs/api/kotti.views/index.rst                |   1 -
 docs/api/kotti.views/kotti.views.image.rst    |   8 -
 docs/conf.py                                  |   3 +-
 docs/developing/advanced/blobs.rst            | 258 +++++----
 docs/developing/advanced/images.rst           |  20 +-
 docs/developing/basic/configuration.rst       |  40 +-
 kotti/__init__.py                             |   8 +-
 ...ec72f1_add_file_columns_to_images_table.py |  59 ++
 kotti/filedepot.py                            | 297 ++++++++++-
 kotti/interfaces.py                           |  15 +-
 kotti/message.py                              |  42 +-
 kotti/resources.py                            | 115 ++--
 kotti/templates/edit/upload.pt                |  34 +-
 kotti/templates/view/image.pt                 |  22 +-
 kotti/testing.py                              |   2 +
 kotti/tests/__init__.py                       |  88 ++-
 kotti/tests/browser-image.txt                 | 162 ------
 kotti/tests/logo.png                          | Bin 0 -> 55715 bytes
 kotti/tests/test_app.py                       |  43 +-
 kotti/tests/test_cache.py                     |  43 +-
 kotti/tests/test_deprecated.py                |  58 +-
 kotti/tests/test_file.py                      | 164 ++++--
 kotti/tests/test_filedepot.py                 |  57 +-
 kotti/tests/test_image.py                     |  13 -
 kotti/tests/test_node.py                      |  24 -
 kotti/tests/test_upload.py                    |  26 -
 kotti/tests/test_util_views.py                |  24 +-
 kotti/util.py                                 |  38 --
 kotti/views/edit/actions.py                   |   3 +-
 kotti/views/edit/content.py                   |  35 +-
 kotti/views/file.py                           | 101 +---
 kotti/views/form.py                           |   7 +-
 kotti/views/image.py                          | 126 +----
 kotti/views/navigation.py                     |   3 +-
 kotti/views/users.py                          |  14 +-
 kotti/views/util.py                           |  20 +-
 requirements.txt                              |   2 +
 setup.py                                      |   4 +-
 44 files changed, 1704 insertions(+), 938 deletions(-)
 create mode 100644 docs/_static/callgraph-served-by-kotti.svg
 create mode 100644 docs/_static/callgraph-served-by-tween.svg
 delete mode 100644 docs/api/kotti.views/kotti.views.image.rst
 create mode 100644 kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
 delete mode 100644 kotti/tests/browser-image.txt
 create mode 100644 kotti/tests/logo.png
 delete mode 100644 kotti/tests/test_image.py

diff --git a/.gitignore b/.gitignore
index 5e7c94c1b..32a9eab4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ bower_components
 node_modules
 __pycache__
 
+filestore
diff --git a/.travis.yml b/.travis.yml
index 5e9f44418..0b3cfcfd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 sudo: false
+cache: pip
 python:
   - "2.6"
   - "2.7"
diff --git a/CHANGES.txt b/CHANGES.txt
index 7cd9abbb0..0eb0844ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,38 @@
 Change History
 ==============
 
-1.2.5 - unreleased
+1.3.0 - unreleased
 ------------------
 
-- No changes yet.
+- Completely revised ``Depot`` integration.  See
+  http://kotti.readthedocs.org/en/latest/developing/advanced/blobs.html
+  for details.
+
+- Make ``kotti.resources.SaveDataMixin`` more versatile in that it now supports
+  a ``data_filters`` attribute (or even a completely overridden ``data``
+  attribute) on subclasses.  For an example for what this is useful, see the
+  new ``kotti_image`` package's readme and the Depot documentation
+  (http://depot.readthedocs.org/en/latest/database.html#custom-behaviour-in-attachments).
+
+  ** These changes require a database migration. **
+
+  A migration script is included, which can be executed by running
+  ``kotti-migrate <your.ini> upgrade_all``.  However, this script will fail if
+  you subclassed from ``kotti.resources.Image`` in your application.  It also
+  doesn't cover custom classes inherited from ``kotti.resources.File`` (other
+  than Kotti's ``Image``).  Migration of those can be performed easily, by
+  copying the code from the included migration step to your package's migration
+  environment and adjust it to your needs.
+
+- Move all image related code to the new ``kotti_image`` add on package.
+  All classes and functions are imported into their former place, so that code
+  that imports from there will still be working.
+
+- Fix broken upload type selector.
+
+- Create RFC6266 compliant content disposition headers for non-ASCII filenames.
+
+- Add request.uploaded_file_response method.
 
 1.2.4 - 2015-11-26
 ------------------
diff --git a/development.ini b/development.ini
index 655dbabd9..1b833ba48 100644
--- a/development.ini
+++ b/development.ini
@@ -18,6 +18,10 @@ kotti.configurators = kotti_tinymce.kotti_configure
 kotti.site_title = My Kotti site
 kotti.secret = qwerty
 
+#kotti.depot.0.name = localfs
+#kotti.depot.0.backend = depot.io.local.LocalFileStorage
+#kotti.depot.0.storage_path = %(here)s/filestore
+
 [filter:fanstatic]
 use = egg:fanstatic#fanstatic
 
diff --git a/docs/_static/callgraph-served-by-kotti.svg b/docs/_static/callgraph-served-by-kotti.svg
new file mode 100644
index 000000000..904235529
--- /dev/null
+++ b/docs/_static/callgraph-served-by-kotti.svg
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="2719pt" height="703pt"
+ viewBox="0.00 0.00 2719.00 702.87" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 698.873)">
+<title>G</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-698.873 2715,-698.873 2715,4 -4,4"/>
+<text text-anchor="middle" x="1355.5" y="-15.4146" font-family="Verdana" font-size="7.00" fill="#000000">Generated by Python Call Graph v1.0.1</text>
+<text text-anchor="middle" x="1355.5" y="-6.90732" font-family="Verdana" font-size="7.00" fill="#000000">http://pycallgraph.slowchop.com</text>
+<g id="clust1" class="cluster"><title>cluster_kotti</title>
+<polygon fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.800000" points="8,-33.0146 8,-588.212 2703,-588.212 2703,-33.0146 8,-33.0146"/>
+<text text-anchor="middle" x="1355.5" y="-576.212" font-family="Verdana" font-size="10.00">kotti</text>
+</g>
+<g id="clust2" class="cluster"><title>cluster___main__</title>
+<polygon fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.800000" points="1428,-614.719 1428,-686.873 1518,-686.873 1518,-614.719 1428,-614.719"/>
+<text text-anchor="middle" x="1473" y="-674.873" font-family="Verdana" font-size="10.00">__main__</text>
+</g>
+<!-- kotti.security.is_user -->
+<g id="node1" class="node"><title>kotti.security.is_user</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="2413.62,-479.551 2324.38,-479.551 2324.38,-443.551 2413.62,-443.551 2413.62,-479.551"/>
+<text text-anchor="middle" x="2369" y="-468.712" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.is_user</text>
+<text text-anchor="middle" x="2369" y="-460.205" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2369" y="-451.698" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000010s</text>
+</g>
+<!-- kotti.resources.DefaultRootCache.get_root -->
+<g id="node2" class="node"><title>kotti.resources.DefaultRootCache.get_root</title>
+<polygon fill="#aab8e5" stroke="#aab8e5" points="2278.94,-77.0146 2113.06,-77.0146 2113.06,-41.0146 2278.94,-41.0146 2278.94,-77.0146"/>
+<text text-anchor="middle" x="2196" y="-66.1756" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.DefaultRootCache.get_root</text>
+<text text-anchor="middle" x="2196" y="-57.6683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2196" y="-49.161" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.466594s</text>
+</g>
+<!-- kotti.resources.File.__parent__ -->
+<g id="node3" class="node"><title>kotti.resources.File.__parent__</title>
+<polygon fill="#ccdde5" stroke="#ccdde5" points="2695.08,-560.059 2568.92,-560.059 2568.92,-524.059 2695.08,-524.059 2695.08,-560.059"/>
+<text text-anchor="middle" x="2632" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.File.__parent__</text>
+<text text-anchor="middle" x="2632" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 4</text>
+<text text-anchor="middle" x="2632" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.141308s</text>
+</g>
+<!-- kotti.sqla.MutationList.replacer -->
+<g id="node4" class="node"><title>kotti.sqla.MutationList.replacer</title>
+<polygon fill="#dde4e5" stroke="#dde4e5" points="2552.35,-238.029 2427.65,-238.029 2427.65,-202.029 2552.35,-202.029 2552.35,-238.029"/>
+<text text-anchor="middle" x="2490" y="-227.19" font-family="Verdana" font-size="7.00" fill="#000000">kotti.sqla.MutationList.replacer</text>
+<text text-anchor="middle" x="2490" y="-218.683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 4</text>
+<text text-anchor="middle" x="2490" y="-210.176" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000070s</text>
+</g>
+<!-- kotti.security.&lt;genexpr&gt; -->
+<g id="node5" class="node"><title>kotti.security.&lt;genexpr&gt;</title>
+<polygon fill="#ccdde5" stroke="#ccdde5" points="2367.95,-238.029 2264.05,-238.029 2264.05,-202.029 2367.95,-202.029 2367.95,-238.029"/>
+<text text-anchor="middle" x="2316" y="-227.19" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.&lt;genexpr&gt;</text>
+<text text-anchor="middle" x="2316" y="-218.683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 13</text>
+<text text-anchor="middle" x="2316" y="-210.176" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000448s</text>
+</g>
+<!-- kotti.filedepot.Request.uploaded_file_response -->
+<g id="node6" class="node"><title>kotti.filedepot.Request.uploaded_file_response</title>
+<polygon fill="#dfe5e5" stroke="#dfe5e5" points="1651.59,-479.551 1470.41,-479.551 1470.41,-443.551 1651.59,-443.551 1651.59,-479.551"/>
+<text text-anchor="middle" x="1561" y="-468.712" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.Request.uploaded_file_response</text>
+<text text-anchor="middle" x="1561" y="-460.205" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1561" y="-451.698" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.030320s</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__ -->
+<g id="node23" class="node"><title>kotti.filedepot.StoredFileResponse.__init__</title>
+<polygon fill="#e2e5e5" stroke="#e2e5e5" points="1496.82,-399.044 1329.18,-399.044 1329.18,-363.044 1496.82,-363.044 1496.82,-399.044"/>
+<text text-anchor="middle" x="1413" y="-388.205" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.StoredFileResponse.__init__</text>
+<text text-anchor="middle" x="1413" y="-379.698" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1413" y="-371.19" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.007179s</text>
+</g>
+<!-- kotti.filedepot.Request.uploaded_file_response&#45;&gt;kotti.filedepot.StoredFileResponse.__init__ -->
+<g id="edge5" class="edge"><title>kotti.filedepot.Request.uploaded_file_response&#45;&gt;kotti.filedepot.StoredFileResponse.__init__</title>
+<path fill="none" stroke="#b0b2b2" d="M1528.89,-443.516C1506.97,-431.891 1477.75,-416.389 1454.13,-403.861"/>
+<polygon fill="#b0b2b2" stroke="#b0b2b2" points="1455.53,-400.64 1445.05,-399.046 1452.25,-406.824 1455.53,-400.64"/>
+<text text-anchor="middle" x="1493.23" y="-419.951" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.security.list_groups_callback -->
+<g id="node7" class="node"><title>kotti.security.list_groups_callback</title>
+<polygon fill="#bdd1e5" stroke="#bdd1e5" points="2550.6,-560.059 2415.4,-560.059 2415.4,-524.059 2550.6,-524.059 2550.6,-560.059"/>
+<text text-anchor="middle" x="2483" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.list_groups_callback</text>
+<text text-anchor="middle" x="2483" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2483" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.307940s</text>
+</g>
+<!-- kotti.security.list_groups_callback&#45;&gt;kotti.security.is_user -->
+<g id="edge18" class="edge"><title>kotti.security.list_groups_callback&#45;&gt;kotti.security.is_user</title>
+<path fill="none" stroke="#b1b2b2" d="M2458.26,-524.024C2441.83,-512.707 2420.06,-497.717 2402.14,-485.373"/>
+<polygon fill="#b1b2b2" stroke="#b1b2b2" points="2403.91,-482.342 2393.69,-479.553 2399.94,-488.107 2403.91,-482.342"/>
+<text text-anchor="middle" x="2431.23" y="-500.459" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.security.list_groups -->
+<g id="node20" class="node"><title>kotti.security.list_groups</title>
+<polygon fill="#c1d4e5" stroke="#c1d4e5" points="2534.11,-479.551 2431.89,-479.551 2431.89,-443.551 2534.11,-443.551 2534.11,-479.551"/>
+<text text-anchor="middle" x="2483" y="-468.712" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.list_groups</text>
+<text text-anchor="middle" x="2483" y="-460.205" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2483" y="-451.698" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.280317s</text>
+</g>
+<!-- kotti.security.list_groups_callback&#45;&gt;kotti.security.list_groups -->
+<g id="edge19" class="edge"><title>kotti.security.list_groups_callback&#45;&gt;kotti.security.list_groups</title>
+<path fill="none" stroke="#96a5b2" d="M2483,-524.024C2483,-514.045 2483,-501.209 2483,-489.85"/>
+<polygon fill="#96a5b2" stroke="#96a5b2" points="2486.5,-489.553 2483,-479.553 2479.5,-489.553 2486.5,-489.553"/>
+<text text-anchor="middle" x="2485.23" y="-500.459" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.security.get_principals -->
+<g id="node24" class="node"><title>kotti.security.get_principals</title>
+<polygon fill="#dde4e5" stroke="#dde4e5" points="2683.51,-238.029 2570.49,-238.029 2570.49,-202.029 2683.51,-202.029 2683.51,-238.029"/>
+<text text-anchor="middle" x="2627" y="-227.19" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.get_principals</text>
+<text text-anchor="middle" x="2627" y="-218.683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 4</text>
+<text text-anchor="middle" x="2627" y="-210.176" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000696s</text>
+</g>
+<!-- kotti.security.list_groups_callback&#45;&gt;kotti.security.get_principals -->
+<g id="edge17" class="edge"><title>kotti.security.list_groups_callback&#45;&gt;kotti.security.get_principals</title>
+<path fill="none" stroke="#b0b2b2" d="M2544.56,-523.978C2605.9,-506.06 2691,-478.352 2691,-462.551 2691,-462.551 2691,-462.551 2691,-299.537 2691,-277.823 2676.11,-258.792 2660.7,-244.907"/>
+<polygon fill="#b0b2b2" stroke="#b0b2b2" points="2662.56,-241.902 2652.66,-238.128 2658.05,-247.252 2662.56,-241.902"/>
+<text text-anchor="middle" x="2693.23" y="-379.698" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.get_settings -->
+<g id="node8" class="node"><title>kotti.get_settings</title>
+<polygon fill="#dbe4e5" stroke="#dbe4e5" points="2474.74,-157.522 2397.26,-157.522 2397.26,-121.522 2474.74,-121.522 2474.74,-157.522"/>
+<text text-anchor="middle" x="2436" y="-146.683" font-family="Verdana" font-size="7.00" fill="#000000">kotti.get_settings</text>
+<text text-anchor="middle" x="2436" y="-138.176" font-family="Verdana" font-size="7.00" fill="#000000">calls: 5</text>
+<text text-anchor="middle" x="2436" y="-129.668" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000491s</text>
+</g>
+<!-- kotti.security._cachekey_list_groups_raw -->
+<g id="node9" class="node"><title>kotti.security._cachekey_list_groups_raw</title>
+<polygon fill="#cedee5" stroke="#cedee5" points="1774.7,-318.537 1613.3,-318.537 1613.3,-282.537 1774.7,-282.537 1774.7,-318.537"/>
+<text text-anchor="middle" x="1694" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security._cachekey_list_groups_raw</text>
+<text text-anchor="middle" x="1694" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 12</text>
+<text text-anchor="middle" x="1694" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000468s</text>
+</g>
+<!-- kotti.sqla.NestedMutationDict.__init__ -->
+<g id="node10" class="node"><title>kotti.sqla.NestedMutationDict.__init__</title>
+<polygon fill="#cadce5" stroke="#cadce5" points="2055.57,-479.551 1904.43,-479.551 1904.43,-443.551 2055.57,-443.551 2055.57,-479.551"/>
+<text text-anchor="middle" x="1980" y="-468.712" font-family="Verdana" font-size="7.00" fill="#000000">kotti.sqla.NestedMutationDict.__init__</text>
+<text text-anchor="middle" x="1980" y="-460.205" font-family="Verdana" font-size="7.00" fill="#000000">calls: 14</text>
+<text text-anchor="middle" x="1980" y="-451.698" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000457s</text>
+</g>
+<!-- kotti.sqla.NestedMutationDict.__init__&#45;&gt;kotti.sqla.NestedMutationDict.__init__ -->
+<g id="edge30" class="edge"><title>kotti.sqla.NestedMutationDict.__init__&#45;&gt;kotti.sqla.NestedMutationDict.__init__</title>
+<path fill="none" stroke="#a8b0b2" d="M2055.6,-468.282C2066.34,-467.193 2073.54,-464.95 2073.54,-461.551 2073.54,-459.374 2070.58,-457.671 2065.64,-456.442"/>
+<polygon fill="#a8b0b2" stroke="#a8b0b2" points="2066.03,-452.961 2055.6,-454.821 2064.92,-459.871 2066.03,-452.961"/>
+<text text-anchor="middle" x="2075.76" y="-460.205" font-family="Verdana" font-size="7.00" fill="#000000">7</text>
+</g>
+<!-- kotti.util.replacement -->
+<g id="node11" class="node"><title>kotti.util.replacement</title>
+<polygon fill="#9a9be5" stroke="#9a9be5" points="2383.51,-399.044 2292.49,-399.044 2292.49,-363.044 2383.51,-363.044 2383.51,-399.044"/>
+<text text-anchor="middle" x="2338" y="-388.205" font-family="Verdana" font-size="7.00" fill="#000000">kotti.util.replacement</text>
+<text text-anchor="middle" x="2338" y="-379.698" font-family="Verdana" font-size="7.00" fill="#000000">calls: 19</text>
+<text text-anchor="middle" x="2338" y="-371.19" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.319137s</text>
+</g>
+<!-- kotti.util.replacement&#45;&gt;kotti.security._cachekey_list_groups_raw -->
+<g id="edge28" class="edge"><title>kotti.util.replacement&#45;&gt;kotti.security._cachekey_list_groups_raw</title>
+<path fill="none" stroke="#a0adb2" d="M2292.16,-376.189C2198.61,-368.057 1978.81,-347.599 1785.04,-318.79"/>
+<polygon fill="#a0adb2" stroke="#a0adb2" points="1785.37,-315.3 1774.96,-317.28 1784.33,-322.223 1785.37,-315.3"/>
+<text text-anchor="middle" x="1984.45" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">12</text>
+</g>
+<!-- kotti.security._cachekey_list_groups_ext -->
+<g id="node25" class="node"><title>kotti.security._cachekey_list_groups_ext</title>
+<polygon fill="#dfe5e5" stroke="#dfe5e5" points="1951.51,-318.537 1792.49,-318.537 1792.49,-282.537 1951.51,-282.537 1951.51,-318.537"/>
+<text text-anchor="middle" x="1872" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security._cachekey_list_groups_ext</text>
+<text text-anchor="middle" x="1872" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 3</text>
+<text text-anchor="middle" x="1872" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000088s</text>
+</g>
+<!-- kotti.util.replacement&#45;&gt;kotti.security._cachekey_list_groups_ext -->
+<g id="edge27" class="edge"><title>kotti.util.replacement&#45;&gt;kotti.security._cachekey_list_groups_ext</title>
+<path fill="none" stroke="#aeb2b2" d="M2292.38,-373.008C2223.29,-362.263 2087.73,-340.834 1961.77,-318.647"/>
+<polygon fill="#aeb2b2" stroke="#aeb2b2" points="1962.01,-315.136 1951.56,-316.843 1960.8,-322.03 1962.01,-315.136"/>
+<text text-anchor="middle" x="2118.23" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">3</text>
+</g>
+<!-- kotti.security.list_groups_raw -->
+<g id="node33" class="node"><title>kotti.security.list_groups_raw</title>
+<polygon fill="#cedee5" stroke="#cedee5" points="2251.82,-318.537 2132.18,-318.537 2132.18,-282.537 2251.82,-282.537 2251.82,-318.537"/>
+<text text-anchor="middle" x="2192" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.list_groups_raw</text>
+<text text-anchor="middle" x="2192" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 12</text>
+<text text-anchor="middle" x="2192" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.002851s</text>
+</g>
+<!-- kotti.util.replacement&#45;&gt;kotti.security.list_groups_raw -->
+<g id="edge24" class="edge"><title>kotti.util.replacement&#45;&gt;kotti.security.list_groups_raw</title>
+<path fill="none" stroke="#a0acb2" d="M2306.32,-363.009C2284.7,-351.384 2255.87,-335.882 2232.57,-323.354"/>
+<polygon fill="#a0acb2" stroke="#a0acb2" points="2234.08,-320.192 2223.62,-318.538 2230.77,-326.357 2234.08,-320.192"/>
+<text text-anchor="middle" x="2273.45" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">12</text>
+</g>
+<!-- kotti.security.Principals.__getitem__ -->
+<g id="node34" class="node"><title>kotti.security.Principals.__getitem__</title>
+<polygon fill="#dce4e5" stroke="#dce4e5" points="2114.43,-318.537 1969.57,-318.537 1969.57,-282.537 2114.43,-282.537 2114.43,-318.537"/>
+<text text-anchor="middle" x="2042" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.Principals.__getitem__</text>
+<text text-anchor="middle" x="2042" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 3</text>
+<text text-anchor="middle" x="2042" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.026548s</text>
+</g>
+<!-- kotti.util.replacement&#45;&gt;kotti.security.Principals.__getitem__ -->
+<g id="edge25" class="edge"><title>kotti.util.replacement&#45;&gt;kotti.security.Principals.__getitem__</title>
+<path fill="none" stroke="#abb1b2" d="M2292.4,-367.949C2245.43,-355.493 2171.48,-335.879 2116.1,-321.191"/>
+<polygon fill="#abb1b2" stroke="#abb1b2" points="2116.9,-317.781 2106.34,-318.601 2115.11,-324.547 2116.9,-317.781"/>
+<text text-anchor="middle" x="2200.23" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">3</text>
+</g>
+<!-- kotti.security.Principals.&lt;lambda&gt; -->
+<g id="node35" class="node"><title>kotti.security.Principals.&lt;lambda&gt;</title>
+<polygon fill="#dde4e5" stroke="#dde4e5" points="2406.5,-318.537 2269.5,-318.537 2269.5,-282.537 2406.5,-282.537 2406.5,-318.537"/>
+<text text-anchor="middle" x="2338" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.Principals.&lt;lambda&gt;</text>
+<text text-anchor="middle" x="2338" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 4</text>
+<text text-anchor="middle" x="2338" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000025s</text>
+</g>
+<!-- kotti.util.replacement&#45;&gt;kotti.security.Principals.&lt;lambda&gt; -->
+<g id="edge26" class="edge"><title>kotti.util.replacement&#45;&gt;kotti.security.Principals.&lt;lambda&gt;</title>
+<path fill="none" stroke="#acb1b2" d="M2338,-363.009C2338,-353.03 2338,-340.194 2338,-328.835"/>
+<polygon fill="#acb1b2" stroke="#acb1b2" points="2341.5,-328.538 2338,-318.538 2334.5,-328.538 2341.5,-328.538"/>
+<text text-anchor="middle" x="2340.23" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">4</text>
+</g>
+<!-- kotti.security.list_groups_ext -->
+<g id="node36" class="node"><title>kotti.security.list_groups_ext</title>
+<polygon fill="#bcd0e5" stroke="#bcd0e5" points="2672.13,-318.537 2553.87,-318.537 2553.87,-282.537 2672.13,-282.537 2672.13,-318.537"/>
+<text text-anchor="middle" x="2613" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.list_groups_ext</text>
+<text text-anchor="middle" x="2613" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 3</text>
+<text text-anchor="middle" x="2613" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.285032s</text>
+</g>
+<!-- kotti.util.replacement&#45;&gt;kotti.security.list_groups_ext -->
+<g id="edge23" class="edge"><title>kotti.util.replacement&#45;&gt;kotti.security.list_groups_ext</title>
+<path fill="none" stroke="#92a1b2" d="M2383.72,-366.992C2427.39,-354.525 2493.79,-335.568 2543.92,-321.258"/>
+<polygon fill="#92a1b2" stroke="#92a1b2" points="2545.06,-324.572 2553.71,-318.461 2543.14,-317.841 2545.06,-324.572"/>
+<text text-anchor="middle" x="2493.23" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">3</text>
+</g>
+<!-- kotti.util.request_container -->
+<g id="node40" class="node"><title>kotti.util.request_container</title>
+<polygon fill="#c1d4e5" stroke="#c1d4e5" points="2535.65,-318.537 2424.35,-318.537 2424.35,-282.537 2535.65,-282.537 2535.65,-318.537"/>
+<text text-anchor="middle" x="2480" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.util.request_container</text>
+<text text-anchor="middle" x="2480" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 19</text>
+<text text-anchor="middle" x="2480" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.001191s</text>
+</g>
+<!-- kotti.util.replacement&#45;&gt;kotti.util.request_container -->
+<g id="edge29" class="edge"><title>kotti.util.replacement&#45;&gt;kotti.util.request_container</title>
+<path fill="none" stroke="#96a4b2" d="M2368.81,-363.009C2389.75,-351.435 2417.63,-336.019 2440.24,-323.521"/>
+<polygon fill="#96a4b2" stroke="#96a4b2" points="2442.19,-326.44 2449.25,-318.538 2438.8,-320.314 2442.19,-326.44"/>
+<text text-anchor="middle" x="2421.45" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">19</text>
+</g>
+<!-- kotti.filedepot.DBFileStorage.get -->
+<g id="node12" class="node"><title>kotti.filedepot.DBFileStorage.get</title>
+<polygon fill="#e0e5e5" stroke="#e0e5e5" points="2397.18,-560.059 2266.82,-560.059 2266.82,-524.059 2397.18,-524.059 2397.18,-560.059"/>
+<text text-anchor="middle" x="2332" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.DBFileStorage.get</text>
+<text text-anchor="middle" x="2332" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2332" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.022635s</text>
+</g>
+<!-- kotti.resources.DefaultRootCache.root_id -->
+<g id="node13" class="node"><title>kotti.resources.DefaultRootCache.root_id</title>
+<polygon fill="#bdd1e5" stroke="#bdd1e5" points="2248.44,-560.059 2087.56,-560.059 2087.56,-524.059 2248.44,-524.059 2248.44,-560.059"/>
+<text text-anchor="middle" x="2168" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.DefaultRootCache.root_id</text>
+<text text-anchor="middle" x="2168" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2168" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.308565s</text>
+</g>
+<!-- kotti.sqla.coerce -->
+<g id="node14" class="node"><title>kotti.sqla.coerce</title>
+<polygon fill="#9998e5" stroke="#9998e5" points="2069.14,-560.059 1994.86,-560.059 1994.86,-524.059 2069.14,-524.059 2069.14,-560.059"/>
+<text text-anchor="middle" x="2032" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.sqla.coerce</text>
+<text text-anchor="middle" x="2032" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 40</text>
+<text text-anchor="middle" x="2032" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.001440s</text>
+</g>
+<!-- kotti.sqla.coerce&#45;&gt;kotti.sqla.NestedMutationDict.__init__ -->
+<g id="edge1" class="edge"><title>kotti.sqla.coerce&#45;&gt;kotti.sqla.NestedMutationDict.__init__</title>
+<path fill="none" stroke="#a8b0b2" d="M2020.72,-524.024C2013.77,-513.53 2004.72,-499.878 1996.93,-488.106"/>
+<polygon fill="#a8b0b2" stroke="#a8b0b2" points="1999.7,-485.957 1991.26,-479.553 1993.87,-489.823 1999.7,-485.957"/>
+<text text-anchor="middle" x="2009.23" y="-500.459" font-family="Verdana" font-size="7.00" fill="#000000">7</text>
+</g>
+<!-- kotti.sqla.MutationList.__init__ -->
+<g id="node15" class="node"><title>kotti.sqla.MutationList.__init__</title>
+<polygon fill="#d8e3e5" stroke="#d8e3e5" points="2220.74,-479.551 2095.26,-479.551 2095.26,-443.551 2220.74,-443.551 2220.74,-479.551"/>
+<text text-anchor="middle" x="2158" y="-468.712" font-family="Verdana" font-size="7.00" fill="#000000">kotti.sqla.MutationList.__init__</text>
+<text text-anchor="middle" x="2158" y="-460.205" font-family="Verdana" font-size="7.00" fill="#000000">calls: 7</text>
+<text text-anchor="middle" x="2158" y="-451.698" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000101s</text>
+</g>
+<!-- kotti.sqla.coerce&#45;&gt;kotti.sqla.MutationList.__init__ -->
+<g id="edge2" class="edge"><title>kotti.sqla.coerce&#45;&gt;kotti.sqla.MutationList.__init__</title>
+<path fill="none" stroke="#a8b0b2" d="M2059.34,-524.024C2077.75,-512.553 2102.22,-497.308 2122.18,-484.869"/>
+<polygon fill="#a8b0b2" stroke="#a8b0b2" points="2124.08,-487.812 2130.71,-479.553 2120.38,-481.871 2124.08,-487.812"/>
+<text text-anchor="middle" x="2104.23" y="-500.459" font-family="Verdana" font-size="7.00" fill="#000000">7</text>
+</g>
+<!-- kotti.views.file.inline_view -->
+<g id="node16" class="node"><title>kotti.views.file.inline_view</title>
+<polygon fill="#dfe5e5" stroke="#dfe5e5" points="1976.19,-560.059 1867.81,-560.059 1867.81,-524.059 1976.19,-524.059 1976.19,-560.059"/>
+<text text-anchor="middle" x="1922" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.views.file.inline_view</text>
+<text text-anchor="middle" x="1922" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1922" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.030461s</text>
+</g>
+<!-- kotti.views.file.inline_view&#45;&gt;kotti.filedepot.Request.uploaded_file_response -->
+<g id="edge4" class="edge"><title>kotti.views.file.inline_view&#45;&gt;kotti.filedepot.Request.uploaded_file_response</title>
+<path fill="none" stroke="#aeb2b2" d="M1867.76,-526.2C1864.8,-525.459 1861.87,-524.74 1859,-524.059 1793.17,-508.398 1718.61,-493.011 1660.54,-481.544"/>
+<polygon fill="#aeb2b2" stroke="#aeb2b2" points="1661.12,-478.091 1650.63,-479.594 1659.77,-484.959 1661.12,-478.091"/>
+<text text-anchor="middle" x="1779.23" y="-500.459" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.resources.Document.__eq__ -->
+<g id="node17" class="node"><title>kotti.resources.Document.__eq__</title>
+<polygon fill="#b7c9e5" stroke="#b7c9e5" points="1849.55,-560.059 1714.45,-560.059 1714.45,-524.059 1849.55,-524.059 1849.55,-560.059"/>
+<text text-anchor="middle" x="1782" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.Document.__eq__</text>
+<text text-anchor="middle" x="1782" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 24</text>
+<text text-anchor="middle" x="1782" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.001784s</text>
+</g>
+<!-- kotti.security.Document._get_acl -->
+<g id="node18" class="node"><title>kotti.security.Document._get_acl</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="1696.27,-560.059 1563.73,-560.059 1563.73,-524.059 1696.27,-524.059 1696.27,-560.059"/>
+<text text-anchor="middle" x="1630" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.Document._get_acl</text>
+<text text-anchor="middle" x="1630" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1630" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000103s</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse._get_type_and_encoding -->
+<g id="node19" class="node"><title>kotti.filedepot.StoredFileResponse._get_type_and_encoding</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="1272.54,-318.537 1045.46,-318.537 1045.46,-282.537 1272.54,-282.537 1272.54,-318.537"/>
+<text text-anchor="middle" x="1159" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.StoredFileResponse._get_type_and_encoding</text>
+<text text-anchor="middle" x="1159" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1159" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000135s</text>
+</g>
+<!-- kotti.security.list_groups&#45;&gt;kotti.util.replacement -->
+<g id="edge9" class="edge"><title>kotti.security.list_groups&#45;&gt;kotti.util.replacement</title>
+<path fill="none" stroke="#92a1b2" d="M2451.54,-443.516C2430.07,-431.891 2401.43,-416.389 2378.3,-403.861"/>
+<polygon fill="#92a1b2" stroke="#92a1b2" points="2379.86,-400.729 2369.4,-399.046 2376.53,-406.885 2379.86,-400.729"/>
+<text text-anchor="middle" x="2416.23" y="-419.951" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.TweenFactory.__call__ -->
+<g id="node21" class="node"><title>kotti.filedepot.TweenFactory.__call__</title>
+<polygon fill="#e54ae1" stroke="#e54ae1" points="1546.41,-560.059 1399.59,-560.059 1399.59,-524.059 1546.41,-524.059 1546.41,-560.059"/>
+<text text-anchor="middle" x="1473" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.TweenFactory.__call__</text>
+<text text-anchor="middle" x="1473" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1473" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 1.253096s</text>
+</g>
+<!-- kotti.resources.File.__eq__ -->
+<g id="node22" class="node"><title>kotti.resources.File.__eq__</title>
+<polygon fill="#e1e5e5" stroke="#e1e5e5" points="1381.7,-560.059 1270.3,-560.059 1270.3,-524.059 1381.7,-524.059 1381.7,-560.059"/>
+<text text-anchor="middle" x="1326" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.File.__eq__</text>
+<text text-anchor="middle" x="1326" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 2</text>
+<text text-anchor="middle" x="1326" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000176s</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.StoredFileResponse._get_type_and_encoding -->
+<g id="edge14" class="edge"><title>kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.StoredFileResponse._get_type_and_encoding</title>
+<path fill="none" stroke="#b0b2b2" d="M1357.89,-363.009C1318.44,-350.818 1265.21,-334.364 1223.74,-321.547"/>
+<polygon fill="#b0b2b2" stroke="#b0b2b2" points="1224.59,-318.147 1214.01,-318.538 1222.53,-324.835 1224.59,-318.147"/>
+<text text-anchor="middle" x="1295.23" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.DBStoredFile.public_url -->
+<g id="node32" class="node"><title>kotti.filedepot.DBStoredFile.public_url</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="1440.74,-318.537 1291.26,-318.537 1291.26,-282.537 1440.74,-282.537 1440.74,-318.537"/>
+<text text-anchor="middle" x="1366" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.DBStoredFile.public_url</text>
+<text text-anchor="middle" x="1366" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1366" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000007s</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.DBStoredFile.public_url -->
+<g id="edge15" class="edge"><title>kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.DBStoredFile.public_url</title>
+<path fill="none" stroke="#b1b2b2" d="M1402.8,-363.009C1396.58,-352.618 1388.51,-339.131 1381.51,-327.438"/>
+<polygon fill="#b1b2b2" stroke="#b1b2b2" points="1384.32,-325.32 1376.18,-318.538 1378.31,-328.916 1384.32,-325.32"/>
+<text text-anchor="middle" x="1392.23" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.type.generate_etag -->
+<g id="node42" class="node"><title>kotti.filedepot.type.generate_etag</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="1595.24,-318.537 1458.76,-318.537 1458.76,-282.537 1595.24,-282.537 1595.24,-318.537"/>
+<text text-anchor="middle" x="1527" y="-307.698" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.type.generate_etag</text>
+<text text-anchor="middle" x="1527" y="-299.19" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1527" y="-290.683" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000071s</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.type.generate_etag -->
+<g id="edge16" class="edge"><title>kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.type.generate_etag</title>
+<path fill="none" stroke="#b1b2b2" d="M1437.74,-363.009C1454.17,-351.693 1475.94,-336.702 1493.86,-324.358"/>
+<polygon fill="#b1b2b2" stroke="#b1b2b2" points="1496.06,-327.093 1502.31,-318.538 1492.09,-321.328 1496.06,-327.093"/>
+<text text-anchor="middle" x="1478.23" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.security.get_principals&#45;&gt;kotti.get_settings -->
+<g id="edge6" class="edge"><title>kotti.security.get_principals&#45;&gt;kotti.get_settings</title>
+<path fill="none" stroke="#acb1b2" d="M2585.56,-201.994C2555.73,-189.734 2515.41,-173.161 2484.15,-160.312"/>
+<polygon fill="#acb1b2" stroke="#acb1b2" points="2485.34,-157.018 2474.76,-156.453 2482.68,-163.492 2485.34,-157.018"/>
+<text text-anchor="middle" x="2539.23" y="-178.429" font-family="Verdana" font-size="7.00" fill="#000000">4</text>
+</g>
+<!-- kotti.security.principals_factory -->
+<g id="node28" class="node"><title>kotti.security.principals_factory</title>
+<polygon fill="#dde4e5" stroke="#dde4e5" points="2690.17,-157.522 2563.83,-157.522 2563.83,-121.522 2690.17,-121.522 2690.17,-157.522"/>
+<text text-anchor="middle" x="2627" y="-146.683" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.principals_factory</text>
+<text text-anchor="middle" x="2627" y="-138.176" font-family="Verdana" font-size="7.00" fill="#000000">calls: 4</text>
+<text text-anchor="middle" x="2627" y="-129.668" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000035s</text>
+</g>
+<!-- kotti.security.get_principals&#45;&gt;kotti.security.principals_factory -->
+<g id="edge7" class="edge"><title>kotti.security.get_principals&#45;&gt;kotti.security.principals_factory</title>
+<path fill="none" stroke="#acb1b2" d="M2627,-201.994C2627,-192.015 2627,-179.18 2627,-167.82"/>
+<polygon fill="#acb1b2" stroke="#acb1b2" points="2630.5,-167.524 2627,-157.524 2623.5,-167.524 2630.5,-167.524"/>
+<text text-anchor="middle" x="2629.23" y="-178.429" font-family="Verdana" font-size="7.00" fill="#000000">4</text>
+</g>
+<!-- kotti.sqla.ACLType.process_result_value -->
+<g id="node26" class="node"><title>kotti.sqla.ACLType.process_result_value</title>
+<polygon fill="#cadbe5" stroke="#cadbe5" points="1230.58,-560.059 1073.42,-560.059 1073.42,-524.059 1230.58,-524.059 1230.58,-560.059"/>
+<text text-anchor="middle" x="1152" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.sqla.ACLType.process_result_value</text>
+<text text-anchor="middle" x="1152" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 14</text>
+<text text-anchor="middle" x="1152" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.003174s</text>
+</g>
+<!-- kotti.sqla.ACLType.process_result_value&#45;&gt;kotti.sqla.ACLType.process_result_value -->
+<g id="edge10" class="edge"><title>kotti.sqla.ACLType.process_result_value&#45;&gt;kotti.sqla.ACLType.process_result_value</title>
+<path fill="none" stroke="#a7b0b2" d="M1230.79,-548.712C1241.44,-547.597 1248.54,-545.379 1248.54,-542.059 1248.54,-539.932 1245.63,-538.257 1240.73,-537.035"/>
+<polygon fill="#a7b0b2" stroke="#a7b0b2" points="1241.22,-533.568 1230.79,-535.405 1240.09,-540.476 1241.22,-533.568"/>
+<text text-anchor="middle" x="1250.76" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">7</text>
+</g>
+<!-- kotti.sqla.JsonType.process_result_value -->
+<g id="node27" class="node"><title>kotti.sqla.JsonType.process_result_value</title>
+<polygon fill="#d6e2e5" stroke="#d6e2e5" points="1055.6,-560.059 896.404,-560.059 896.404,-524.059 1055.6,-524.059 1055.6,-560.059"/>
+<text text-anchor="middle" x="976" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.sqla.JsonType.process_result_value</text>
+<text text-anchor="middle" x="976" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 8</text>
+<text text-anchor="middle" x="976" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000935s</text>
+</g>
+<!-- kotti.resources.DefaultRootCache.__call__ -->
+<g id="node29" class="node"><title>kotti.resources.DefaultRootCache.__call__</title>
+<polygon fill="#aab8e5" stroke="#aab8e5" points="2278.95,-157.522 2113.05,-157.522 2113.05,-121.522 2278.95,-121.522 2278.95,-157.522"/>
+<text text-anchor="middle" x="2196" y="-146.683" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.DefaultRootCache.__call__</text>
+<text text-anchor="middle" x="2196" y="-138.176" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2196" y="-129.668" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.466665s</text>
+</g>
+<!-- kotti.resources.DefaultRootCache.__call__&#45;&gt;kotti.resources.DefaultRootCache.get_root -->
+<g id="edge22" class="edge"><title>kotti.resources.DefaultRootCache.__call__&#45;&gt;kotti.resources.DefaultRootCache.get_root</title>
+<path fill="none" stroke="#848fb2" d="M2196,-121.487C2196,-111.508 2196,-98.6723 2196,-87.3131"/>
+<polygon fill="#848fb2" stroke="#848fb2" points="2199.5,-87.0163 2196,-77.0163 2192.5,-87.0164 2199.5,-87.0163"/>
+<text text-anchor="middle" x="2198.23" y="-97.922" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.resources.Document.__parent__ -->
+<g id="node30" class="node"><title>kotti.resources.Document.__parent__</title>
+<polygon fill="#c4d7e5" stroke="#c4d7e5" points="877.93,-560.059 728.07,-560.059 728.07,-524.059 877.93,-524.059 877.93,-560.059"/>
+<text text-anchor="middle" x="803" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.Document.__parent__</text>
+<text text-anchor="middle" x="803" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 9</text>
+<text text-anchor="middle" x="803" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.128562s</text>
+</g>
+<!-- kotti.filedepot.UploadedFileField.patched_processed_result_value -->
+<g id="node31" class="node"><title>kotti.filedepot.UploadedFileField.patched_processed_result_value</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="710.118,-560.059 463.882,-560.059 463.882,-524.059 710.118,-524.059 710.118,-560.059"/>
+<text text-anchor="middle" x="587" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.UploadedFileField.patched_processed_result_value</text>
+<text text-anchor="middle" x="587" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="587" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000571s</text>
+</g>
+<!-- kotti.security.list_groups_raw&#45;&gt;kotti.security.&lt;genexpr&gt; -->
+<g id="edge3" class="edge"><title>kotti.security.list_groups_raw&#45;&gt;kotti.security.&lt;genexpr&gt;</title>
+<path fill="none" stroke="#9facb2" d="M2218.91,-282.502C2236.94,-271.082 2260.89,-255.922 2280.48,-243.515"/>
+<polygon fill="#9facb2" stroke="#9facb2" points="2282.57,-246.337 2289.15,-238.031 2278.83,-240.423 2282.57,-246.337"/>
+<text text-anchor="middle" x="2261.45" y="-258.937" font-family="Verdana" font-size="7.00" fill="#000000">13</text>
+</g>
+<!-- kotti.security.list_groups_ext&#45;&gt;kotti.sqla.MutationList.replacer -->
+<g id="edge12" class="edge"><title>kotti.security.list_groups_ext&#45;&gt;kotti.sqla.MutationList.replacer</title>
+<path fill="none" stroke="#afb2b2" d="M2586.31,-282.502C2568.42,-271.082 2544.67,-255.922 2525.23,-243.515"/>
+<polygon fill="#afb2b2" stroke="#afb2b2" points="2526.95,-240.461 2516.64,-238.031 2523.18,-246.361 2526.95,-240.461"/>
+<text text-anchor="middle" x="2557.23" y="-258.937" font-family="Verdana" font-size="7.00" fill="#000000">2</text>
+</g>
+<!-- kotti.security.list_groups_ext&#45;&gt;kotti.util.replacement -->
+<g id="edge13" class="edge"><title>kotti.security.list_groups_ext&#45;&gt;kotti.util.replacement</title>
+<path fill="none" stroke="#7f86b2" d="M2571.5,-318.56C2549.35,-327.244 2521.46,-337.529 2496,-345.044 2462.47,-354.941 2424.21,-363.485 2393.73,-369.655"/>
+<polygon fill="#7f86b2" stroke="#7f86b2" points="2392.84,-366.264 2383.71,-371.654 2394.21,-373.129 2392.84,-366.264"/>
+<text text-anchor="middle" x="2526.45" y="-339.444" font-family="Verdana" font-size="7.00" fill="#000000">14</text>
+</g>
+<!-- kotti.security.list_groups_ext&#45;&gt;kotti.security.get_principals -->
+<g id="edge11" class="edge"><title>kotti.security.list_groups_ext&#45;&gt;kotti.security.get_principals</title>
+<path fill="none" stroke="#adb2b2" d="M2616.04,-282.502C2617.84,-272.42 2620.15,-259.422 2622.19,-247.977"/>
+<polygon fill="#adb2b2" stroke="#adb2b2" points="2625.66,-248.49 2623.97,-238.031 2618.77,-247.261 2625.66,-248.49"/>
+<text text-anchor="middle" x="2622.23" y="-258.937" font-family="Verdana" font-size="7.00" fill="#000000">3</text>
+</g>
+<!-- kotti.security.File._get_acl -->
+<g id="node37" class="node"><title>kotti.security.File._get_acl</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="446.416,-560.059 337.584,-560.059 337.584,-524.059 446.416,-524.059 446.416,-560.059"/>
+<text text-anchor="middle" x="392" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.security.File._get_acl</text>
+<text text-anchor="middle" x="392" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="392" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000097s</text>
+</g>
+<!-- kotti.resources.get_root -->
+<g id="node38" class="node"><title>kotti.resources.get_root</title>
+<polygon fill="#aab8e5" stroke="#aab8e5" points="2246.27,-238.029 2145.73,-238.029 2145.73,-202.029 2246.27,-202.029 2246.27,-238.029"/>
+<text text-anchor="middle" x="2196" y="-227.19" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.get_root</text>
+<text text-anchor="middle" x="2196" y="-218.683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="2196" y="-210.176" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.466963s</text>
+</g>
+<!-- kotti.resources.get_root&#45;&gt;kotti.get_settings -->
+<g id="edge21" class="edge"><title>kotti.resources.get_root&#45;&gt;kotti.get_settings</title>
+<path fill="none" stroke="#b0b2b2" d="M2246.31,-202.572C2287.92,-188.96 2346.64,-169.752 2387.69,-156.324"/>
+<polygon fill="#b0b2b2" stroke="#b0b2b2" points="2388.79,-159.648 2397.21,-153.212 2386.61,-152.995 2388.79,-159.648"/>
+<text text-anchor="middle" x="2332.23" y="-178.429" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.resources.get_root&#45;&gt;kotti.resources.DefaultRootCache.__call__ -->
+<g id="edge20" class="edge"><title>kotti.resources.get_root&#45;&gt;kotti.resources.DefaultRootCache.__call__</title>
+<path fill="none" stroke="#848fb2" d="M2196,-201.994C2196,-192.015 2196,-179.18 2196,-167.82"/>
+<polygon fill="#848fb2" stroke="#848fb2" points="2199.5,-167.524 2196,-157.524 2192.5,-167.524 2199.5,-167.524"/>
+<text text-anchor="middle" x="2198.23" y="-178.429" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.adjust_for_engine -->
+<g id="node39" class="node"><title>kotti.filedepot.adjust_for_engine</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="319.614,-560.059 188.386,-560.059 188.386,-524.059 319.614,-524.059 319.614,-560.059"/>
+<text text-anchor="middle" x="254" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.adjust_for_engine</text>
+<text text-anchor="middle" x="254" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="254" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000034s</text>
+</g>
+<!-- kotti.resources.Document.__getitem__ -->
+<g id="node41" class="node"><title>kotti.resources.Document.__getitem__</title>
+<polygon fill="#acbbe5" stroke="#acbbe5" points="169.966,-560.059 16.0337,-560.059 16.0337,-524.059 169.966,-524.059 169.966,-560.059"/>
+<text text-anchor="middle" x="93" y="-549.22" font-family="Verdana" font-size="7.00" fill="#000000">kotti.resources.Document.__getitem__</text>
+<text text-anchor="middle" x="93" y="-540.712" font-family="Verdana" font-size="7.00" fill="#000000">calls: 3</text>
+<text text-anchor="middle" x="93" y="-532.205" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.416480s</text>
+</g>
+<!-- __main__ -->
+<g id="node43" class="node"><title>__main__</title>
+<polygon fill="#e3e5e5" stroke="#e3e5e5" points="1510.14,-658.719 1435.86,-658.719 1435.86,-622.719 1510.14,-622.719 1510.14,-658.719"/>
+<text text-anchor="middle" x="1473" y="-647.88" font-family="Verdana" font-size="7.00" fill="#000000">__main__</text>
+<text text-anchor="middle" x="1473" y="-639.373" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="1473" y="-630.866" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000000s</text>
+</g>
+<!-- __main__&#45;&gt;kotti.filedepot.TweenFactory.__call__ -->
+<g id="edge8" class="edge"><title>__main__&#45;&gt;kotti.filedepot.TweenFactory.__call__</title>
+<path fill="none" stroke="#b23aaf" d="M1473,-622.438C1473,-608.006 1473,-587.167 1473,-570.462"/>
+<polygon fill="#b23aaf" stroke="#b23aaf" points="1476.5,-570.19 1473,-560.19 1469.5,-570.19 1476.5,-570.19"/>
+<text text-anchor="middle" x="1475.23" y="-599.119" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+</g>
+</svg>
diff --git a/docs/_static/callgraph-served-by-tween.svg b/docs/_static/callgraph-served-by-tween.svg
new file mode 100644
index 000000000..8274d53cd
--- /dev/null
+++ b/docs/_static/callgraph-served-by-tween.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="590pt" height="381pt"
+ viewBox="0.00 0.00 590.00 380.84" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 376.843)">
+<title>G</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-376.843 586,-376.843 586,4 -4,4"/>
+<text text-anchor="middle" x="291" y="-15.4146" font-family="Verdana" font-size="7.00" fill="#000000">Generated by Python Call Graph v1.0.1</text>
+<text text-anchor="middle" x="291" y="-6.90732" font-family="Verdana" font-size="7.00" fill="#000000">http://pycallgraph.slowchop.com</text>
+<g id="clust1" class="cluster"><title>cluster_kotti</title>
+<polygon fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.800000" points="8,-33.0146 8,-266.183 574,-266.183 574,-33.0146 8,-33.0146"/>
+<text text-anchor="middle" x="291" y="-254.183" font-family="Verdana" font-size="10.00">kotti</text>
+</g>
+<g id="clust2" class="cluster"><title>cluster___main__</title>
+<polygon fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.800000" points="238,-292.69 238,-364.843 328,-364.843 328,-292.69 238,-292.69"/>
+<text text-anchor="middle" x="283" y="-352.843" font-family="Verdana" font-size="10.00">__main__</text>
+</g>
+<!-- kotti.filedepot.TweenFactory.__call__ -->
+<g id="node1" class="node"><title>kotti.filedepot.TweenFactory.__call__</title>
+<polygon fill="#e52685" stroke="#e52685" points="356.413,-238.029 209.587,-238.029 209.587,-202.029 356.413,-202.029 356.413,-238.029"/>
+<text text-anchor="middle" x="283" y="-227.19" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.TweenFactory.__call__</text>
+<text text-anchor="middle" x="283" y="-218.683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="283" y="-210.176" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.044785s</text>
+</g>
+<!-- kotti.filedepot.DBStoredFile.public_url -->
+<g id="node2" class="node"><title>kotti.filedepot.DBStoredFile.public_url</title>
+<polygon fill="#9998e5" stroke="#9998e5" points="165.739,-77.0146 16.2615,-77.0146 16.2615,-41.0146 165.739,-41.0146 165.739,-77.0146"/>
+<text text-anchor="middle" x="91" y="-66.1756" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.DBStoredFile.public_url</text>
+<text text-anchor="middle" x="91" y="-57.6683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 2</text>
+<text text-anchor="middle" x="91" y="-49.161" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000010s</text>
+</g>
+<!-- kotti.filedepot.TweenFactory.__call__&#45;&gt;kotti.filedepot.DBStoredFile.public_url -->
+<g id="edge1" class="edge"><title>kotti.filedepot.TweenFactory.__call__&#45;&gt;kotti.filedepot.DBStoredFile.public_url</title>
+<path fill="none" stroke="#94a3b2" d="M251.879,-201.949C232.088,-190.479 206.363,-174.419 185.55,-157.522 158.075,-135.217 130.319,-105.553 112.054,-84.8242"/>
+<polygon fill="#94a3b2" stroke="#94a3b2" points="114.514,-82.3192 105.305,-77.0797 109.237,-86.9182 114.514,-82.3192"/>
+<text text-anchor="middle" x="187.225" y="-138.176" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__ -->
+<g id="node3" class="node"><title>kotti.filedepot.StoredFileResponse.__init__</title>
+<polygon fill="#b1c1e5" stroke="#b1c1e5" points="366.817,-157.522 199.183,-157.522 199.183,-121.522 366.817,-121.522 366.817,-157.522"/>
+<text text-anchor="middle" x="283" y="-146.683" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.StoredFileResponse.__init__</text>
+<text text-anchor="middle" x="283" y="-138.176" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="283" y="-129.668" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.004096s</text>
+</g>
+<!-- kotti.filedepot.TweenFactory.__call__&#45;&gt;kotti.filedepot.StoredFileResponse.__init__ -->
+<g id="edge2" class="edge"><title>kotti.filedepot.TweenFactory.__call__&#45;&gt;kotti.filedepot.StoredFileResponse.__init__</title>
+<path fill="none" stroke="#8996b2" d="M283,-201.994C283,-192.015 283,-179.18 283,-167.82"/>
+<polygon fill="#8996b2" stroke="#8996b2" points="286.5,-167.524 283,-157.524 279.5,-167.524 286.5,-167.524"/>
+<text text-anchor="middle" x="285.225" y="-178.429" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.DBFileStorage.get -->
+<g id="node7" class="node"><title>kotti.filedepot.DBFileStorage.get</title>
+<polygon fill="#e538b9" stroke="#e538b9" points="515.18,-157.522 384.82,-157.522 384.82,-121.522 515.18,-121.522 515.18,-157.522"/>
+<text text-anchor="middle" x="450" y="-146.683" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.DBFileStorage.get</text>
+<text text-anchor="middle" x="450" y="-138.176" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="450" y="-129.668" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.039316s</text>
+</g>
+<!-- kotti.filedepot.TweenFactory.__call__&#45;&gt;kotti.filedepot.DBFileStorage.get -->
+<g id="edge3" class="edge"><title>kotti.filedepot.TweenFactory.__call__&#45;&gt;kotti.filedepot.DBFileStorage.get</title>
+<path fill="none" stroke="#b22c90" d="M319.237,-201.994C344.294,-190.215 377.818,-174.455 404.648,-161.842"/>
+<polygon fill="#b22c90" stroke="#b22c90" points="406.273,-164.946 413.834,-157.524 403.295,-158.611 406.273,-164.946"/>
+<text text-anchor="middle" x="378.225" y="-178.429" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.DBStoredFile.public_url -->
+<g id="edge5" class="edge"><title>kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.DBStoredFile.public_url</title>
+<path fill="none" stroke="#94a3b2" d="M241.339,-121.487C212.153,-109.553 172.977,-93.5342 141.933,-80.8407"/>
+<polygon fill="#94a3b2" stroke="#94a3b2" points="143.161,-77.5615 132.58,-77.0163 140.511,-84.0408 143.161,-77.5615"/>
+<text text-anchor="middle" x="194.225" y="-97.922" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse._get_type_and_encoding -->
+<g id="node5" class="node"><title>kotti.filedepot.StoredFileResponse._get_type_and_encoding</title>
+<polygon fill="#bfd2e5" stroke="#bfd2e5" points="411.539,-77.0146 184.461,-77.0146 184.461,-41.0146 411.539,-41.0146 411.539,-77.0146"/>
+<text text-anchor="middle" x="298" y="-66.1756" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.StoredFileResponse._get_type_and_encoding</text>
+<text text-anchor="middle" x="298" y="-57.6683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="298" y="-49.161" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000050s</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.StoredFileResponse._get_type_and_encoding -->
+<g id="edge4" class="edge"><title>kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.StoredFileResponse._get_type_and_encoding</title>
+<path fill="none" stroke="#94a3b2" d="M286.255,-121.487C288.181,-111.405 290.665,-98.4073 292.851,-86.9623"/>
+<polygon fill="#94a3b2" stroke="#94a3b2" points="296.313,-87.4955 294.752,-77.0163 289.437,-86.1818 296.313,-87.4955"/>
+<text text-anchor="middle" x="292.225" y="-97.922" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.type.generate_etag -->
+<g id="node6" class="node"><title>kotti.filedepot.type.generate_etag</title>
+<polygon fill="#bfd2e5" stroke="#bfd2e5" points="566.241,-77.0146 429.759,-77.0146 429.759,-41.0146 566.241,-41.0146 566.241,-77.0146"/>
+<text text-anchor="middle" x="498" y="-66.1756" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.type.generate_etag</text>
+<text text-anchor="middle" x="498" y="-57.6683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="498" y="-49.161" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000063s</text>
+</g>
+<!-- kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.type.generate_etag -->
+<g id="edge6" class="edge"><title>kotti.filedepot.StoredFileResponse.__init__&#45;&gt;kotti.filedepot.type.generate_etag</title>
+<path fill="none" stroke="#94a3b2" d="M329.652,-121.487C362.615,-109.45 406.96,-93.2578 441.863,-80.5132"/>
+<polygon fill="#94a3b2" stroke="#94a3b2" points="443.246,-83.7341 451.439,-77.0163 440.845,-77.1587 443.246,-83.7341"/>
+<text text-anchor="middle" x="398.225" y="-97.922" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+<!-- kotti.filedepot.adjust_for_engine -->
+<g id="node4" class="node"><title>kotti.filedepot.adjust_for_engine</title>
+<polygon fill="#bfd2e5" stroke="#bfd2e5" points="176.614,-238.029 45.3862,-238.029 45.3862,-202.029 176.614,-202.029 176.614,-238.029"/>
+<text text-anchor="middle" x="111" y="-227.19" font-family="Verdana" font-size="7.00" fill="#000000">kotti.filedepot.adjust_for_engine</text>
+<text text-anchor="middle" x="111" y="-218.683" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="111" y="-210.176" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000040s</text>
+</g>
+<!-- __main__ -->
+<g id="node8" class="node"><title>__main__</title>
+<polygon fill="#bfd2e5" stroke="#bfd2e5" points="320.143,-336.69 245.857,-336.69 245.857,-300.69 320.143,-300.69 320.143,-336.69"/>
+<text text-anchor="middle" x="283" y="-325.851" font-family="Verdana" font-size="7.00" fill="#000000">__main__</text>
+<text text-anchor="middle" x="283" y="-317.344" font-family="Verdana" font-size="7.00" fill="#000000">calls: 1</text>
+<text text-anchor="middle" x="283" y="-308.836" font-family="Verdana" font-size="7.00" fill="#000000">time: 0.000000s</text>
+</g>
+<!-- __main__&#45;&gt;kotti.filedepot.TweenFactory.__call__ -->
+<g id="edge7" class="edge"><title>__main__&#45;&gt;kotti.filedepot.TweenFactory.__call__</title>
+<path fill="none" stroke="#b21d68" d="M283,-300.409C283,-285.976 283,-265.137 283,-248.432"/>
+<polygon fill="#b21d68" stroke="#b21d68" points="286.5,-248.161 283,-238.161 279.5,-248.161 286.5,-248.161"/>
+<text text-anchor="middle" x="285.225" y="-277.09" font-family="Verdana" font-size="7.00" fill="#000000">1</text>
+</g>
+</g>
+</svg>
diff --git a/docs/api/kotti.views/index.rst b/docs/api/kotti.views/index.rst
index a5f29aa6f..557a2d971 100644
--- a/docs/api/kotti.views/index.rst
+++ b/docs/api/kotti.views/index.rst
@@ -14,7 +14,6 @@ kotti.views
    kotti.views.edit/index
    kotti.views.file
    kotti.views.form
-   kotti.views.image
    kotti.views.login
    kotti.views.site_setup
    kotti.views.slots
diff --git a/docs/api/kotti.views/kotti.views.image.rst b/docs/api/kotti.views/kotti.views.image.rst
deleted file mode 100644
index 290e22877..000000000
--- a/docs/api/kotti.views/kotti.views.image.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. _api-kotti.views.image:
-
-kotti.views.image
------------------
-
-.. automodule:: kotti.views.image
-   :members:
-   :member-order: bysource
diff --git a/docs/conf.py b/docs/conf.py
index 44ae540c3..7b8227c0e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -27,7 +27,7 @@
     'sphinx.ext.viewcode',
     ]
 
-copyright = u'2012-2014, Kotti developers'.format(date.today().year)
+copyright = u'2012-{0}, Kotti developers'.format(date.today().year)
 exclude_patterns = ['_build', '_themes']
 master_doc = 'index'
 project = u'Kotti'
@@ -123,6 +123,7 @@
     'bleach': ('http://bleach.readthedocs.org/en/latest/', None),
     'colander': ('http://colander.readthedocs.org/en/latest/', None),
     'deform': ('http://deform.readthedocs.org/en/latest/', None),
+    'depot': ('http://depot.readthedocs.org/en/latest/', None),
     'fanstatic': ('http://www.fanstatic.org/en/latest/', None),
     'pyramid': ('http://pyramid.readthedocs.org/en/latest/', None),
     'sqlalchemy': ('http://sqlalchemy.readthedocs.org/en/latest/', None),
diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 11c42930a..2149275bd 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -1,50 +1,64 @@
 .. _blobs:
 
-Working with blob data in Kotti
+Working with Blob Data in Kotti
 ===============================
 
-Kotti provides a flexible mechanism of storing blob data by with the help of
-`filedepot`_ storages. Both ``File`` and ``Image`` store their data in
-:class:`depot.fields.sqlalchemy.UploadedFileField` and they will offload their
-blob data to the configured depot storage. Working together with
-`filedepot`_ configured storages means it is possible to store blob data in
-a variety of ways: filesystem, GridFS, Amazon storage, etc. 
-
-By default Kotti will store its blob data in the configured SQL
-database, using :class:`kotti.filedepot.DBFileStorage` storage, but you can
-configure your own preferred way of storing your blob data. The benefit of
-storing files in ``DBFileStorage`` is having *all* content in a single place
-(the DB) which makes backups, exporting and importing of your site's data easy,
-as long as you don't have too many or too large files. The downsides of this
-approach appear when your database server resides on a different host (network
-performance becomes a greater issue) or your DB dumps become too large to be
-handled efficiently.
-
-Configuring a depot store
--------------------------
-
-While `filedepot`_ allows storing data in any of the configured
-filestorages, at this time there's no mechanism in Kotti to select, at runtime,
-the depot where new data will be saved. Instead, Kotti will store new
-files only in the configured ``default`` store. If, for example, you add a new
-depot and make that the default, you should leave the old depot configured so
-that Kotti will continue serving files uploaded there.
-
-By default, Kotti comes configured with a db-based filestorage.::
+Kotti provides flexible mechanisms for storing and serving blob data by with the help of `Depot`_.
+
+.. contents::
+
+How File-like Content is stored
+-------------------------------
+
+Both ``File`` and ``Image`` store their data in :class:`depot.fields.sqlalchemy.UploadedFileField` and they will offload their blob data to the configured depot storage.
+Working together with `Depot`_ configured storages means it is possible to store blob data in a variety of ways: filesystem, GridFS, Amazon storage, etc.
+
+- :class:`depot.io.local.LocalFileStorage`
+- :class:`depot.io.awss3.S3Storage`
+- :class:`depot.io.gridfs.GridFSStorage`
+- etc.
+
+By default Kotti will store its blob data in the configured SQL database, using :class:`kotti.filedepot.DBFileStorage` storage, but you can configure your own preferred way of storing your blob data.
+The benefit of storing files in :class:`kotti.filedepot.DBFileStorage` is having *all* content in a single place (the DB) which makes backups, exporting and importing of your site's data easy, as long as you don't have too many or too large files.
+The downsides of this approach appear when your database server resides on a different host (network performance becomes a greater issue) or your DB dumps become too large to be handled efficiently.
+
+Configuration
+-------------
+
+Mountpoint
+~~~~~~~~~~
+
+Kotti provides a Pyramid tween (:ref:`pyramid.registering_tweens`) that is responsible for the actual serving of blob data.
+It does pretty much the same as :class:`depot.middleware.DepotMiddleware`, but is better integrated into Pyramid and therefore Kotti.
+
+This tween "intercepts" all requests before they reach the main application (Kotti).
+If it's a request for blob data (identified by the configured ``kotti.depot_mountpoint``), it will be served by the tween itself (or redirected to an external storage like S3), otherwise it will be "forwarded" to the main application.
+This mountpoint is also used to generate URLs to blobs.
+The default value for ``kotti.depot_mountpoint`` is ``/depot``::
+
+    kotti.depot_mountpoint = /depot
+
+Storages
+~~~~~~~~
+
+While `Depot`_ allows storing data in any of the configured filestorages, at this time there's no mechanism in Kotti to select, at runtime, the depot where new data will be saved.
+Instead, Kotti will store new files only in the configured ``default`` store.
+If, for example, you add a new depot and make that the default, you should leave the old depot configured so that Kotti will continue serving files uploaded there.
+
+By default, Kotti comes configured with a db-based filestorage::
 
     kotti.depot.0.name = dbfiles
     kotti.depot.0.backend = kotti.filedepot.DBFileStorage
 
-The depot configured at position 0 is the default file depot. The minimum
-information required to configure a depot are the ``name`` and ``backend``. The
-``name`` can be any string and it is used by `filedepot`_ to identify the
-depot store for a particular saved file. The ``name`` should never be changed, as
-it will make the saved files unaccessible.
+To configure a depot, several ``kotti.depot.*.*`` lines need to be added.
+The number in the first position is used to group backend configuration and to order the file storages in the configuration of `Depot`_.
+The depot configured with number 0 will be the default depot, where all new blob data will be saved.
+There are 2 options that are required for every storage configuration: ``name`` and ``backend``.
+The ``name`` is a unique string that will be used to identify the path of saved files (it is recorded with each blob info), so once configured for a particular storage, it should never change.
+The ``backend`` should point to a dotted path for the storage class.
+Any further parameters for a particular backend will be passed as keyword arguments to the backend class.
 
-Any further parameters for a particular backend will be passed as keyword
-arguments to the backend class. See this example, in which we store, by
-default, files in ``/var/local/files/`` using the
-:class:`depot.io.local.LocalFileStorage`::
+See this example, in which we store, by default, files in ``/var/local/files/`` using the :class:`depot.io.local.LocalFileStorage`::
 
     kotti.depot.0.name = localfs
     kotti.depot.0.backend = depot.io.local.LocalFileStorage
@@ -52,12 +66,76 @@ default, files in ``/var/local/files/`` using the
     kotti.depot.1.name = dbfiles
     kotti.depot.1.backend = kotti.filedepot.DBFileStorage
 
-Notice that we kept the ``dbfiles`` storage, but we moved it to position 1. No
-blob data will be saved there anymore, but existing files in that storage will
-continue to be available from there.
+Notice that we kept the ``dbfiles`` storage, but we moved it to position 1.
+No blob data will be saved there anymore, but existing files in that storage will continue to be available from there.
+
+How File-like Content is served
+-------------------------------
+
+Starting with Kotti 1.3.0, file-like content can be served in two different ways.
+Let's look at an example to compare them.
+
+Say we have a :class:`kotti.resources.File` object in our resource tree, located at ``/foo/bar/file``.
+
+Method 1
+~~~~~~~~
+
+In the default views this file is served under the URL ``http://localhost/foo/bar/file/attachment-view``.
+This URL can be created like this::
+
+    >>> from kotti.resources import File
+    >>> file = File.query.filter(File.name == 'file').one()
+    >>> request.resource_url(file, 'attachment-view')
+    'http://localhost/foo/bar/file/attachment-view'
+
+When this URL is requested, a :class:`kotti.filedepot.StoredFileResponse` is returned::
+
+    >>> request.uploaded_file_response(file.data)
+    <StoredFileResponse at 0x10c8d22d0 200 OK>
+
+The request is processed in the same way as for every other type of content in Kotti.
+It goes through the full traversal and view lookup machinery *with full permission checks*.
+
+Method 2
+~~~~~~~~
+
+Often these permission checks do not need to be enforced strictly.
+For such cases Kotti provides a "shortcut" in form of a Pyramid tween, that directly processes all requests under a certain path befor they even reach Kotti.
+This means: no traversal, no view lookup, no permission checks.
+The URL for this method can be created very similarily::
+
+    >>> request.uploaded_file_url(file.data, 'attachment')
+    'http://localhost//depot/dbfiles/68f31e97-a7f9-11e5-be07-c82a1403e6a7/download'
+
+Comparison
+~~~~~~~~~~
+
+Obviously method 2 is *a lot* faster than method 1 - typically at least by the factor of 3.
+
+If you take a look at the callgraphs, you'll understand where this difference comes from:
+
+========== ==========
+|m1kotti|_ |m2kotti|_
+========== ==========
+ Method 1   Method 2
+========== ==========
+
+.. |m1kotti| image:: /_static/callgraph-served-by-kotti.svg
+   :width: 100%
+.. _m1kotti: ../../_static/callgraph-served-by-kotti.svg
+.. |m2kotti| image:: /_static/callgraph-served-by-tween.svg
+   :width: 100%
+.. _m2kotti: ../../_static/callgraph-served-by-tween.svg
+
+The difference will be even more drastic, when you set up proper HTTP caching.
+All responses for method 2 can be cached *forever*, because the URL will change when the file's content changes.
+
+Developing (with) File-like Content
+-----------------------------------
+
+Add a Blob Field to your Model
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Add a blob field to your model
-------------------------------
 Adding a blob data attribute to your models can be as simple as::
 
     from depot.fields.sqlalchemy import UploadedFileField
@@ -66,9 +144,7 @@ Adding a blob data attribute to your models can be as simple as::
     class Person(Content):
         avatar = UploadedFileField()
 
-While you can directly assign a ``bytes`` value to the ``avatar`` column, the
-``UploadedFileField`` column type works best when you assign a
-:class:`cgi.FieldStorage` instance as value::
+While you can directly assign a ``bytes`` value to the ``avatar`` column, the ``UploadedFileField`` column type works best when you assign a :class:`cgi.FieldStorage` instance as value::
 
     from StringIO import StringIO
     from kotti.util import _to_fieldstorage
@@ -76,75 +152,42 @@ While you can directly assign a ``bytes`` value to the ``avatar`` column, the
     content = '...'
     data = {
             'fp': StringIO(content),
-            'filename': 'avatar.png', 
+            'filename': 'avatar.png',
             'mimetype': 'image/png',
             'size': len(content),
             }
     person = Person()
     person.avatar = _to_fieldstorage(**data)
 
-Note that the ``data`` dictionary described here has the same format as the
-deserialized value of a ``deform.widget.FileUploadWidget``. See
-:class:`kotti.views.edit.content.FileAddForm` and 
-:class:`kotti.views.edit.content.FileEditForm` for a full example
-of how to add or edit a model with a blob field.
+Note that the ``data`` dictionary described here has the same format as the deserialized value of a ``deform.widget.FileUploadWidget``.
+See :class:`kotti.views.edit.content.FileAddForm` and :class:`kotti.views.edit.content.FileEditForm` for a full example of how to add or edit a model with a blob field.
 
-Reading blob data
------------------
+Reading Blob Data
+~~~~~~~~~~~~~~~~~
 
-If you try directly to read data from an ``UploadedFileField`` you'll get a
-:class:`depot.fields.upload.UploadedFile` instance, which offers a
-dictionary-like interface to the stored file metadata and direct access to a
-stream with the stored file through the ``file`` attribute::
+If you try directly to read data from an ``UploadedFileField`` you'll get a :class:`depot.fields.upload.UploadedFile` instance, which offers a dictionary-like interface to the stored file metadata and direct access to a stream with the stored file through the ``file`` attribute::
 
     person = DBSession.query(Person).get(1)
     blob = person.avatar.file.read()
 
-You should never write to the file stream directly. Instead, you should assign
-a new value to the ``UploadedFileField`` column, as described in the previous
-section.
-
-Downloading blob data
----------------------
+You should never write to the file stream directly.
+Instead, you should assign a new value to the ``UploadedFileField`` column, as described in the previous section.
 
-Serving blob data is facilitated by the
-:class:`kotti.views.file.UploadedFileResponse`. You should return an
-instance of this class as the response of your view, and it will stream the
-blob from the storage to the client browser. As parameters it takes the blob
-column and the type of disposition: ``inline`` or ``attachment`` (to trigger a
-download in the browser). This, for example is the ``inline-view`` view for a
-:class:`kotti.resources.File`::
+Testing UploadedFileField Columns
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    @view_config(name='inline-view', context=File, permission='view')
-    def inline_view(context, request):
-        return UploadedFileResponse(context.data, request, disposition='inline')
+Because :class:`depot.manager.DepotManager` acts as a singleton, special care needs to be taken when testing features that involve saving data into ``UploadedFileField`` columns.
 
-If the used depot storage offers a ``public_url`` value for the blob, then
-``UploadedFileResponse``, instead of streaming the data, will redirect to that
-location.
+``UploadedFileField`` columns require having at least one depot file storage configured.
+You can use a fixture called ``filedepot`` to have a mock file storage available for your tests.
 
-Testing UploadedFileField columns
----------------------------------
+If you're developing new depot file storages you should use the ``no_filedepots`` fixture, which resets the configured depots for the test run and restores the default depots back, as a teardown.
 
-Because :class:`depot.manager.DepotManager` acts as a singleton, special care
-needs to be taken when testing features that involve saving data into
-``UploadedFileField`` columns.
+Inheritance Issues with UploadedFileField Columns
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``UploadedFileField`` columns require having at least one depot file storage
-configured. You can use a fixture called ``filedepot`` to have a mock file
-storage available for your tests.
-
-If you're developing new depot file storages you should use the
-``no_filedepots`` fixture, which resets the configured depots for the test run
-and restores the default depots back, as a teardown.
-
-Inheritance issues with UploadedFileField columns
--------------------------------------------------
-
-You should be aware that, presently, subclassing a model with an
-``UploadedFileField`` column doesn't work properly.  As a workaround, add a 
-``__declare_last__`` classmethod in your superclass model, similar to the one
-below, where we're fixing the ``data`` column of the ``File`` class. ::
+You should be aware that, presently, subclassing a model with an ``UploadedFileField`` column doesn't work properly.
+As a workaround, add a ``__declare_last__`` classmethod in your superclass model, similar to the one below, where we're fixing the ``data`` column of the ``File`` class. ::
 
     from depot.fields.sqlalchemy import _SQLAMutationTracker
 
@@ -160,20 +203,16 @@ below, where we're fixing the ``data`` column of the ``File`` class. ::
 Migrating data between two different storages
 ---------------------------------------------
 
-Kotti provides a script that can migrate blob data from one configured stored
-to another and update the saved fields with the new locations. It is not needed
-to do this if you just want to add a new torage, or replace the default one,
-but you can use it if you'd like to consolidate the blob data in one place
-only. You can invoke the script with::
+Kotti provides a script that can migrate blob data from one configured stored to another and update the saved fields with the new locations.
+It is not needed to do this if you just want to add a new torage, or replace the default one, but you can use it if you'd like to consolidate the blob data in one place only.
+You can invoke the script with::
 
     kotti-migrate-storage <config_uri> --from-storage <name> --to-storage <name>
 
-The storage names are those assigned in the configuration file designated in
-``<config_uri>``. For example, let's assume you've started a website that has
-the default blob storage, the ``DBFileStorage`` named *dbfiles*. You'd like to
-move all the existing blob data to a :class:`depot.io.local.LocalFileStorage`
-storage and make that the default. First, add the ``LocalFileStorage`` depot, 
-make it the default and place the old ``DBFileStorage`` in position *1*:::
+The storage names are those assigned in the configuration file designated in ``<config_uri>``.
+For example, let's assume you've started a website that has the default blob storage, the ``DBFileStorage`` named *dbfiles*.
+You'd like to move all the existing blob data to a :class:`depot.io.local.LocalFileStorage` storage and make that the default.
+First, add the ``LocalFileStorage`` depot, make it the default and place the old ``DBFileStorage`` in position *1*:::
 
     kotti.depot.0.backend = depot.io.local.LocalFileStorage
     kotti.depot.0.name = localfs
@@ -187,4 +226,5 @@ Now you can invoke the migration with:::
 
 As always when dealing with migrations, make sure you backup your data first!
 
-.. _filedepot: https://pypi.python.org/pypi/filedepot/
+
+.. _Depot: http://depot.readthedocs.org/en/latest/
diff --git a/docs/developing/advanced/images.rst b/docs/developing/advanced/images.rst
index 44f95976b..dd728cbdc 100644
--- a/docs/developing/advanced/images.rst
+++ b/docs/developing/advanced/images.rst
@@ -1,20 +1,8 @@
 .. _images:
 
-Image URLs
-==========
+Images
+======
 
-Kotti provides on-the-fly image scaling by utilizing `plone.scale`_.
+All image related functions were moved to `kotti_image`_ as of Kotti 1.3.0.
 
-Images can be referenced by this URL schema: ``/path/to/image_content_object/image[/<image_scale>]/download]`` where ``<image_scale>`` is a predefined image scale (see below).
-
-If the last URL path segment is ``download``, the image will be served with ``Content-disposition: attachment`` otherwise it will be served with ``Content-disposition: inline``.
-
-Predefined image scale sizes
-----------------------------
-
-You may define image scale sizes in your ``.ini`` file by setting values for ``kotti.image_scales.<scale_name>`` to values of the form ``<max_width>x<max_height>`` (e.g. ``kotti.image_scales.thumb = 160x120`` with the resulting scale name ``thumb``).
-
-``span1`` (60x120) to ``span12`` (1160x2320) are always defined (with values corresponding to the Twitter Bootstrap default grid sizes), but their values can be overwritten by setting ``kotti.image_scales.span<N>``  to different values in your .ini file.
-
-
-.. _plone.scale: http://packages.python.org/plone.scale/
+.. _kotti_image: https://pypi.python.org/pypi/kotti_image
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 6ebbb6942..6c26f210d 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -60,7 +60,8 @@ kotti.caching_policy_chooser      Component for choosing the cache header policy
 kotti.configurators               List of advanced functions for config
 kotti.date_format                 Date format to use, default: ``medium``
 kotti.datetime_format             Datetime format to use, default: ``medium``
-kotti.depot.*.*                   Configure the blob storage. More details below
+kotti.depot_mountpoint            Configure the mountpoint for the blob storage.  See :ref:`blobs` for details.
+kotti.depot.*.*                   Configure the blob storage.  See :ref:`blobs` for details.
 kotti.fanstatic.edit_needed       List of static resources used for edit interface
 kotti.fanstatic.view_needed       List of static resources used for public interface
 kotti.login_success_callback      Override Kotti's default ``login_success_callback`` function
@@ -305,43 +306,6 @@ The default configuration here is:
   kotti.url_normalzier = kotti.url_normalizer.url_normalizer
   kotti.url_normalizer.map_non_ascii_characters = True
 
-
-Blob storage configuration
---------------------------
-
-By default, Kotti will store blob data (files uploaded in File and Image instances) in the database.
-Internally, Kotti integrates with ``filedepot``, so it is possible to use any ``filedepot`` compatible storage, including those provided by ``filedepot`` itself:
-
-- :class:`depot.io.local.LocalFileStorage`
-- :class:`depot.io.awss3.S3Storage`
-- :class:`depot.io.gridfs.GridFSStorage`
-
-The default storage for Kotti is :class:`~kotti.filedepot.DBFileStorage`.
-The benefit of storing files in ``DBFileStorage`` is having *all* content in a single place (the DB) which makes backups, exporting and importing of your site's data easy, as long as you don't have too many or too large files.
-The downsides of this approach appear when your database server resides on a different host (network performance becomes a greater issue) or your DB dumps become too large to be handled efficiently.
-
-To configure a depot, several ``kotti.depot.*.*`` lines need to be added.
-The number in the first position is used to group backend configuration and to order the file storages in the configuration of ``filedepot``.
-The depot configured with number 0 will be the default depot, where all new blob data will be saved.
-There are 2 options that are required for every storage configuration: ``name`` and ``backend``.
-The ``name`` is a unique string that will be used to identify the path of saved files (it is recorded with each blob info), so once configured for a particular storage, it should never change.
-The ``backend`` should point to a dotted path for the storage class.
-Then, any number of keyword arguments can be added, and they will be passed to the backend class on initialization.
-
-Example of a possible configurationi that stores blob data on the disk, in
-``/var/local/files`` using the ``filedepot`` :class:`depot.io.local.LocalFileStorage` provided backend.
-Kotti's default backend, ``DBFileStorage`` has been moved to position **1** and all data stored there will continue to be available.
-See :ref:`blobs` to see how to migrate blob data between storages.
-
-.. code-block:: ini
-
-  kotti.depot.0.name = localfs
-  kotti.depot.0.backend = depot.io.local.LocalFileStorage
-  kotti.depot.0.storage_path = /var/local/files
-  kotti.depot.1.name = dbfiles
-  kotti.depot.1.backend = kotti.filedepot.DBFileStorage
-
-
 Local navigation
 ----------------
 
diff --git a/kotti/__init__.py b/kotti/__init__.py
index b8c47b352..4b8e5b9e5 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -1,5 +1,4 @@
 import pkg_resources
-
 from sqlalchemy import engine_from_config
 from sqlalchemy import MetaData
 from sqlalchemy.ext.declarative import declarative_base
@@ -61,7 +60,6 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.available_types': ' '.join([
         'kotti.resources.Document',
         'kotti.resources.File',
-        'kotti.resources.Image',
         ]),
     'kotti.base_includes': ' '.join([
         'kotti',
@@ -77,7 +75,6 @@ def none_factory(**kwargs):  # pragma: no cover
         'kotti.views.edit.default_views',
         'kotti.views.edit.upload',
         'kotti.views.file',
-        'kotti.views.image',
         'kotti.views.login',
         'kotti.views.navigation',
         'kotti.views.users',
@@ -87,6 +84,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.configurators': '',
     'kotti.date_format': 'medium',
     'kotti.datetime_format': 'medium',
+    'kotti.depot_mountpoint': '/depot',
     'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
     'kotti.depot.0.name': 'dbfiles',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
@@ -201,6 +199,10 @@ def base_configure(global_config, **settings):
         if key.startswith('kotti') and isinstance(value, basestring):
             settings[key] = unicode(value, 'utf8')
 
+    # will be removed in 2.0
+    import kotti_image
+    kotti_image.kotti_configure(settings)
+
     # Allow extending packages to change 'settings' w/ Python:
     k = 'kotti.configurators'
     for func in _resolve_dotted(settings, keys=(k,))[k]:
diff --git a/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py b/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
new file mode 100644
index 000000000..c93ca006c
--- /dev/null
+++ b/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
@@ -0,0 +1,59 @@
+"""Add file columns  to images table.
+
+Revision ID: 814c4ec72f1
+Revises: 4a3de0d0804a
+Create Date: 2015-12-14 17:37:36.723844
+
+"""
+
+# revision identifiers, used by Alembic.
+from depot.fields.sqlalchemy import UploadedFileField
+
+revision = '814c4ec72f1'
+down_revision = '4a3de0d0804a'
+
+from alembic import op
+import sqlalchemy as sa
+
+from kotti import DBSession
+
+
+def upgrade():
+
+    op.drop_table('images')
+    op.create_table(
+        'images',
+        sa.Column('id', sa.Integer(), sa.ForeignKey('contents.id'),
+                  primary_key=True),
+        sa.Column('filename', sa.Unicode(100)),
+        sa.Column('mimetype', sa.String(100)),
+        sa.Column('size', sa.Integer()),
+        sa.Column('data', UploadedFileField()))
+
+    DBSession.execute("""
+        INSERT INTO images (id, filename, mimetype, size, data)
+        SELECT f.id, f.filename, f.mimetype, f.size, f.data
+        FROM files f INNER JOIN nodes n ON f.id = n.id
+        WHERE n.type = 'image'""")
+
+    DBSession.execute("""
+        DELETE FROM files
+        WHERE id IN (SELECT id FROM images)""")
+
+
+def downgrade():
+    from kotti.resources import Image
+    DBSession.execute("""
+        INSERT INTO files (id, filename, mimetype, size, data)
+        SELECT id, filename, mimetype, size, data
+        FROM images""")
+    op.drop_table('images')
+    op.create_table(
+        'images',
+        sa.Column('id', sa.Integer(), sa.ForeignKey('files.id'),
+                  primary_key=True))
+    DBSession.execute("""
+        INSERT INTO images (id)
+        SELECT id
+        FROM nodes
+        WHERE type = 'image'""")
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 0a3a524e3..7cfc533e3 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -1,21 +1,35 @@
+import logging
+import mimetypes
 import uuid
 from datetime import datetime
+from time import time
 
+import rfc6266
+from depot.fields.sqlalchemy import _SQLAMutationTracker
+from depot.io.interfaces import FileStorage
+from depot.manager import DepotManager
+from pyramid import tweens
+from pyramid.httpexceptions import HTTPMovedPermanently
+from pyramid.httpexceptions import HTTPNotFound
+from pyramid.response import _BLOCK_SIZE
+from pyramid.response import FileIter
+from pyramid.response import Response
 from sqlalchemy import Column
 from sqlalchemy import DateTime
+from sqlalchemy import event
 from sqlalchemy import Integer
 from sqlalchemy import LargeBinary
 from sqlalchemy import String
 from sqlalchemy import Unicode
-from sqlalchemy import event
 from sqlalchemy.orm import deferred
+from unidecode import unidecode
 
-from depot.io.interfaces import FileStorage
-
-from kotti import Base
+from kotti import Base, get_settings
 from kotti import DBSession
 from kotti.util import camel_case_to_name
 from kotti.util import command
+from kotti.util import extract_from_settings
+from kotti.util import _to_fieldstorage
 
 _marker = object()
 
@@ -107,13 +121,27 @@ def seekable(self):
         """
         return True
 
-    def seek(self, n):
-        """ Move the file cursor to position `n`
+    def seek(self, offset, whence=0):
+        """ Change stream position.
+
+        Change the stream position to the given byte offset. The offset is
+        interpreted relative to the position indicated by whence.
 
         :param n: Position for the cursor
         :type n: int
+
+        :param whence: * 0 -- start of stream (the default);
+                              offset should be zero or positive
+                       * 1 -- current stream position; offset may be negative
+                       * 2 -- end of stream; offset is usually negative
+        :type whence: int
         """
-        self._cursor = n
+        if whence == 0:
+            self._cursor = offset
+        elif whence in (1, 2):
+            self._cursor = self._cursor + offset
+        else:
+            raise ValueError('whence must be 0, 1 or 2')
 
     def tell(self):
         """ Returns current position of file cursor
@@ -292,22 +320,7 @@ def _get_file_id(self, file_or_id):
         return file_or_id
 
 
-def configure_filedepot(settings):
-    from kotti.util import extract_depot_settings
-    from depot.manager import DepotManager
-
-    config = extract_depot_settings('kotti.depot.', settings)
-    for conf in config:
-        name = conf.pop('name')
-        if name not in DepotManager._depots:
-            DepotManager.configure(name, conf, prefix='')
-
-
 def migrate_storage(from_storage, to_storage):
-    from depot.fields.sqlalchemy import _SQLAMutationTracker
-    from depot.manager import DepotManager
-    from kotti.util import _to_fieldstorage
-    import logging
 
     log = logging.getLogger(__name__)
 
@@ -361,6 +374,189 @@ def migrate_storages_command():  # pragma: no cover
     )
 
 
+class StoredFileResponse(Response):
+    """ A Response object that can be used to serve an UploadedFile instance.
+
+    Code adapted from :class:`pyramid.response.FileResponse`.
+    """
+
+    def __init__(self, f, request, disposition='attachment',
+                 cache_max_age=604800, content_type=None,
+                 content_encoding=None):
+        """
+        :param f: the ``UploadedFile`` file field value.
+        :type f: :class:`depot.io.interfaces.StoredFile`
+
+        :param request: Current request.
+        :type request: :class:`pyramid.request.Request`
+
+        :param disposition:
+        :type disposition:
+
+        :param cache_max_age: The number of seconds that should be used to HTTP
+                              cache this response.
+
+        :param content_type: The content_type of the response.
+
+        :param content_encoding: The content_encoding of the response.
+                                 It's generally safe to leave this set to
+                                 ``None`` if you're serving a binary file.
+                                 This argument will be ignored if you also
+                                 leave ``content-type`` as ``None``.
+        """
+
+        if f.public_url:
+            raise HTTPMovedPermanently(f.public_url)
+
+        content_encoding, content_type = self._get_type_and_encoding(
+            content_encoding, content_type, f)
+
+        super(StoredFileResponse, self).__init__(
+            conditional_response=True,
+            content_type=content_type,
+            content_encoding=content_encoding)
+
+        app_iter = None
+        if request is not None:
+            environ = request.environ
+            if 'wsgi.file_wrapper' in environ:
+                app_iter = environ['wsgi.file_wrapper'](f, _BLOCK_SIZE)
+        if app_iter is None:
+            app_iter = FileIter(f)
+        self.app_iter = app_iter
+
+        # assignment of content_length must come after assignment of app_iter
+        self.content_length = f.content_length
+        self.last_modified = f.last_modified
+
+        if cache_max_age is not None:
+            self.cache_expires = cache_max_age
+            self.cache_control.public = True
+
+        self.etag = self.generate_etag(f)
+        self.content_disposition = rfc6266.build_header(
+            f.filename, disposition=disposition,
+            filename_compat=unidecode(f.filename))
+
+    def _get_type_and_encoding(self, content_encoding, content_type, f):
+        content_type = content_type or getattr(f, 'content_type', None)
+        if content_type is None:
+            content_type, content_encoding = \
+                mimetypes.guess_type(f.filename, strict=False)
+        if content_type is None:
+            content_type = 'application/octet-stream'
+        # str-ifying content_type is a workaround for a bug in Python 2.7.7
+        # on Windows where mimetypes.guess_type returns unicode for the
+        # content_type.
+        content_type = str(content_type)
+        return content_encoding, content_type
+
+    @classmethod
+    def generate_etag(self, f):
+        return '"%s-%s"' % (f.last_modified, f.content_length)
+
+
+def uploaded_file_response(self, uploaded_file, disposition='inline'):
+    return StoredFileResponse(uploaded_file.file, self,
+                              disposition=disposition)
+
+
+def uploaded_file_url(self, uploaded_file, disposition='inline'):
+    if disposition == 'attachment':
+        suffix = '/download'
+    else:
+        suffix = ''
+    url = '{0}/{1}/{2}{3}'.format(
+        self.application_url,
+        get_settings()['kotti.depot_mountpoint'][1:],
+        uploaded_file.path,
+        suffix)
+    return url
+
+
+class TweenFactory(object):
+    """Factory for a Pyramid tween in charge of serving Depot files.
+
+    This is the Pyramid tween version of
+    :class:`depot.middleware.DepotMiddleware`.  It does exactly the same as
+    Depot's WSGI middleware, but operates on a :class:`pyramid.request.Request`
+    object instead of the WSGI environment.
+    """
+
+    def __init__(self, handler, registry):
+        """
+        :param handler: Downstream tween or main Pyramid request handler (Kotti)
+        :type handler: function
+
+        :param registry: Application registry
+        :type registry: :class:`pyramid.registry.Registry`
+        """
+
+        self.mountpoint = registry.settings['kotti.depot_mountpoint']
+        self.handler = handler
+        self.registry = registry
+
+        self.cache_max_age = 3600 * 24 * 7
+        self.replace_wsgi_filewrapper = True
+
+        DepotManager.set_middleware(self)
+
+    def url_for(self, path):
+        return u'/'.join((self.mountpoint, path))
+
+    def __call__(self, request):
+        """
+        :param request: Current request
+        :type request: :class:`kotti.request.Request`
+
+        :return: Respone object
+        :rtype: :class:`pyramid.response.Response`
+        """
+
+        # Only handle GET and HEAD requests for the mountpoint.
+        # All other requests are passed to downstream handlers.
+        if request.method not in ('GET', 'HEAD') \
+                or not request.path.startswith(self.mountpoint):
+            response = self.handler(request)
+            return response
+
+        # paths match this pattern
+        # /<mountpoint>/<depot name>/<file id>[/download]
+        path = request.path.split('/')
+        if len(path) and not path[0]:
+            path = path[1:]
+
+        if len(path) < 3:
+            response = HTTPNotFound()
+            return response
+
+        __, depot, fileid = path[:3]
+        depot = DepotManager.get(depot)
+        if not depot:
+            response = HTTPNotFound()
+            return response
+
+        try:
+            f = depot.get(fileid)
+        except (IOError, ValueError):
+            response = HTTPNotFound()
+            return response
+
+        # if the file has a public_url, it's stored somewhere else (e.g. S3)
+        public_url = f.public_url
+        if public_url is not None:
+            response = HTTPMovedPermanently(public_url)
+            return response
+
+        # file is not directly accessible for user agents, serve it ourselves
+        if path[-1] == 'download':
+            disposition = 'attachment'
+        else:
+            disposition = 'inline'
+        response = StoredFileResponse(f, request, disposition=disposition)
+        return response
+
+
 def adjust_for_engine(conn, branch):
     # adjust for engine type
 
@@ -383,6 +579,55 @@ def patched_processed_result_value(self, value, dialect):
         UploadedFileField.process_result_value = patched_processed_result_value
 
 
+def extract_depot_settings(prefix="kotti.depot.", settings=None):
+    """ Merges items from a dictionary that have keys that start with `prefix`
+    to a list of dictionaries.
+
+    :param prefix: A dotted string representing the prefix for the common values
+    :type prefix: string
+
+    :param settings: A dictionary with settings. Result is extracted from this
+    :type settings: dict
+
+      >>> settings = {
+      ...     'kotti.depot_mountpoint': '/depot',
+      ...     'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
+      ...     'kotti.depot.0.file_storage': 'var/files',
+      ...     'kotti.depot.0.name': 'local',
+      ...     'kotti.depot.1.backend': 'depot.io.gridfs.GridStorage',
+      ...     'kotti.depot.1.name': 'mongodb',
+      ...     'kotti.depot.1.uri': 'localhost://',
+      ... }
+      >>> res = extract_depot_settings('kotti.depot.', settings)
+      >>> print sorted(res[0].items())
+      [('backend', 'kotti.filedepot.DBFileStorage'), ('file_storage', 'var/files'), ('name', 'local')]
+      >>> print sorted(res[1].items())
+      [('backend', 'depot.io.gridfs.GridStorage'), ('name', 'mongodb'), ('uri', 'localhost://')]
+    """
+
+    extracted = {}
+    for k, v in extract_from_settings(prefix, settings).items():
+        index, conf = k.split('.', 1)
+        index = int(index)
+        extracted.setdefault(index, {})
+        extracted[index][conf] = v
+
+    result = []
+    for k in sorted(extracted.keys()):
+        result.append(extracted[k])
+
+    return result
+
+
+def configure_filedepot(settings):
+
+    config = extract_depot_settings('kotti.depot.', settings)
+    for conf in config:
+        name = conf.pop('name')
+        if name not in DepotManager._depots:
+            DepotManager.configure(name, conf, prefix='')
+
+
 def includeme(config):
     """ Pyramid includeme hook.
 
@@ -390,10 +635,16 @@ def includeme(config):
     :type config: :class:`pyramid.config.Configurator`
     """
 
+    config.add_tween('kotti.filedepot.TweenFactory',
+                     over=tweens.MAIN,
+                     under=tweens.INGRESS)
+    config.add_request_method(uploaded_file_response,
+                              name='uploaded_file_response')
+    config.add_request_method(uploaded_file_url, name='uploaded_file_url')
+
     from kotti.events import objectevent_listeners
     from kotti.events import ObjectInsert
     from kotti.events import ObjectUpdate
-    from depot.fields.sqlalchemy import _SQLAMutationTracker
 
     from sqlalchemy.event import listen
     from sqlalchemy.engine import Engine
diff --git a/kotti/interfaces.py b/kotti/interfaces.py
index 06f0f0471..9f30547a9 100644
--- a/kotti/interfaces.py
+++ b/kotti/interfaces.py
@@ -25,11 +25,6 @@ class IFile(IContent):
        (and subclasses thereof)"""
 
 
-class IImage(IFile):
-    """Marker interface for all nodes of type Image
-       (and subclasses thereof)"""
-
-
 class IDefaultWorkflow(Interface):
     """Marker interface for content classes that want to use the
        default workflow"""
@@ -52,3 +47,13 @@ class INavigationRoot(Interface):
         The root item for the navigation will be ``/a/b`` for everey context in
         or below ``/a/b`` and ``/a`` for every other item.
         """
+
+
+# DEPRECATED
+
+from kotti_image.interfaces import IImage
+from zope.deprecation.deprecation import deprecated
+__ = IImage  # pyflakes
+deprecated('IImage',
+           'Image was outfactored to the kotti_image package.  '
+           'Please import from there.')
diff --git a/kotti/message.py b/kotti/message.py
index 270ada6e5..b7ee7e51b 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -30,27 +30,27 @@ def make_token(user, seconds=None):
 
 def validate_token(user, token, valid_hrs=24):
     """
-      >>> from kotti.testing import setUp, tearDown
-      >>> ignore = setUp()
-      >>> class User(object):
-      ...     pass
-      >>> daniel = User()
-      >>> daniel.name = u'daniel'
-      >>> alice = User()
-      >>> alice.name = u'alice'
-      >>> token = make_token(daniel)
-      >>> validate_token(daniel, token)
-      True
-      >>> validate_token(alice, token)
-      False
-      >>> validate_token(daniel, 'foo')
-      False
-      >>> token = make_token(daniel, seconds=time.time() - 100000)
-      >>> validate_token(daniel, token)
-      False
-      >>> validate_token(daniel, token, valid_hrs=48)
-      True
-      >>> tearDown()
+        >>> from kotti.testing import setUp, tearDown
+        >>> ignore = setUp()
+        >>> class User(object):
+        ...     pass
+        >>> daniel = User()
+        >>> daniel.name = u'daniel'
+        >>> alice = User()
+        >>> alice.name = u'alice'
+        >>> token = make_token(daniel)
+        >>> validate_token(daniel, token)
+        True
+        >>> validate_token(alice, token)
+        False
+        >>> validate_token(daniel, 'foo')
+        False
+        >>> token = make_token(daniel, seconds=time.time() - 100000)
+        >>> validate_token(daniel, token)
+        False
+        >>> validate_token(daniel, token, valid_hrs=48)
+        True
+        >>> tearDown()
     """
     try:
         seconds = float(token.split(':')[1])
diff --git a/kotti/resources.py b/kotti/resources.py
index 607a82830..6f672d10d 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -17,7 +17,6 @@
 
 from depot.fields.sqlalchemy import _SQLAMutationTracker
 from depot.fields.sqlalchemy import UploadedFileField
-from kotti import _resolve_dotted
 from pyramid.decorator import reify
 from pyramid.traversal import resource_path
 from sqlalchemy import Boolean
@@ -31,6 +30,7 @@
 from sqlalchemy import UnicodeText
 from sqlalchemy import UniqueConstraint
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.orm import backref
@@ -43,6 +43,7 @@
 from transaction import commit
 from zope.interface import implementer
 
+from kotti import _resolve_dotted
 from kotti import Base
 from kotti import DBSession
 from kotti import get_settings
@@ -52,10 +53,8 @@
 from kotti.interfaces import IDefaultWorkflow
 from kotti.interfaces import IDocument
 from kotti.interfaces import IFile
-from kotti.interfaces import IImage
 from kotti.interfaces import INode
 from kotti.migrate import stamp_heads
-from kotti.security import has_permission
 from kotti.security import PersistentACLMixin
 from kotti.security import view_permitted
 from kotti.sqla import ACLType
@@ -161,7 +160,7 @@ def children_with_permission(self, request, permission='view'):
 
         return [
             c for c in self.children
-            if has_permission(permission, c, request)
+            if request.has_permission(permission, c)
         ]
 
 
@@ -655,6 +654,27 @@ class SaveDataMixin(object):
         See http://stackoverflow.com/questions/30433960/how-to-use-declare-last-in-sqlalchemy-1-0  # noqa
     """
 
+    #: The filename is used in the attachment view to give downloads
+    #: the original filename it had when it was uploaded.
+    #: (:class:`sqlalchemy.types.Unicode`)
+    filename = Column(Unicode(100))
+    #: MIME type of the file
+    #: (:class:`sqlalchemy.types.String`)
+    mimetype = Column(String(100))
+    #: Size of the file in bytes
+    #: (:class:`sqlalchemy.types.Integer`)
+    size = Column(Integer())
+
+    #: Filedepot mapped blob
+    #: (:class:`depot.fileds.sqlalchemy.UploadedFileField`)
+    @declared_attr
+    def data(cls):
+
+        return cls.__table__.c.get('data',
+                                   Column(UploadedFileField(cls.data_filters)))
+
+    data_filters = ()
+
     @classmethod
     def __declare_last__(cls):
         """ Unconfigure the event set in _SQLAMutationTracker,
@@ -698,48 +718,6 @@ def _save_data(cls, target, value, oldvalue, initiator):
 
         return newvalue
 
-
-@implementer(IFile)
-class File(Content, SaveDataMixin):
-    """File adds some attributes to :class:`~kotti.resources.Content` that are
-       useful for storing binary data.
-    """
-    #: Primary key column in the DB
-    #: (:class:`sqlalchemy.types.Integer`)
-    id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
-    #: Filedepot mapped blob
-    #: (:class:`depot.fileds.sqlalchemy.UploadedFileField`)
-    data = Column(UploadedFileField)
-    #: The filename is used in the attachment view to give downloads
-    #: the original filename it had when it was uploaded.
-    #: (:class:`sqlalchemy.types.Unicode`)
-    filename = Column(Unicode(100))
-    #: MIME type of the file
-    #: (:class:`sqlalchemy.types.String`)
-    mimetype = Column(String(100))
-    #: Size of the file in bytes
-    #: (:class:`sqlalchemy.types.Integer`)
-    size = Column(Integer())
-
-    type_info = Content.type_info.copy(
-        name=u'File',
-        title=_(u'File'),
-        add_view=u'add_file',
-        addable_to=[u'Document'],
-        selectable_default_views=[],
-        uploadable_mimetypes=['*', ],
-        )
-
-    def __init__(self, data=None, filename=None, mimetype=None, size=None,
-                 **kwargs):
-
-        super(File, self).__init__(**kwargs)
-
-        self.filename = filename
-        self.mimetype = mimetype
-        self.size = size
-        self.data = data
-
     @classmethod
     def from_field_storage(cls, fs):
         """ Create and return an instance of this class from a file upload
@@ -758,20 +736,34 @@ def from_field_storage(cls, fs):
 
         return cls(data=fs)
 
+    def __init__(self, data=None, filename=None, mimetype=None, size=None,
+                 **kwargs):
+
+        super(SaveDataMixin, self).__init__(**kwargs)
 
-@implementer(IImage)
-class Image(File):
-    """Image doesn't add anything to :class:`~kotti.resources.File`, but images
-       have different views, that e.g. support on the fly scaling.
+        self.filename = filename
+        self.mimetype = mimetype
+        self.size = size
+        self.data = data
+
+
+@implementer(IFile)
+class File(SaveDataMixin, Content):
+    """File adds some attributes to :class:`~kotti.resources.Content` that are
+       useful for storing binary data.
     """
 
-    id = Column(Integer(), ForeignKey('files.id'), primary_key=True)
+    #: Primary key column in the DB
+    #: (:class:`sqlalchemy.types.Integer`)
+    id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
 
-    type_info = File.type_info.copy(
-        name=u'Image',
-        title=_(u'Image'),
-        add_view=u'add_image',
-        uploadable_mimetypes=['image/*', ],
+    type_info = Content.type_info.copy(
+        name=u'File',
+        title=_(u'File'),
+        add_view=u'add_file',
+        addable_to=[u'Document'],
+        selectable_default_views=[],
+        uploadable_mimetypes=['*', ],
         )
 
 
@@ -864,3 +856,14 @@ def initialize_sql(engine, drop_all=False):
     commit()
 
     return DBSession
+
+
+# DEPRECATED
+
+from zope.deprecation.deprecation import deprecated
+from kotti_image.resources import Image
+
+__ = Image
+deprecated('Image',
+           'Image was outfactored to the kotti_image package.  '
+           'Please import from there.')
diff --git a/kotti/templates/edit/upload.pt b/kotti/templates/edit/upload.pt
index ebb11228b..4de11536e 100644
--- a/kotti/templates/edit/upload.pt
+++ b/kotti/templates/edit/upload.pt
@@ -30,24 +30,22 @@
               <td>
                 {{f.file.type}} <br>
                 <div class="btn-group" ng-show="f.status=='ready for upload'">
-                  <button type="button"
-                    class="btn btn-default btn-xs dropdown-toggle"
-                    data-toggle="dropdown">
-                    Create as:
-                    {{f.desired_type.title}}
-                    <span class="caret" ng-show="f.allowed_types.length>1">
-                    </span>
-                  </button>
-                  <ul class="dropdown-menu" role="menu"
-                      ng-show="f.allowed_types.length>1">
-                    <li ng-repeat="t in f.allowed_types">
-                      <a ng-click="f.desired_type=t">
-                        <i class="icon-ok pull-right"
-                           ng-show="t==f.desired_type"></i>
-                        {{t.title}}
-                      </a>
-                    </li>
-                  </ul>
+                  <div class="dropdown">
+                    <button class="btn btn-xs btn-default dropdown-toggle" type="button" id="uploadType" data-toggle="dropdown">
+                      Create as:
+                      {{f.desiredType.title}}
+                      <span class="caret" ng-show="f.allowedTypes.length>1"></span>
+                    </button>
+                    <ul class="dropdown-menu" role="menu" aria-labelledby="uploadType" ng-show="f.allowedTypes.length>1">
+                      <li ng-repeat="t in f.allowedTypes" role="presentation">
+                        <a role="menuitem" tabindex="-1" href="#" ng-click="f.desiredType=t">
+                          <i class="icon-ok pull-right"
+                             ng-show="t==f.desiredType"></i>
+                          {{t.title}}
+                        </a>
+                      </li>
+                    </ul>
+                  </div>
                 </div>
               </td>
               <td class="col-md-2">{{f.size | bytes}}</td>
diff --git a/kotti/templates/view/image.pt b/kotti/templates/view/image.pt
index 25d2653d5..3ef8e87de 100644
--- a/kotti/templates/view/image.pt
+++ b/kotti/templates/view/image.pt
@@ -1,16 +1,6 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      metal:use-macro="api.macro('kotti:templates/view/master.pt')">
-
-  <article metal:fill-slot="content" class="document-view content">
-    <h1>${context.title}</h1>
-    <p class="lead">
-      ${context.description}
-    </p>
-    <div tal:replace="api.render_template('kotti:templates/view/tags.pt')" />
-    <div class="body">
-        <img src="${request.resource_url(context, 'image')}" />
-    </div>
-  </article>
-
-</html>
+<div tal:replace="api.render_template('kotti_image:templates/image.pt')">
+  <!--
+  This template was moved to 'kotti_image:templates/image.pt'.
+  Use / override that instead.
+  -->
+</div>
diff --git a/kotti/testing.py b/kotti/testing.py
index a1531bbd0..b1fab4fc1 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -141,6 +141,7 @@ def setUp(init_db=True, **kwargs):
 
 
 def tearDown():
+    from depot.manager import DepotManager
     from kotti import events
     from kotti import security
     from kotti.message import _inject_mailer
@@ -152,6 +153,7 @@ def tearDown():
 
     _inject_mailer[:] = []
     transaction.abort()
+    DepotManager._clear()
     testing.tearDown()
 
 
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 7ff2312d8..95e5b7dc2 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -9,9 +9,9 @@
 
    digraph kotti_fixtures {
       "allwarnings";
-      "mock_filedepot";
       "app" -> "webtest";
       "config" -> "db_session";
+      "config" -> "depot_tween";
       "config" -> "dummy_request";
       "config" -> "events";
       "config" -> "workflow";
@@ -22,11 +22,16 @@
       "custom_settings" -> "unresolved_settings";
       "db_session" -> "app";
       "db_session" -> "browser";
-      "db_session" -> "root";
       "db_session" -> "filedepot";
+      "db_session" -> "root";
       "dummy_mailer" -> "app";
       "dummy_mailer";
+      "dummy_request" -> "depot_tween";
       "events" -> "app";
+      "filedepot" -> "depot_tween";
+      "mock_filedepot" -> "depot_tween";
+      "mock_filedepot";
+      "no_filedepots" -> "depot_tween";
       "settings" -> "config";
       "settings" -> "content";
       "setup_app" -> "app";
@@ -41,11 +46,26 @@
 # public pytest fixtures
 
 import warnings
+from datetime import datetime
 
 from pytest import fixture
 from mock import MagicMock
 
-from datetime import datetime
+from kotti import testing
+
+
+@fixture
+def image_asset():
+    """ Return an image file """
+
+    return testing.asset('sendeschluss.jpg')
+
+
+@fixture
+def image_asset2():
+    """ Return another image file """
+
+    return testing.asset('logo.png')
 
 
 @fixture
@@ -217,7 +237,7 @@ def events(config, request):
 
 
 @fixture
-def setup_app(unresolved_settings):
+def setup_app(unresolved_settings, filedepot):
     from kotti import base_configure
     config = base_configure({}, **unresolved_settings)
     return config.make_wsgi_app()
@@ -289,13 +309,13 @@ def __init__(self):
         self._storage.setdefault(0)
 
     def get(self, id):
-        info = self._storage[id]
+        info = self._storage[int(id)]
 
         from StringIO import StringIO
 
         f = MagicMock(wraps=StringIO(info['content']))
         f.seek(0)
-        f.public_url = ''
+        f.public_url = None
         f.filename = info['filename']
         f.content_type = info['content_type']
         f.content_length = len(info['content'])
@@ -308,8 +328,12 @@ def create(self, content, filename=None, content_type=None):
         _id = max(self._storage) + 1
         filename = filename or getattr(content, 'filename', None)
         content_type = content_type or getattr(content, 'type', None)
-        if not isinstance(content, str):
+
+        if hasattr(content, 'file') and hasattr(content.file, 'read'):
             content = content.file.read()
+        elif hasattr(content, 'read'):
+            content = content.read()
+
         self._storage[_id] = {'content': content,
                               'filename': filename,
                               'content_type': content_type}
@@ -320,7 +344,35 @@ def delete(self, id):
 
 
 @fixture
-def mock_filedepot(request):
+def depot_tween(request, config, dummy_request):
+    """ Sets up the Depot tween and patches Depot's ``set_middleware`` to
+    suppress exceptions on subsequent calls """
+
+    from depot.manager import DepotManager
+    from kotti.filedepot import TweenFactory
+    from kotti.filedepot import uploaded_file_response
+    from kotti.filedepot import uploaded_file_url
+
+    dummy_request.__class__.uploaded_file_response = uploaded_file_response
+    dummy_request.__class__.uploaded_file_url = uploaded_file_url
+
+    _set_middleware = DepotManager.set_middleware
+    TweenFactory(None, config.registry)
+
+    @classmethod
+    def set_middleware_patched(cls, mw):
+        pass
+
+    DepotManager.set_middleware = set_middleware_patched
+
+    def restore():
+        DepotManager.set_middleware = _set_middleware
+
+    request.addfinalizer(restore)
+
+
+@fixture
+def mock_filedepot(request, depot_tween):
     """ Configures a mock depot store for :class:`depot.manager.DepotManager`
 
     This filedepot is not integrated with dbsession.
@@ -328,29 +380,24 @@ def mock_filedepot(request):
     """
     from depot.manager import DepotManager
 
-    _old_depots = DepotManager._depots
-    _old_default_depot = DepotManager._default_depot
     DepotManager._depots = {
         'mockdepot': MagicMock(wraps=TestStorage())
     }
     DepotManager._default_depot = 'mockdepot'
 
     def restore():
-        DepotManager._depots = _old_depots
-        DepotManager._default_depot = _old_default_depot
+        DepotManager._clear()
 
     request.addfinalizer(restore)
 
 
 @fixture
-def filedepot(db_session, request):
+def filedepot(db_session, request, depot_tween):
     """ Configures a dbsession integrated mock depot store for
     :class:`depot.manager.DepotManager`
     """
     from depot.manager import DepotManager
 
-    _old_depots = DepotManager._depots
-    _old_default_depot = DepotManager._default_depot
     DepotManager._depots = {
         'filedepot': MagicMock(wraps=TestStorage())
     }
@@ -358,27 +405,22 @@ def filedepot(db_session, request):
 
     def restore():
         db_session.rollback()
-        DepotManager._depots = _old_depots
-        DepotManager._default_depot = _old_default_depot
+        DepotManager._clear()
 
     request.addfinalizer(restore)
 
 
 @fixture
-def no_filedepots(db_session, request):
+def no_filedepots(db_session, request, depot_tween):
     """ A filedepot fixture to empty and then restore DepotManager configuration
     """
     from depot.manager import DepotManager
 
-    _old_depots = DepotManager._depots
-    _old_default_depot = DepotManager._default_depot
-
     DepotManager._depots = {}
     DepotManager._default_depot = None
 
     def restore():
         db_session.rollback()
-        DepotManager._depots = _old_depots
-        DepotManager._default_depot = _old_default_depot
+        DepotManager._clear()
 
     request.addfinalizer(restore)
diff --git a/kotti/tests/browser-image.txt b/kotti/tests/browser-image.txt
deleted file mode 100644
index d26d05199..000000000
--- a/kotti/tests/browser-image.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-kotti image browser tests
-=========================
-
-Setup and Login
----------------
-  >>> from kotti import testing
-  >>> tools = testing.setUpFunctional(**{
-  ...     'pyramid.includes': 'kotti.views.navigation.includeme_local_navigation',
-  ...     })
-  >>> browser = tools['Browser']()
-  >>> ctrl = browser.getControl
-
-  >>> browser.open(testing.BASE_URL + '/edit')
-  >>> "Log in" in browser.contents
-  True
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-
-Add a document as parent node for all images
---------------------------------------------
-
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "My Gallery"
-  >>> ctrl("save").click()
-  >>> "Item was added" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/my-gallery/'
-  True
-
-Add images
-----------
-
-  >>> image = testing.asset('sendeschluss.jpg').read()
-
-Image 1
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/')
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Image").click()
-
-  >>> ctrl("Title").value = "Image 1"
-  >>> ctrl("Description").value = "A beautiful image"
-  >>> ctrl("File").add_file(image, 'image/jpeg', 'sendeschluss.jpg')
-
-  >>> ctrl("save").click()
-  >>> "Item was added" in browser.contents
-  True
-
-Image 2
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/')
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Image").click()
-
-  >>> ctrl("Title").value = "Image 2"
-  >>> ctrl("Description").value = "An even more beautiful image"
-  >>> ctrl("File").add_file(image, 'image/jpeg', 'sendeschluss.jpg')
-
-  >>> ctrl("save").click()
-  >>> "Item was added" in browser.contents
-  True
-
-Image without file should show error message
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/')
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Image").click()
-
-  >>> ctrl("Title").value = "Image 3"
-  >>> ctrl("Description").value = "An even more beautiful image"
-  >>> ctrl("save").click()
-  >>> "There was a problem with your submission" in browser.contents
-  True
-  >>> "Required" in browser.contents
-  True
-
-View gallery and images
------------------------
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/')
-  >>> pos = browser.contents.index
-  >>> pos("Image 1") < pos("Image 2")
-  True
-  >>> "A beautiful image" in browser.contents
-  True
-  >>> browser.getLink("Image 2").click()
-  >>> "An even more beautiful image" in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/image-1')
-  >>> browser.headers["content-type"].lower()
-  'text/html; charset=utf-8'
-
-View image scales
------------------
-
-Default scale
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/image-1/image')
-  >>> browser.headers["content-type"]
-  'image/jpeg'
-  >>> browser.headers["content-length"]
-  '107341'
-  >>> browser.headers["content-disposition"].lower()
-  'inline;filename="sendeschluss.jpg"'
-
-Default scale, attachment
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/image-1/image/download')
-  >>> browser.headers["content-type"]
-  'image/jpeg'
-  >>> browser.headers["content-length"]
-  '107341'
-  >>> browser.headers["content-disposition"].lower()
-  'attachment;filename="sendeschluss.jpg"'
-
-Span1
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/image-1/image/span1')
-  >>> browser.headers["content-type"]
-  'image/jpeg'
-  >>> 1000 < int(browser.headers["content-length"]) < 2000
-  True
-  >>> browser.headers["content-disposition"].lower()
-  'inline;filename="sendeschluss.jpg"'
-
-Span1, attachment
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/image-1/image/span1/download')
-  >>> browser.headers["content-type"]
-  'image/jpeg'
-  >>> browser.headers["content-disposition"].lower()
-  'attachment;filename="sendeschluss.jpg"'
-
-Invalid predefined scale (should return original size)
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/image-1/image/invalid_scale')
-  >>> browser.headers["content-type"]
-  'image/jpeg'
-  >>> browser.headers["content-length"]
-  '107341'
-  >>> browser.headers["content-disposition"].lower()
-  'inline;filename="sendeschluss.jpg"'
-
-Invalid predefined scale (should return original size), attachment
-
-  >>> browser.open(testing.BASE_URL + '/my-gallery/image-1/image/invalid_scale/download')
-  >>> browser.headers["content-type"]
-  'image/jpeg'
-  >>> browser.headers["content-length"]
-  '107341'
-  >>> browser.headers["content-disposition"].lower()
-  'attachment;filename="sendeschluss.jpg"'
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/kotti/tests/logo.png b/kotti/tests/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa66c5970872ef030f208d719331a7d95a56a954
GIT binary patch
literal 55715
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
H@a+EpaqagO

literal 0
HcmV?d00001

diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index bb6b04edd..5c1297b59 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -53,7 +53,8 @@ def test_auth_policies_no_override(self, db_session):
 
         settings = self.required_settings()
         with patch('kotti.resources.initialize_sql'):
-            main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                main({}, **settings)
 
         registry = get_current_registry()
         assert registry.queryUtility(IAuthenticationPolicy) is not None
@@ -66,7 +67,8 @@ def test_auth_policies_override(self, db_session):
         settings['kotti.authn_policy_factory'] = 'kotti.none_factory'
         settings['kotti.authz_policy_factory'] = 'kotti.none_factory'
         with patch('kotti.resources.initialize_sql'):
-            main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                main({}, **settings)
 
         registry = get_current_registry()
         assert registry.queryUtility(IAuthenticationPolicy) is None
@@ -78,15 +80,17 @@ def test_asset_overrides(self, db_session):
         settings = self.required_settings()
         settings['kotti.asset_overrides'] = 'pyramid:scaffold/'
         with patch('kotti.resources.initialize_sql'):
-            main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                main({}, **settings)
 
     def test_pyramid_includes_overrides_base_includes(self, root):
         from kotti import main
 
         settings = self.required_settings()
-        settings['pyramid.includes'] = ('kotti.testing.includeme_login')
+        settings['pyramid.includes'] = 'kotti.testing.includeme_login'
         with patch('kotti.resources.initialize_sql'):
-            app = main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                app = main({}, **settings)
 
         provides = [
             IViewClassifier,
@@ -103,7 +107,8 @@ def test_use_tables(self, db_session):
         settings['kotti.populators'] = ''
         settings['kotti.use_tables'] = 'principals'
         with patch('kotti.resources.initialize_sql'):
-            main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                main({}, **settings)
 
     def test_root_factory(self, db_session):
         from kotti import main
@@ -113,11 +118,13 @@ def test_root_factory(self, db_session):
         settings = self.required_settings()
         settings['kotti.root_factory'] = (TestingRootFactory,)
         with patch('kotti.resources.initialize_sql'):
-            app = main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                app = main({}, **settings)
         assert isinstance(get_root(), TestingRootFactory)
         assert isinstance(app.root_factory(), TestingRootFactory)
 
-    def test_render_master_edit_template_minimal_root(self, settings=None):
+    def test_render_master_edit_template_minimal_root(self, no_filedepots,
+                                                      settings=None):
         from kotti import main
 
         settings = settings or self.required_settings()
@@ -130,12 +137,13 @@ def test_render_master_edit_template_minimal_root(self, settings=None):
         (status, headers, response) = request.call_application(app)
         assert status == '200 OK'
 
-    def test_render_master_view_template_minimal_root(self, db_session):
+    def test_render_master_view_template_minimal_root(self, no_filedepots,
+                                                      db_session):
         settings = self.required_settings()
-        settings['pyramid.includes'] = ('kotti.testing.includeme_layout')
+        settings['pyramid.includes'] = 'kotti.testing.includeme_layout'
         return self.test_render_master_edit_template_minimal_root(settings)
 
-    def test_setting_values_as_unicode(self, db_session):
+    def test_setting_values_as_unicode(self, db_session, filedepot):
         from kotti import get_settings
         from kotti import main
 
@@ -145,7 +153,8 @@ def test_setting_values_as_unicode(self, db_session):
         settings['foo.site_title'] = 'K\xc3\xb6tti'
 
         with patch('kotti.resources.initialize_sql'):
-            main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                main({}, **settings)
         assert get_settings()['kotti.site_title'] == u'K\xf6tti'
         assert get_settings()['kotti_foo.site_title'] == u'K\xf6tti'
         assert get_settings()['foo.site_title'] == 'K\xc3\xb6tti'
@@ -157,8 +166,10 @@ def test_default_filedepot(self, db_session):
         settings = self.required_settings()
 
         with patch('kotti.resources.initialize_sql'):
-            main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                main({}, **settings)
         assert DepotManager.get().__class__.__name__ == 'DBFileStorage'
+        DepotManager._clear()
 
     def test_configure_filedepot(self, no_filedepots):
         from depot.manager import DepotManager
@@ -196,7 +207,8 @@ def test_search_content(self, db_session):
         settings = self.required_settings()
         settings['kotti.search_content'] = 'kotti.testing.dummy_search'
         with patch('kotti.resources.initialize_sql'):
-            main({}, **settings)
+            with patch('kotti.filedepot.TweenFactory'):
+                main({}, **settings)
         assert search_content(u"Nuno") == u"Not found. Sorry!"
 
     def test_stamp_heads(self, db_session, connection):
@@ -207,7 +219,8 @@ def test_stamp_heads(self, db_session, connection):
         engine.table_names = Mock(return_value=[])
         with patch('kotti.engine_from_config', return_value=engine):
             with patch('kotti.resources.metadata'):
-                main({}, **settings)
+                with patch('kotti.filedepot.TweenFactory'):
+                    main({}, **settings)
 
         res = db_session.execute(select(
             columns=[column('version_num')],
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index 528468bb1..f2370b346 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -24,9 +24,9 @@ def delta(date_string):
 
 @pytest.fixture
 def cachetest_content(root, filedepot):
-    image = asset('sendeschluss.jpg').read()
+    image = asset('sendeschluss.jpg')
     root['textfile'] = File("file contents", u"mytext.txt", u"text/plain")
-    root['image'] = Image(image, u"sendeschluss.jpg", u"image/jpeg")
+    root['image'] = Image(image.read(), u"sendeschluss.jpg", u"image/jpeg")
 
 
 class TestSetMaxAge:
@@ -110,15 +110,6 @@ def test_cache_unauth(self, webtest, cachetest_content):
         d = delta(resp.headers.get('Expires'))
         assert (d.days, d.seconds) < (0, 0)
 
-        # media content
-        resp = webtest.app.get('/textfile/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
-        assert resp.headers.get('Cache-Control') == 'max-age=14400'
-        d = delta(resp.headers.get('Expires'))
-        assert (d.days, d.seconds) > (0, 14000)
-        resp = webtest.app.get('/image/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
-
         # resources
         resp = webtest.app.get('/static-kotti/base.css')
         assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
@@ -135,6 +126,18 @@ def test_cache_unauth(self, webtest, cachetest_content):
         resp = webtest.app.get('/this-isnt-here', status=404)
         assert 'X-Caching-Policy' not in resp.headers
 
+        # media content
+        resp = webtest.app.get('/textfile/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
+        assert resp.headers.get('Cache-Control') == 'max-age=14400,public'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) > (0, 14000)
+        resp = webtest.app.get('/image/inline-view')
+        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
+        assert resp.headers.get('Cache-Control') == 'max-age=14400,public'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) > (0, 14000)
+
     @pytest.mark.user('admin')
     def test_cache_auth(self, webtest, cachetest_content):
 
@@ -142,12 +145,6 @@ def test_cache_auth(self, webtest, cachetest_content):
         resp = webtest.app.get('/')
         assert resp.headers.get('X-Caching-Policy') == 'No Cache'
 
-        # media content
-        resp = webtest.app.get('/textfile/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
-        resp = webtest.app.get('/image/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
-
         # resources
         resp = webtest.app.get('/static-kotti/base.css')
         assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
@@ -155,3 +152,15 @@ def test_cache_auth(self, webtest, cachetest_content):
         # 404
         resp = webtest.app.get('/this-isnt-here', status=404)
         assert 'X-Caching-Policy' not in resp.headers
+
+        # media content
+        resp = webtest.app.get('/textfile/inline-view')
+        resp.headers.get('X-Caching-Policy') == 'No Cache'
+        assert resp.headers.get('Cache-Control') == 'max-age=0,public'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) <= (0, 0)
+        resp = webtest.app.get('/image/inline-view')
+        resp.headers.get('X-Caching-Policy') == 'No Cache'
+        assert resp.headers.get('Cache-Control') == 'max-age=0,public'
+        d = delta(resp.headers.get('Expires'))
+        assert (d.days, d.seconds) <= (0, 0)
diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 25d3727cc..67fa917fe 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -2,6 +2,8 @@
 
 import warnings
 
+from pytest import raises
+
 
 def assert_deprecations(w, *msgs):
 
@@ -12,13 +14,59 @@ def assert_deprecations(w, *msgs):
         assert msgs[i] in str(w[i].message)
 
 
-class TestDeprecated10:
+class TestToBeRemovedIn20:
 
-    def test_security_has_permission(self, allwarnings):
+    def test_type_info_action_links_deprecated(self, allwarnings):
+        from kotti.resources import TypeInfo
+        from kotti.util import LinkParent
+
+        my_item = object()
+        with warnings.catch_warnings(record=True) as wngs:
+            # If there's a last LinkParent item, we'll assume that is
+            # the action menu.
+            TypeInfo(edit_links=[LinkParent('foo', [])],
+                     action_links=[my_item])
+            assert wngs[0].category == DeprecationWarning
 
+        with raises(ValueError):
+            # If there's no last LinkParent item, we'll raise an
+            # error, since we can't do anything useful with the link.
+            TypeInfo(edit_links=[], action_links=[my_item])
+
+    def test_security_has_permission(self, allwarnings):
         with warnings.catch_warnings(record=True) as w:
             from kotti.security import has_permission
-            has_permission  # pyflakes
+            __ = has_permission  # pyflakes
+            assert_deprecations(w, "deprecated as of Kotti 1.0")
+
+    def test_object_after_delete(self, allwarnings):
+        with warnings.catch_warnings(record=True) as w:
+            from kotti.events import ObjectAfterDelete
+            __ = ObjectAfterDelete  # pyflakes
+            assert_deprecations(w, "Kotti 0.10")
+
+    def test_is_root_permission(self, allwarnings):
+        with warnings.catch_warnings(record=True) as w:
+            from kotti.views.util import is_root
+            __ = is_root  # pyflakes
+            assert_deprecations(w, "deprecated as of Kotti 1.0")
 
-            assert_deprecations(
-                w, "deprecated as of Kotti 1.0")
+    def test_uploaded_file_response(self, allwarnings):
+        with warnings.catch_warnings(record=True) as w:
+            from kotti.views.file import UploadedFileResponse
+            __ = UploadedFileResponse  # pyflakes
+            assert_deprecations(w, "removed in Kotti 2.0.0")
+
+    def test_image_deprecations(self, allwarnings):
+        with warnings.catch_warnings(record=True) as w:
+            from kotti.interfaces import IImage
+            from kotti.resources import Image
+            from kotti.views.edit.content import ImageAddForm
+            from kotti.views.edit.content import ImageEditForm
+            from kotti.views.image import _load_image_scales
+            from kotti.views.image import image_scales
+            from kotti.views.image import ImageView
+            from kotti.views.image import includeme
+            __ = (IImage, Image, _load_image_scales, image_scales, ImageView,
+                  includeme, ImageAddForm, ImageEditForm)  # pyflakes
+            assert_deprecations(w, *('kotti_image', ) * 8)
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index c03349d25..8e462d5e0 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from StringIO import StringIO
 from colander import null
 from pyramid.httpexceptions import HTTPMovedPermanently
@@ -6,38 +8,44 @@
 import pytest
 
 from kotti.testing import DummyRequest
+from kotti.testing import asset
 from kotti.views.file import inline_view
 from kotti.views.file import attachment_view
 from kotti.views.file import UploadedFileResponse
+from kotti.filedepot import StoredFileResponse
 
 
 class TestFileViews:
     def _create_file(self, config):
         from kotti.resources import File
-        self.file = File("file contents", u"myf\xfcle.png", u"image/png")
+        self.file = File(asset('logo.png').read(), u"myfüle.png", u"image/png")
 
     def _test_common_headers(self, headers):
         for name in ('Content-Disposition', 'Content-Length', 'Content-Type'):
             assert isinstance(headers[name], str)
-        assert headers["Content-Length"] == "13"
+        assert headers["Content-Length"] == "55715"
         assert headers["Content-Type"] == "image/png"
 
     @pytest.mark.parametrize("params",
                              [(inline_view, 'inline'),
                               (attachment_view, 'attachment')])
-    def test_file_views(self, params, config, filedepot):
+    def test_file_views(self, params, config, filedepot, dummy_request,
+                        depot_tween):
+        from kotti.filedepot import TweenFactory
+
         view, disposition = params
         self._create_file(config)
-        res = view(self.file, None)
+
+        res = view(self.file, dummy_request)
 
         self._test_common_headers(res.headers)
 
-        assert res.headers["Content-Disposition"] == disposition + \
-            ';filename="myfle.png"'
+        assert res.content_disposition.startswith(
+            '{0}; filename=my'.format(disposition))
 
-        assert res.app_iter.file.read() == 'file contents'
+        assert res.app_iter.file.read() == asset('logo.png').read()
         res.app_iter.file.seek(0)
-        assert res.body == 'file contents'
+        assert res.body == asset('logo.png').read()
 
 
 class TestFileEditForm:
@@ -138,23 +146,34 @@ class TestDepotStore:
     from kotti.resources import File, Image
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_create(self, factory, filedepot):
-        f = factory('file content')
-        assert len(f.data['files']) == 1
-        assert f.data.file.read() == 'file content'
+    def test_create(self, factory, filedepot, image_asset, app):
+        data = image_asset.read()
+        f = factory(data)
+        if factory.__class__.__name__ == 'File':
+            assert len(f.data['files']) == 1
+        elif factory.__class__.__name__ == 'Image':
+            assert len(f.data['files']) == 4
+        assert f.data.file.read() == data
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_edit_content(self, factory, filedepot):
-        f = factory('file content')
-        assert f.data.file.read() == 'file content'
-        f.data = 'edited'
-        assert f.data.file.read() == 'edited'
+    def test_edit_content(self, factory, filedepot, image_asset, image_asset2,
+                          app, db_session):
+        data = image_asset.read()
+        f = factory(data)
+        assert f.data.file.read() == data
+        db_session.flush()
+        data2 = image_asset2.read()
+        f.data = data2
+        db_session.flush()
+
+        assert f.data.file.read() == data2
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_session_rollback(self, factory, db_session, filedepot):
+    def test_session_rollback(self, factory, db_session, filedepot, image_asset,
+                              app):
         from depot.manager import DepotManager
 
-        f = factory(data='file content', name=u'content', title=u'content')
+        f = factory(data=image_asset.read(), name=u'content', title=u'content')
         id = f.data['file_id']
 
         db_session.add(f)
@@ -166,10 +185,11 @@ def test_session_rollback(self, factory, db_session, filedepot):
         assert DepotManager.get().delete.called
 
     @pytest.mark.parametrize("factory", [File, Image])
-    def test_delete(self, factory, db_session, root, filedepot):
+    def test_delete(self, factory, db_session, root, filedepot, image_asset,
+                    app):
         from depot.manager import DepotManager
 
-        f = factory(data='file content', name=u'content', title=u'content')
+        f = factory(data=image_asset, name=u'content', title=u'content')
         id = f.data['file_id']
         root[str(id)] = f
         db_session.flush()
@@ -187,40 +207,41 @@ def test_delete(self, factory, db_session, root, filedepot):
 class TestUploadedFileResponse:
     def _create_file(self,
                      data="file contents",
-                     filename=u"myf\xfcle.png",
+                     filename=u"myfüle.png",
                      mimetype=u"image/png"):
         from kotti.resources import File
         return File(data, filename, mimetype)
 
-    def test_as_body(self, filedepot):
-        f = self._create_file()
+    def test_as_body(self, filedepot, image_asset):
+        data = image_asset.read()
+        f = self._create_file(data)
         resp = UploadedFileResponse(f.data, DummyRequest())
-        assert resp.body == 'file contents'
+        assert resp.body == data
 
-    def test_as_app_iter(self, filedepot):
+    def test_as_app_iter(self, filedepot, image_asset):
         from pyramid.response import FileIter
-
-        f = self._create_file()
+        data = image_asset.read()
+        f = self._create_file(data)
         resp = UploadedFileResponse(f.data, DummyRequest())
         assert isinstance(resp.app_iter, FileIter)
-        assert ''.join(resp.app_iter) == 'file contents'
+        assert ''.join(resp.app_iter) == data
 
-    def test_unknown_filename(self, filedepot):
-        f = self._create_file("file contents", u"file", None)
+    def test_unknown_filename(self, filedepot, image_asset2):
+        f = self._create_file(b'foo', u"file.bar", None)
         resp = UploadedFileResponse(f.data, DummyRequest())
         assert resp.headers['Content-Type'] == 'application/octet-stream'
 
-    def test_guess_content_type(self, filedepot):
-        f = self._create_file("file contents", u"file.jpg", None)
+    def test_guess_content_type(self, filedepot, image_asset):
+        f = self._create_file(image_asset.read(), u"file.png", None)
         resp = UploadedFileResponse(f.data, DummyRequest())
-        assert resp.headers['Content-Type'] == 'image/jpeg'
+        assert resp.headers['Content-Type'] == 'image/png'
 
     def test_caching(self, filedepot, monkeypatch):
         import datetime
         import webob.response
 
         f = self._create_file()
-        d = datetime.datetime(2012, 12, 31, 13, 0, 0)
+        d = datetime.datetime(2012, 12, 31, 13)
 
         class mockdatetime:
             @staticmethod
@@ -236,13 +257,78 @@ def utcnow():
         assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
 
     def test_redirect(self, filedepot):
+
+        class PublicFile(object):
+            public_url = 'http://example.com'
+
+        class PublicData(object):
+            file = PublicFile()
+
+        with pytest.raises(HTTPMovedPermanently) as e:
+            UploadedFileResponse(PublicData(), DummyRequest())
+
+        response = e.value
+        assert response.headers['Location'] == 'http://example.com'
+
+
+class TestStoredFileResponse:
+    def _create_file(self,
+                     data="file contents",
+                     filename=u"myfüle.png",
+                     mimetype=u"image/png"):
+        from kotti.resources import File
+        return File(data, filename, mimetype)
+
+    def test_as_body(self, filedepot, image_asset):
+        data = image_asset.read()
+        f = self._create_file(data)
+        resp = StoredFileResponse(f.data.file, DummyRequest())
+        assert resp.body == data
+
+    def test_as_app_iter(self, filedepot, image_asset):
+        from pyramid.response import FileIter
+        data = image_asset.read()
+        f = self._create_file(data)
+        resp = StoredFileResponse(f.data.file, DummyRequest())
+        assert isinstance(resp.app_iter, FileIter)
+        assert ''.join(resp.app_iter) == data
+
+    def test_unknown_filename(self, filedepot, image_asset2):
+        f = self._create_file(b'foo', u"file.bar", None)
+        resp = StoredFileResponse(f.data.file, DummyRequest())
+        assert resp.headers['Content-Type'] == 'application/octet-stream'
+
+    def test_guess_content_type(self, filedepot, image_asset):
+        f = self._create_file(image_asset.read(), u"file.png", None)
+        resp = StoredFileResponse(f.data.file, DummyRequest())
+        assert resp.headers['Content-Type'] == 'image/png'
+
+    def test_caching(self, filedepot, monkeypatch):
+        import datetime
+        import webob.response
+
         f = self._create_file()
-        f.data._thaw()
-        f.data['_public_url'] = 'http://example.com'
-        f.data._freeze()
+        d = datetime.datetime(2012, 12, 31, 13)
+
+        class mockdatetime:
+            @staticmethod
+            def utcnow():
+                return d
+
+        monkeypatch.setattr(webob.response, 'datetime', mockdatetime)
+
+        resp = StoredFileResponse(f.data.file, DummyRequest(), cache_max_age=10)
+
+        # this is set by filedepot fixture
+        assert resp.headers['Last-Modified'] == 'Sun, 30 Dec 2012 00:00:00 GMT'
+        assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
+
+    def test_redirect(self, filedepot):
+        class PublicFile(object):
+            public_url = 'http://example.com'
 
         with pytest.raises(HTTPMovedPermanently) as e:
-            UploadedFileResponse(f.data, DummyRequest())
+            StoredFileResponse(PublicFile(), DummyRequest())
 
         response = e.value
         assert response.headers['Location'] == 'http://example.com'
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index f3ba33832..460d23530 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -156,7 +156,7 @@ def test_session_integration(self, db_session):
 
 class TestMigrateBetweenStorage:
 
-    def _create_content(self, db_session, root):
+    def _create_content(self, db_session, root, image1, image2):
         data = [
             ('f1...', u'file1.jpg', 'image/jpeg'),
             ('f2...', u'file2.png', 'image/png'),
@@ -166,8 +166,8 @@ def _create_content(self, db_session, root):
             root[row[1]] = f
 
         data = [
-            ('i1...', u'image1.jpg', 'image/jpeg'),
-            ('i2...', u'image2.png', 'image/png'),
+            (image2, u'image1.jpg', 'image/jpeg'),
+            (image1, u'image2.png', 'image/png'),
         ]
         for row in data:
             f = Image(data=row[0], filename=row[1], mimetype=row[2])
@@ -175,7 +175,8 @@ def _create_content(self, db_session, root):
 
         db_session.flush()
 
-    def test_migrate_between_storages(self, db_session, root, no_filedepots):
+    def test_migrate_between_storages(self, db_session, root, no_filedepots,
+                                      image_asset, image_asset2):
         from kotti.filedepot import configure_filedepot
         from kotti.filedepot import migrate_storage
         from kotti.resources import Node
@@ -201,14 +202,16 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots):
         }
 
         configure_filedepot(settings)
-        self._create_content(db_session, root)
+        image1 = image_asset.read()
+        image2 = image_asset2.read()
+        self._create_content(db_session, root, image1, image2)
 
-        assert db_session.query(DBStoredFile).count() == 4
+        assert db_session.query(DBStoredFile).count() == 8
 
         migrate_storage('dbfiles', 'localfs')
 
         folders = os.listdir(tmp_location)
-        assert len(folders) == 4
+        assert len(folders) == 8
 
         db_session.flush()
 
@@ -227,12 +230,48 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots):
 
         i1 = root['image1.jpg']
         assert i1.data.file_id in folders
-        assert i1.data.file.read() == 'i1...'
+        i1data = i1.data.file.read()
+        assert i1data == image2
 
         i2 = root['image2.png']
         assert i2.data.file_id in folders
-        assert i2.data.file.read() == 'i2...'
+        i2data = i2.data.file.read()
+        assert i2data == image1
 
         assert db_session.query(DBStoredFile).count() == 0
 
         shutil.rmtree(tmp_location)
+
+
+class TestTween:
+
+    @pytest.mark.user('admin')
+    def test_tween(self, webtest, filedepot, root, image_asset, db_session):
+
+        from kotti.resources import Image, get_root
+
+        # create an image resource
+        img = root['img'] = Image(data=image_asset.read(), title='Image')
+        db_session.flush()
+        root = get_root()
+        img = root['img']
+
+        # the image resource itself is served by the full Kotti stack
+        resp = webtest.app.get('/img')
+        assert resp.content_type == 'text/html'
+        assert resp.etag is None
+        assert resp.cache_control.max_age == 0
+        assert '<img src="http://localhost/img/image" />' in resp.body
+
+        # the attachments (created by the filters) are served by the
+        # FiledepotServeApp
+        resp = webtest.app.get(img.data['thumb_128x128_url'])
+
+        assert resp.etag is not None
+        assert resp.cache_control.max_age == 604800
+        assert resp.body.startswith('\x89PNG')
+
+        resp = webtest.app.get(img.data['thumb_256x256_url'])
+        assert resp.etag is not None
+        assert resp.cache_control.max_age == 604800
+        assert resp.body.startswith('\x89PNG')
diff --git a/kotti/tests/test_image.py b/kotti/tests/test_image.py
deleted file mode 100644
index dbb32642c..000000000
--- a/kotti/tests/test_image.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-class TestImageScaleLoading:
-
-    def test_it(self):
-
-        from kotti.views.image import _load_image_scales, image_scales
-
-        assert "daumennagel" not in image_scales
-
-        _load_image_scales({"kotti.image_scales.daumennagel": "100x100"})
-
-        assert image_scales["daumennagel"] == [100, 100]
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 969224876..c953540c5 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -1,5 +1,3 @@
-from warnings import catch_warnings
-
 from pytest import mark
 from pytest import raises
 from pyramid.security import ALL_PERMISSIONS
@@ -458,28 +456,6 @@ def test_add_selectable_default_view(self):
         assert ('one', 'two') in Document.type_info.selectable_default_views
         assert ('one', 'two') not in Content.type_info.selectable_default_views
 
-    def test_action_links_deprecated(self, allwarnings):
-        from kotti.resources import TypeInfo
-        from kotti.util import LinkParent
-
-        my_item = object()
-        with catch_warnings(record=True) as wngs:
-            # If there's a last LinkParent item, we'll assume that is
-            # the action menu.
-            TypeInfo(
-                edit_links=[LinkParent('foo', [])],
-                action_links=[my_item],
-                )
-            assert wngs[0].category == DeprecationWarning
-
-        with raises(ValueError):
-            # If there's no last LinkParent item, we'll raise an
-            # error, since we can't do anything useful with the link.
-            TypeInfo(
-                edit_links=[],
-                action_links=[my_item],
-                )
-
     def test_type_info_add_permission_default(self):
         from kotti.resources import TypeInfo
         type_info = TypeInfo()
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index cdc68fd12..271bafe23 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -31,8 +31,6 @@ def test_upload_anonymous(root, dummy_request, browser):
     browser.open(u'{0}/content_types'.format(BASE_URL))
     assert browser.url.startswith(u'{0}/@@login'.format(BASE_URL))
 
-    # import pdb; pdb.set_trace()
-
 
 @user('admin')
 def test_upload_authenticated_wo_mimetype(root, dummy_request, browser):
@@ -54,27 +52,3 @@ def test_upload_authenticated_text(root, dummy_request, browser):
     types = j['content_types']
     assert len(types) == 1
     assert types[0]['name'] == u'File'
-
-
-@user('admin')
-def test_upload_authenticated_image(root, dummy_request, browser):
-
-    link = browser.getLink
-
-    # get possible content types for image/png
-    browser.open(u'{0}/content_types?mimetype=image/png'.format(BASE_URL))
-    j = json.loads(browser.contents)
-    assert 'content_types' in j
-
-    # images and files are allowed
-    types = j['content_types']
-    assert len(types) == 2
-
-    # images must be first
-    assert types[0]['name'] == u'Image'
-    assert types[1]['name'] == u'File'
-
-    # Open the upload 'form'
-    browser.open(u'{0}/'.format(BASE_URL))
-    link('Upload Content').click()
-    assert 'Select file(s) to upload' in browser.contents
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 7e27a93a4..cb4901cb1 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -78,22 +78,25 @@ def test_list_children(self, db_session):
 
         # Now try it on a little graph:
         a, aa, ab, ac, aca, acb = create_contents(root)
-        with patch('kotti.views.util.has_permission', return_value=True):
+        with patch('kotti.testing.DummyRequest.has_permission',
+                   return_value=True):
             assert api.list_children() == [a]
             assert api.list_children(root) == [a]
             assert api.list_children(a) == [aa, ab, ac]
             assert api.list_children(aca) == []
 
         # Try permissions
-        with patch('kotti.views.util.has_permission') as has_permission:
+        with patch('kotti.testing.DummyRequest.has_permission') \
+                as has_permission:
             has_permission.return_value = False
             assert api.list_children(root) == []
-            has_permission.assert_called_once_with('view', a, api.request)
+            has_permission.assert_called_once_with('view', a)
 
-        with patch('kotti.views.util.has_permission') as has_permission:
+        with patch('kotti.testing.DummyRequest.has_permission') \
+                as has_permission:
             has_permission.return_value = False
             assert api.list_children(root, permission='edit') == []
-            has_permission.assert_called_once_with('edit', a, api.request)
+            has_permission.assert_called_once_with('edit', a)
 
     def test_root(self, db_session):
         api = self.make()
@@ -136,10 +139,11 @@ def test_breadcrumbs_with_navigation_root(self, db_session):
         assert breadcrumbs == [a, ac, acb]
 
     def test_has_permission(self, db_session):
-        with patch('kotti.views.util.has_permission') as has_permission:
+        with patch('kotti.testing.DummyRequest.has_permission') \
+                as has_permission:
             api = self.make()
             api.has_permission('drink')
-            has_permission.assert_called_with('drink', api.root, api.request)
+            has_permission.assert_called_with('drink', api.root)
 
     def test_edit_links(self, config, db_session):
         from kotti import views
@@ -413,7 +417,7 @@ def test_format_datetime(self, db_session):
         from babel.dates import format_datetime
         from babel.core import UnknownLocaleError
         api = self.make()
-        first = datetime.datetime(2012, 1, 1, 0)
+        first = datetime.datetime(2012, 1, 1)
         assert (
             api.format_datetime(first) ==
             format_datetime(first, format='medium', locale='en'))
@@ -566,10 +570,10 @@ def test_no_permission(self, config, root):
         from kotti.views.navigation import local_navigation
         a, aa, ab, ac, aca, acb = create_contents(root)
 
-        with patch('kotti.views.navigation.has_permission', return_value=True):
+        with patch('kotti.testing.DummyRequest.has_permission', return_value=True):
             assert local_navigation(ac, DummyRequest())['parent'] is not None
 
-        with patch('kotti.views.navigation.has_permission', return_value=False):
+        with patch('kotti.testing.DummyRequest.has_permission', return_value=False):
             assert local_navigation(ac, DummyRequest())['parent'] is None
 
     def test_in_navigation(self, config, root):
diff --git a/kotti/util.py b/kotti/util.py
index cf1a69d37..c25d81549 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -279,44 +279,6 @@ def extract_from_settings(prefix, settings=None):
     return extracted
 
 
-def extract_depot_settings(prefix="kotti.depot.", settings=None):
-    """ Merges items from a dictionary that have keys that start with `prefix`
-    to a list of dictionaries.
-
-    :param prefix: A dotted string representing the prefix for the common values
-    :type prefix: string
-    :value settings: A dictionary with settings. Result is extracted from this
-    :type settings: dict
-
-      >>> settings = {
-      ...     'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
-      ...     'kotti.depot.0.file_storage': 'var/files',
-      ...     'kotti.depot.0.name': 'local',
-      ...     'kotti.depot.1.backend': 'depot.io.gridfs.GridStorage',
-      ...     'kotti.depot.1.name': 'mongodb',
-      ...     'kotti.depot.1.uri': 'localhost://',
-      ... }
-      >>> res = extract_depot_settings('kotti.depot.', settings)
-      >>> print sorted(res[0].items())
-      [('backend', 'kotti.filedepot.DBFileStorage'), ('file_storage', 'var/files'), ('name', 'local')]
-      >>> print sorted(res[1].items())
-      [('backend', 'depot.io.gridfs.GridStorage'), ('name', 'mongodb'), ('uri', 'localhost://')]
-    """
-
-    extracted = {}
-    for k, v in extract_from_settings(prefix, settings).items():
-        index, conf = k.split('.', 1)
-        index = int(index)
-        extracted.setdefault(index, {})
-        extracted[index][conf] = v
-
-    result = []
-    for k in sorted(extracted.keys()):
-        result.append(extracted[k])
-
-    return result
-
-
 def disambiguate_name(name):
     parts = name.split(u'-')
     if len(parts) > 1:
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index bd89ad0eb..17f13b5a7 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -6,7 +6,6 @@
 from pyramid.url import resource_url
 from pyramid.view import view_config
 from pyramid.exceptions import Forbidden
-from pyramid.security import has_permission
 from pyramid.view import view_defaults
 from zope.deprecation import deprecated
 
@@ -140,7 +139,7 @@ def paste_nodes(self):
             item = DBSession.query(Node).get(id)
             if item is not None:
                 if action == 'cut':
-                    if not has_permission('edit', item, self.request):
+                    if not self.request.has_permission('edit', item):
                         raise Forbidden()
                     item.__parent__.children.remove(item)
                     item.name = title_to_name(item.name,
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 2cfb0e33e..9d1ed1e15 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -14,7 +14,6 @@
 
 from kotti.resources import Document
 from kotti.resources import File
-from kotti.resources import Image
 from kotti.resources import Node
 from kotti.util import _
 from kotti.util import _to_fieldstorage
@@ -31,7 +30,8 @@ class ContentSchema(colander.MappingSchema):
     title = colander.SchemaNode(
         colander.String(),
         title=_(u'Title'),
-        validator=colander.Length(max=Node.title.property.columns[0].type.length),
+        validator=colander.Length(
+            max=Node.title.property.columns[0].type.length),
         )
     description = colander.SchemaNode(
         colander.String(),
@@ -133,15 +133,6 @@ def add(self, **appstruct):
         return item
 
 
-class ImageEditForm(FileEditForm):
-    pass
-
-
-class ImageAddForm(FileAddForm):
-    item_type = _(u"Image")
-    item_class = Image
-
-
 def includeme(config):
     config.add_view(
         DocumentEditForm,
@@ -173,17 +164,13 @@ def includeme(config):
         renderer='kotti:templates/edit/node.pt',
         )
 
-    config.add_view(
-        ImageEditForm,
-        context=Image,
-        name='edit',
-        permission='edit',
-        renderer='kotti:templates/edit/node.pt',
-        )
+# DEPRECATED
 
-    config.add_view(
-        ImageAddForm,
-        name=Image.type_info.add_view,
-        permission=Image.type_info.add_permission,
-        renderer='kotti:templates/edit/node.pt',
-        )
+from zope.deprecation import deprecated
+from kotti_image.views.edit import ImageAddForm
+from kotti_image.views.edit import ImageEditForm
+__ = ImageAddForm, ImageEditForm   # pyflakes
+
+deprecated(('ImageAddForm', 'ImageEditForm'),
+           'Image was outfactored to the kotti_image package.  '
+           'Please import from there.')
diff --git a/kotti/views/file.py b/kotti/views/file.py
index 16d38416c..0fc6b9192 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -1,93 +1,46 @@
 # -*- coding: utf-8 -*-
 
-from pyramid.httpexceptions import HTTPMovedPermanently
-from pyramid.response import _BLOCK_SIZE
-from pyramid.response import FileIter
-from pyramid.response import Response
 from pyramid.view import view_config
 
-from kotti.resources import File
+from kotti.interfaces import IFile
 
-import mimetypes
 
-
-class UploadedFileResponse(Response):
-    """
-    A Response object that can be used to serve an UploadedFile instance.
-
-    ``data`` is the ``UploadedFile`` file field value.
-
-    ``request`` must be a Pyramid :term:`request` object.  Note
-    that a request *must* be passed if the response is meant to attempt to
-    use the ``wsgi.file_wrapper`` feature of the web server that you're using
-    to serve your Pyramid application.
-
-    ``cache_max_age`` is the number of seconds that should be used
-    to HTTP cache this response.
-
-    ``content_type`` is the content_type of the response.
-
-    ``content_encoding`` is the content_encoding of the response.
-    It's generally safe to leave this set to ``None`` if you're serving a
-    binary file.  This argument will be ignored if you also leave
-    ``content-type`` as ``None``.
-
-    Code adapted from pyramid.response.FileResponse
-    """
-    def __init__(self, data, request=None, disposition='attachment',
-                 cache_max_age=None, content_type=None,
-                 content_encoding=None):
-
-        if data._public_url:
-            raise HTTPMovedPermanently(data._public_url)
-
-        filename = data.filename
-
-        content_type = content_type or getattr(data, 'content_type', None)
-        if content_type is None:
-            content_type, content_encoding = \
-                mimetypes.guess_type(filename, strict=False)
-
-        if content_type is None:
-            content_type = 'application/octet-stream'
-        # str-ifying content_type is a workaround for a bug in Python 2.7.7
-        # on Windows where mimetypes.guess_type returns unicode for the
-        # content_type.
-        content_type = str(content_type)
-
-        super(UploadedFileResponse, self).__init__(
-            conditional_response=True,
-            content_type=content_type,
-            content_encoding=content_encoding
-        )
-
-        self.app_iter = FileIter(data.file, _BLOCK_SIZE)
-        # assignment of content_length must come after assignment of app_iter
-        self.content_length = data.file.content_length
-        self.last_modified = data.file.last_modified
-        if cache_max_age is not None:
-            self.cache_expires = cache_max_age
-
-        disp = '{0};filename="{1}"'.format(
-            disposition, data.filename.encode('ascii', 'ignore'))
-        self.headerlist.append(('Content-Disposition', disp))
-
-
-@view_config(name='view', context=File, permission='view',
+@view_config(name='view', context=IFile, permission='view',
              renderer='kotti:templates/view/file.pt')
 def view(context, request):
     return {}
 
 
-@view_config(name='inline-view', context=File, permission='view')
+@view_config(name='inline-view', context=IFile, permission='view')
 def inline_view(context, request):
-    return UploadedFileResponse(context.data, request, disposition='inline')
+    return request.uploaded_file_response(context.data)
 
 
-@view_config(name='attachment-view', context=File, permission='view')
+@view_config(name='attachment-view', context=IFile, permission='view')
 def attachment_view(context, request):
-    return UploadedFileResponse(context.data, request, disposition='attachment')
+    return request.uploaded_file_response(context.data, 'attachment')
 
 
 def includeme(config):
     config.scan(__name__)
+
+
+# DEPRECATED
+
+from zope.deprecation.deprecation import deprecated
+from kotti.filedepot import StoredFileResponse
+
+
+class UploadedFileResponse(StoredFileResponse):
+    def __init__(self, data, request, disposition='attachment',
+                 cache_max_age=None, content_type=None,
+                 content_encoding=None):
+        super(UploadedFileResponse, self).__init__(
+            data.file, request, disposition=disposition,
+            cache_max_age=cache_max_age, content_type=content_type,
+            content_encoding=content_encoding)
+
+deprecated('UploadedFileResponse',
+           'UploadedFileResponse is deprecated and will be removed in '
+           'Kotti 2.0.0.  Use "request.uploaded_file_response(context.data)" '
+           'instead.')
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 0e1984405..a56571314 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -39,10 +39,13 @@ def get_appstruct(context, schema):
 class ObjectType(colander.SchemaType):
     """ A type leaving the value untouched.
     """
-    def serialize(self, node, value):
+
+    @classmethod
+    def serialize(cls, node, value):
         return value
 
-    def deserialize(self, node, value):
+    @classmethod
+    def deserialize(cls, node, value):
         return value
 
 
diff --git a/kotti/views/image.py b/kotti/views/image.py
index dc3e653d4..778ae0ded 100644
--- a/kotti/views/image.py
+++ b/kotti/views/image.py
@@ -2,123 +2,15 @@
 Views for image content objects.
 """
 
-import PIL
-from plone.scale.scale import scaleImage
-from pyramid.response import Response
-from pyramid.view import view_config
-from pyramid.view import view_defaults
+from kotti_image.views import _load_image_scales
+from kotti_image.views import image_scales
+from kotti_image.views import ImageView
+from kotti_image.views import includeme
 
-from kotti.interfaces import IImage
-from kotti.util import extract_from_settings
-from kotti.views.file import UploadedFileResponse
+from zope.deprecation import deprecated
 
-PIL.ImageFile.MAXBLOCK = 33554432
+__ = _load_image_scales, image_scales, ImageView, includeme  # pyflakes
 
-#: Default image scales
-image_scales = {
-    'span1': [60, 120],
-    'span2': [160, 320],
-    'span3': [260, 520],
-    'span4': [360, 720],
-    'span5': [460, 920],
-    'span6': [560, 1120],
-    'span7': [660, 1320],
-    'span8': [760, 1520],
-    'span9': [860, 1720],
-    'span10': [960, 1920],
-    'span11': [1060, 2120],
-    'span12': [1160, 2320],
-    }
-
-
-@view_defaults(context=IImage, permission='view')
-class ImageView(object):
-    """The ImageView class is registered for the :class:`IImage` context."""
-
-    def __init__(self, context, request):
-
-        self.context = context
-        self.request = request
-
-    @view_config(name='view',
-                 renderer='kotti:templates/view/image.pt')
-    def view(self):
-        """
-        :result: Empty dictionary to be handed to the image.pt template for
-                 rendering.
-        :rtype: dict
-        """
-
-        return {}
-
-    @view_config(name="image")
-    def image(self, subpath=None):
-        """Return the image in a specific scale, either inline
-        (default) or as attachment.
-
-        :param subpath: [<image_scale>]/download] (optional).
-                        When 'download' is the last element in subpath,
-                        the image is served with a 'Content-Disposition:
-                        attachment' header.  <image_scale> has to be one of the
-                        predefined image_scales - either from the defaults in
-                        this module or one set with a
-                        kotti.image_scales.<scale_name> in your app config ini
-                        file.
-        :type subpath: str
-
-        :result: complete response object
-        :rtype: pyramid.response.Response
-        """
-
-        if subpath is None:
-            subpath = self.request.subpath
-
-        width, height = (None, None)
-        subpath = list(subpath)
-
-        if (len(subpath) > 0) and (subpath[-1] == "download"):
-            disposition = "attachment"
-            subpath.pop()
-        else:
-            disposition = "inline"
-
-        if len(subpath) == 1:
-            scale = subpath[0]
-            if scale in image_scales:
-                # /path/to/image/scale/thumb
-                width, height = image_scales[scale]
-
-        if not (width and height):
-            return UploadedFileResponse(
-                self.context.data, self.request, disposition)
-
-        image, format, size = scaleImage(self.context.data.file.read(),
-                                         width=width,
-                                         height=height,
-                                         direction="thumb")
-        res = Response(
-            headerlist=[
-                ('Content-Disposition', '{0};filename="{1}"'.format(
-                    disposition,
-                    self.context.filename.encode('ascii', 'ignore'))),
-                ('Content-Length', str(len(image))),
-                ('Content-Type', str(self.context.mimetype)),
-            ],
-            body=image,
-        )
-
-        return res
-
-
-def _load_image_scales(settings):
-    image_scale_strings = extract_from_settings(
-        'kotti.image_scales.', settings)
-
-    for k in image_scale_strings.keys():
-        image_scales[k] = [int(x) for x in image_scale_strings[k].split("x")]
-
-
-def includeme(config):
-    _load_image_scales(config.registry.settings)
-
-    config.scan(__name__)
+deprecated(('_load_image_scales', 'image_scales', 'ImageView', 'includeme'),
+           'Image was outfactored to the kotti_image package.  '
+           'Please import from there.')
diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index 69632c97f..080786108 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -9,7 +9,6 @@
 from kotti.interfaces import INavigationRoot
 from kotti.interfaces import INode
 from kotti.resources import get_root
-from kotti.security import has_permission
 from kotti.views.util import nodes_tree
 
 
@@ -39,7 +38,7 @@ def local_navigation(context, request):
     def ch(node):
         return [child for child in node.values()
                 if child.in_navigation and
-                has_permission('view', child, request)]
+                request.has_permission('view', child)]
 
     parent = context
     children = ch(context)
diff --git a/kotti/views/users.py b/kotti/views/users.py
index c222d29be..30133da9d 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -138,13 +138,13 @@ def with_roles(entry):
 
 def name_pattern_validator(node, value):
     """
-      >>> name_pattern_validator(None, u'bob')
-      >>> name_pattern_validator(None, u'b ob')
-      Traceback (most recent call last):
-      Invalid: <unprintable Invalid object>
-      >>> name_pattern_validator(None, u'b:ob')
-      Traceback (most recent call last):
-      Invalid: <unprintable Invalid object>
+        >>> name_pattern_validator(None, u'bob')
+        >>> name_pattern_validator(None, u'b ob')
+        Traceback (most recent call last):
+        Invalid: <unprintable Invalid object>
+        >>> name_pattern_validator(None, u'b:ob')
+        Traceback (most recent call last):
+        Invalid: <unprintable Invalid object>
     """
     valid_pattern = re.compile(r"^[a-zA-Z0-9_\-\.]+$")
     if not valid_pattern.match(value):
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 44fe8661a..44769113e 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -18,7 +18,6 @@
 from sqlalchemy import and_
 from sqlalchemy import not_
 from sqlalchemy import or_
-from zope.deprecation.deprecation import deprecate
 from zope.deprecation import deprecated
 
 from kotti import DBSession
@@ -30,7 +29,6 @@
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
 from kotti.sanitizers import sanitize
-from kotti.security import has_permission
 from kotti.security import view_permitted
 from kotti.util import render_view
 from kotti.util import TemplateStructure
@@ -81,11 +79,11 @@ def add_renderer_globals(event):
         event['api'] = api
 
 
-@deprecate("'is_root' is deprecated as of Kotti 1.0.0. "
-           "Use the 'root_only=True' if you were using this as a "
-           "'custom_predicates' predicate.")
 def is_root(context, request):
     return context is request.root
+deprecated('is_root', "'is_root' is deprecated as of Kotti 1.0.0. "
+           "Use the 'root_only=True' if you were using this as a "
+           "'custom_predicates' predicate.")
 
 
 class Slots(object):
@@ -265,7 +263,7 @@ def has_permission(self, permission, context=None):
         context is passed to ``has_permission``."""
         if context is None:
             context = self.context
-        return has_permission(permission, context, self.request)
+        return self.request.has_permission(permission, context)
 
     def render_view(self, name='', context=None, request=None, secure=True,
                     bare=True):
@@ -292,7 +290,7 @@ def list_children(self, context=None, permission='view'):
         if hasattr(context, 'values'):
             for child in context.values():
                 if (not permission or
-                        has_permission(permission, child, self.request)):
+                        self.request.has_permission(permission, child)):
                     children.append(child)
         return children
 
@@ -401,7 +399,7 @@ def children(self):
                 self._permission,
             )
             for child in self._item_to_children[self.id]
-            if has_permission(self._permission, child, self._request)
+            if self._request.has_permission(self._permission, child)
         ]
 
     def _flatten(self, item):
@@ -422,7 +420,7 @@ def nodes_tree(request, context=None, permission='view'):
     item_to_children = defaultdict(lambda: [])
     for node in DBSession.query(Content).with_polymorphic(Content):
         item_mapping[node.id] = node
-        if has_permission(permission, node, request):
+        if request.has_permission(permission, node):
             item_to_children[node.parent_id].append(node)
 
     for children in item_to_children.values():
@@ -472,7 +470,7 @@ def default_search_content(search_term, request=None):
     result_dicts = []
 
     for result in results:
-        if has_permission('view', result, request):
+        if request.has_permission('view', result):
             result_dicts.append(dict(
                 name=result.name,
                 title=result.title,
@@ -493,7 +491,7 @@ def search_content_for_tags(tags, request=None):
     result_dicts = []
 
     for result in content_with_tags(tags):
-        if has_permission('view', result, request):
+        if request.has_permission('view', result):
             result_dicts.append(dict(
                 name=result.name,
                 title=result.title,
diff --git a/requirements.txt b/requirements.txt
index b3b8f147e..f8b6a8c4c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -41,6 +41,7 @@ js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 kotti-tinymce==0.5.4
+kotti-image==0.1.2
 lingua==4.5.1
 peppercorn==0.5
 plone.scale==1.4
@@ -60,6 +61,7 @@ repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
 repoze.zcml==1.0b1
+rfc6266==0.0.4
 shutilwhich==1.1.0
 six==1.10.0
 transaction==1.4.4
diff --git a/setup.py b/setup.py
index 83c0bec23..0e9ab0c1b 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,7 @@
     'js.jquery_timepicker_addon',
     'js.jqueryui>=1.8.24',
     'js.jqueryui_tagit',
+    'kotti_image',
     'lingua>=1.3',
     'plone.scale',  # needed for image resizing capabilities
     'py_bcrypt',
@@ -49,6 +50,7 @@
     'pyramid_zcml',
     'repoze.lru',
     'repoze.workflow',
+    'rfc6266',
     'sqlalchemy>=1.0.0',
     'sqlalchemy-utils',
     'transaction>=1.1.0',
@@ -85,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.2.5-dev',
+      version='1.3.0-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 6fa8a9ab64d5b903db646857de7509c227cbdba2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 12:59:23 +0100
Subject: [PATCH 384/600] Bump version.

---
 CHANGES.txt                              | 9 ++++++---
 kotti/scaffolds/package/requirements.txt | 2 +-
 requirements.txt                         | 2 +-
 setup.py                                 | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0eb0844ae..7c8d353fc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,11 @@
 Change History
 ==============
 
-1.3.0 - unreleased
-------------------
+1.3.0-alpha.1 - 2015-12-22
+--------------------------
+
+**This is a alpha release.  Blindly upgrading your production environments will
+make the universe collapse!**
 
 - Completely revised ``Depot`` integration.  See
   http://kotti.readthedocs.org/en/latest/developing/advanced/blobs.html
@@ -14,7 +17,7 @@ Change History
   new ``kotti_image`` package's readme and the Depot documentation
   (http://depot.readthedocs.org/en/latest/database.html#custom-behaviour-in-attachments).
 
-  ** These changes require a database migration. **
+  **These changes require a database migration.**
 
   A migration script is included, which can be executed by running
   ``kotti-migrate <your.ini> upgrade_all``.  However, this script will fail if
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index a7f957685..26fd678cf 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1 +1 @@
--r https://raw.githubusercontent.com/Kotti/Kotti/stable/requirements.txt
+-r https://raw.githubusercontent.com/Kotti/Kotti/testing/requirements.txt
diff --git a/requirements.txt b/requirements.txt
index f8b6a8c4c..cdd1f6259 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.2.4
+Kotti==1.3.0-alpha.1
 Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.24
diff --git a/setup.py b/setup.py
index 0e9ab0c1b..513da15e5 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-dev',
+      version='1.3.0-alpha.1',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From bd213a2fd8a2d50f46769f499200d9fd52a1086e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 13:01:18 +0100
Subject: [PATCH 385/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7c8d353fc..26d8e219a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.3.0 - unreleased
+------------------
+
+- No changes yet.
+
 1.3.0-alpha.1 - 2015-12-22
 --------------------------
 
diff --git a/setup.py b/setup.py
index 513da15e5..cda4203fe 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.1',
+      version='1.3.0-alpha.2-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 9dde010cc21296d6e5a8c222991cc5d3cb518948 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 13:33:28 +0100
Subject: [PATCH 386/600] Fix some issues reported by quantifiedco.de.  Add a
 .checkignore to skip test analysis in the future.

---
 .checkignore                | 2 ++
 docs/conf.py                | 2 +-
 kotti/filedepot.py          | 7 ++++---
 kotti/views/edit/actions.py | 2 +-
 kotti/views/users.py        | 3 ++-
 kotti/views/util.py         | 9 ++++++---
 6 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 .checkignore

diff --git a/.checkignore b/.checkignore
new file mode 100644
index 000000000..28ba17f00
--- /dev/null
+++ b/.checkignore
@@ -0,0 +1,2 @@
+kotti/testing.py
+kotti/tests/*
diff --git a/docs/conf.py b/docs/conf.py
index 7b8227c0e..1d0d51f73 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,7 +50,7 @@
 # -- Options for HTML output ---------------------------------------------------
 
 # on_rtd is whether we are on readthedocs.org
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+on_rtd = os.environ.get('READTHEDOCS') == 'True'
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
     import sphinx_rtd_theme
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 7cfc533e3..88a65d328 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -438,7 +438,8 @@ def __init__(self, f, request, disposition='attachment',
             f.filename, disposition=disposition,
             filename_compat=unidecode(f.filename))
 
-    def _get_type_and_encoding(self, content_encoding, content_type, f):
+    @classmethod
+    def _get_type_and_encoding(cls, content_encoding, content_type, f):
         content_type = content_type or getattr(f, 'content_type', None)
         if content_type is None:
             content_type, content_encoding = \
@@ -452,8 +453,8 @@ def _get_type_and_encoding(self, content_encoding, content_type, f):
         return content_encoding, content_type
 
     @classmethod
-    def generate_etag(self, f):
-        return '"%s-%s"' % (f.last_modified, f.content_length)
+    def generate_etag(cls, f):
+        return '"{0}-{1}"'.format(f.last_modified, f.content_length)
 
 
 def uploaded_file_response(self, uploaded_file, disposition='inline'):
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 17f13b5a7..2fc415f71 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -266,7 +266,7 @@ def delete_node(self):
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
 
-        action = self.request.POST.get(u'delete', None)
+        action = self.request.POST.get(u'delete')
         if action is not None:
 
             parent = self.context.__parent__
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 30133da9d..c9a6e0926 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -355,7 +355,8 @@ class GroupAddFormView(UserAddFormView):
     buttons = (Button('add_group', _(u'Add Group')),
                Button('cancel', _(u'Cancel')))
 
-    def schema_factory(self):
+    @classmethod
+    def schema_factory(cls):
         schema = group_schema()
         del schema['active']
         return schema
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 44769113e..a00076e00 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -137,7 +137,8 @@ def __init__(self, context, request, bare=None, **kwargs):
         self.slots = Slots(context, request)
         self.__dict__.update(kwargs)
 
-    def is_location(self, context):
+    @classmethod
+    def is_location(cls, context):
         """Does `context` implement :class:`pyramid.interfaces.ILocation`?
 
         :param context: The context.
@@ -333,7 +334,8 @@ def format_currency(self, n, currency, format=None):
         return format_currency(n, currency,
                                format=format, locale=self.locale_name)
 
-    def get_type(self, name):
+    @classmethod
+    def get_type(cls, name):
         for class_ in get_settings()['kotti.available_types']:
             if class_.type_info.name == name:
                 return class_
@@ -358,7 +360,8 @@ def site_setup_links(self):
         return [l for l in CONTROL_PANEL_LINKS
                 if l.visible(self.root, self.request)]
 
-    def sanitize(self, html, sanitizer='default'):
+    @classmethod
+    def sanitize(cls, html, sanitizer='default'):
         """ Convenience wrapper for :func:`kotti.sanitizers.sanitize`.
 
         :param html: HTML to be sanitized

From 7d737fdd5acdd916f66950ed8a439e7fc128ce59 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 14:12:46 +0100
Subject: [PATCH 387/600] Covert instance and class methods to static methods
 where possible.

---
 kotti/filedepot.py          | 42 ++++++++++++++++++-------------------
 kotti/migrate.py            |  3 ++-
 kotti/resources.py          |  4 ++--
 kotti/sqla.py               |  6 ++++--
 kotti/util.py               |  3 ++-
 kotti/views/edit/actions.py |  2 +-
 kotti/views/form.py         |  8 +++----
 kotti/views/users.py        | 17 +++++++++------
 kotti/views/util.py         | 12 +++++------
 9 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 88a65d328..fef8b4416 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -69,6 +69,8 @@ class DBStoredFile(Base):
     _cursor = 0
     _data = _marker
 
+    public_url = None
+
     def __init__(self, file_id, filename=None, content_type=None,
                  last_modified=None, content_length=None, **kwds):
         self.file_id = file_id
@@ -100,23 +102,27 @@ def read(self, n=-1):
 
         return result
 
-    def close(self, *args, **kwargs):
+    @staticmethod
+    def close(*args, **kwargs):
         """Implement :meth:`StoredFile.close`.
         :class:`DBStoredFile` never closes.
         """
         return
 
-    def closed(self):
+    @staticmethod
+    def closed():
         """Implement :meth:`StoredFile.closed`.
         """
         return False
 
-    def writable(self):
+    @staticmethod
+    def writable():
         """Implement :meth:`StoredFile.writable`.
         """
         return False
 
-    def seekable(self):
+    @staticmethod
+    def seekable():
         """Implement :meth:`StoredFile.seekable`.
         """
         return True
@@ -160,17 +166,6 @@ def name(self):
         """
         return self.filename
 
-    @property
-    def public_url(self):
-        """ Integration with :class:`depot.middleware.DepotMiddleware`
-
-        When supported by the storage this will provide the
-        public url to which the file content can be accessed.
-        In case this returns ``None`` it means that the file can
-        only be served by the :class:`depot.middleware.DepotMiddleware` itself.
-        """
-        return None
-
     @classmethod
     def __declare_last__(cls):
         """ Executed by SQLAlchemy as part of mapper configuration
@@ -203,7 +198,8 @@ class DBFileStorage(FileStorage):
     Uses `kotti.filedepot.DBStoredFile` to store blob data in an SQL database.
     """
 
-    def get(self, file_id):
+    @staticmethod
+    def get(file_id):
         """Returns the file given by the file_id
 
         :param file_id: the unique id associated to the file
@@ -311,10 +307,12 @@ def exists(self, file_or_id):
         return bool(
             DBSession.query(DBStoredFile).filter_by(file_id=file_id).count())
 
-    def list(self, *args):
+    @staticmethod
+    def list(*args):
         raise NotImplementedError("list() method is unimplemented.")
 
-    def _get_file_id(self, file_or_id):
+    @staticmethod
+    def _get_file_id(file_or_id):
         if hasattr(file_or_id, 'file_id'):
             return file_or_id.file_id
         return file_or_id
@@ -438,8 +436,8 @@ def __init__(self, f, request, disposition='attachment',
             f.filename, disposition=disposition,
             filename_compat=unidecode(f.filename))
 
-    @classmethod
-    def _get_type_and_encoding(cls, content_encoding, content_type, f):
+    @staticmethod
+    def _get_type_and_encoding(content_encoding, content_type, f):
         content_type = content_type or getattr(f, 'content_type', None)
         if content_type is None:
             content_type, content_encoding = \
@@ -452,8 +450,8 @@ def _get_type_and_encoding(cls, content_encoding, content_type, f):
         content_type = str(content_type)
         return content_encoding, content_type
 
-    @classmethod
-    def generate_etag(cls, f):
+    @staticmethod
+    def generate_etag(f):
         return '"{0}-{1}"'.format(f.last_modified, f.content_length)
 
 
diff --git a/kotti/migrate.py b/kotti/migrate.py
index 21409aac9..4b900df04 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -91,7 +91,8 @@ def run_env(self, fn, **kw):
                                 version_table=self.version_table, **kw):
             self.script_dir.run_env()
 
-    def _make_config(self, location):
+    @staticmethod
+    def _make_config(location):
         cfg = Config()
         cfg.set_main_option("script_location", location)
         cfg.set_main_option("sqlalchemy.url", get_settings()['sqlalchemy.url'])
diff --git a/kotti/resources.py b/kotti/resources.py
index 6f672d10d..0fea7893a 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -689,8 +689,8 @@ def __declare_last__(cls):
         # enables proper registration on its subclasses
         event.listen(cls.data, 'set', cls._save_data, retval=True)
 
-    @classmethod
-    def _save_data(cls, target, value, oldvalue, initiator):
+    @staticmethod
+    def _save_data(target, value, oldvalue, initiator):
         """ Refresh metadata and save the binary data to the data field.
 
         :param target: The File instance
diff --git a/kotti/sqla.py b/kotti/sqla.py
index 90d0c362f..d27ad4c22 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -36,12 +36,14 @@ class JsonType(TypeDecorator):
     """
     impl = TEXT
 
-    def process_bind_param(self, value, dialect):
+    @staticmethod
+    def process_bind_param(value, dialect):
         if value is not None:
             value = json.dumps(value, default=dump_default)
         return value
 
-    def process_result_value(self, value, dialect):
+    @staticmethod
+    def process_result_value(value, dialect):
         if value is not None:
             value = json.loads(value)
         return value
diff --git a/kotti/util.py b/kotti/util.py
index c25d81549..7063ac31c 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -149,7 +149,8 @@ def __init__(self, name, predicate=None):
     def __call__(self, context, request):
         return TemplateStructure(render_view(context, request, name=self.name))
 
-    def selected(self, context, request):
+    @staticmethod
+    def selected(context, request):
         return False
 
 
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 2fc415f71..5b426d6b0 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -398,7 +398,7 @@ def change_state(self):
         if 'change_state' in self.request.POST:
             ids = self.request.POST.getall('children-to-change-state')
             to_state = self.request.POST.get('to-state', u'no-change')
-            include_children = self.request.POST.get('include-children', None)
+            include_children = self.request.POST.get('include-children')
             if to_state != u'no-change':
                 items = DBSession.query(Node).filter(Node.id.in_(ids)).all()
                 for item in items:
diff --git a/kotti/views/form.py b/kotti/views/form.py
index a56571314..ee4292a7a 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -40,12 +40,12 @@ class ObjectType(colander.SchemaType):
     """ A type leaving the value untouched.
     """
 
-    @classmethod
-    def serialize(cls, node, value):
+    @staticmethod
+    def serialize(node, value):
         return value
 
-    @classmethod
-    def deserialize(cls, node, value):
+    @staticmethod
+    def deserialize(node, value):
         return value
 
 
diff --git a/kotti/views/users.py b/kotti/views/users.py
index c9a6e0926..9563620b2 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -321,7 +321,8 @@ class UserAddFormView(AddFormView):
     buttons = (Button('add_user', _(u'Add User')),
                Button('cancel', _(u'Cancel')))
 
-    def schema_factory(self):
+    @staticmethod
+    def schema_factory():
         schema = user_schema()
         del schema['active']
         schema.add(colander.SchemaNode(
@@ -355,8 +356,8 @@ class GroupAddFormView(UserAddFormView):
     buttons = (Button('add_group', _(u'Add Group')),
                Button('cancel', _(u'Cancel')))
 
-    @classmethod
-    def schema_factory(cls):
+    @staticmethod
+    def schema_factory():
         schema = group_schema()
         del schema['active']
         return schema
@@ -439,7 +440,8 @@ class UserEditFormView(EditFormView):
     def success_url(self):
         return self.request.url
 
-    def schema_factory(self):
+    @staticmethod
+    def schema_factory():
         return user_schema(PrincipalBasic())
 
 
@@ -449,7 +451,8 @@ class UserManageFormView(UserEditFormView):
                Button('cancel', _(u'Cancel')),
                Button('delete', _(u'Delete'), css_class='btn btn-danger'))
 
-    def schema_factory(self):
+    @staticmethod
+    def schema_factory():
         schema = user_schema()
         del schema['name']
         return schema
@@ -481,7 +484,9 @@ def delete_success(self, appstruct):
 
 
 class GroupManageFormView(UserManageFormView):
-    def schema_factory(self):
+
+    @staticmethod
+    def schema_factory():
         schema = group_schema()
         del schema['name']
         del schema['active']
diff --git a/kotti/views/util.py b/kotti/views/util.py
index a00076e00..e3030f373 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -137,8 +137,8 @@ def __init__(self, context, request, bare=None, **kwargs):
         self.slots = Slots(context, request)
         self.__dict__.update(kwargs)
 
-    @classmethod
-    def is_location(cls, context):
+    @staticmethod
+    def is_location(context):
         """Does `context` implement :class:`pyramid.interfaces.ILocation`?
 
         :param context: The context.
@@ -334,8 +334,8 @@ def format_currency(self, n, currency, format=None):
         return format_currency(n, currency,
                                format=format, locale=self.locale_name)
 
-    @classmethod
-    def get_type(cls, name):
+    @staticmethod
+    def get_type(name):
         for class_ in get_settings()['kotti.available_types']:
             if class_.type_info.name == name:
                 return class_
@@ -360,8 +360,8 @@ def site_setup_links(self):
         return [l for l in CONTROL_PANEL_LINKS
                 if l.visible(self.root, self.request)]
 
-    @classmethod
-    def sanitize(cls, html, sanitizer='default'):
+    @staticmethod
+    def sanitize(html, sanitizer='default'):
         """ Convenience wrapper for :func:`kotti.sanitizers.sanitize`.
 
         :param html: HTML to be sanitized

From b39ebf05390e00d14a34ee8b97a7f6b160d414da Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 14:15:38 +0100
Subject: [PATCH 388/600] Avoid consecutive if-statements.

---
 kotti/message.py   | 6 +++---
 kotti/resources.py | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kotti/message.py b/kotti/message.py
index b7ee7e51b..2dd2f398e 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -56,9 +56,9 @@ def validate_token(user, token, valid_hrs=24):
         seconds = float(token.split(':')[1])
     except (IndexError, ValueError):
         return False
-    if token == make_token(user, seconds):
-        if time.time() - seconds < 60 * 60 * valid_hrs:
-            return True
+    if token == make_token(user, seconds) \
+            and time.time() - seconds < 60 * 60 * valid_hrs:
+        return True
     return False
 
 
diff --git a/kotti/resources.py b/kotti/resources.py
index 0fea7893a..5997c1c23 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -419,9 +419,8 @@ def is_uploadable_mimetype(self, mimetype):
         match_score = 0
 
         for mt in self.uploadable_mimetypes:
-            if fnmatch(mimetype, mt):
-                if len(mt) > match_score:
-                    match_score = len(mt)
+            if fnmatch(mimetype, mt) and len(mt) > match_score:
+                match_score = len(mt)
 
         return match_score
 

From f1754e8ab8762551862b46235ffbf8586aaf649f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 14:19:01 +0100
Subject: [PATCH 389/600] Use iterators instead of materializing the list.

---
 kotti/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/util.py b/kotti/util.py
index 7063ac31c..a75874ad7 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -164,10 +164,10 @@ def __init__(self, title, children):
         self.children = children
 
     def visible(self, context, request):
-        return any([ch.visible(context, request) for ch in self.children])
+        return any(ch.visible(context, request) for ch in self.children)
 
     def selected(self, context, request):
-        return any([ch.selected(context, request) for ch in self.children])
+        return any(ch.selected(context, request) for ch in self.children)
 
     def get_visible_children(self, context, request):
         return [ch for ch in self.children if ch.visible(context, request)]

From ffabbebd0ed6f43457411e58ec0b352e0f3acec6 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 22 Dec 2015 14:26:31 +0100
Subject: [PATCH 390/600] Update SQLAlchemy and alembic requirements.

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index cdd1f6259..234e043e9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,11 +8,11 @@ MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==3.0.0
 Pygments==2.0.2
-SQLAlchemy==1.0.9
+SQLAlchemy==1.0.10
 SQLAlchemy-Utils==0.31.4
 Unidecode==0.04.18
 WebOb==1.5.1
-alembic==0.8.3
+alembic==0.8.4
 appdirs==1.4.0
 bleach==1.4.2
 bleach-whitelist==0.0.7

From 76a9ac98f4c4b380c6244f476f21e42c631fd013 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 27 Dec 2015 20:17:02 +0100
Subject: [PATCH 391/600] Upgrade requirements.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 234e043e9..e52cfe90c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==3.0.0
 Pygments==2.0.2
-SQLAlchemy==1.0.10
+SQLAlchemy==1.0.11
 SQLAlchemy-Utils==0.31.4
 Unidecode==0.04.18
 WebOb==1.5.1

From e97fca7d2920931e083144088230d75f2f6b5cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u?= <bizauionica@gmail.com>
Date: Fri, 1 Jan 2016 07:33:39 +0200
Subject: [PATCH 392/600] Update the year in the footer.

---
 kotti/templates/view/footer.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/templates/view/footer.pt b/kotti/templates/view/footer.pt
index c39d4c393..8404a1422 100644
--- a/kotti/templates/view/footer.pt
+++ b/kotti/templates/view/footer.pt
@@ -1,4 +1,4 @@
 <hr />
 <footer>
-  <p class="pull-right">&copy; Aliens 2015</p>
+  <p class="pull-right">&copy; Aliens 2016</p>
 </footer>

From 837df4b28a313493c958ed08bb11de2144d47f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u?= <bizauionica@gmail.com>
Date: Fri, 1 Jan 2016 07:34:06 +0200
Subject: [PATCH 393/600] Update the copyright year

---
 COPYRIGHT.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 8dacaefd1..e2ac24ddb 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
-Copyright (c) 2010-2015 Daniel Nouri and Contributors.
+Copyright (c) 2010-2016 Daniel Nouri and Contributors.
 All Rights Reserved

From 88d3373d6e16cd7cf7872054960139b645884f4c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 3 Jan 2016 13:53:48 +0100
Subject: [PATCH 394/600] Get rid of more browser doctests.  Also fix 2 bugs 
 found during conversion to webtest:

  - copy and paste of file nodes wouldn't create a new depot file, but instead lead to multiple references to a single file which would cause undesired results when one of them was deleted later.
  - local 'role:owner' was not set when a new node was created by copy and paste.
---
 CHANGES.txt                          |    9 +-
 kotti/events.py                      |    5 +-
 kotti/resources.py                   |    9 +
 kotti/templates/edit/contents.pt     |    3 +-
 kotti/templates/edit/delete-nodes.pt |   82 +-
 kotti/templates/edit/delete.pt       |   33 +-
 kotti/templates/edit/rename.pt       |    2 +-
 kotti/templates/edit/share.pt        |    6 +-
 kotti/templates/login.pt             |   10 +-
 kotti/templates/site-setup/users.pt  |    6 +-
 kotti/tests/__init__.py              |    9 +-
 kotti/tests/browser.txt              | 1027 --------------------------
 kotti/tests/test_functional.py       |  832 +++++++++++++++++++++
 13 files changed, 930 insertions(+), 1103 deletions(-)
 delete mode 100644 kotti/tests/browser.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 26d8e219a..85bfd6910 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,14 @@ Change History
 1.3.0 - unreleased
 ------------------
 
-- No changes yet.
+- Bugfix: copy and paste of file nodes wouldn't create a new depot file, but
+  instead lead to multiple references to a single file which would cause
+  undesired results when one of them was deleted later.
+
+- Bugfix: local 'role:owner' was not set when a new node was created by copy
+  and paste.
+
+- Get rid of more browser doctests (converted to webtest).
 
 1.3.0-alpha.1 - 2015-12-22
 --------------------------
diff --git a/kotti/events.py b/kotti/events.py
index a2b29837c..168511e4e 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -226,12 +226,13 @@ def set_owner(event):
     """
 
     obj, request = event.object, event.request
-    if request is not None and isinstance(obj, Node) and obj.owner is None:
+    if request is not None and isinstance(obj, Node):
         userid = request.authenticated_userid
         if userid is not None:
             userid = unicode(userid)
             # Set owner metadata:
-            obj.owner = userid
+            if obj.owner is None:
+                obj.owner = userid
             # Add owner role for userid if it's not inherited already:
             if u'role:owner' not in list_groups(userid, obj):
                 groups = list_groups_raw(userid, obj) | set([u'role:owner'])
diff --git a/kotti/resources.py b/kotti/resources.py
index 5997c1c23..33ac7bc95 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -745,6 +745,15 @@ def __init__(self, data=None, filename=None, mimetype=None, size=None,
         self.size = size
         self.data = data
 
+    def copy(self, **kwargs):
+        """ Same as `Content.copy` with additional data support.  ``data`` needs
+        some special attention, because we don't want the same depot file to be
+        assigned to multiple content nodes.
+        """
+        _copy = super(SaveDataMixin, self).copy(**kwargs)
+        _copy.data = self.data.file.read()
+        return _copy
+
 
 @implementer(IFile)
 class File(SaveDataMixin, Content):
diff --git a/kotti/templates/edit/contents.pt b/kotti/templates/edit/contents.pt
index 7e80522c6..ce0634fa6 100644
--- a/kotti/templates/edit/contents.pt
+++ b/kotti/templates/edit/contents.pt
@@ -25,7 +25,8 @@
         </tal:repeat>
       </div>
 
-      <form action="${request.resource_url(context, '@@contents')}" method="post">
+      <form id="form-contents" method="post"
+            action="${request.resource_url(context, '@@contents')}">
         <tal:no-content tal:condition="not:children">
           <span class="text-info" i18n:translate="">No content items are contained here.</span>
         </tal:no-content>
diff --git a/kotti/templates/edit/delete-nodes.pt b/kotti/templates/edit/delete-nodes.pt
index fbb9a601d..adde8a1ec 100644
--- a/kotti/templates/edit/delete-nodes.pt
+++ b/kotti/templates/edit/delete-nodes.pt
@@ -8,50 +8,48 @@
 
     <h1 i18n:translate="">Delete</h1>
 
-    <div class="tab-pane" id="delete-nodes">
-      <form action="${request.url}" method="post">
+    <form id="form-delete-nodes" action="${request.url}" method="post">
 
-        <p class="lead" i18n:translate="">
-          Are you sure you want to delete the following items?
-        </p>
+      <p class="lead" i18n:translate="">
+        Are you sure you want to delete the following items?
+      </p>
 
-        <table class="table table-condensed" tal:condition="items">
-          <thead>
-            <tr>
-              <th></th>
-              <th i18n:translate="">Title</th>
-              <th i18n:translate="">Type</th>
-              <th i18n:translate="">State</th>
-              <th i18n:translate="">Creation Date</th>
-              <th i18n:translate="">Modification Date</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr tal:repeat="item items">
-              <tal:block tal:define="url request.resource_url(item, '@@contents')">
-                <td><input name="children-to-delete" type="checkbox" value="${item.id}" checked="checked" title="Select item" i18n:attributes="title" /></td>
-                <td><a href="${url}">${item.title}</a></td>
-                <td>${item.type_info.title}</td>
-                <td>${item.state in states and states[item.state]['title']}</td>
-                <td>${api.format_date(item.creation_date)}</td>
-                <td>${api.format_date(item.modification_date)}</td>
-              </tal:block>
-            </tr>
-          </tbody>
-        </table>
-        <div class="form-actions">
-          <button type="submit" name="cancel" value="cancel"
-                  class="btn btn-default">
-            <span i18n:translate="">Cancel</span>
-          </button>
-          <button type="submit" name="delete_nodes" value="delete_nodes"
-                  class="btn btn-danger">
-            <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
-            <span i18n:translate="">Delete</span>
-          </button>
-        </div>
-      </form>
-    </div>
+      <table class="table table-condensed" tal:condition="items">
+        <thead>
+          <tr>
+            <th></th>
+            <th i18n:translate="">Title</th>
+            <th i18n:translate="">Type</th>
+            <th i18n:translate="">State</th>
+            <th i18n:translate="">Creation Date</th>
+            <th i18n:translate="">Modification Date</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr tal:repeat="item items">
+            <tal:block tal:define="url request.resource_url(item, '@@contents')">
+              <td><input name="children-to-delete" type="checkbox" value="${item.id}" checked="checked" title="Select item" i18n:attributes="title" /></td>
+              <td><a href="${url}">${item.title}</a></td>
+              <td>${item.type_info.title}</td>
+              <td>${item.state in states and states[item.state]['title']}</td>
+              <td>${api.format_date(item.creation_date)}</td>
+              <td>${api.format_date(item.modification_date)}</td>
+            </tal:block>
+          </tr>
+        </tbody>
+      </table>
+      <div class="form-actions">
+        <button type="submit" name="cancel" value="cancel"
+                class="btn btn-default">
+          <span i18n:translate="">Cancel</span>
+        </button>
+        <button type="submit" name="delete_nodes" value="delete_nodes"
+                class="btn btn-danger">
+          <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+          <span i18n:translate="">Delete</span>
+        </button>
+      </div>
+    </form>
 
   </div>
 </html>
diff --git a/kotti/templates/edit/delete.pt b/kotti/templates/edit/delete.pt
index eea435217..2fc40d92b 100644
--- a/kotti/templates/edit/delete.pt
+++ b/kotti/templates/edit/delete.pt
@@ -8,23 +8,22 @@
 
     <h1 i18n:translate="">Delete <em i18n:name="title">${context.title}</em></h1>
 
-    <div class="tab-pane" id="delete" tal:condition="context is not api.root">
-      <form action="${request.url}" method="post" id="form-move-2">
-        <p class="lead" i18n:translate="">
-          Are you sure you want to delete
-          <em i18n:name="title">${context.title}</em>?
-        </p>
-        <button type="submit" name="delete" value="cancel"
-                class="btn btn-default">
-          <span i18n:translate="">Cancel</span>
-        </button>
-        <button type="submit" name="delete" value="delete"
-                class="btn btn-danger">
-          <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
-          <span i18n:translate="">Delete</span>
-        </button>
-      </form>
-    </div>
+    <form action="${request.url}" method="post" id="form-delete"
+          tal:condition="context is not api.root">
+      <p class="lead" i18n:translate="">
+        Are you sure you want to delete
+        <em i18n:name="title">${context.title}</em>?
+      </p>
+      <button type="submit" name="delete" value="cancel"
+              class="btn btn-default">
+        <span i18n:translate="">Cancel</span>
+      </button>
+      <button type="submit" name="delete" value="delete"
+              class="btn btn-danger">
+        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+        <span i18n:translate="">Delete</span>
+      </button>
+    </form>
 
   </div>
 </html>
diff --git a/kotti/templates/edit/rename.pt b/kotti/templates/edit/rename.pt
index 6c391aaba..73822a192 100644
--- a/kotti/templates/edit/rename.pt
+++ b/kotti/templates/edit/rename.pt
@@ -13,7 +13,7 @@
     </p>
 
     <div id="rename" tal:condition="context is not api.root">
-      <form action="${request.url}" method="post" id="form-move-3">
+      <form action="${request.url}" method="post" id="form-rename">
         <div class="form-group">
           <label class="control-label desc" for="move-new-name"
                  i18n:translate="">New name</label>
diff --git a/kotti/templates/edit/share.pt b/kotti/templates/edit/share.pt
index 4c8b59f37..ff0d845c7 100644
--- a/kotti/templates/edit/share.pt
+++ b/kotti/templates/edit/share.pt
@@ -14,7 +14,8 @@
         <h3 class="panel-title" i18n:translate="">Search users and groups</h3>
       </div>
       <div class="panel-body">
-        <form action="${request.url}" method="post" class="form">
+        <form action="${request.url}" method="post" class="form"
+              id="form-share-search">
           <div class="form-group">
             <label for="query" i18n:translate="" class="sr-only">
               Search users and groups
@@ -36,7 +37,8 @@
       </div>
     </div>
 
-    <form action="${request.url}" method="post" tal:condition="entries">
+    <form action="${request.url}" method="post" tal:condition="entries"
+          id="form-share-assign">
 
       <fieldset>
         <legend i18n:translate="">Assign local roles</legend>
diff --git a/kotti/templates/login.pt b/kotti/templates/login.pt
index 8008b2348..e70c029d6 100644
--- a/kotti/templates/login.pt
+++ b/kotti/templates/login.pt
@@ -9,7 +9,8 @@
   <div metal:fill-slot="content" class="login-form">
 
     <div class="row">
-      <form class="col-md-6 col-md-offset-3" action="${url}" method="post">
+      <form class="col-md-6 col-md-offset-3" id="login-form"
+            action="${url}" method="post">
         <div class="panel panel-default">
           <div class="panel-heading">
             <h3 class="panel-title" i18n:translate="">Login</h3>
@@ -37,7 +38,8 @@
         </div>
       </form>
 
-      <form class="col-md-6 col-md-offset-3" action="${url}" method="post">
+      <form class="col-md-6 col-md-offset-3" id="forgot-password-form"
+            action="${url}" method="post">
         <div class="panel panel-default">
           <div class="panel-heading">
             <h3 class="panel-title" i18n:translate="">
@@ -69,8 +71,8 @@
         </div>
       </form>
 
-      <form class="col-md-6 col-md-offset-3" action="${url}" method="post"
-            tal:condition="register">
+      <form class="col-md-6 col-md-offset-3" id="register-form"
+            action="${url}" method="post" tal:condition="register">
         <div class="panel panel-default">
           <div class="panel-heading">
             <h3 class="panel-title" i18n:translate="">
diff --git a/kotti/templates/site-setup/users.pt b/kotti/templates/site-setup/users.pt
index 33a524a60..4a868e03a 100644
--- a/kotti/templates/site-setup/users.pt
+++ b/kotti/templates/site-setup/users.pt
@@ -34,7 +34,8 @@
             <h3 class="panel-title" i18n:translate="">Find users or groups</h3>
           </div>
           <div class="panel-body">
-            <form action="${request.url}" method="post" class="form">
+            <form action="${request.url}" id="form-principal-search"
+                  method="post" class="form">
               <div class="control-group">
                 <label for="search-query" i18n:translate="">
                   User- / groupname
@@ -58,7 +59,8 @@
           </div>
         </div>
 
-        <form action="${request.url}" method="post" tal:condition="entries">
+        <form action="${request.url}" id="form-global-roles" method="post"
+              tal:condition="entries">
 
           <h2 i18n:translate="">Assign global roles</h2>
           <table class="table table-bordered table-hover">
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 95e5b7dc2..2d29cdca4 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -24,14 +24,15 @@
       "db_session" -> "browser";
       "db_session" -> "filedepot";
       "db_session" -> "root";
+      "depot_tween" -> "webtest";
       "dummy_mailer" -> "app";
       "dummy_mailer";
       "dummy_request" -> "depot_tween";
       "events" -> "app";
-      "filedepot" -> "depot_tween";
-      "mock_filedepot" -> "depot_tween";
+      "depot_tween" -> "filedepot";
+      "depot_tween" -> "mock_filedepot";
       "mock_filedepot";
-      "no_filedepots" -> "depot_tween";
+      "depot_tween" -> "no_filedepots";
       "settings" -> "config";
       "settings" -> "content";
       "setup_app" -> "app";
@@ -283,7 +284,7 @@ def root(db_session):
 
 
 @fixture
-def webtest(app, monkeypatch, request):
+def webtest(app, monkeypatch, request, filedepot, dummy_mailer):
     from webtest import TestApp
     if 'user' in request.keywords:
         login = request.keywords['user'].args[0]
diff --git a/kotti/tests/browser.txt b/kotti/tests/browser.txt
deleted file mode 100644
index 3ba218f3e..000000000
--- a/kotti/tests/browser.txt
+++ /dev/null
@@ -1,1027 +0,0 @@
-Kotti browser tests
-===================
-
-Setup
------
-
-   >>> from cStringIO import StringIO
-   >>> import pytest
-   >>> from kotti import testing, DBSession
-   >>> from kotti.resources import Node, Document, File, Image
-
-Get a handle for some useful objects:
-
-   >>> tools = testing.setUpFunctional()
-   >>> browser = tools['Browser']()
-   >>> ctrl = browser.getControl
-   >>> root = DBSession.query(Node).get(1)
-   >>> mailer = testing.registerDummyMailer()
-   >>> save_addable_document = Document.type_info.addable_to
-   >>> save_addable_file = File.type_info.addable_to
-   >>> save_addable_image = Image.type_info.addable_to
-
-Open the frontpage:
-
-   >>> browser.open(testing.BASE_URL)
-
-
-Login
------
-
-Editing is locked down to authenticated users:
-
-  >>> browser.open(testing.BASE_URL + '/edit')
-  >>> "Log in" in browser.contents
-  True
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/edit'
-  True
-
-Logging out redirects us to the URL we came from and presents us with
-the login form:
-
-  >>> browser.getLink("Logout").click()
-  >>> "You have been logged out" in browser.contents
-  True
-
-Log in again, this time force an error:
-
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "funny"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Adminstrator" in browser.contents
-  False
-  >>> "Login failed" in browser.contents
-  True
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/edit'
-  True
-
-Add a document
---------------
-
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> "Add Document to Welcome to Kotti" in browser.contents
-  True
-  >>> ctrl("Title").value = "Child One"
-  >>> ctrl("save").click()
-  >>> "Item was added" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/child-one/'
-  True
-
-Edit the document
------------------
-
-  >>> browser.getLink("Edit").click()
-  >>> "Edit Child One" in browser.contents
-  True
-  >>> ctrl("Title").value = "First Child"
-  >>> ctrl("save").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-  >>> browser.getLink("Edit").click()
-  >>> ctrl("Title").value
-  'First Child'
-  >>> browser.getLink("View").click()
-  >>> "First Child" in browser.contents
-  True
-
-And now force a validation error:
-
-  >>> browser.getLink("Edit").click()
-  >>> ctrl("Title").value = ""
-  >>> ctrl("save").click()
-  >>> "There was a problem" in browser.contents
-  True
-  >>> ctrl("Title").value
-  ''
-  >>> browser.getLink("View").click()
-  >>> "First Child" in browser.contents
-  True
-
-And now click the 'Cancel' button:
-
-  >>> browser.getLink("Edit").click()
-  >>> ctrl("Title").value = "Firstborn"
-  >>> ctrl("cancel").click()
-  >>> with pytest.raises(LookupError): ctrl("Title")
-  >>> "Firstborn" in browser.contents
-  False
-
-Now click the 'Cancel' button for an invalid form entry:
-
-  >>> browser.getLink("Edit").click()
-  >>> ctrl("Title").value = ""
-  >>> ctrl("cancel").click()
-  >>> with pytest.raises(LookupError): ctrl("Title")
-  >>> "Firstborn" in browser.contents
-  False
-
-Add two more documents, at different levels
--------------------------------------------
-
-  >>> browser.open(testing.BASE_URL + '/')
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Second Child"
-  >>> ctrl("save").click()
-  >>> "Item was added" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/second-child/'
-  True
-
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Grandchild"
-  >>> ctrl("save").click()
-  >>> browser.url == testing.BASE_URL + '/second-child/grandchild/'
-  True
-  >>> "Grandchild" in browser.contents
-  True
-
-Add another grandchild with the same name:
-
-  >>> browser.open(testing.BASE_URL + '/second-child')
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Grandchild"
-  >>> ctrl("save").click()
-  >>> browser.url == testing.BASE_URL + '/second-child/grandchild-1/'
-  True
-
-There's no Add link if nothing can be added:
-
-  >>> browser.open(testing.BASE_URL + '/second-child/grandchild-1/')
-  >>> browser.getLink("Add").text
-  'Add'
-  >>> try:
-  ...     Document.type_info.addable_to = ()
-  ...     File.type_info.addable_to = ()
-  ...     Image.type_info.addable_to = ()
-  ...     browser.reload()
-  ...     browser.getLink("Add")
-  ... finally:
-  ...     Document.type_info.addable_to = save_addable_document
-  ...     File.type_info.addable_to = save_addable_file
-  ...     Image.type_info.addable_to = save_addable_image
-  Traceback (most recent call last):
-  LinkNotFoundError
-
-Add a file
-----------
-
-  >>> browser.open(testing.BASE_URL + '/')
-  >>> browser.getLink(url="/add_file").click()
-  >>> ctrl("Description").value = "A tiny file"
-  >>> ctrl("File").add_file('tiny', 'text/plain', 'tiny.txt')
-  >>> ctrl("save").click()
-  >>> "Item was added" in browser.contents
-  True
-  >>> print browser.url
-  http://localhost:6543/tiny.txt/
-
-Add a file larger than maximum file size
-----------------------------------------
-
-  >>> browser.open(testing.BASE_URL + '/')
-  >>> browser.getLink(url="/add_file").click()
-  >>> ctrl("Title").value = "Huge File"
-  >>> ctrl("Description").value = "An huge file"
-  >>> huge = '*' * (10 * 1024 * 1024 + 1)
-  >>> ctrl("File").add_file(StringIO(huge), 'text/plain', 'huge.txt')
-  >>> ctrl("save").click()
-  >>> "There was a problem" in browser.contents
-  True
-  >>> "Maximum file size" in browser.contents
-  True
-
-Add tags to a document:
------------------------
-
-  >>> browser.open(testing.BASE_URL + '/second-child')
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Grandchild"
-  >>> ctrl("Tags").value = ''
-  >>> ctrl("save").click()
-
-  >>> browser.open(testing.BASE_URL + '/second-child')
-  >>> browser.getLink("Add").click()
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Grandchild"
-  >>> ctrl("Tags").value = 'tag 1, tag 2,tag 3'
-  >>> ctrl("save").click()
-  >>> browser.open(testing.BASE_URL + '/second-child/grandchild-2/@@edit')
-  >>> "tag 1" in browser.contents
-  True
-  >>> "tag 2" in browser.contents
-  True
-  >>> "tag 3" in browser.contents
-  True
-  >>> ctrl("Tags").value = 'tag 1, tag 4, tag 5,tag 6, tag 7, übertag'
-  >>> ctrl("save").click()
-  >>> browser.open(testing.BASE_URL + '/second-child/grandchild-2/@@edit')
-  >>> 'value="tag 1,tag 4,tag 5,tag 6,tag 7,übertag"' in browser.contents
-  True
-
-Delete a document
------------------
-
-  >>> browser.open(testing.BASE_URL + '/second-child/grandchild')
-  >>> browser.getLink('Delete').click()
-  >>> ctrl("cancel").click()
-  >>> "Grandchild was deleted" in browser.contents
-  False
-  >>> browser.getLink('Delete').click()
-  >>> ctrl("delete").click()
-  >>> "Grandchild was deleted" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/second-child/'
-  True
-
-Copy and paste
---------------
-
-  >>> browser.open(testing.BASE_URL + '/second-child')
-  >>> browser.getLink('Cut').click()
-  >>> "Second Child was cut" in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL + '/child-one')
-  >>> browser.getLink('Paste').click()
-  >>> "Second Child was pasted" in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child/')
-  >>> browser.open(testing.BASE_URL + '/second-child/')
-  Traceback (most recent call last):
-  HTTPError: HTTP Error 404: Not Found
-
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child')
-  >>> browser.getLink('Copy').click()
-  >>> "Second Child was copied" in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink('Paste').click()
-  >>> "Second Child was pasted" in browser.contents
-  True
-
-We can paste twice since we copied:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink('Paste').click()
-  >>> "Second Child was pasted" in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/second-child/')
-  >>> "Second Child" in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/second-child-1/')
-  >>> "Second Child" in browser.contents
-  True
-
-We can also copy and paste items that contain children, like the whole
-site:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink('Copy').click()
-  >>> "Welcome to Kotti was copied" in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/second-child')
-  >>> browser.getLink('Paste').click()
-  >>> "Welcome to Kotti was pasted" in browser.contents
-  True
-  >>> browser.open(
-  ...     testing.BASE_URL + '/second-child/welcome-to-kotti/')
-  >>> browser.open(
-  ...     testing.BASE_URL + '/second-child/welcome-to-kotti/second-child/')
-
-And finally cut and paste a tree:
-
-  >>> browser.open(testing.BASE_URL + '/second-child')
-  >>> browser.getLink('Cut').click()
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child')
-  >>> browser.getLink('Paste').click()
-  >>> "Second Child was pasted" in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/second-child/')
-  Traceback (most recent call last):
-  HTTPError: HTTP Error 404: Not Found
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child/second-child')
-
-Note how we can't cut and paste an item into itself:
-
-  >>> browser.open(testing.BASE_URL + '/child-one')
-  >>> browser.getLink('Cut').click()
-  >>> browser.getLink('Paste').click()
-  Traceback (most recent call last):
-  LinkNotFoundError
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child')
-  >>> browser.getLink('Paste').click()
-  Traceback (most recent call last):
-  LinkNotFoundError
-
-Whether we can paste or not also depends on the 'type_info.addable'
-property:
-
-  >>> browser.open(testing.BASE_URL + '/child-one')
-  >>> browser.getLink('Copy').click()
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child')
-  >>> browser.getLink('Paste').click()
-  >>> Document.type_info.addable_to = ()
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child')
-  >>> try:
-  ...     browser.getLink('Paste')
-  ... finally:
-  ...     Document.type_info.addable_to = save_addable_document
-  Traceback (most recent call last):
-  LinkNotFoundError
-
-
-You can't cut the root of a site:
-
-  >>> browser.open(testing.BASE_URL + '/child-one')
-  >>> browser.getLink('Cut')
-  <Link text='Cut' url='http://localhost:6543/child-one/@@cut'>
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink('Cut')
-  Traceback (most recent call last):
-  LinkNotFoundError
-
-
-We can rename an item. Slashes will be stripped out.:
-
-  >>> browser.open(testing.BASE_URL + '/child-one/second-child')
-  >>> browser.getLink('Rename').click()
-  >>> ctrl("New name").value
-  'second-child'
-  >>> ctrl("New title").value
-  'Second Child'
-  >>> ctrl("New name").value = "thi/rd-ch/ild"
-  >>> ctrl("New title").value = "My Third Child"
-  >>> ctrl(name="rename").click()
-  >>> "Item was renamed" in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/child-one/third-child/'
-  True
-  >>> browser.getLink("View").click()
-  >>> "My Third Child" in browser.contents
-  True
-
-We cannot rename the root:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink('Rename').click()
-  Traceback (most recent call last):
-  LinkNotFoundError
-
-
-On setup pages we can't use the actions:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink('User Management').click()
-  >>> browser.getLink('Copy').click()
-  Traceback (most recent call last):
-  LinkNotFoundError
-  >>> browser.getLink('Preferences').click()
-  >>> browser.getLink('Copy').click()
-  Traceback (most recent call last):
-  LinkNotFoundError
-
-
-Contents view actions
----------------------
-
-  >>> browser.open(testing.BASE_URL + '/child-one')
-  >>> browser.getLink('Contents').click()
-  >>> browser.url == testing.BASE_URL + '/child-one/@@contents'
-  True
-
-  >>> ctrl(name='copy').click()
-  >>> u'You have to select items' in browser.contents
-  True
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:1]
-  >>> ctrl(name='copy').click()
-  >>> 'copied.' in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL + '/second-child-1/@@contents')
-  >>> 'My Third Child' in browser.contents
-  False
-  >>> ctrl(name='paste').click()
-  >>> "My Third Child" in browser.contents
-  True
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:1]
-  >>> ctrl(name='cut').click()
-  >>> 'cut.' in browser.contents  # TODO: this should be show all names
-  True
-
-  >>> browser.open(testing.BASE_URL + '/child-one/@@contents')
-  >>> "Grandchild" in browser.contents
-  False
-  >>> ctrl(name='paste').click()
-  >>> "Grandchild" in browser.contents
-  True
-  >>> with pytest.raises(LookupError): ctrl(name='paste')
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:2]
-  >>> ctrl(name='cut').click()
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink('Document').click()
-  >>> ctrl('Title').value = 'Forth child'
-  >>> ctrl(name='save').click()
-  >>> browser.open(testing.BASE_URL + '/forth-child/@@contents')
-
-  >>> "Grandchild" in browser.contents
-  False
-  >>> "My Third Child" in browser.contents
-  False
-  >>> ctrl(name='paste').click()
-  >>> "Grandchild" in browser.contents
-  True
-  >>> "My Third Child" in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/child-one/@@contents')
-  >>> "Grandchild" in browser.contents
-  False
-
-  >>> browser.open(testing.BASE_URL + '/forth-child/@@contents')
-  >>> 'third-child' in browser.contents
-  True
-  >>> 'Grandchild' in browser.contents
-  True
-  >>> 'child-the-third' in browser.contents
-  False
-  >>> 'Hello Bob' in browser.contents
-  False
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:2]
-  >>> ctrl(name='rename_nodes').click()
-  >>> ctrl(name='cancel').click()
-  >>> u'No changes were made.' in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/forth-child/@@contents'
-  True
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:2]
-  >>> ctrl(name='rename_nodes').click()
-  >>> ctrl(name='%s-name' % childs.options[0]).value = 'child-the-third'
-  >>> ctrl(name='%s-title' % childs.options[0]).value = 'child, the third'
-  >>> ctrl(name='%s-name' % childs.options[1]).value = 'hello-bob'
-  >>> ctrl(name='%s-title' % childs.options[1]).value = 'Hello Bob'
-  >>> ctrl(name='rename_nodes').click()
-
-  >>> browser.url == testing.BASE_URL + '/forth-child/@@contents'
-  True
-  >>> 'third-child' in browser.contents
-  False
-  >>> 'Grandchild' in browser.contents
-  False
-  >>> 'child-the-third' in browser.contents
-  True
-  >>> 'Hello Bob' in browser.contents
-  True
-
-  >>> browser.getLink('File').click()
-  >>> ctrl('Description').value = 'A file'
-  >>> ctrl('File').add_file('something', 'text/plain', 'some.txt')
-  >>> ctrl('save').click()
-  >>> browser.open(testing.BASE_URL + '/forth-child/@@contents')
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:3]
-  >>> ctrl(name='delete_nodes').click()
-  >>> ctrl(name='cancel').click()
-  >>> u'No changes were made.' in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/forth-child/@@contents'
-  True
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:3]
-  >>> ctrl(name='delete_nodes').click()
-  >>> "Are you sure" in browser.contents
-  True
-
-  >>> ctrl(name='children-to-delete').value = childs.options[0:3]
-  >>> ctrl(name='delete_nodes').click()
-  >>> "child, the third was deleted." in browser.contents
-  True
-  >>> "Hello Bob was deleted." in browser.contents
-  True
-  >>> "some.txt was deleted." in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL + '/forth-child/@@contents')
-  >>> "Welcome to Kotti" in browser.contents
-  True
-  >>> '<i class="glyphicon glyphicon-home"></i>' in browser.contents
-  True
-  >>> '<i class="glyphicon glyphicon-folder-open"></i>' in browser.contents
-  True
-  >>> '<i class="glyphicon glyphicon-folder-close"></i>' in browser.contents
-  False
-
-
-Contents view change state actions
-----------------------------------
-
-  >>> browser.getLink("Second Child").click()
-  >>> browser.getLink("Contents").click()
-  >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=public' in browser.contents
-  True
-  >>> browser.getLink("Make Public", index=3).click()
-  >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=private' in browser.contents
-  True
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:3]
-  >>> ctrl(name='change_state').click()
-  >>> 'Change workflow state' in browser.contents
-  True
-  >>> ctrl(name='cancel').click()
-  >>> u'No changes were made.' in browser.contents
-  True
-  >>> browser.url == testing.BASE_URL + '/second-child-1/@@contents'
-  True
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:3]
-  >>> ctrl(name='change_state').click()
-  >>> childs = ctrl(name='children-to-change-state')
-  >>> childs.value = []
-  >>> ctrl(name='change_state').click()
-  >>> u'No changes were made.' in browser.contents
-  True
-
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:3]
-  >>> ctrl(name='change_state').click()
-  >>> ctrl(name='to-state').value = ['private']
-  >>> ctrl(name='change_state').click()
-  >>> 'Your changes have been saved.' in browser.contents
-  True
-  >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=public' in browser.contents
-  True
-  >>> 'http://localhost:6543/second-child-1/grandchild-2/@@workflow-change?new_state=public' in browser.contents
-  True
-  >>> 'http://localhost:6543/second-child-1/grandchild-3/@@workflow-change?new_state=public' in browser.contents
-  True
-
-  >>> browser.getLink('My Third Child').click()
-  >>> 'http://localhost:6543/second-child-1/third-child/child-one/@@workflow-change?new_state=public' in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/second-child-1/third-child/child-one/@@workflow-change?new_state=public')
-  >>> browser.open(testing.BASE_URL + '/second-child-1/third-child/@@contents')
-  >>> 'http://localhost:6543/second-child-1/third-child/child-one/@@workflow-change?new_state=private' in browser.contents
-  True
-
-  >>> browser.getLink('First Child', index=1).click()
-  >>> browser.getLink('Document').click()
-  >>> ctrl('Title').value = 'Sub child'
-  >>> ctrl(name='save').click()
-  >>> 'http://localhost:6543/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=public' in browser.contents
-  True
-
-  >>> browser.getLink("Second Child").click()
-  >>> browser.getLink("Contents").click()
-  >>> childs = ctrl(name='children')
-  >>> childs.value = childs.options[0:3]
-  >>> ctrl(name='change_state').click()
-  >>> ctrl(name='include-children').value = ['include-children']
-  >>> ctrl(name='to-state').value = ['public']
-  >>> ctrl(name='change_state').click()
-  >>> 'Your changes have been saved.' in browser.contents
-  True
-  >>> 'http://localhost:6543/second-child-1/third-child/@@workflow-change?new_state=private' in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/second-child-1/third-child/child-one/sub-child/')
-  >>> 'http://localhost:6543/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=private' in browser.contents
-  True
-
-
-Navigation
-----------
-
-  >>> browser.getLink("Navigate").click()
-  >>> browser.getLink("Second Child").click()
-  >>> browser.url == testing.BASE_URL + '/second-child-1/'
-  True
-
-User management
----------------
-
-The user management screen is available through the "Site Setup" submenu:
-
-  >>> browser.getLink("User Management").click()
-
-We add Bob's Group and assign the ``Viewer`` role:
-
-  >>> ctrl("Name", index=1).value = "bobsgroup"
-  >>> ctrl("Title", index=1).value = "Bob's Group"
-  >>> ctrl("Viewer", index=1).click()
-  >>> ctrl(name="add_group").click()
-  >>> "Bob's Group was added" in browser.contents
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:viewer").value
-  True
-
-And a Bob.  Only alphanumeric characters are allowed for the name:
-
-  >>> ctrl("Name", index=0).value = "bob:"
-  >>> ctrl("Full name", index=0).value = "Bob Dabolina"
-  >>> ctrl("Password", index=0).value = "secret"
-  >>> ctrl(name='password-confirm').value = "secret"
-  >>> ctrl("Email", index=0).value = "bob@DABOLINA.com"
-  >>> ctrl(name="add_user").click()
-  >>> "There was a problem" in browser.contents
-  True
-
-Use a valid username now.  Note how the checkbox to send a password
-registration link is ticked:
-
-  >>> ctrl("Name", index=0).value = u"Bob"
-  >>> ctrl("Email", index=0).value = "bob@dabolina.com"
-  >>> ctrl("Send password registration link", index=0).selected
-  True
-  >>> ctrl(name="add_user").click()
-  >>> "Bob Dabolina was added" in browser.contents
-  True
-
-We cannot add Bob twice:
-
-  >>> ctrl("Name", index=0).value = "bob"
-  >>> ctrl("Full name", index=0).value = "Bobby Brown"
-  >>> ctrl("Password", index=0).value = "secret"
-  >>> ctrl(name='password-confirm').value = "secret"
-  >>> ctrl(name="add_user").click()
-  >>> "A user with that name already exists" in browser.contents
-  True
-
-We cannot add Bob Dabolina's email twice:
-
-  >>> ctrl("Name", index=0).value = "bob2"
-  >>> ctrl("Full name", index=0).value = "Bobby Brown"
-  >>> ctrl("Email", index=0).value = "bob@dabolina.com"
-  >>> ctrl("Password", index=0).value = "secret"
-  >>> ctrl(name='password-confirm').value = "secret"
-  >>> ctrl(name="add_user").click()
-  >>> "A user with that email already exists" in browser.contents
-  True
-  >>> ctrl("Email", index=0).value = "bob@gmail.com"
-  >>> ctrl(name="add_user").click()
-  >>> "Bobby Brown was added" in browser.contents
-  True
-
-Searching for Bob will return both Bob and Bob's Group:
-
-  >>> ctrl(name="query").value = "Bob"
-  >>> ctrl(name="search").click()
-  >>> "Bob Dabolina" in browser.contents
-  True
-  >>> "Bob's Group" in browser.contents
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:viewer").value
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:editor").value
-  False
-  >>> ctrl(name="role::bob::role:editor").value
-  False
-
-We can click on the Bob's entry to edit the list of groups he belongs
-to:
-
-  >>> browser.getLink("Bob Dabolina").click()
-  >>> ctrl(name="group").value = "bobsgroup"
-  >>> ctrl(name="save").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-
-We cannot update on the Bobby Brown's entry with duplicated email:
-
-  >>> browser.getLink("Back to User Management").click()
-  >>> ctrl(name="query").value = "Bobby"
-  >>> ctrl(name="search").click()
-  >>> browser.getLink("Bobby Brown").click()
-  >>> ctrl("Email", index=0).value = "bob@dabolina.com"
-  >>> ctrl(name="save").click()
-  >>> "A user with that email already exists" in browser.contents
-  True
-
-If we cancel the edit of the user, we are redirected to the user management
-screen:
-
-  >>> ctrl(name="cancel").click()
-  >>> "No changes were made." in browser.contents
-  True
-  >>> browser.url
-  'http://localhost:6543/@@setup-users'
-
-
-Back in user management we can see how Bob's inherited the Viewer role
-from Bob's Group:
-
-  >>> ctrl(name="query").value = "Bob"
-  >>> ctrl(name="search").click()
-  >>> ctrl(name="role::group:bobsgroup::role:viewer").value
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:viewer").disabled
-  False
-  >>> ctrl(name="role::bob::role:viewer").value
-  True
-  >>> ctrl(name="role::bob::role:viewer").disabled
-  True
-
-We can click on the Bob's Group entry to edit an email address:
-
-  >>> browser.getLink("Bob's Group").click()
-  >>> ctrl(name="email").value = 'bogsgroup@gmail.com'
-  >>> ctrl(name="save").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-
-Set password
-------------
-
-Remember that we sent Bob an email for registration.  He can use it to
-set his own password:
-
-  >>> [email, email2] = mailer.outbox
-  >>> print email.recipients
-  [u'"Bob Dabolina" <bob@dabolina.com>']
-  >>> print email.subject
-  Your registration for Website des Kottbusser Tors
-  >>> print email.body # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-  Hello, Bob Dabolina!
-  You are joining Website des Kottbusser Tors.
-  Click here to set your password and log in:
-  http://localhost:6543/@@set-password?token=...
-
-We'll use that link to set our password:
-
-  >>> browser.getLink("Logout").click()
-  >>> link = email.body[email.body.index('http://localhost'):].split()[0]
-  >>> browser.open(link)
-  >>> ctrl("Password", index=0).value = "newpassword"
-  >>> ctrl(name='password-confirm').value = "newpasswoops" # a silly error
-  >>> ctrl(name="submit").click()
-  >>> "There was a problem with your submission" in browser.contents
-  True
-  >>> ctrl("Password", index=0).value = "newpassword"
-  >>> ctrl(name='password-confirm').value = "newpassword"
-  >>> ctrl(name="submit").click()
-  >>> "You have reset your password" in browser.contents
-  True
-  >>> browser.getLink("Logout").click()
-
-We cannot use that link again:
-
-  >>> browser.open(link)
-  >>> ctrl("Password", index=0).value = "wontwork"
-  >>> ctrl(name='password-confirm').value = "wontwork"
-  >>> ctrl(name="submit").click()
-  >>> "Your password reset token may have expired" in browser.contents
-  True
-
-Log in as Bob with the new password:
-
-  >>> browser.open(testing.BASE_URL + '/@@edit')
-  >>> ctrl("Username or email", index=0).value = "bOB"
-  >>> ctrl("Password").value = "newpassword"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Bob Dabolina" in browser.contents
-  True
-  >>> browser.open(testing.BASE_URL + '/@@edit')
-  >>> browser.getLink("Logout").click()
-
-The login form has a "Reset password" button.  Let's try it:
-
-  >>> browser.open(testing.BASE_URL + '/@@edit')
-  >>> ctrl("Username or email", index=1).value = "bobby" # silly error
-  >>> ctrl("Password").value = ""
-  >>> ctrl(name="reset-password").click()
-  >>> "That username or email is not known by this system" in browser.contents
-  True
-  >>> ctrl("Username or email", index=1).value = "bob"
-  >>> ctrl(name="reset-password").click()
-  >>> "You should be receiving an email" in browser.contents
-  True
-
-  >>> [email1, email2, email3] = mailer.outbox
-  >>> print email3.body # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-  Hello, Bob Dabolina!
-  <BLANKLINE>
-  Click this link to reset your password at Website des Kottbusser Tors:...
-
-User preferences
-----------------
-
-The "Preferences" link leads us to a form where the user can change
-their preferences so the user need to be authenticated:
-
-  >>> browser.open(testing.BASE_URL + '/@@prefs')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-
-  >>> ctrl("Full name").value = "Mr. Administrator"
-  >>> ctrl("Email").value = 'admin@minad.com'
-  >>> ctrl(name="save").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-
-The email could not be used if already a users with that email exists:
-
-  >>> ctrl("Email").value = 'bob@dabolina.com'
-  >>> ctrl(name="save").click()
-  >>> "A user with that email already exists" in browser.contents
-  True
-
-
-If the user cancel the process he will be redirected to the site root:
-
-  >>> ctrl(name="cancel").click()
-  >>> 'Welcome to Kotti' in browser.contents
-  True
-
-
-Share
------
-
-The Share tab allows us to assign users and groups to roles:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink("Edit").click()
-  >>> browser.getLink("Share").click()
-
-We can search for users:
-
-  >>> ctrl(name='query').value = "Bob"
-  >>> ctrl(name="search").click()
-
-Bob and Bob's Group are listed now:
-
-  >>> "Bob Dabolina" in browser.contents
-  True
-  >>> "Bob's Group" in browser.contents
-  True
-
-We add Bob's Group to Owners and Editors before taking away Owners
-again:
-
-  >>> ctrl(name="role::group:bobsgroup::role:owner").value = True
-  >>> ctrl(name="role::group:bobsgroup::role:editor").value = True
-  >>> ctrl(name="apply").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-  >>> browser.reload()
-  >>> ctrl(name="role::group:bobsgroup::role:owner").value
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:editor").value
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:owner").value = False
-  >>> ctrl(name="apply").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:owner").value
-  False
-
-Not making any changes will give us a different feedback message:
-
-  >>> ctrl(name="apply").click()
-  >>> "Your changes have been saved" in browser.contents
-  False
-  >>> ctrl(name="role::group:bobsgroup::role:owner").value
-  False
-  >>> ctrl(name="role::group:bobsgroup::role:editor").value
-  True
-
-Bob should now have an inherited Editor role, because he's part of
-Bob's Group:
-
-  >>> ctrl(name="query").value = "Bob Dabolina"
-  >>> ctrl(name="search").click()
-  >>> ctrl(name="role::bob::role:editor").value
-  True
-  >>> ctrl(name="role::bob::role:owner").value
-  False
-  >>> ctrl(name="role::bob::role:editor").disabled
-  True
-
-Lastly, let's take away the remaining Editor role from Bob's Group
-again:
-
-  >>> "Bob's Group" in browser.contents
-  True
-  >>> ctrl(name="role::group:bobsgroup::role:editor").value = False
-  >>> ctrl(name="apply").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-  >>> "Bob's Group" in browser.contents
-  False
-
-
-Delete users
-------------
-
-  >>> browser.getLink("User Management").click()
-
-We add a group and assign the ``Manager`` role to one:
-
-  >>> ctrl("Name", index=1).value = "pelayogroup"
-  >>> ctrl("Title", index=1).value = "Pelayo Group"
-  >>> ctrl("Admin", index=1).click()
-  >>> ctrl(name="add_group").click()
-  >>> "Pelayo Group was added" in browser.contents
-  True
-  >>> ctrl(name="role::group:pelayogroup::role:admin").value
-  True
-
-And add some users to this group.
-
-  >>> ctrl("Name", index=0).value = "Bruce"
-  >>> ctrl("Full name", index=0).value = "Bruce Pelayo"
-  >>> ctrl("Password", index=0).value = "secret"
-  >>> ctrl(name='password-confirm').value = "secret"
-  >>> ctrl("Email", index=0).value = "bruce@pelayno.com"
-  >>> ctrl(name="group", index=0).value = "pelayogroup"
-  >>> ctrl(name="add_user").click()
-  >>> "Bruce Pelayo was added" in browser.contents
-  True
-
-  >>> ctrl("Name", index=0).value = "Brian"
-  >>> ctrl("Full name", index=0).value = "Brian Pelayo"
-  >>> ctrl("Password", index=0).value = "secret"
-  >>> ctrl(name='password-confirm').value = "secret"
-  >>> ctrl("Email", index=0).value = "brian@pelayno.com"
-  >>> ctrl(name="group", index=0).value = "pelayogroup"
-  >>> ctrl(name="add_user").click()
-  >>> "Brian Pelayo was added" in browser.contents
-  True
-
-Lets login as Bruce and add some content:
-
-  >>> browser.getLink("Logout").click()
-  >>> browser.open(testing.BASE_URL + '/login')
-  >>> ctrl("Username or email", index=0).value = "bruce"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Bruce Pelayo!" in browser.contents
-  True
-
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Bruce one"
-  >>> ctrl("save").click()
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink("Document").click()
-  >>> ctrl("Title").value = "Bruce two"
-  >>> ctrl("save").click()
-
-Now let's delete Bruce::
-
-  >>> browser.getLink("Logout").click()
-  >>> browser.open(testing.BASE_URL + '/login')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-
-  >>> browser.getLink("User Management").click()
-  >>> ctrl(name="query").value = "Bruce"
-  >>> ctrl(name="search").click()
-  >>> browser.getLink("Bruce Pelayo").click()
-  >>> ctrl(name='delete').click()
-
-  >>> "Delete <em>Bruce Pelayo</em>" in browser.contents
-  True
-  >>> "Are you sure you want to delete <span>User</span> <em>Bruce Pelayo</em>?" in browser.contents
-  True
-
-  >>> ctrl(name='delete').click()
-  >>> "User Bruce Pelayo was deleted." in browser.contents
-  True
-
-  >>> ctrl(name="query").value = "Bruce"
-  >>> ctrl(name="search").click()
-  >>> "No users or groups were found." in browser.contents
-  True
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 5a9070120..772a35f4f 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -1,6 +1,11 @@
+# coding:utf8
+
 from StringIO import StringIO
 from mock import patch
 
+import pytest
+from webtest.forms import Upload
+
 from kotti.testing import BASE_URL
 from kotti.testing import user
 
@@ -114,3 +119,830 @@ def test_title_max_length_file_ko(self, browser):
         file_ctrl.add_file(StringIO("abc"), filename='my_image.gif')
         browser.getControl('save').click()
         assert "Item was added" not in browser.contents
+
+
+class TestBrowser:
+    """ This is a one to one conversion of the former browsert.txt.
+    These tests should definitively be rewritten and splitted into multiple
+    methods to ease readability.
+    """
+
+    @staticmethod
+    def _login(app, login, password):
+        resp = app.get('/@@login')
+        form = resp.forms['login-form']
+        form['login'] = login
+        form['password'] = password
+        resp = form.submit('submit')
+        return resp
+
+    @staticmethod
+    def _select_children(resp, *child_idx):
+        """ Mark the checkbox(es) of the rows in the ``contents`` view
+
+        :param resp: response which's body contains the contents table
+        :type resp: :class:`webtest.response.TestResponse`
+
+        :param *child_idx: index of the child in the folder listing
+                           (starting with 0)
+        :type *child_idx: int
+
+        :return: contents form with children selected (ready for submission)
+        :rtype: :class:`webtest.forms.Form`
+        """
+
+        form = resp.forms['form-contents']
+        form['children'] = [
+            cb._value for cb in [
+                form.fields['children'][idx] for idx in child_idx]]
+
+        return form
+
+    def test_login(self, webtest):
+
+        # get the frontpage
+        resp = webtest.app.get('/')
+        assert "You have successfully installed Kotti." in resp.body
+
+        # access a protected URL
+        resp = webtest.app.get('/edit').maybe_follow()
+        assert "Log in" in resp.body
+
+        # submit the login form
+        form = resp.forms['login-form']
+        assert form['came_from'].value == 'http://localhost/edit'
+        form['login'] = 'admin'
+        form['password'] = 'secret'
+
+        resp = form.submit('submit').maybe_follow()
+        assert "Welcome, Administrator" in resp.body
+
+        # log out
+        resp = resp.click('Logout').maybe_follow()
+        assert "You have been logged out" in resp.body
+
+        # attempt to login with wrong credentials
+        form = resp.forms['login-form']
+        assert form['came_from'].value == 'http://localhost/edit'
+        form['login'] = 'admin'
+        form['password'] = 'funny'
+
+        resp = form.submit('submit')
+        assert "Welcome, Adminstrator" not in resp.body
+        assert "Login failed" in resp.body
+
+        # and again, this time with correct credentials
+        form = resp.forms['login-form']
+        assert form['came_from'].value == 'http://localhost/edit'
+        form['login'] = 'admin'
+        form['password'] = 'secret'
+        resp = form.submit('submit').maybe_follow()
+        assert "Welcome, Administrator" in resp.body
+
+    @pytest.mark.user('admin')
+    def test_content_management(self, webtest):
+
+        from kotti.resources import Document
+        from kotti.resources import File
+        from kotti_image.resources import Image
+
+        save_addable_document = Document.type_info.addable_to
+        save_addable_file = File.type_info.addable_to
+        save_addable_image = Image.type_info.addable_to
+
+        app = webtest.app
+        resp = app.get('/')
+
+        # Add a document
+        resp = resp.click('Document', index=0)
+        assert "Add Document to Welcome to Kotti" in resp.body
+        form = resp.forms['deform']
+        form['title'] = "Child One"
+        resp = form.submit('save').maybe_follow()
+        assert "Item was added" in resp.body
+        assert resp.request.path == '/child-one/'
+
+        # Edit the document
+        resp = resp.click('Edit')
+        assert "Edit Child One" in resp.body
+        form = resp.forms['deform']
+        form['title'] = "First Child"
+        resp = form.submit('save').maybe_follow()
+        assert "Your changes have been saved" in resp.body
+        resp = resp.click('Edit')
+        form = resp.forms['deform']
+        assert form['title'].value == "First Child"
+        resp = resp.click('Edit')
+        assert "First Child" in resp.body
+
+        # And now force a validation error:
+        resp = resp.click('Edit')
+        form = resp.forms['deform']
+        form['title'] = ""
+        resp = form.submit('save')
+        assert "There was a problem" in resp.body
+        assert form['title'].value == ''
+
+        # And now click the 'Cancel' button:
+        resp = resp.click('Edit')
+        form = resp.forms['deform']
+        form['title'] = "Firstborn"
+        resp = form.submit('cancel').maybe_follow()
+        assert 'deform' not in resp.forms
+        assert "Firstborn" not in resp.body
+
+        # Now click the 'Cancel' button for an invalid form entry:
+        resp = resp.click('Edit')
+        form = resp.forms['deform']
+        form['title'] = ""
+        resp = form.submit('cancel').maybe_follow()
+        assert 'deform' not in resp.forms
+        assert "Firstborn" not in resp.body
+
+        # Add two more documents, at different levels
+        resp = app.get('/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Second Child"
+        resp = form.submit('save').maybe_follow()
+        assert "Item was added" in resp.body
+        assert resp.request.path == '/second-child/'
+
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Grandchild"
+        resp = form.submit('save').maybe_follow()
+        assert "Item was added" in resp.body
+        assert resp.request.path == '/second-child/grandchild/'
+
+        # Add another grandchild with the same name:
+        resp = app.get('/second-child/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Grandchild"
+        resp = form.submit('save').maybe_follow()
+        assert "Item was added" in resp.body
+        assert resp.request.path == '/second-child/grandchild-1/'
+
+        # There's no Add link if nothing can be added:
+        resp = app.get('/second-child/grandchild-1/')
+        try:
+            Document.type_info.addable_to = ()
+            File.type_info.addable_to = ()
+            Image.type_info.addable_to = ()
+            with pytest.raises(IndexError):
+                resp.click(href='add_')
+        finally:
+            Document.type_info.addable_to = save_addable_document
+            File.type_info.addable_to = save_addable_file
+            Image.type_info.addable_to = save_addable_image
+
+        # Add a file
+        resp = app.get('/')
+        resp = resp.click('File', index=0)
+        form = resp.forms['deform']
+        form['description'] = "A tiny file"
+        form['upload'] = Upload('tiny.txt', 'tiny', 'text/plain')
+        resp = form.submit('save').maybe_follow()
+        assert "Item was added" in resp.body
+        assert resp.request.path == '/tiny.txt/'
+
+        # Add a file larger than maximum file size
+        resp = app.get('/')
+        resp = resp.click('File', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Huge file"
+        form['description'] = "An uge file"
+        form['upload'] = Upload('huge.txt',
+                                '*' * (10 * 1024 * 1024 + 1), 'text/plain')
+        resp = form.submit('save')
+        assert "There was a problem" in resp.body
+        assert "Maximum file size" in resp.body
+
+        # Add tags to a document:
+        resp = app.get('/second-child/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Grandchild"
+        form['tags'] = ''
+        form.submit('save').maybe_follow()
+        resp = app.get('/second-child/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Grandchild"
+        form['tags'] = 'tag 1, tag 2,tag 3'
+        form.submit('save').maybe_follow()
+        resp = app.get('/second-child/grandchild-2/@@edit')
+        form = resp.forms['deform']
+        assert 'tag 1' in resp.body
+        assert 'tag 2' in resp.body
+        assert 'tag 3' in resp.body
+        form['tags'] = 'tag 1, tag 4, tag 5,tag 6, tag 7, übertag'
+        form.submit('save').maybe_follow()
+        resp = app.get('/second-child/grandchild-2/@@edit')
+        assert 'value="tag 1,tag 4,tag 5,tag 6,tag 7,übertag"' in resp.body
+
+        # Delete a document
+        resp = app.get('/second-child/grandchild/')
+        resp = resp.click('Delete', index=0)
+        form = resp.forms['form-delete']
+        resp = form.submit('cancel')
+        assert "Grandchild was deleted" not in resp.body
+        resp = app.get('/second-child/grandchild/')
+        resp = resp.click('Delete', index=0)
+        form = resp.forms['form-delete']
+        resp = form.submit('delete', value='delete').maybe_follow()
+        assert "Grandchild was deleted" in resp.body
+        assert resp.request.path == '/second-child/'
+
+        # Copy and paste
+        resp = app.get('/second-child/')
+        resp = resp.click('Cut', index=0).follow()
+        assert "Second Child was cut" in resp.body
+        resp = app.get('/child-one/')
+        resp = resp.click('Paste', index=0).follow()
+        assert "Second Child was pasted" in resp.body
+        app.get('/second-child/', status=404)
+        resp = app.get('/child-one/second-child/')
+        resp = resp.click('Copy', index=0).follow()
+        assert "Second Child was copied" in resp.body
+        resp = app.get('/')
+        resp = resp.click('Paste', index=0).follow()
+        assert "Second Child was pasted" in resp.body
+
+        # We can paste twice since we copied:
+        resp = app.get('/')
+        resp = resp.click('Paste', index=0).follow()
+        assert "Second Child was pasted" in resp.body
+        resp = app.get('/second-child/')
+        assert "Second Child" in resp.body
+        resp = app.get('/second-child-1/')
+        assert "Second Child" in resp.body
+
+        # We can also copy and paste items that contain children,
+        # like the whole site:
+        resp = app.get('/')
+        resp = resp.click('Copy', index=0).follow()
+        assert "Welcome to Kotti was copied" in resp.body
+        resp = app.get('/second-child/')
+        resp = resp.click('Paste', index=0).follow()
+        assert "Welcome to Kotti was pasted" in resp.body
+        resp = app.get('/second-child/welcome-to-kotti/')
+        assert resp.status_code == 200
+        resp = app.get('/second-child/welcome-to-kotti/second-child/')
+        assert resp.status_code == 200
+
+        # And finally cut and paste a tree:
+        resp = app.get('/second-child/')
+        resp.click('Cut', index=0).follow()
+        resp = app.get('/child-one/second-child/')
+        resp = resp.click('Paste', index=0).follow()
+        assert "Second Child was pasted" in resp.body
+        app.get('/second-child/', status=404)
+
+        # Note how we can't cut and paste an item into itself:
+        resp = app.get('/child-one/')
+        resp.click('Cut', index=0).follow()
+        with pytest.raises(IndexError):
+            resp.click('Paste', index=0).follow()
+        resp = app.get('/child-one/second-child/')
+        with pytest.raises(IndexError):
+            resp.click('Paste', index=0).follow()
+
+        # Whether we can paste or not also depends on the
+        # ``type_info.addable`` property:
+        resp = app.get('/child-one/')
+        resp.click('Copy', index=0).follow()
+        resp = app.get('/child-one/second-child/')
+        resp.click('Paste', index=0).follow()
+        try:
+            Document.type_info.addable_to = ()
+            resp = app.get('/child-one/second-child/')
+            with pytest.raises(IndexError):
+                resp.click('Paste', index=0).follow()
+        finally:
+            Document.type_info.addable_to = save_addable_document
+
+        # You can't cut the root of a site:
+        resp = app.get('/child-one/')
+        resp.click('Cut', index=0)
+        resp = app.get('/')
+        with pytest.raises(IndexError):
+            resp.click('Cut', index=0)
+
+        # We can rename an item. Slashes will be stripped out.:
+        resp = app.get('/child-one/second-child/')
+        resp = resp.click('Rename', index=0)
+        form = resp.forms['form-rename']
+        assert form['name'].value == 'second-child'
+        assert form['title'].value == 'Second Child'
+        form['name'] = 'thi/rd-ch/ild'
+        form['title'] = 'My Third Child'
+        resp = form.submit('rename').maybe_follow()
+        assert "Item was renamed" in resp.body
+        assert resp.request.path == '/child-one/third-child/'
+
+        # We cannot rename the root:
+        resp = app.get('/')
+        with pytest.raises(IndexError):
+            resp.click('Rename', index=0)
+
+        # On setup pages we can't use the actions:
+        resp = app.get('/')
+        resp = resp.click('User Management', index=0)
+        with pytest.raises(IndexError):
+            resp.click('Copy', index=0)
+        resp = resp.click('Preferences', index=0)
+        with pytest.raises(IndexError):
+            resp.click('Copy', index=0)
+
+        # Contents view actions
+        resp = app.get('/child-one')
+        resp = resp.click('Contents', index=0)
+        assert resp.request.path == '/child-one/@@contents'
+        resp = resp.forms['form-contents'].submit('copy').maybe_follow()
+        assert 'You have to select items' in resp.body
+        form = self._select_children(resp, 0)
+        resp = form.submit('copy').maybe_follow()
+        assert 'My Third Child was copied.' in resp.body
+        resp = app.get('/second-child-1/@@contents')
+        assert 'My Third Child' not in resp.body
+        resp = resp.forms['form-contents'].submit('paste').maybe_follow()
+        assert 'My Third Child' in resp.body
+        resp = app.get('/second-child-1/@@contents')
+        form = self._select_children(resp, 0)
+        resp = form.submit('cut').maybe_follow()
+        assert 'cut.' in resp.body
+        resp = app.get('/child-one/@@contents')
+        assert "Grandchild" not in resp.body
+        resp = resp.forms['form-contents'].submit('paste').maybe_follow()
+        assert "Grandchild" in resp.body
+        with pytest.raises(IndexError):
+            resp.click('Paste')
+        resp = app.get('/child-one/@@contents')
+        form = resp.forms['form-contents']
+        form = self._select_children(resp, 0, 1)
+        form.submit('cut').maybe_follow()
+        resp = app.get('/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = 'Forth child'
+        form.submit('save').maybe_follow()
+        resp = app.get('/forth-child/@@contents')
+        assert "Grandchild" not in resp.body
+        assert "My Third Child" not in resp.body
+        resp = resp.forms['form-contents'].submit('paste').maybe_follow()
+        resp = app.get('/forth-child/@@contents')
+        assert "Grandchild" in resp.body
+        assert "My Third Child" in resp.body
+        resp = app.get('/child-one/@@contents')
+        assert "Grandchild" not in resp.body
+        resp = app.get('/forth-child/@@contents')
+        assert 'third-child' in resp.body
+        assert 'Grandchild' in resp.body
+        assert 'child-the-third' not in resp.body
+        assert 'Hello Bob' not in resp.body
+        form = self._select_children(resp, 0, 1)
+        resp = form.submit('rename_nodes').maybe_follow()
+        resp = resp.forms['form-rename-nodes'].submit('cancel').maybe_follow()
+        assert 'No changes were made.' in resp.body
+        assert resp.request.path == '/forth-child/@@contents'
+        form = self._select_children(resp, 0, 1)
+        resp = form.submit('rename_nodes').maybe_follow()
+        form = resp.forms['form-rename-nodes']
+        form[form.submit_fields()[1][0]] = 'child-the-third'
+        form[form.submit_fields()[2][0]] = 'child, the third'
+        form[form.submit_fields()[4][0]] = 'hello-bob'
+        form[form.submit_fields()[5][0]] = 'Hello Bob'
+        resp = form.submit('rename_nodes').maybe_follow()
+        assert resp.request.path == '/forth-child/@@contents'
+        assert 'third-child' not in resp.body
+        assert 'Grandchild' not in resp.body
+        assert 'child-the-third' in resp.body
+        assert 'Hello Bob' in resp.body
+
+        resp = resp.click('File', index=0)
+        form = resp.forms['deform']
+        form['description'] = 'A file'
+        form['upload'] = Upload('some.txt', 'something', 'text/plain')
+        form.submit('save').maybe_follow()
+        resp = app.get('/forth-child/@@contents')
+        form = self._select_children(resp, 0, 1, 2)
+        resp = form.submit('delete_nodes').maybe_follow()
+        resp = resp.forms['form-delete-nodes'].submit('cancel').maybe_follow()
+        assert 'No changes were made.' in resp.body
+        assert resp.request.path == '/forth-child/@@contents'
+        form = self._select_children(resp, 0, 1, 2)
+        resp = form.submit('delete_nodes').maybe_follow()
+        assert "Are you sure" in resp.body
+        resp = resp.forms['form-delete-nodes'].submit('delete_nodes',
+                                                      status=302).follow()
+        assert "child, the third was deleted." in resp.body
+        assert "Hello Bob was deleted." in resp.body
+        assert "some.txt was deleted." in resp.body
+        resp = app.get('/forth-child/@@contents')
+        assert "Welcome to Kotti" in resp.body
+        assert '<i class="glyphicon glyphicon-home"></i>' in resp.body
+        assert '<i class="glyphicon glyphicon-folder-open"></i>' in resp.body
+        assert '<i class="glyphicon glyphicon-folder-close"></i>' \
+               not in resp.body
+
+        # Contents view change state actions
+        resp = resp.click("Second Child")
+        resp = resp.click("Contents")
+        assert '/second-child-1/third-child/@@workflow-change' \
+               '?new_state=public' in resp.body
+        resp = resp.click(href='/second-child-1/third-child/@@workflow-change'
+                               '\?new_state=public').follow()
+        assert '/second-child-1/third-child/@@workflow-change' \
+               '?new_state=private' in resp.body
+        resp = app.get('/second-child-1/third-child/@@contents')
+        form = self._select_children(resp, 0, 1, 2)
+        resp = form.submit('change_state').maybe_follow()
+        assert 'Change workflow state' in resp.body
+        resp = resp.forms['form-change-state'].submit('cancel').maybe_follow()
+        assert 'No changes were made.' in resp.body
+        assert resp.request.path == '/second-child-1/third-child/@@contents'
+        form = self._select_children(resp, 0, 1, 2)
+        resp = form.submit('change_state').maybe_follow()
+        form = resp.forms['form-change-state']
+        form['children-to-change-state'] = []
+        resp = form.submit('change_state').maybe_follow()
+        assert 'No changes were made.' in resp.body
+        form = self._select_children(resp, 0, 1, 2)
+        resp = form.submit('change_state').maybe_follow()
+        form = resp.forms['form-change-state']
+        form['to-state'] = 'public'
+        resp = form.submit('change_state').maybe_follow()
+        assert 'Your changes have been saved.' in resp.body
+        assert '/second-child-1/third-child/grandchild-1/@@workflow-change' \
+               '?new_state=private' in resp.body
+        assert '/second-child-1/third-child/grandchild-2/@@workflow-change' \
+               '?new_state=private' in resp.body
+        assert '/second-child-1/third-child/grandchild-3/@@workflow-change' \
+               '?new_state=private' in resp.body
+
+        resp = resp.click('My Third Child')
+        assert '/second-child-1/third-child/child-one/@@workflow-change' \
+               '?new_state=public' in resp.body
+        resp = app.get('/second-child-1/third-child/child-one/@@workflow-change?new_state=public')
+        resp = app.get('/second-child-1/third-child/@@contents')
+        assert '/second-child-1/third-child/child-one/@@workflow-change' \
+               '?new_state=private' in resp.body
+
+        resp = resp.click('First Child', index=1)
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = 'Sub child'
+        resp = form.submit('save').maybe_follow()
+        assert '/second-child-1/third-child/child-one/sub-child/' \
+               '@@workflow-change?new_state=public' in resp.body
+
+        resp = resp.click("Second Child", index=0)
+        resp = resp.click("Contents")
+        form = self._select_children(resp, 0, 1, 2)
+        resp = form.submit('change_state').maybe_follow()
+        form = resp.forms['form-change-state']
+        form['include-children'] = 'include-children'
+        form['to-state'] = 'public'
+        resp = form.submit('change_state').maybe_follow()
+        assert 'Your changes have been saved.' in resp.body
+        assert '/second-child-1/third-child/@@workflow-change' \
+               '?new_state=private' in resp.body
+        resp = app.get('/second-child-1/third-child/child-one/sub-child/')
+        assert '/second-child-1/third-child/child-one/sub-child/' \
+               '@@workflow-change?new_state=private' in resp.body
+
+        # Navigation
+        resp = resp.click("Navigate")
+        resp = resp.click("Second Child", index=0)
+        assert resp.request.path == '/second-child-1/'
+
+    def test_user_management(self, webtest, settings, dummy_mailer):
+        from kotti import get_settings
+        get_settings()['kotti.site_title'] = u'Website des Kottbusser Tors'
+
+        app = webtest.app
+        resp = self._login(app, 'admin', 'secret').follow()
+
+        # The user management screen is available through
+        # the "Site Setup" submenu
+        resp = resp.click('User Management')
+
+        # Add Bob's Group and assign the ``viewer`` role
+        form = resp.forms['deform_group_add']
+        form['name'] = 'bobsgroup'
+        form['title'] = "Bob's Group"
+        form.get('checkbox', index=0).checked = True
+        resp = form.submit('add_group').maybe_follow()
+        assert "Bob's Group was added" in resp.body
+        assert resp.forms['form-global-roles'][
+            'role::group:bobsgroup::role:viewer'].value == 'on'
+
+        # And a Bob.
+        # Only alphanumeric characters are allowed for the name
+        form = resp.forms['deform_user_add']
+        form["name"] = "bob:"
+        form["title"] = "Bob Dabolina"
+        form["password"] = "secret"
+        form['password-confirm'] = "secret"
+        form["email"] = "bob@DABOLINA.com"
+        resp = form.submit("add_user")
+        assert "There was a problem" in resp.body
+
+        # Use a valid username now.  Note how the checkbox to send a password
+        # registration link is ticked:
+        form = resp.forms['deform_user_add']
+        form["name"] = "Bob"
+        form["email"] = "bob@DABOLINA.com"
+        form["send_email"].checked = True
+        resp = form.submit("add_user").maybe_follow()
+        assert "Bob Dabolina was added" in resp.body
+
+        # We cannot add Bob twice:
+        form = resp.forms['deform_user_add']
+        form["name"] = "bob"
+        form["title"] = "Bobby Brown"
+        form["password"] = "secret"
+        form["password-confirm"] = "secret"
+        resp = form.submit("add_user")
+        assert "A user with that name already exists" in resp.body
+
+        # We cannot add Bob Dabolina's email twice:
+        form = resp.forms['deform_user_add']
+        form["name"] = "bob2"
+        form["title"] = "Bobby Brown"
+        form["email"] = "bob@dabolina.com"
+        form["password"] = "secret"
+        form['password-confirm'] = "secret"
+        resp = form.submit("add_user")
+        assert "A user with that email already exists" in resp.body
+        form = resp.forms['deform_user_add']
+        form["email"] = "bob@gmail.com"
+        resp = form.submit("add_user").maybe_follow()
+        assert "Bobby Brown was added" in resp.body
+
+        # Searching for Bob will return both Bob and Bob's Group:
+        form = resp.forms['form-principal-search']
+        form["query"] = "Bob"
+        resp = form.submit("search")
+        assert "Bob Dabolina" in resp.body
+        assert "Bob's Group" in resp.body
+        form = resp.forms['form-global-roles']
+        assert form["role::group:bobsgroup::role:viewer"].checked
+        assert not form["role::group:bobsgroup::role:editor"].checked
+        assert not form["role::bob::role:editor"].checked
+
+        # We can click on the Bob's entry to edit the list of groups
+        # he belongs to:
+        resp = resp.click("Bob Dabolina")
+        form = resp.forms['deform']
+        form["group"] = "bobsgroup"
+        resp = form.submit("save").maybe_follow()
+        assert "Your changes have been saved" in resp.body
+
+        # We cannot update on the Bobby Brown's entry with duplicated email:
+        resp = resp.click("Back to User Management")
+        form = resp.forms['form-principal-search']
+        form["query"] = "Bobby"
+        resp = form.submit("search")
+        resp = resp.click("Bobby Brown")
+        form = resp.forms['deform']
+        form["email"] = "bob@dabolina.com"
+        resp = form.submit("save")
+        assert "A user with that email already exists" in resp.body
+
+        # If we cancel the edit of the user, we are redirected to the
+        # user management screen:
+        resp = resp.forms['deform'].submit("cancel").maybe_follow()
+        assert "No changes were made." in resp.body
+        assert resp.request.path == '/@@setup-users'
+
+        # Back in user management we can see how Bob's inherited the
+        # viewer role from Bob's Group:
+        form = resp.forms['form-principal-search']
+        form["query"] = "Bob"
+        resp = form.submit("search")
+        form = resp.forms['form-global-roles']
+        assert form["role::group:bobsgroup::role:viewer"].checked
+        assert 'disabled' not in form[
+            "role::group:bobsgroup::role:viewer"].attrs
+        assert form["role::bob::role:viewer"].checked
+        assert 'disabled' in form["role::bob::role:viewer"].attrs
+
+        # We can click on the Bob's Group entry to edit an email address:
+        resp = resp.click("Bob's Group")
+        form = resp.forms['deform']
+        form["email"] = 'bogsgroup@gmail.com'
+        resp = form.submit("save").maybe_follow()
+        assert "Your changes have been saved" in resp.body
+
+        # Set password
+        # ------------
+
+        # Remember that we sent Bob an email for registration.
+        # He can use it to set his own password:
+        [email, email2] = dummy_mailer.outbox
+        assert email.recipients == [u'"Bob Dabolina" <bob@dabolina.com>']
+        assert email.subject == "Your registration for Website des " \
+                                "Kottbusser Tors"
+        assert "Hello, Bob Dabolina!" in email.body
+        assert "You are joining Website des Kottbusser Tors." in email.body
+        assert "Click here to set your password and log in:" in email.body
+        assert "@@set-password?token=" in email.body
+
+        # We'll use that link to set our password:
+        resp.click("Logout").follow()
+        path = email.body[email.body.index('http://localhost'):].split()[0][16:]
+        resp = app.get(path)
+        form = resp.forms['deform']
+        form['password'] = "newpassword"
+        form['password-confirm'] = "newpasswoops"  # a silly error
+        resp = form.submit("submit")
+        assert "There was a problem with your submission" in resp.body
+        form = resp.forms['deform']
+        form['password'] = "newpassword"
+        form['password-confirm'] = "newpassword"
+        resp = form.submit("submit").maybe_follow()
+        assert "You have reset your password" in resp.body
+
+        # We cannot use that link again:
+        resp = app.get(path)
+        form = resp.forms['deform']
+        form['password'] = "won't work"
+        form['password-confirm'] = "won't work"
+        resp = form.submit("submit")
+        assert "Your password reset token may have expired" in resp.body
+
+        # Log in as Bob with the new password:
+        resp = self._login(app, 'bOB', 'newpassword').follow()
+        assert "Welcome, Bob Dabolina" in resp.body
+        app.get('/@@edit')
+        resp = resp.click("Logout").follow()
+
+        # The login form has a "Reset password" button.  Let's try it:
+        resp = self._login(app, "bobby", "")
+        assert "Login failed." in resp.body
+        form = resp.forms['forgot-password-form']
+        form['login'] = "bob"
+        resp = form.submit('reset-password').follow()
+        assert "You should be receiving an email" in resp.body
+        [email1, email2, email3] = dummy_mailer.outbox
+        assert 'Hello, Bob Dabolina!' in email3.body
+        assert 'Click this link to reset your password at Website des ' \
+               'Kottbusser Tors:' in email3.body
+
+        # User preferences
+        # ----------------
+
+        # The "Preferences" link leads us to a form where the user can change
+        # their preferences so the user need to be authenticated:
+        resp = self._login(app, 'admin', 'secret').follow()
+        assert "Welcome, Administrator" in resp.body
+        resp = app.get('/@@prefs')
+        form = resp.forms['deform']
+        form['title'] = "Mr. Administrator"
+        form['email'] = 'admin@minad.com'
+        resp = form.submit("save").follow()
+        assert "Your changes have been saved" in resp.body
+
+        # The email could not be used if already a users with that email exists:
+        form = resp.forms['deform']
+        form['email'] = 'bob@dabolina.com'
+        resp = form.submit("save")
+
+        # If the user cancel the process he will be redirected to the site root:
+        form = resp.forms['deform']
+        resp = form.submit("cancel").follow()
+        assert 'Welcome to Kotti' in resp.body
+
+        # Share
+        # -----
+
+        # The Share tab allows us to assign users and groups to roles:
+        resp = app.get('/')
+        resp = resp.click("Edit")
+        resp = resp.click("Share")
+
+        # We can search for users:
+        form = resp.forms['form-share-search']
+        form['query'] = "Bob"
+        resp = form.submit("search")
+
+        # Bob and Bob's Group are listed now:
+        assert "Bob Dabolina" in resp.body
+        assert "Bob's Group" in resp.body
+
+        # We add Bob's Group to Owners and Editors before taking away Owners
+        # again:
+        form = resp.forms['form-share-assign']
+        form["role::group:bobsgroup::role:owner"].checked = True
+        form["role::group:bobsgroup::role:editor"].checked = True
+        resp = form.submit("apply").follow()
+        assert "Your changes have been saved" in resp.body
+        resp = app.get(resp.request.path)  # >>> browser.reload()
+        form = resp.forms['form-share-assign']
+        assert form["role::group:bobsgroup::role:owner"].checked
+        assert form["role::group:bobsgroup::role:editor"].checked
+        form["role::group:bobsgroup::role:owner"].checked = False
+        resp = form.submit("apply").follow()
+        assert "Your changes have been saved" in resp.body
+        form = resp.forms['form-share-assign']
+        assert not form["role::group:bobsgroup::role:owner"].checked
+
+        # Not making any changes will give us a different feedback message:
+        resp = form.submit("apply")
+        assert "Your changes have been saved" not in resp.body
+        form = resp.forms['form-share-assign']
+        assert not form["role::group:bobsgroup::role:owner"].checked
+        assert form["role::group:bobsgroup::role:editor"].checked
+
+        # Bob should now have an inherited Editor role, because he's part of
+        # Bob's Group:
+        form = resp.forms['form-share-search']
+        form["query"] = "Bob Dabolina"
+        resp = form.submit("search")
+        form = resp.forms['form-share-assign']
+        assert form["role::bob::role:editor"].checked
+        # TODO assert 'disabled' in form["role::bob::role:editor"].attrs
+        # TODO assert not form["role::bob::role:owner"].checked
+
+        # Lastly, let's take away the remaining Editor role from Bob's Group
+        # again:
+        assert "Bob's Group" in resp.body
+        form["role::group:bobsgroup::role:editor"].checked = None
+        resp = form.submit("apply").follow()
+        assert "Your changes have been saved" in resp.body
+        # TODO assert "Bob's Group" not in resp.body
+        form = resp.forms['form-share-assign']
+        assert not form["role::group:bobsgroup::role:editor"].checked
+
+        # Delete users
+        # ------------
+
+        resp = app.get('/')
+        resp = resp.click("User Management")
+
+        # We add a group and assign the ``Manager`` role to one:
+        form = resp.forms['deform_group_add']
+        form['name'] = "pelayogroup"
+        form['title'] = "Pelayo Group"
+        form.get('checkbox', index=3).checked = True
+        resp = form.submit("add_group").maybe_follow()
+        assert "Pelayo Group was added" in resp.body
+        form = resp.forms['form-global-roles']
+        assert form["role::group:pelayogroup::role:admin"].checked
+
+        # And add some users to this group.
+        form = resp.forms['deform_user_add']
+        form['name'] = "Bruce"
+        form['title'] = "Bruce Pelayo"
+        form['password'] = "secret"
+        form['password-confirm'] = "secret"
+        form['email'] = "bruce@pelayno.com"
+        form["group"] = "pelayogroup"
+        resp = form.submit("add_user").maybe_follow()
+        assert "Bruce Pelayo was added" in resp.body
+
+        form = resp.forms['deform_user_add']
+        form['name'] = "Brian"
+        form['title'] = "Brian Pelayo"
+        form['password'] = "secret"
+        form['password-confirm'] = "secret"
+        form['email'] = "brian@pelayno.com"
+        form["group"] = "pelayogroup"
+        resp = form.submit("add_user").maybe_follow()
+        assert "Brian Pelayo was added" in resp.body
+
+        # Lets login as Bruce and add some content:
+        resp.click("Logout").maybe_follow()
+        resp = self._login(app, 'bruce', 'secret').maybe_follow()
+        assert "Welcome, Bruce Pelayo!" in resp.body
+        resp = resp.click("Document", index=0)
+        form = resp.forms['deform']
+        form["title"] = "Bruce one"
+        form.submit("save").maybe_follow()
+        resp = app.get('/')
+        resp = resp.click("Document", index=0)
+        form = resp.forms['deform']
+        form["title"] = "Bruce two"
+        form.submit("save").maybe_follow()
+
+        # Now let's delete Bruce::
+        resp.click('Logout').maybe_follow()
+        resp = self._login(app, 'admin', 'secret').maybe_follow()
+        resp = resp.click("User Management")
+        form = resp.forms['form-principal-search']
+        form["query"] = "Bruce"
+        resp = form.submit("search").maybe_follow()
+        resp = resp.click("Bruce Pelayo")
+        resp = resp.forms['deform'].submit('delete').maybe_follow()
+        assert "Delete <em>Bruce Pelayo</em>" in resp.body
+        assert "Are you sure you want to delete <span>User</span> " \
+               "<em>Bruce Pelayo</em>?" in resp.body
+        resp = resp.forms['form-delete-user'].submit('delete').maybe_follow()
+        assert "User Bruce Pelayo was deleted." in resp.body
+        form = resp.forms['form-principal-search']
+        form["query"] = "Bruce"
+        resp = form.submit("search").maybe_follow()
+        assert "No users or groups were found." in resp.body

From 9d91c52c5cf5635d3f6346fdaa937d1c1f160f73 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 4 Jan 2016 12:16:56 +0100
Subject: [PATCH 395/600] Update requirements.

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e52cfe90c..10c7b000d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Kotti==1.3.0-alpha.1
-Babel==2.1.1
+Babel==2.2.0
 Beaker==1.7.0
 Chameleon==2.24
 FormEncode==1.3.0
@@ -41,7 +41,7 @@ js.jqueryui-tagit==2.0.24-2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 kotti-tinymce==0.5.4
-kotti-image==0.1.2
+kotti-image==0.1.3
 lingua==4.5.1
 peppercorn==0.5
 plone.scale==1.4

From 9a1267966192b92c066b61ef18fdee55f4a04dea Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 4 Jan 2016 13:38:04 +0100
Subject: [PATCH 396/600] Fix wrong assertion in test_format_currency that was
 probably introduced because of a former bug / missing feature in Babel.

---
 kotti/tests/test_util_views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index cb4901cb1..6155c2f8b 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -407,8 +407,8 @@ def test_format_currency(self, db_session):
         api = self.make()
         assert u'€13.99' == api.format_currency(13.99, 'EUR')
         assert u'$15,499.12' == api.format_currency(15499.12, 'USD')
-        assert u'€1' == api.format_currency(1, format=u'€#,##0',
-                                            currency='EUR')
+        assert u'€1.00' == api.format_currency(1, format=u'€#,##0',
+                                               currency='EUR')
         assert u'CHF3.14' == api.format_currency(
             decimal.Decimal((0, (3, 1, 4), -2)), 'CHF')
 

From 7a6ec048ddd6608e09c2b8f185a2d956b1feeae8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 4 Jan 2016 21:51:04 +0100
Subject: [PATCH 397/600] - Add custom traverser doing single query traversal.
 - Use SQLAlchemy's baked query to cache query construction (not execution!)
 where possible. - Properly configure caching and use pip-accel on Travis CI
 (build times < 50%). - Bugfix: kotti.events._update_children_paths could fail
 (at least under Python 2.6 with SQLite) under unclear conditions.

---
 .travis.yml                       |  14 +-
 CHANGES.txt                       |   7 +
 docs/api/index.rst                |   1 +
 docs/api/kotti.traversal.rst      |   8 +
 kotti/__init__.py                 |   1 +
 kotti/events.py                   |   4 +-
 kotti/filedepot.py                |   1 -
 kotti/resources.py                |  32 +++-
 kotti/security.py                 |  31 ++--
 kotti/sqla.py                     |   8 +-
 kotti/tests/test_functional.py    |  99 ++++++-------
 kotti/tests/test_zzz_scaffolds.py | 153 ++++++++++---------
 kotti/traversal.py                | 236 ++++++++++++++++++++++++++++++
 kotti/views/view.py               |   4 +-
 requirements.txt                  |   1 +
 setup.py                          |   1 +
 16 files changed, 434 insertions(+), 167 deletions(-)
 create mode 100644 docs/api/kotti.traversal.rst
 create mode 100644 kotti/traversal.py

diff --git a/.travis.yml b/.travis.yml
index 0b3cfcfd7..bb9497b9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,11 @@
 language: python
 sudo: false
-cache: pip
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.pip-accel
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
 python:
   - "2.6"
   - "2.7"
@@ -9,13 +14,12 @@ env:
   - KOTTI_TEST_DB_STRING=mysql+oursql://root@localhost:3306/kotti_testing
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
-  - travis_retry pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
-  - travis_retry pip install "setuptools>=17.1"  # fix issue with mock==1.3.0
-  - travis_retry pip install -e . -r requirements.txt --use-mirrors
+  - travis_retry pip install --cache-dir $HOME/.cache/pip -U pip setuptools pip-accel
+  - travis_retry pip-accel install psycopg2 oursql python-coveralls codecov
+  - travis_retry pip-accel install -e . -r requirements.txt
   - pip uninstall -y Kotti
   - python setup.py develop
   - python setup.py dev
-  - travis_retry pip install psycopg2 oursql python-coveralls codecov
 before_script:
   - psql -c 'create database kotti_testing;' -U postgres
   - mysql -e 'create database kotti_testing;'
diff --git a/CHANGES.txt b/CHANGES.txt
index 85bfd6910..328c427ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Change History
 1.3.0 - unreleased
 ------------------
 
+- Add a custom traverser, which gets all nodes in a single DB query.  For deeply
+  nested trees this results in drastic perfor,ance improvements.  See
+  http://kotti.readthedocs.org/en/master/api/kotti.traversal.html for details.
+
 - Bugfix: copy and paste of file nodes wouldn't create a new depot file, but
   instead lead to multiple references to a single file which would cause
   undesired results when one of them was deleted later.
@@ -11,6 +15,9 @@ Change History
 - Bugfix: local 'role:owner' was not set when a new node was created by copy
   and paste.
 
+- Bugfix: kotti.events._update_children_paths could fail under unclear
+  conditions (at least under Python 2.6 with SQLite).
+
 - Get rid of more browser doctests (converted to webtest).
 
 1.3.0-alpha.1 - 2015-12-22
diff --git a/docs/api/index.rst b/docs/api/index.rst
index af5e64564..54aede10a 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -23,6 +23,7 @@ API Documentation
    kotti.sqla
    kotti.testing
    kotti.tests
+   kotti.traversal
    kotti.util
    kotti.views/index
    kotti.workflow
diff --git a/docs/api/kotti.traversal.rst b/docs/api/kotti.traversal.rst
new file mode 100644
index 000000000..57492c761
--- /dev/null
+++ b/docs/api/kotti.traversal.rst
@@ -0,0 +1,8 @@
+.. _api-kotti.traversal:
+
+kotti.traversal
+---------------
+
+.. automodule:: kotti.traversal
+   :members:
+   :member-order: bysource
diff --git a/kotti/__init__.py b/kotti/__init__.py
index 4b8e5b9e5..e14a43bf8 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -63,6 +63,7 @@ def none_factory(**kwargs):  # pragma: no cover
         ]),
     'kotti.base_includes': ' '.join([
         'kotti',
+        'kotti.traversal',
         'kotti.filedepot',
         'kotti.events',
         'kotti.sanitizers',
diff --git a/kotti/events.py b/kotti/events.py
index 168511e4e..c523bab55 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -315,7 +315,7 @@ def reset_content_owner(event):
 def _update_children_paths(old_parent_path, new_parent_path):
     for child in DBSession.query(Node).options(
         load_only('path', 'type')).filter(
-            Node.path.startswith(old_parent_path)):
+            Node.path.startswith(old_parent_path)).order_by(Node.path):
         if child.path == new_parent_path:
             # The child is the node itself and has already be renamed.
             # Nothing to do!
@@ -386,7 +386,7 @@ def _all_children(item, _all=None):
 def _set_path_for_new_parent(target, value, oldvalue, initiator):
     """Triggered whenever the Node's 'parent' attribute is set.
     """
-    if value is None:
+    if value is None or value == oldvalue:
         # The parent is about to be set to 'None', so skip.
         return
 
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index fef8b4416..2643207ac 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -2,7 +2,6 @@
 import mimetypes
 import uuid
 from datetime import datetime
-from time import time
 
 import rfc6266
 from depot.fields.sqlalchemy import _SQLAMutationTracker
diff --git a/kotti/resources.py b/kotti/resources.py
index 33ac7bc95..48f7dfe45 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -11,14 +11,15 @@
 import os
 import warnings
 from copy import copy
-from fnmatch import fnmatch
 from cStringIO import StringIO
+from fnmatch import fnmatch
 from UserDict import DictMixin
 
 from depot.fields.sqlalchemy import _SQLAMutationTracker
 from depot.fields.sqlalchemy import UploadedFileField
 from pyramid.decorator import reify
 from pyramid.traversal import resource_path
+from sqlalchemy import bindparam
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
@@ -58,6 +59,7 @@
 from kotti.security import PersistentACLMixin
 from kotti.security import view_permitted
 from kotti.sqla import ACLType
+from kotti.sqla import bakery
 from kotti.sqla import JsonType
 from kotti.sqla import MutationList
 from kotti.sqla import NestedMutationDict
@@ -94,7 +96,8 @@ def keys(self):
         return [child.name for child in self.children]
 
     def __getitem__(self, path):
-        DBSession()._autoflush()
+        db_session = DBSession()
+        db_session._autoflush()
 
         if not hasattr(path, '__iter__'):
             path = (path,)
@@ -112,10 +115,16 @@ def __getitem__(self, path):
             else:
                 return child
 
+        baked_query = bakery(lambda session: session.query(Node))
+
         if len(path) == 1:
             try:
-                return DBSession.query(Node).filter_by(
-                    name=path[0], parent=self).one()
+                baked_query += lambda q: q.filter(
+                    Node.name == bindparam('name'),
+                    Node.parent_id == bindparam('parent_id')
+                )
+                return baked_query(db_session).params(
+                    name=path[0], parent_id=self.id).one()
             except NoResultFound:
                 raise KeyError(path)
 
@@ -129,10 +138,10 @@ def __getitem__(self, path):
             conditions.append(alias.c.parent_id == old_alias.c.id)
             conditions.append(alias.c.name == name)
         expr = select([alias.c.id], and_(*conditions))
-        row = DBSession.execute(expr).fetchone()
+        row = db_session.execute(expr).fetchone()
         if row is None:
             raise KeyError(path)
-        return DBSession.query(Node).get(row.id)
+        return baked_query(db_session).get(row.id)
 
     @hybrid_property
     def children(self):
@@ -472,7 +481,8 @@ class TagsToContents(Base):
     #: to :class:`~kotti.resources.Tag` instances to allow easy access to all
     #: content tagged with that tag.
     #: (:func:`sqlalchemy.orm.relationship`)
-    tag = relation(Tag, backref=backref('content_tags', cascade='all'))
+    tag = relation(Tag, backref=backref('content_tags', cascade='all'),
+                   lazy='joined',)
     #: Ordering position of the tag
     #: :class:`sqlalchemy.types.Integer`
     position = Column(Integer, nullable=False)
@@ -572,6 +582,7 @@ def __mapper_args__(cls):
     _tags = relation(
         TagsToContents,
         backref=backref('item'),
+        lazy='joined',
         order_by=[TagsToContents.position],
         collection_class=ordering_list("position"),
         cascade='all, delete-orphan',
@@ -790,6 +801,7 @@ def get_root(request=None):
 
 class DefaultRootCache(object):
     """ Default implementation for :func:`~kotti.resources.get_root` """
+    _id = None
 
     @reify
     def root_id(self):
@@ -798,7 +810,11 @@ def root_id(self):
         :rtype: int
         """
 
-        return Node.query.filter(Node.parent_id == None).one().id  # noqa
+        query = bakery(lambda session: session.query(Node)
+                       .with_polymorphic(Node).add_columns(Node.id)
+                       .enable_eagerloads(False).filter(Node.parent_id == None))
+
+        return query(DBSession()).one().id
 
     def get_root(self):
         """ Query for the root node by its id.  This enables SQLAlchemy's
diff --git a/kotti/security.py b/kotti/security.py
index d1ee10fd0..45e9a4ca3 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -4,24 +4,25 @@
 from UserDict import DictMixin
 
 import bcrypt
-from sqlalchemy import Boolean
+from pyramid.location import lineage
+from pyramid.security import view_execution_permitted
+from sqlalchemy import Boolean, bindparam
 from sqlalchemy import Column
 from sqlalchemy import DateTime
+from sqlalchemy import func
 from sqlalchemy import Integer
 from sqlalchemy import Unicode
-from sqlalchemy import func
+from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.sql.expression import and_
 from sqlalchemy.sql.expression import or_
-from sqlalchemy.orm.exc import NoResultFound
-from pyramid.location import lineage
-from pyramid.security import view_execution_permitted
 from zope.deprecation.deprecation import deprecated
 
-from kotti import get_settings
-from kotti import DBSession
 from kotti import Base
-from kotti.sqla import MutationList
+from kotti import DBSession
+from kotti import get_settings
+from kotti.sqla import bakery
 from kotti.sqla import JsonType
+from kotti.sqla import MutationList
 from kotti.util import _
 from kotti.util import request_cache
 from kotti.util import DontCache
@@ -449,6 +450,12 @@ class Principals(DictMixin):
     """
     factory = Principal
 
+    @classmethod
+    def _principal_by_name(cls, name):
+        query = bakery(lambda session: session.query(cls.factory).filter(
+            cls.factory.name == bindparam('name')))
+        return query(DBSession()).params(name=name).one()
+
     @request_cache(lambda self, name: unicode(name))
     def __getitem__(self, name):
         name = unicode(name)
@@ -457,8 +464,9 @@ def __getitem__(self, name):
         if name.startswith('role:'):
             raise KeyError(name)
         try:
-            return DBSession.query(
-                self.factory).filter(self.factory.name == name).one()
+            return self._principal_by_name(name)
+            # return DBSession.query(
+            #     self.factory).filter(self.factory.name == name).one()
         except NoResultFound:
             raise KeyError(name)
 
@@ -471,8 +479,7 @@ def __setitem__(self, name, principal):
     def __delitem__(self, name):
         name = unicode(name)
         try:
-            principal = DBSession.query(
-                self.factory).filter(self.factory.name == name).one()
+            principal = self._principal_by_name(name)
             DBSession.delete(principal)
         except NoResultFound:
             raise KeyError(name)
diff --git a/kotti/sqla.py b/kotti/sqla.py
index d27ad4c22..bf5fb9a6c 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -10,9 +10,13 @@
 from pyramid.compat import json
 from pyramid.security import ALL_PERMISSIONS
 from pyramid.security import Allow
-from sqlalchemy.types import TypeDecorator, TEXT
-from sqlalchemy.ext.mutable import Mutable
+from sqlalchemy.ext import baked
 from sqlalchemy.ext.declarative import declared_attr
+from sqlalchemy.ext.mutable import Mutable
+from sqlalchemy.types import TypeDecorator, TEXT
+
+bakery = baked.bakery()
+baked.bake_lazy_loaders()
 
 
 def dump_default(obj):
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 772a35f4f..a7ff1a527 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -15,7 +15,7 @@ def test_it(self, app):
         res = app.post(
             '/@@login', dict(login='admin', password='secret', submit='submit'))
         assert res.status == '302 Found'
-        res = res.follow()
+        res = res.maybe_follow()
         assert res.status == '200 OK'
 
 
@@ -357,22 +357,22 @@ def test_content_management(self, webtest):
 
         # Copy and paste
         resp = app.get('/second-child/')
-        resp = resp.click('Cut', index=0).follow()
+        resp = resp.click('Cut', index=0).maybe_follow()
         assert "Second Child was cut" in resp.body
         resp = app.get('/child-one/')
-        resp = resp.click('Paste', index=0).follow()
+        resp = resp.click('Paste', index=0).maybe_follow()
         assert "Second Child was pasted" in resp.body
         app.get('/second-child/', status=404)
         resp = app.get('/child-one/second-child/')
-        resp = resp.click('Copy', index=0).follow()
+        resp = resp.click('Copy', index=0).maybe_follow()
         assert "Second Child was copied" in resp.body
         resp = app.get('/')
-        resp = resp.click('Paste', index=0).follow()
+        resp = resp.click('Paste', index=0).maybe_follow()
         assert "Second Child was pasted" in resp.body
 
         # We can paste twice since we copied:
         resp = app.get('/')
-        resp = resp.click('Paste', index=0).follow()
+        resp = resp.click('Paste', index=0).maybe_follow()
         assert "Second Child was pasted" in resp.body
         resp = app.get('/second-child/')
         assert "Second Child" in resp.body
@@ -382,10 +382,10 @@ def test_content_management(self, webtest):
         # We can also copy and paste items that contain children,
         # like the whole site:
         resp = app.get('/')
-        resp = resp.click('Copy', index=0).follow()
+        resp = resp.click('Copy', index=0).maybe_follow()
         assert "Welcome to Kotti was copied" in resp.body
         resp = app.get('/second-child/')
-        resp = resp.click('Paste', index=0).follow()
+        resp = resp.click('Paste', index=0).maybe_follow()
         assert "Welcome to Kotti was pasted" in resp.body
         resp = app.get('/second-child/welcome-to-kotti/')
         assert resp.status_code == 200
@@ -394,32 +394,32 @@ def test_content_management(self, webtest):
 
         # And finally cut and paste a tree:
         resp = app.get('/second-child/')
-        resp.click('Cut', index=0).follow()
+        resp.click('Cut', index=0).maybe_follow()
         resp = app.get('/child-one/second-child/')
-        resp = resp.click('Paste', index=0).follow()
+        resp = resp.click('Paste', index=0).maybe_follow()
         assert "Second Child was pasted" in resp.body
         app.get('/second-child/', status=404)
 
         # Note how we can't cut and paste an item into itself:
         resp = app.get('/child-one/')
-        resp.click('Cut', index=0).follow()
+        resp.click('Cut', index=0).maybe_follow()
         with pytest.raises(IndexError):
-            resp.click('Paste', index=0).follow()
+            resp.click('Paste', index=0).maybe_follow()
         resp = app.get('/child-one/second-child/')
         with pytest.raises(IndexError):
-            resp.click('Paste', index=0).follow()
+            resp.click('Paste', index=0).maybe_follow()
 
         # Whether we can paste or not also depends on the
         # ``type_info.addable`` property:
         resp = app.get('/child-one/')
-        resp.click('Copy', index=0).follow()
+        resp.click('Copy', index=0).maybe_follow()
         resp = app.get('/child-one/second-child/')
-        resp.click('Paste', index=0).follow()
+        resp.click('Paste', index=0).maybe_follow()
         try:
             Document.type_info.addable_to = ()
             resp = app.get('/child-one/second-child/')
             with pytest.raises(IndexError):
-                resp.click('Paste', index=0).follow()
+                resp.click('Paste', index=0).maybe_follow()
         finally:
             Document.type_info.addable_to = save_addable_document
 
@@ -480,7 +480,6 @@ def test_content_management(self, webtest):
         with pytest.raises(IndexError):
             resp.click('Paste')
         resp = app.get('/child-one/@@contents')
-        form = resp.forms['form-contents']
         form = self._select_children(resp, 0, 1)
         form.submit('cut').maybe_follow()
         resp = app.get('/')
@@ -491,7 +490,7 @@ def test_content_management(self, webtest):
         resp = app.get('/forth-child/@@contents')
         assert "Grandchild" not in resp.body
         assert "My Third Child" not in resp.body
-        resp = resp.forms['form-contents'].submit('paste').maybe_follow()
+        resp.forms['form-contents'].submit('paste').maybe_follow()
         resp = app.get('/forth-child/@@contents')
         assert "Grandchild" in resp.body
         assert "My Third Child" in resp.body
@@ -536,7 +535,7 @@ def test_content_management(self, webtest):
         resp = form.submit('delete_nodes').maybe_follow()
         assert "Are you sure" in resp.body
         resp = resp.forms['form-delete-nodes'].submit('delete_nodes',
-                                                      status=302).follow()
+                                                      status=302).maybe_follow()
         assert "child, the third was deleted." in resp.body
         assert "Hello Bob was deleted." in resp.body
         assert "some.txt was deleted." in resp.body
@@ -544,18 +543,14 @@ def test_content_management(self, webtest):
         assert "Welcome to Kotti" in resp.body
         assert '<i class="glyphicon glyphicon-home"></i>' in resp.body
         assert '<i class="glyphicon glyphicon-folder-open"></i>' in resp.body
-        assert '<i class="glyphicon glyphicon-folder-close"></i>' \
-               not in resp.body
+        assert '<i class="glyphicon glyphicon-folder-close"></i>' not in resp.body  # noqa
 
         # Contents view change state actions
         resp = resp.click("Second Child")
         resp = resp.click("Contents")
-        assert '/second-child-1/third-child/@@workflow-change' \
-               '?new_state=public' in resp.body
-        resp = resp.click(href='/second-child-1/third-child/@@workflow-change'
-                               '\?new_state=public').follow()
-        assert '/second-child-1/third-child/@@workflow-change' \
-               '?new_state=private' in resp.body
+        assert '/second-child-1/third-child/@@workflow-change?new_state=public' in resp.body  # noqa
+        resp = app.get('/second-child-1/third-child/@@workflow-change?new_state=public').maybe_follow()  # noqa
+        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.body  # noqa
         resp = app.get('/second-child-1/third-child/@@contents')
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('change_state').maybe_follow()
@@ -575,29 +570,21 @@ def test_content_management(self, webtest):
         form['to-state'] = 'public'
         resp = form.submit('change_state').maybe_follow()
         assert 'Your changes have been saved.' in resp.body
-        assert '/second-child-1/third-child/grandchild-1/@@workflow-change' \
-               '?new_state=private' in resp.body
-        assert '/second-child-1/third-child/grandchild-2/@@workflow-change' \
-               '?new_state=private' in resp.body
-        assert '/second-child-1/third-child/grandchild-3/@@workflow-change' \
-               '?new_state=private' in resp.body
+        assert '/second-child-1/third-child/grandchild-1/@@workflow-change?new_state=private' in resp.body  # noqa
+        assert '/second-child-1/third-child/grandchild-2/@@workflow-change?new_state=private' in resp.body  # noqa
+        assert '/second-child-1/third-child/grandchild-3/@@workflow-change?new_state=private' in resp.body  # noqa
 
         resp = resp.click('My Third Child')
-        assert '/second-child-1/third-child/child-one/@@workflow-change' \
-               '?new_state=public' in resp.body
-        resp = app.get('/second-child-1/third-child/child-one/@@workflow-change?new_state=public')
+        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=public' in resp.body  # noqa
+        app.get('/second-child-1/third-child/child-one/@@workflow-change?new_state=public')  # noqa
         resp = app.get('/second-child-1/third-child/@@contents')
-        assert '/second-child-1/third-child/child-one/@@workflow-change' \
-               '?new_state=private' in resp.body
-
+        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=private' in resp.body  # noqa
         resp = resp.click('First Child', index=1)
         resp = resp.click('Document', index=0)
         form = resp.forms['deform']
         form['title'] = 'Sub child'
         resp = form.submit('save').maybe_follow()
-        assert '/second-child-1/third-child/child-one/sub-child/' \
-               '@@workflow-change?new_state=public' in resp.body
-
+        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.body  # noqa
         resp = resp.click("Second Child", index=0)
         resp = resp.click("Contents")
         form = self._select_children(resp, 0, 1, 2)
@@ -607,11 +594,9 @@ def test_content_management(self, webtest):
         form['to-state'] = 'public'
         resp = form.submit('change_state').maybe_follow()
         assert 'Your changes have been saved.' in resp.body
-        assert '/second-child-1/third-child/@@workflow-change' \
-               '?new_state=private' in resp.body
+        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.body
         resp = app.get('/second-child-1/third-child/child-one/sub-child/')
-        assert '/second-child-1/third-child/child-one/sub-child/' \
-               '@@workflow-change?new_state=private' in resp.body
+        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=private' in resp.body
 
         # Navigation
         resp = resp.click("Navigate")
@@ -623,7 +608,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         get_settings()['kotti.site_title'] = u'Website des Kottbusser Tors'
 
         app = webtest.app
-        resp = self._login(app, 'admin', 'secret').follow()
+        resp = self._login(app, 'admin', 'secret').maybe_follow()
 
         # The user management screen is available through
         # the "Site Setup" submenu
@@ -752,7 +737,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         assert "@@set-password?token=" in email.body
 
         # We'll use that link to set our password:
-        resp.click("Logout").follow()
+        resp.click("Logout").maybe_follow()
         path = email.body[email.body.index('http://localhost'):].split()[0][16:]
         resp = app.get(path)
         form = resp.forms['deform']
@@ -775,17 +760,17 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         assert "Your password reset token may have expired" in resp.body
 
         # Log in as Bob with the new password:
-        resp = self._login(app, 'bOB', 'newpassword').follow()
+        resp = self._login(app, 'bOB', 'newpassword').maybe_follow()
         assert "Welcome, Bob Dabolina" in resp.body
         app.get('/@@edit')
-        resp = resp.click("Logout").follow()
+        resp = resp.click("Logout").maybe_follow()
 
         # The login form has a "Reset password" button.  Let's try it:
         resp = self._login(app, "bobby", "")
         assert "Login failed." in resp.body
         form = resp.forms['forgot-password-form']
         form['login'] = "bob"
-        resp = form.submit('reset-password').follow()
+        resp = form.submit('reset-password').maybe_follow()
         assert "You should be receiving an email" in resp.body
         [email1, email2, email3] = dummy_mailer.outbox
         assert 'Hello, Bob Dabolina!' in email3.body
@@ -797,13 +782,13 @@ def test_user_management(self, webtest, settings, dummy_mailer):
 
         # The "Preferences" link leads us to a form where the user can change
         # their preferences so the user need to be authenticated:
-        resp = self._login(app, 'admin', 'secret').follow()
+        resp = self._login(app, 'admin', 'secret').maybe_follow()
         assert "Welcome, Administrator" in resp.body
         resp = app.get('/@@prefs')
         form = resp.forms['deform']
         form['title'] = "Mr. Administrator"
         form['email'] = 'admin@minad.com'
-        resp = form.submit("save").follow()
+        resp = form.submit("save").maybe_follow()
         assert "Your changes have been saved" in resp.body
 
         # The email could not be used if already a users with that email exists:
@@ -813,7 +798,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
 
         # If the user cancel the process he will be redirected to the site root:
         form = resp.forms['deform']
-        resp = form.submit("cancel").follow()
+        resp = form.submit("cancel").maybe_follow()
         assert 'Welcome to Kotti' in resp.body
 
         # Share
@@ -838,14 +823,14 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form = resp.forms['form-share-assign']
         form["role::group:bobsgroup::role:owner"].checked = True
         form["role::group:bobsgroup::role:editor"].checked = True
-        resp = form.submit("apply").follow()
+        resp = form.submit("apply").maybe_follow()
         assert "Your changes have been saved" in resp.body
         resp = app.get(resp.request.path)  # >>> browser.reload()
         form = resp.forms['form-share-assign']
         assert form["role::group:bobsgroup::role:owner"].checked
         assert form["role::group:bobsgroup::role:editor"].checked
         form["role::group:bobsgroup::role:owner"].checked = False
-        resp = form.submit("apply").follow()
+        resp = form.submit("apply").maybe_follow()
         assert "Your changes have been saved" in resp.body
         form = resp.forms['form-share-assign']
         assert not form["role::group:bobsgroup::role:owner"].checked
@@ -871,7 +856,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         # again:
         assert "Bob's Group" in resp.body
         form["role::group:bobsgroup::role:editor"].checked = None
-        resp = form.submit("apply").follow()
+        resp = form.submit("apply").maybe_follow()
         assert "Your changes have been saved" in resp.body
         # TODO assert "Bob's Group" not in resp.body
         form = resp.forms['form-share-assign']
diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index d6ed4e3b2..0c88e655f 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -24,59 +24,57 @@
 
 
 @fixture
-def virtualenv(request):
+def virtualenv(request, travis):
     """ Create a virtualenv and ``chdir`` into it.  Remove it and ``chdir``
     into the previous working directory again when the test has been run.
     """
 
-    import virtualenv
-    from virtualenv import Logger
-
-    # create a temp directory
-    cwd = os.getcwd()
-    virtualenv_directory = mkdtemp()
-
-    # install a virtualenv
-    logger = Logger([(Logger.level_for_integer(2), sys.stdout)])
-    virtualenv.logger = logger
-    virtualenv.create_environment(
-        virtualenv_directory,
-        site_packages=False,
-        clear=True,
-        unzip_setuptools=True)
-
-    # chdir into the virtualenv directory
-    os.chdir(virtualenv_directory)
-
-    # update setuptools in the virtualenv
-    subprocess.check_call([
-        os.path.join('bin', 'pip'),
-        'install', '-U', 'setuptools>=17.1'])
-
-    # install requirements.txt into the virtualenv
-    subprocess.check_call([
-        os.path.join('bin', 'pip'),
-        'install', '-r',
-        os.path.join(cwd, 'requirements.txt')])
-
-    # also install psycopg2 and oursql
-    subprocess.check_call([
-        os.path.join('bin', 'pip'),
-        'install', 'psycopg2', 'oursql'])
-
-    # setuptools-git is required to be able to call setup.py install
-    # sucessfully.
-    subprocess.check_call([
-        os.path.join('bin', 'pip'),
-        'install', 'setuptools-git'])
-
-    shutil.copytree(cwd, os.path.join(virtualenv_directory, 'kotti'))
-
-    # install Kotti into the virtualenv
-    os.chdir('kotti')
-    subprocess.check_call([
-        os.path.join('..', 'bin', 'python'), 'setup.py', 'develop'])
-    os.chdir('..')
+    with travis.folding_output():
+        import virtualenv
+        from virtualenv import Logger
+
+        # create a temp directory
+        cwd = os.getcwd()
+        virtualenv_directory = mkdtemp()
+
+        # install a virtualenv
+        logger = Logger([(Logger.level_for_integer(2), sys.stdout)])
+        virtualenv.logger = logger
+        virtualenv.create_environment(
+            virtualenv_directory,
+            site_packages=False,
+            clear=True,
+            unzip_setuptools=True)
+
+        # chdir into the virtualenv directory
+        os.chdir(virtualenv_directory)
+
+        # update setuptools in the virtualenv
+        subprocess.check_call([
+            os.path.join('bin', 'pip'),
+            'install', '-U', 'pip', 'setuptools', 'pip-accel'])
+
+        # install requirements.txt into the virtualenv
+        subprocess.check_call([
+            os.path.join('bin', 'pip-accel'),
+            'install', '-r',
+            os.path.join(cwd, 'requirements.txt')],
+            env={'VIRTUAL_ENV': virtualenv_directory, })
+
+        # setuptools-git is required to be able to call setup.py install
+        # sucessfully.  also install psycopg2 and oursql.
+        subprocess.check_call([
+            os.path.join('bin', 'pip-accel'),
+            'install', 'setuptools-git', 'psycopg2', 'oursql'],
+            env={'VIRTUAL_ENV': virtualenv_directory, })
+
+        shutil.copytree(cwd, os.path.join(virtualenv_directory, 'kotti'))
+
+        # install Kotti into the virtualenv
+        os.chdir('kotti')
+        subprocess.check_call([
+            os.path.join('..', 'bin', 'python'), 'setup.py', 'develop'])
+        os.chdir('..')
 
     def delete_virtualenv():
         shutil.rmtree(virtualenv_directory)
@@ -86,32 +84,31 @@ def delete_virtualenv():
 
 
 @slow
-def test_scaffold_kotti_addon(virtualenv):
-
-    # print available scaffolds
-    subprocess.check_call([os.path.join('bin', 'pcreate'), '-l'])
-
-    # set some environment variables to make pcreate non interactive
-    os.environ["author"] = "Kotti developers"
-    os.environ["email"] = "kotti@googlegroups.com"
-    os.environ["gh_user"] = "Kotti"
-
-    # create a project from the scaffold
-    subprocess.check_call([
-        os.path.join('bin', 'pcreate'),
-        '-s', 'kotti', 'kotti_my_addon'])
-
-    # develop the package
-    os.chdir('kotti_my_addon')
-    subprocess.check_call([
-        os.path.join('..', 'bin', 'python'),
-        'setup.py', 'develop'])
-    subprocess.check_call([
-        os.path.join('..', 'bin', 'python'),
-        'setup.py', 'dev'])
-
-    # run the tests
-    subprocess.check_call([
-        os.path.join('..', 'bin', 'py.test')])
-
-    pass
+def test_scaffold_kotti_addon(virtualenv, travis):
+
+    with travis.folding_output():
+        # print available scaffolds
+        subprocess.check_call([os.path.join('bin', 'pcreate'), '-l'])
+
+        # set some environment variables to make pcreate non interactive
+        os.environ["author"] = "Kotti developers"
+        os.environ["email"] = "kotti@googlegroups.com"
+        os.environ["gh_user"] = "Kotti"
+
+        # create a project from the scaffold
+        subprocess.check_call([
+            os.path.join('bin', 'pcreate'),
+            '-s', 'kotti', 'kotti_my_addon'])
+
+        # develop the package
+        os.chdir('kotti_my_addon')
+        subprocess.check_call([
+            os.path.join('..', 'bin', 'python'),
+            'setup.py', 'develop'])
+        subprocess.check_call([
+            os.path.join('..', 'bin', 'python'),
+            'setup.py', 'dev'])
+
+        # run the tests
+        subprocess.check_call([
+            os.path.join('..', 'bin', 'py.test')])
diff --git a/kotti/traversal.py b/kotti/traversal.py
new file mode 100644
index 000000000..572b4590a
--- /dev/null
+++ b/kotti/traversal.py
@@ -0,0 +1,236 @@
+""" This module contains Kotti's node tree traverser.
+
+In Kotti versions < 1.3.0, Pyramid's default traverser
+(:class:`pyramid.traversal.ResourceTreeTraverser`) was used.  This traverser
+still works, but it becomes decreasingly performant the deeper your resource
+tree is nested.  This is caused by the fact, that it generates one DB query per
+level, whereas the Kotti traverser (:class:`kotti.traversal.NodeTreeTraverser`)
+generates a single DB query, regardless of the number of request path segments.
+This query not only finds the context, but also returns all node items in its
+lineage.  This means, that neither accessing ``context.parent`` nor calling
+:func:`pyramid.location.lineage` will result in additional DB queries.
+
+The performance benefits are huge.  The table below compares the requests per
+seconds (rps) that were reached on a developer's notebook against a PostgreSQL
+database with 4419 :class:`kotti.resources.Document` nodes.
+
+===================== ======================= =====================
+request.path          Pyramid traverser (rps) Kotti traverser (rps)
+===================== ======================= =====================
+/                     49                      49
+/a/                   41                      36
+/a/b/                 30                      35
+/a/b/c/               23                      34
+/a/b/c/d/             19                      33
+/a/b/c/d/e/           16                      33
+/a/b/c/d/e/f/         14                      33
+/a/b/c/d/e/f/g/       12                      32
+/a/b/c/d/e/f/g/h/     11                      31
+/a/b/c/d/e/f/g/h/i/   10                      30
+/a/b/c/d/e/f/g/h/i/j/ 8                       29
+===================== ======================= =====================
+
+"""
+
+from pyramid.compat import decode_path_info
+from pyramid.compat import is_nonstr_iter
+from pyramid.exceptions import URLDecodeError
+from pyramid.interfaces import ITraverser
+from pyramid.interfaces import VH_ROOT_KEY
+from pyramid.traversal import empty
+from pyramid.traversal import ResourceTreeTraverser
+from pyramid.traversal import slash
+from pyramid.traversal import split_path_info
+from sqlalchemy import or_
+from zope.interface import implementer
+
+from kotti import DBSession
+from kotti.resources import Node
+
+
+@implementer(ITraverser)
+class NodeTreeTraverser(ResourceTreeTraverser):
+    """ An optimized resource tree traverser for :class:`kotti.resources.Node`
+    based resource trees. """
+
+    @staticmethod
+    def _extract_from_request(request):  # pragma: no cover
+        """ Extract subpath, vpath and vroot_tuple from the request.  The
+        contents of this method is just a copy from the base class'
+        implementation.
+
+        :param request: Current request
+        :type request: :class:`pyramid.request.Request`
+
+        :return: (subpath, vpath, vroot_tuple)
+        :rtype: tuple
+        """
+
+        environ = request.environ
+        matchdict = request.matchdict
+        if matchdict is not None:
+            path = matchdict.get('traverse', slash) or slash
+            if is_nonstr_iter(path):
+                path = '/' + slash.join(path) or slash
+            subpath = matchdict.get('subpath', ())
+            if not is_nonstr_iter(subpath):
+                subpath = split_path_info(subpath)
+        else:
+            subpath = ()
+            try:
+                path = request.path_info or slash
+            except KeyError:
+                path = slash
+            except UnicodeDecodeError as e:
+                raise URLDecodeError(e.encoding, e.object, e.start, e.end,
+                                     e.reason)
+        if VH_ROOT_KEY in environ:
+            vroot_path = decode_path_info(environ[VH_ROOT_KEY])
+            vroot_tuple = split_path_info(vroot_path)
+            vpath = vroot_path + path
+        else:
+            vroot_tuple = ()
+            vpath = path
+        return subpath, vpath, vroot_tuple
+
+    def __call__(self, request):
+        """ The first part of this function is copied without changes from
+        :meth:`pyramid.traversal.ResourceTreeTraverser.__call__`.
+
+        :param request: Current request
+        :type request: :class:`pyramid.request.Request`
+
+        :return: Traversal info dictionary
+        :rtype: see :func:`pyramid.traversal.traverse`
+        """
+
+        subpath, vpath, vroot_tuple = self._extract_from_request(request)
+
+        root = self.root
+
+        # Part 2:
+        vs = self.VIEW_SELECTOR
+        lvs = len(vs)
+        result = {
+            'context': root,
+            'view_name': empty,
+            'subpath': subpath,
+            'traversed': (),
+            'virtual_root': root,
+            'virtual_root_path': vroot_tuple,
+            'root': root}
+
+        if vpath == slash:
+            return result
+        else:
+            vpath_tuple = split_path_info(vpath)
+            traversed_nodes = self.traverse(root, vpath_tuple)
+            if len(traversed_nodes) == 0:
+                view_name = vpath_tuple[0]
+                if view_name[:lvs] == vs:
+                    view_name = view_name[lvs:]
+                result['view_name'] = view_name
+                result['subpath'] = vpath_tuple[1:]
+                return result
+            traversed = vpath_tuple[:len(traversed_nodes)]
+            subpath = list(vpath_tuple[len(traversed_nodes):])
+            if subpath:
+                view_name = subpath.pop(0)
+                if view_name[:lvs] == vs:
+                    view_name = view_name[lvs:]
+            else:
+                view_name = empty
+            return {'context': traversed_nodes[-1],
+                    'view_name': view_name,
+                    'subpath': subpath,
+                    'traversed': traversed,
+                    'virtual_root': root,
+                    'virtual_root_path': vroot_tuple,
+                    'root': root}
+
+    @staticmethod
+    def traverse(root, vpath_tuple):
+        """
+        :param root: The node where traversal should start
+        :type root: :class:`kotti.resources.Node`
+
+        :param vpath_tuple: Tuple of path segments to be traversed
+        :type vpath_tuple: tuple
+
+        :return: List of nodes, from root (excluded) to context (included).
+                 Each node has its parent set already, so that no subsequent
+                 queries will be be performed, e.g. when calling
+                 ``lineage(context)``
+        :rtype: list of :class:`kotti.resources.Node`
+        """
+
+        conditions = [
+            (Node.path == root.path + '/'.join(vpath_tuple[:idx + 1]) + '/')
+            for idx, item in enumerate(vpath_tuple)]
+        nodes = DBSession().query(Node)\
+            .order_by(Node.path)\
+            .filter(or_(*conditions))\
+            .all()
+        for i, node in enumerate(nodes):
+            if i == 0:
+                setattr(node, 'parent', root)
+            else:
+                setattr(node, 'parent', nodes[i - 1])
+
+        return nodes
+
+    def _traverse_cte(self, root, vpath_tuple):  # pragma: no cover
+        """ Version of the traverse method, that uses a CTE instead of the
+        Node.path attribute.  Unfortunately this is **much** slower and works
+        only on PostgreSQL.
+
+        It **does** work, but is not used ATM.  Could be very useful to replace
+        :func:`kotti.events._set_path_for_new_parent` and
+        :func:`kotti.events._set_path_for_new_name` event handlers to handle
+        everything on the database with a single call, instead of the expensive
+        recursion maassacre we have right now.
+        """
+
+        raise NotImplementedError('Use the traverse method instead.')
+
+        """
+        # needed until we find out how to pass an empty array of type String
+        # (i.e. 'VARCHAR[]') to the initial cte.
+
+        vpath = ('', ) + vpath_tuple
+
+        cte = DBSession.query(
+                Node.id,
+                # array([concat('', Node.name)]).label('path')) \
+                concat('', Node.name).label('path')) \
+            .enable_eagerloads(False) \
+            .filter(Node.parent_id == None) \
+            .cte(name="n1", recursive=True)
+        parent = aliased(cte, name='parent')
+        child = aliased(Node, name='child')
+        inner = DBSession.query(
+                child.id,
+                # (parent.c.path + array([concat('', child.name)])).label('path')) \
+                concat(parent.c.path, '/', child.name).label('path')) \
+            .enable_eagerloads(False) \
+            .filter(child.parent_id == parent.c.id)
+        cte = cte.union_all(inner)
+        conditions = [
+            # (cte.c.path == array(vpath[:idx + 1]))
+            (cte.c.path == '/'.join(vpath[:idx + 1]))
+            for idx, item in enumerate(vpath)]
+        ids = DBSession.query(Node.id.label('node_id')) \
+            .select_entity_from(cte) \
+            .filter(or_(*conditions))
+        nodes = DBSession.query(Node).filter(Node.id.in_(ids)).order_by(Node.path).offset(1).all()
+        for i, node in enumerate(nodes):
+            if i == 0:
+                setattr(node, 'parent', root)
+            else:
+                setattr(node, 'parent', nodes[i-1])
+        return nodes
+        """
+
+
+def includeme(config):
+    config.add_traverser(NodeTreeTraverser, Node)
diff --git a/kotti/views/view.py b/kotti/views/view.py
index d44f7fdb7..f0d272abc 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -24,7 +24,7 @@ def view_content_default(context, request):
 
     view_name = context.default_view or 'view'
     response = render_view_to_response(context, request, name=view_name)
-    if response is None:  # pragma: no coverage
+    if response is None:  # pragma: no cover
         warnings.warn(
             u'Failed to look up default view called {0!r} for {1!r}.'.format(
                 view_name, context))
@@ -32,7 +32,7 @@ def view_content_default(context, request):
     return response
 
 
-def view_node(context, request):  # pragma: no coverage
+def view_node(context, request):  # pragma: no cover
     return {}  # BBB
 
 
diff --git a/requirements.txt b/requirements.txt
index 10c7b000d..21c0722eb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -43,6 +43,7 @@ js.select2==3.4.1
 kotti-tinymce==0.5.4
 kotti-image==0.1.3
 lingua==4.5.1
+lxml==3.5.0
 peppercorn==0.5
 plone.scale==1.4
 polib==1.0.7
diff --git a/setup.py b/setup.py
index cda4203fe..52f629bb1 100644
--- a/setup.py
+++ b/setup.py
@@ -68,6 +68,7 @@
     'pytest>=2.4.2',
     'pytest-cov',
     'pytest-pep8!=1.0.3',
+    'pytest-travis-fold',
     'pytest-xdist',
     'virtualenv',  # needed for scaffolding tests
     'wsgi_intercept==0.5.1',

From b9eea89603f189eeb7b3a5f92f73602726e6c000 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 4 Jan 2016 22:19:04 +0100
Subject: [PATCH 398/600] Pass a complete copy of os.environ to the subocmmands
 for installing packages in the scaffold testing virtualenvs.

---
 kotti/tests/test_zzz_scaffolds.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index 0c88e655f..7ecbdaefe 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -15,6 +15,7 @@
 import shutil
 import subprocess
 import sys
+from copy import copy
 from tempfile import mkdtemp
 
 from pytest import fixture
@@ -54,19 +55,24 @@ def virtualenv(request, travis):
             os.path.join('bin', 'pip'),
             'install', '-U', 'pip', 'setuptools', 'pip-accel'])
 
+        # create a local copy of the environment, where we can override
+        # VIRTUAL_ENV to make pip-accel work
+        env = copy(os.environ)
+        env.update({'VIRTUAL_ENV': virtualenv_directory, })
+
         # install requirements.txt into the virtualenv
         subprocess.check_call([
             os.path.join('bin', 'pip-accel'),
             'install', '-r',
             os.path.join(cwd, 'requirements.txt')],
-            env={'VIRTUAL_ENV': virtualenv_directory, })
+            env=env)
 
         # setuptools-git is required to be able to call setup.py install
         # sucessfully.  also install psycopg2 and oursql.
         subprocess.check_call([
             os.path.join('bin', 'pip-accel'),
             'install', 'setuptools-git', 'psycopg2', 'oursql'],
-            env={'VIRTUAL_ENV': virtualenv_directory, })
+            env=env)
 
         shutil.copytree(cwd, os.path.join(virtualenv_directory, 'kotti'))
 

From 42c36e06dcd53a9f262b03ce08020a951f41aff8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 4 Jan 2016 22:58:11 +0100
Subject: [PATCH 399/600] Add missing docstrings, convert instance to static
 methods where possible.

---
 kotti/__init__.py                 |  6 ++++++
 kotti/migrate.py                  |  3 ++-
 kotti/sanitizers.py               |  5 +++++
 kotti/testing.py                  | 19 +++++++++++++++++++
 kotti/traversal.py                | 11 +++++++++--
 kotti/views/__init__.py           |  6 ++++++
 kotti/views/cache.py              |  6 ++++++
 kotti/views/edit/__init__.py      |  6 ++++++
 kotti/views/edit/actions.py       |  6 ++++++
 kotti/views/edit/content.py       |  6 ++++++
 kotti/views/edit/default_views.py |  6 ++++++
 kotti/views/edit/upload.py        |  6 ++++++
 kotti/views/file.py               |  6 ++++++
 kotti/views/login.py              |  6 ++++++
 kotti/views/navigation.py         | 12 ++++++++++++
 kotti/views/users.py              |  6 ++++++
 kotti/views/view.py               |  6 ++++++
 17 files changed, 119 insertions(+), 3 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index e14a43bf8..ecced5c1a 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -252,6 +252,12 @@ def base_configure(global_config, **settings):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     import kotti.views.util
 
     settings = config.get_settings()
diff --git a/kotti/migrate.py b/kotti/migrate.py
index 4b900df04..4a5c8fdec 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -98,7 +98,8 @@ def _make_config(location):
         cfg.set_main_option("sqlalchemy.url", get_settings()['sqlalchemy.url'])
         return cfg
 
-    def _make_script_dir(self, alembic_cfg):
+    @staticmethod
+    def _make_script_dir(alembic_cfg):
         script_dir = ScriptDirectory.from_config(alembic_cfg)
         script_dir.__class__ = ScriptDirectoryWithDefaultEnvPy  # O_o
         return script_dir
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index 896219b0c..56adf2e5f 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -153,6 +153,11 @@ def handler(event):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
 
     _setup_sanitizers(config.registry.settings)
     _setup_listeners(config.registry.settings)
diff --git a/kotti/testing.py b/kotti/testing.py
index b1fab4fc1..c138576b1 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -60,6 +60,12 @@ def asset(name):
 
 
 def includeme_login(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.add_view(
         login_view,
         name='login',
@@ -67,7 +73,14 @@ def includeme_login(config):
 
 
 def includeme_layout(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     # override edit master layout with view master layout
+
     config.override_asset(
         to_override='kotti:templates/edit/master.pt',
         override_with='kotti:templates/view/master.pt')
@@ -262,6 +275,12 @@ def dummy_view(context, request):
 
 
 def include_testing_view(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.add_view(
         dummy_view,
         context=TestingRootFactory,
diff --git a/kotti/traversal.py b/kotti/traversal.py
index 572b4590a..cc3ede51e 100644
--- a/kotti/traversal.py
+++ b/kotti/traversal.py
@@ -125,7 +125,7 @@ def __call__(self, request):
         else:
             vpath_tuple = split_path_info(vpath)
             traversed_nodes = self.traverse(root, vpath_tuple)
-            if len(traversed_nodes) == 0:
+            if not traversed_nodes:
                 view_name = vpath_tuple[0]
                 if view_name[:lvs] == vs:
                     view_name = view_name[lvs:]
@@ -179,7 +179,8 @@ def traverse(root, vpath_tuple):
 
         return nodes
 
-    def _traverse_cte(self, root, vpath_tuple):  # pragma: no cover
+    @staticmethod
+    def _traverse_cte(root, vpath_tuple):  # pragma: no cover
         """ Version of the traverse method, that uses a CTE instead of the
         Node.path attribute.  Unfortunately this is **much** slower and works
         only on PostgreSQL.
@@ -233,4 +234,10 @@ def _traverse_cte(self, root, vpath_tuple):  # pragma: no cover
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.add_traverser(NodeTreeTraverser, Node)
diff --git a/kotti/views/__init__.py b/kotti/views/__init__.py
index ec5b692c6..464a06a1c 100644
--- a/kotti/views/__init__.py
+++ b/kotti/views/__init__.py
@@ -25,6 +25,12 @@ def __init__(self, context, request):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.add_static_view('static-kotti', 'kotti:static')
 
     # deform stuff
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index ec2ecc0cf..65d2cdaef 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -131,4 +131,10 @@ def set_cache_headers(event):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan(__name__)
diff --git a/kotti/views/edit/__init__.py b/kotti/views/edit/__init__.py
index 8dd3241e8..ffc705385 100644
--- a/kotti/views/edit/__init__.py
+++ b/kotti/views/edit/__init__.py
@@ -37,4 +37,10 @@ def _states(context, request):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     pass
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 5b426d6b0..1d3b04d5c 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -603,6 +603,12 @@ def actions(context, request):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     import warnings
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 9d1ed1e15..9083bf3ed 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -134,6 +134,12 @@ def add(self, **appstruct):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.add_view(
         DocumentEditForm,
         context=Document,
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index 77a0733de..b41ec7bf5 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -119,4 +119,10 @@ def set_default_view(self):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan('.default_views')
diff --git a/kotti/views/edit/upload.py b/kotti/views/edit/upload.py
index 06d313ffe..5db0ad0a8 100644
--- a/kotti/views/edit/upload.py
+++ b/kotti/views/edit/upload.py
@@ -166,4 +166,10 @@ def process_upload(self):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan(__name__)
diff --git a/kotti/views/file.py b/kotti/views/file.py
index 0fc6b9192..c3d848155 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -22,6 +22,12 @@ def attachment_view(context, request):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan(__name__)
 
 
diff --git a/kotti/views/login.py b/kotti/views/login.py
index 68a0c97fe..c7e50f4e7 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -379,4 +379,10 @@ def forbidden_view_html(request):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan(__name__)
diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index 080786108..36f2a0f37 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -52,6 +52,12 @@ def ch(node):
 
 
 def includeme_local_navigation(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     # Import is needed in function scope to resolve circular imports caused by
     # compatibility imports in slots.py.
     from kotti.views.slots import assign_slot
@@ -60,4 +66,10 @@ def includeme_local_navigation(config):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan(__name__)
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 9563620b2..63399505e 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -612,4 +612,10 @@ def __call__(self):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan(__name__)
diff --git a/kotti/views/view.py b/kotti/views/view.py
index f0d272abc..d8a2067ed 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -76,4 +76,10 @@ def notfound_view(context, request):
 
 
 def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
+
     config.scan(__name__)

From 1753e8f3314ef0545214a261d91a48844df53e2c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 4 Jan 2016 23:33:22 +0100
Subject: [PATCH 400/600] Convert 2 more instance methods to static methds.

---
 kotti/views/form.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kotti/views/form.py b/kotti/views/form.py
index ee4292a7a..6ff61a6d3 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -211,7 +211,8 @@ def serialize(self, field, cstruct, readonly=False):
             cstruct = []
         return field.renderer(self.template, field=field, cstruct=cstruct)
 
-    def deserialize(self, field, pstruct):
+    @staticmethod
+    def deserialize(field, pstruct):
         if pstruct is colander.null:
             return colander.null
         return [item.strip() for item in pstruct.split(',') if item]
@@ -247,7 +248,8 @@ def __getitem__(self, name):
     def __delitem__(self, name):
         del self.session[name]
 
-    def preview_url(self, name):
+    @staticmethod
+    def preview_url(name):
         return None
 
 

From fb00618542476615f7e7dac0caec11d9e48403e5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 5 Jan 2016 09:39:32 +0100
Subject: [PATCH 401/600] Upgrade to Pyramid 1.6 and Pillow 3.1.0.

---
 kotti/tests/test_request.py | 2 +-
 requirements.txt            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index a80879dfb..abd848694 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -5,7 +5,7 @@ def test_it(self):
         from zope.interface import providedBy, implementedBy
 
         req = Request({})
-        req._set_properties({'marker': 'exists'})
+        req.set_property(lambda x: 'exists', 'marker', reify=True)
 
         assert providedBy(req) == implementedBy(Request)
         assert req.marker == 'exists'
diff --git a/requirements.txt b/requirements.txt
index 21c0722eb..c4aa240fc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ FormEncode==1.3.0
 Mako==1.0.3
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==3.0.0
+Pillow==3.1.0
 Pygments==2.0.2
 SQLAlchemy==1.0.11
 SQLAlchemy-Utils==0.31.4
@@ -48,7 +48,7 @@ peppercorn==0.5
 plone.scale==1.4
 polib==1.0.7
 py-bcrypt==0.4
-pyramid==1.5.7
+pyramid==1.6
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-debugtoolbar==2.4.2

From dd50c834b7ce6cebad15aa890750d3769c5f4656 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 5 Jan 2016 10:23:40 +0100
Subject: [PATCH 402/600] Bump version.

---
 CHANGES.txt      | 7 +++++--
 MANIFEST.in      | 2 ++
 requirements.txt | 2 +-
 setup.py         | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 328c427ad..da962618e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,11 @@
 Change History
 ==============
 
-1.3.0 - unreleased
-------------------
+1.3.0-alpha.2 - 2016-01-05
+--------------------------
+
+**This is a alpha release.  Blindly upgrading your production environments will
+make the universe collapse!**
 
 - Add a custom traverser, which gets all nodes in a single DB query.  For deeply
   nested trees this results in drastic perfor,ance improvements.  See
diff --git a/MANIFEST.in b/MANIFEST.in
index d16503250..ea83fc400 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,3 +5,5 @@ recursive-include kotti/static *
 recursive-include kotti/templates *
 recursive-include kotti/tests *
 recursive-include kotti *.zcml
+recursive-exclude * __pycache__
+recursive-exclude * *.pyc
diff --git a/requirements.txt b/requirements.txt
index c4aa240fc..da9a429c8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.3.0-alpha.1
+Kotti==1.3.0-alpha.2
 Babel==2.2.0
 Beaker==1.7.0
 Chameleon==2.24
diff --git a/setup.py b/setup.py
index 52f629bb1..11330406d 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.2-dev',
+      version='1.3.0-alpha.2',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 7ea67a9e2d5888ef1e82426a8c128f38421ec1dc Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 5 Jan 2016 10:26:14 +0100
Subject: [PATCH 403/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index da962618e..c6d6ea04b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.3.0 - unreleased
+------------------
+
+- No changes yet.
+
 1.3.0-alpha.2 - 2016-01-05
 --------------------------
 
diff --git a/setup.py b/setup.py
index 11330406d..bdc9b9ee3 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.2',
+      version='1.3.0-alpha.3-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 991940b1e47484ea34cc3c114ea98fc9c129b2e4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 5 Jan 2016 12:03:17 +0100
Subject: [PATCH 404/600] Order manifest alphabetically  [ci skip].

---
 MANIFEST.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index ea83fc400..ae2af8a1b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,10 @@
+recursive-exclude * *.pyc
+recursive-exclude * __pycache__
+recursive-exclude website *
+recursive-include kotti *.zcml
 recursive-include kotti/alembic *
 recursive-include kotti/locale *
 recursive-include kotti/scaffolds *
 recursive-include kotti/static *
 recursive-include kotti/templates *
 recursive-include kotti/tests *
-recursive-include kotti *.zcml
-recursive-exclude * __pycache__
-recursive-exclude * *.pyc

From 2da296aca50d06a8c6f495dcfa86c8120c2e690e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 11 Jan 2016 16:22:40 +0100
Subject: [PATCH 405/600] Bugfix: don't try to get api.root via the lineage if
 not in a location aware context (for example 404 view).  Return the site root
 instead.

---
 CHANGES.txt                        |  3 ++-
 kotti/tests/test_httpexceptions.py | 10 ++++++++++
 kotti/views/util.py                |  7 ++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c6d6ea04b..500586ce4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Change History
 1.3.0 - unreleased
 ------------------
 
-- No changes yet.
+- Bugfix: don't try to get api.root via the lineage if not in a location aware
+  context (for example 404 view).  Return the site root instead.
 
 1.3.0-alpha.2 - 2016-01-05
 --------------------------
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
index 2712d6a54..4cc044200 100644
--- a/kotti/tests/test_httpexceptions.py
+++ b/kotti/tests/test_httpexceptions.py
@@ -14,3 +14,13 @@ def test_404_anon(webtest, root):
 
     resp = webtest.app.get('/non-existent', status=404)
     assert 'Not Found' in resp.text
+
+
+def test_404_api_root(db_session, dummy_request):
+    from kotti.resources import get_root
+    from kotti.views.util import TemplateAPI
+    from pyramid.httpexceptions import HTTPNotFound
+
+    api = TemplateAPI(HTTPNotFound(), dummy_request)
+
+    assert api.root == get_root()
diff --git a/kotti/views/util.py b/kotti/views/util.py
index e3030f373..05f7e421c 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -26,6 +26,7 @@
 from kotti.interfaces import INavigationRoot
 from kotti.resources import Content
 from kotti.resources import Document
+from kotti.resources import get_root
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
 from kotti.sanitizers import sanitize
@@ -217,7 +218,11 @@ def root(self):
         :result: The root object of the site.
         :rtype: :class:`kotti.resources.Node`
         """
-        return self.lineage[-1]
+
+        if ILocation.providedBy(self.context):
+            return self.lineage[-1]
+        else:
+            return get_root()
 
     @reify
     def navigation_root(self):

From 24ad83792a830c344fda900c06638180066758fb Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 11 Jan 2016 16:34:35 +0100
Subject: [PATCH 406/600] Bump version.

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 500586ce4..37761b361 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-1.3.0 - unreleased
-------------------
+1.3.0-alpha.3 - 2016-01-11
+--------------------------
 
 - Bugfix: don't try to get api.root via the lineage if not in a location aware
   context (for example 404 view).  Return the site root instead.
diff --git a/setup.py b/setup.py
index bdc9b9ee3..88d0adef4 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.3-dev',
+      version='1.3.0-alpha.3',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From f969de89037f956f6e0c5714a193aaf79c474cd0 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 11 Jan 2016 16:35:35 +0100
Subject: [PATCH 407/600] Bump version.

---
 CHANGES.txt      | 5 +++++
 requirements.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 37761b361..b16d52658 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.3.0 - unreleased
+------------------
+
+- No changes yet.
+
 1.3.0-alpha.3 - 2016-01-11
 --------------------------
 
diff --git a/requirements.txt b/requirements.txt
index da9a429c8..16cda1bbd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.3.0-alpha.2
+Kotti==1.3.0-alpha.3
 Babel==2.2.0
 Beaker==1.7.0
 Chameleon==2.24
diff --git a/setup.py b/setup.py
index 88d0adef4..2729f1615 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.3',
+      version='1.3.0-alpha.4-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 5a6a42251dce6f8b7e2e44cd3f6347734876acc1 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Jan 2016 09:49:34 +0100
Subject: [PATCH 408/600] Fix "bad first argument given to super()".

---
 kotti/views/users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/views/users.py b/kotti/views/users.py
index 63399505e..89ab105ce 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -469,7 +469,7 @@ def save_success(self, appstruct):
         else:
             appstruct.pop('password', None)
         _massage_groups_in(appstruct)
-        return super(UserEditFormView, self).save_success(appstruct)
+        return super(UserManageFormView, self).save_success(appstruct)
 
     def cancel_success(self, appstruct):
         self.request.session.flash(_(u'No changes were made.'), 'info')

From 66063cf9f693e17ebeb45704527a6a91632d6cae Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Jan 2016 09:50:01 +0100
Subject: [PATCH 409/600] Add landscape.io badge an link to readme.  [ci skip]

---
 README.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.rst b/README.rst
index f1ac62b57..9342f57a2 100644
--- a/README.rst
+++ b/README.rst
@@ -99,6 +99,9 @@ Development
 |codacy|_
 |codeclimate|_
 |quantifiedcode|_
+|landscape|_
+
+
 
 .. requirements need to be upgraded before we shoff off
    |requires.io|_
@@ -138,6 +141,8 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. |quantifiedcode| image:: http://www.quantifiedcode.com/api/v1/project/f2a648c15f8e42788aaa4fa12a82df93/badge.svg
 .. _quantifiedcode: http://www.quantifiedcode.com/app/project/f2a648c15f8e42788aaa4fa12a82df93
 
+.. |landscape| image:: https://landscape.io/github/Kotti/Kotti/master/landscape.svg?style=flat-square
+.. _landscape: https://landscape.io/github/Kotti/Kotti
 
 .. _contribution guidelines: http://kotti.readthedocs.org/en/latest/contributing.html
 .. _Github repository: https://github.com/Kotti/Kotti

From 418e37776d9db57ff53abc2c26aa5756f46222c7 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Jan 2016 10:51:33 +0100
Subject: [PATCH 410/600] Add an option to replace the WSGI file wrapper with
 ``pyramid.response.FileIter`` for problematic environments.  Also increase
 filedepot test coverage

---
 CHANGES.txt                             |  3 +-
 docs/developing/advanced/blobs.rst      |  6 ++
 docs/developing/basic/configuration.rst | 81 +++++++++++++------------
 kotti/__init__.py                       |  1 +
 kotti/filedepot.py                      |  6 +-
 kotti/tests/test_filedepot.py           | 17 ++++++
 6 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b16d52658..3e711c387 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Change History
 1.3.0 - unreleased
 ------------------
 
-- No changes yet.
+- Add a ``kotti.depot_replace_wsgi_file_wrapper`` option to replace the WSGI
+  file wrapper with ``pyramid.response.FileIter`` for problematic environments.
 
 1.3.0-alpha.3 - 2016-01-11
 --------------------------
diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 2149275bd..0435d5e47 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -38,6 +38,12 @@ The default value for ``kotti.depot_mountpoint`` is ``/depot``::
 
     kotti.depot_mountpoint = /depot
 
+WSGI File Wrapper
+-----------------
+
+In case you have issues serving files with your WSGI server, your can try to set ``kotti.depot_replace_wsgi_file_wrapper = true``.
+This forces Kotti to use :class:`pyramid.response.FileIter` instead of the one provided by your WSGI server.
+
 Storages
 ~~~~~~~~
 
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 6c26f210d..61bbfa897 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -43,46 +43,47 @@ The rest has defaults.
 Do take a look at the required settings (in bold) and adjust them in your site's configuration.
 A few of the settings are less important, and sometimes only used by developers, not integrators.
 
-================================  ==============================================
-Setting                           Description
-================================  ==============================================
-**kotti.site_title**              The title of your site
-**kotti.secret**                  Secret token used for the initial admin password
-kotti.secret2                     Secret token used for email password reset token
-**sqlalchemy.url**                `SQLAlchemy database URL`_
-**mail.default_sender**           Sender address for outgoing email
-kotti.asset_overrides             Override Kotti's templates
-kotti.authn_policy_factory        Component used for authentication
-kotti.authz_policy_factory        Component used for authorization
-kotti.available_types             List of active content types
-kotti.base_includes               List of base Python configuration hooks
-kotti.caching_policy_chooser      Component for choosing the cache header policy
-kotti.configurators               List of advanced functions for config
-kotti.date_format                 Date format to use, default: ``medium``
-kotti.datetime_format             Datetime format to use, default: ``medium``
-kotti.depot_mountpoint            Configure the mountpoint for the blob storage.  See :ref:`blobs` for details.
-kotti.depot.*.*                   Configure the blob storage.  See :ref:`blobs` for details.
-kotti.fanstatic.edit_needed       List of static resources used for edit interface
-kotti.fanstatic.view_needed       List of static resources used for public interface
-kotti.login_success_callback      Override Kotti's default ``login_success_callback`` function
-kotti.max_file_size               Max size for file uploads, default: ``10`` (MB)
-kotti.modification_date_excludes  List of attributes in dotted name notation that should not trigger an update of ``modification_date`` on change
-kotti.populators                  List of functions to fill initial database
-kotti.request_factory             Override Kotti's default request factory
-kotti.reset_password_callback     Override Kotti's default ``reset_password_callback`` function
-kotti.root_factory                Override Kotti's default Pyramid *root factory*
-kotti.sanitize_on_write           Configure :ref:`sanitizers` to be used on write access to resource objects
-kotti.sanitizers                  Configure available :ref:`sanitizers`
-kotti.search_content              Override Kotti's default search function
-kotti.session_factory             Component used for sessions
-kotti.templates.api               Override ``api`` object available in templates
-kotti.time_format                 Time format to use, default: ``medium``
-kotti.url_normalizer              Component used for url normalization
-kotti.zcml_includes               List of packages to include the ZCML from
-mail.host                         Email host to send from
-pyramid.default_locale_name       Set the user interface language, default ``en``
-pyramid.includes                  List of Python configuration hooks
-================================  ==============================================
+=====================================  =========================================
+Setting                                Description
+=====================================  =========================================
+**kotti.site_title**                   The title of your site
+**kotti.secret**                       Secret token used for the initial admin password
+kotti.secret2                          Secret token used for email password reset token
+**sqlalchemy.url**                     `SQLAlchemy database URL`_
+**mail.default_sender**                Sender address for outgoing email
+kotti.asset_overrides                  Override Kotti's templates
+kotti.authn_policy_factory             Component used for authentication
+kotti.authz_policy_factory             Component used for authorization
+kotti.available_types                  List of active content types
+kotti.base_includes                    List of base Python configuration hooks
+kotti.caching_policy_chooser           Component for choosing the cache header policy
+kotti.configurators                    List of advanced functions for config
+kotti.date_format                      Date format to use, default: ``medium``
+kotti.datetime_format                  Datetime format to use, default: ``medium``
+kotti.depot_mountpoint                 Configure the mountpoint for the blob storage.  See :ref:`blobs` for details.
+kotti.depot_replace_wsgi_file_wrapper  Replace you WSGI server's file wrapper with :class:`pyramid.response.FileIter`.
+kotti.depot.*.*                        Configure the blob storage.  See :ref:`blobs` for details.
+kotti.fanstatic.edit_needed            List of static resources used for edit interface
+kotti.fanstatic.view_needed            List of static resources used for public interface
+kotti.login_success_callback           Override Kotti's default ``login_success_callback`` function
+kotti.max_file_size                    Max size for file uploads, default: ``10`` (MB)
+kotti.modification_date_excludes       List of attributes in dotted name notation that should not trigger an update of ``modification_date`` on change
+kotti.populators                       List of functions to fill initial database
+kotti.request_factory                  Override Kotti's default request factory
+kotti.reset_password_callback          Override Kotti's default ``reset_password_callback`` function
+kotti.root_factory                     Override Kotti's default Pyramid *root factory*
+kotti.sanitize_on_write                Configure :ref:`sanitizers` to be used on write access to resource objects
+kotti.sanitizers                       Configure available :ref:`sanitizers`
+kotti.search_content                   Override Kotti's default search function
+kotti.session_factory                  Component used for sessions
+kotti.templates.api                    Override ``api`` object available in templates
+kotti.time_format                      Time format to use, default: ``medium``
+kotti.url_normalizer                   Component used for url normalization
+kotti.zcml_includes                    List of packages to include the ZCML from
+mail.host                              Email host to send from
+pyramid.default_locale_name            Set the user interface language, default ``en``
+pyramid.includes                       List of Python configuration hooks
+=====================================  =========================================
 
 kotti.secret and kotti.secret2
 ------------------------------
diff --git a/kotti/__init__.py b/kotti/__init__.py
index ecced5c1a..d3d9a8fd9 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -86,6 +86,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.date_format': 'medium',
     'kotti.datetime_format': 'medium',
     'kotti.depot_mountpoint': '/depot',
+    'kotti.depot_replace_wsgi_file_wrapper': False,
     'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
     'kotti.depot.0.name': 'dbfiles',
     'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 2643207ac..a61041f99 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -414,7 +414,8 @@ def __init__(self, f, request, disposition='attachment',
             content_encoding=content_encoding)
 
         app_iter = None
-        if request is not None:
+        if request is not None and \
+                not get_settings()['kotti.depot_replace_wsgi_file_wrapper']:
             environ = request.environ
             if 'wsgi.file_wrapper' in environ:
                 app_iter = environ['wsgi.file_wrapper'](f, _BLOCK_SIZE)
@@ -494,9 +495,6 @@ def __init__(self, handler, registry):
         self.handler = handler
         self.registry = registry
 
-        self.cache_max_age = 3600 * 24 * 7
-        self.replace_wsgi_filewrapper = True
-
         DepotManager.set_middleware(self)
 
     def url_for(self, path):
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 460d23530..6337566e5 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -99,6 +99,15 @@ def test_create(self, db_session):
         fs = db_session.query(DBStoredFile).filter_by(file_id=file_id).one()
         assert fs.data == "content here"
 
+    def test_list(self):
+        with pytest.raises(NotImplementedError):
+            DBFileStorage().list()
+
+    def test_exists(self, db_session):
+        assert DBFileStorage().exists("1") == False
+        file_id = self.make_one()
+        assert DBFileStorage().exists(file_id) == True
+
     def test_get(self, db_session):
         with pytest.raises(IOError):
             DBFileStorage().get("1")
@@ -275,3 +284,11 @@ def test_tween(self, webtest, filedepot, root, image_asset, db_session):
         assert resp.etag is not None
         assert resp.cache_control.max_age == 604800
         assert resp.body.startswith('\x89PNG')
+
+        # test 404
+        resp = webtest.app.get('/depot/non_existing/fileid', status=404)
+        assert resp.status_code == 404
+
+        resp = webtest.app.get(img.data['thumb_256x256_url'] + 'not',
+                               status=404)
+        assert resp.status_code == 404

From 2d5198208f47ef3425f8563fa75b6b38e5b2a07d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Jan 2016 12:09:52 +0100
Subject: [PATCH 411/600] Disable alerts, that **sometimes** fail on Travis,
 but never locally.

---
 kotti/tests/test_functional.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index a7ff1a527..877da8ec7 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -387,10 +387,12 @@ def test_content_management(self, webtest):
         resp = app.get('/second-child/')
         resp = resp.click('Paste', index=0).maybe_follow()
         assert "Welcome to Kotti was pasted" in resp.body
-        resp = app.get('/second-child/welcome-to-kotti/')
-        assert resp.status_code == 200
-        resp = app.get('/second-child/welcome-to-kotti/second-child/')
-        assert resp.status_code == 200
+        # These SOMETIMES fail on Travis (never locally).
+        # We disable them for now, as they're more than annoying.
+        # resp = app.get('/second-child/welcome-to-kotti/')
+        # assert resp.status_code == 200
+        # resp = app.get('/second-child/welcome-to-kotti/second-child/')
+        # assert resp.status_code == 200
 
         # And finally cut and paste a tree:
         resp = app.get('/second-child/')

From 8495ae38c16fbb36363c5fe99563208f3add8783 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Jan 2016 12:15:05 +0100
Subject: [PATCH 412/600] Revert "Disable alerts, that **sometimes** fail on
 Travis, but never locally."

This reverts commit 2d5198208f47ef3425f8563fa75b6b38e5b2a07d.
---
 kotti/tests/test_functional.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 877da8ec7..a7ff1a527 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -387,12 +387,10 @@ def test_content_management(self, webtest):
         resp = app.get('/second-child/')
         resp = resp.click('Paste', index=0).maybe_follow()
         assert "Welcome to Kotti was pasted" in resp.body
-        # These SOMETIMES fail on Travis (never locally).
-        # We disable them for now, as they're more than annoying.
-        # resp = app.get('/second-child/welcome-to-kotti/')
-        # assert resp.status_code == 200
-        # resp = app.get('/second-child/welcome-to-kotti/second-child/')
-        # assert resp.status_code == 200
+        resp = app.get('/second-child/welcome-to-kotti/')
+        assert resp.status_code == 200
+        resp = app.get('/second-child/welcome-to-kotti/second-child/')
+        assert resp.status_code == 200
 
         # And finally cut and paste a tree:
         resp = app.get('/second-child/')

From 27ba93361e3e068150a419f7630f68bfbe8b7c37 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Jan 2016 12:24:48 +0100
Subject: [PATCH 413/600] Revise Travis caching.

---
 .travis.yml                       | 7 +++----
 kotti/tests/test_zzz_scaffolds.py | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb9497b9a..8367a9dc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ sudo: false
 cache:
   directories:
     - $HOME/.cache/pip
-    - $HOME/.pip-accel
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 python:
@@ -14,9 +13,9 @@ env:
   - KOTTI_TEST_DB_STRING=mysql+oursql://root@localhost:3306/kotti_testing
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
-  - travis_retry pip install --cache-dir $HOME/.cache/pip -U pip setuptools pip-accel
-  - travis_retry pip-accel install psycopg2 oursql python-coveralls codecov
-  - travis_retry pip-accel install -e . -r requirements.txt
+  - travis_retry pip install -U pip wheel setuptools
+  - travis_retry pip install psycopg2 oursql python-coveralls codecov
+  - travis_retry pip install -e . -r requirements.txt
   - pip uninstall -y Kotti
   - python setup.py develop
   - python setup.py dev
diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index 7ecbdaefe..62663fc4f 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -53,7 +53,7 @@ def virtualenv(request, travis):
         # update setuptools in the virtualenv
         subprocess.check_call([
             os.path.join('bin', 'pip'),
-            'install', '-U', 'pip', 'setuptools', 'pip-accel'])
+            'install', '-U', 'pip', 'wheel', 'setuptools', ])
 
         # create a local copy of the environment, where we can override
         # VIRTUAL_ENV to make pip-accel work
@@ -62,7 +62,7 @@ def virtualenv(request, travis):
 
         # install requirements.txt into the virtualenv
         subprocess.check_call([
-            os.path.join('bin', 'pip-accel'),
+            os.path.join('bin', 'pip'),
             'install', '-r',
             os.path.join(cwd, 'requirements.txt')],
             env=env)
@@ -70,7 +70,7 @@ def virtualenv(request, travis):
         # setuptools-git is required to be able to call setup.py install
         # sucessfully.  also install psycopg2 and oursql.
         subprocess.check_call([
-            os.path.join('bin', 'pip-accel'),
+            os.path.join('bin', 'pip'),
             'install', 'setuptools-git', 'psycopg2', 'oursql'],
             env=env)
 

From 803938492c669ecf90d7952eb3125c5da2ef5ce5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Jan 2016 12:41:38 +0100
Subject: [PATCH 414/600] Adapt revised Travis caching to the scaffold.

---
 kotti/scaffolds/package/+dot+travis.yml_tmpl | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/kotti/scaffolds/package/+dot+travis.yml_tmpl b/kotti/scaffolds/package/+dot+travis.yml_tmpl
index d8c49f2d6..60243d302 100644
--- a/kotti/scaffolds/package/+dot+travis.yml_tmpl
+++ b/kotti/scaffolds/package/+dot+travis.yml_tmpl
@@ -1,4 +1,10 @@
 language: python
+sudo: false
+cache:
+  directories:
+    - $HOME/.cache/pip
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
 python:
   - "2.6"
   - "2.7"
@@ -7,12 +13,12 @@ env:
   - KOTTI_TEST_DB_STRING=mysql+oursql://root@localhost:3306/{{package}}_testing
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
-  - pip install "pip==1.3.1"  # fix issue with fanstatic==1.0a
-  - pip install psycopg2 oursql
+  - travis_retry pip install -U pip wheel setuptools
+  - travis_retry pip install psycopg2 oursql python-coveralls codecov
   - pip install -e . -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
   - pip install --pre Kotti
   - pip install "wsgi_intercept==0.5.1"
   - python setup.py devbefore_script:
   - psql -c 'create database {{package}}_testing;' -U postgres
   - mysql -e 'create database {{package}}_testing;'
-script: py.test --tb=native --cov=kotti --cov-report=term-missing
+script: py.test --tb=native --cov={{package}} --cov-report=term-missing

From b858dbccd050704d671ad1dd99ca23f3c76666f4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 13 Jan 2016 11:03:51 +0100
Subject: [PATCH 415/600] Upgrade requirements.

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 16cda1bbd..e286a3bf7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,7 @@ deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
 filedepot==0.2.1
-html2text==2015.11.4
+html2text==2016.1.8
 html5lib==1.0b8
 iso8601==0.1.11
 js.angular==1.1.4
@@ -42,7 +42,7 @@ js.modernizr==2.5.3.1
 js.select2==3.4.1
 kotti-tinymce==0.5.4
 kotti-image==0.1.3
-lingua==4.5.1
+lingua==4.6
 lxml==3.5.0
 peppercorn==0.5
 plone.scale==1.4

From d7b50aa74cbe9de0b89ae28a26451ba76d827674 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 13 Jan 2016 11:14:39 +0100
Subject: [PATCH 416/600] PEP8.

---
 kotti/tests/test_filedepot.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 6337566e5..ecddf9fac 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -104,9 +104,9 @@ def test_list(self):
             DBFileStorage().list()
 
     def test_exists(self, db_session):
-        assert DBFileStorage().exists("1") == False
+        assert DBFileStorage().exists("1") is False
         file_id = self.make_one()
-        assert DBFileStorage().exists(file_id) == True
+        assert DBFileStorage().exists(file_id) is True
 
     def test_get(self, db_session):
         with pytest.raises(IOError):

From dca013ac0fe409a6b95372373d5c71039e0ab349 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 15 Jan 2016 15:20:32 +0100
Subject: [PATCH 417/600] Bump version.

---
 CHANGES.txt                                                   | 4 ++--
 .../scaffolds/package/+package+/alembic/versions/+dot+gitkeep | 2 ++
 requirements.txt                                              | 2 +-
 setup.py                                                      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep

diff --git a/CHANGES.txt b/CHANGES.txt
index 3e711c387..76bdc748f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-1.3.0 - unreleased
-------------------
+1.3.0-alpha.4 - 2015-01-15
+--------------------------
 
 - Add a ``kotti.depot_replace_wsgi_file_wrapper`` option to replace the WSGI
   file wrapper with ``pyramid.response.FileIter`` for problematic environments.
diff --git a/kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep b/kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep
new file mode 100644
index 000000000..b5e8af4e0
--- /dev/null
+++ b/kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep
@@ -0,0 +1,2 @@
+# Don't delete.  A file is necessary to have an otherwise empty folder
+# added to a git repository.
diff --git a/requirements.txt b/requirements.txt
index e286a3bf7..343d86d2d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.3.0-alpha.3
+Kotti==1.3.0-alpha.4
 Babel==2.2.0
 Beaker==1.7.0
 Chameleon==2.24
diff --git a/setup.py b/setup.py
index 2729f1615..1d0099dce 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.4-dev',
+      version='1.3.0-alpha.4',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 6907ca1bb45844493022f3bd11624b331262d23f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 15 Jan 2016 15:25:20 +0100
Subject: [PATCH 418/600] Update changes.

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 76bdc748f..ba9f4404d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,12 +4,20 @@ Change History
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
+**This is a alpha release.  Blindly upgrading your production environments will
+make the universe collapse!**
+
+
 - Add a ``kotti.depot_replace_wsgi_file_wrapper`` option to replace the WSGI
   file wrapper with ``pyramid.response.FileIter`` for problematic environments.
 
 1.3.0-alpha.3 - 2016-01-11
 --------------------------
 
+**This is a alpha release.  Blindly upgrading your production environments will
+make the universe collapse!**
+
+
 - Bugfix: don't try to get api.root via the lineage if not in a location aware
   context (for example 404 view).  Return the site root instead.
 

From 610a2dd92d48375f6785b612ef32821adf53264d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 15 Jan 2016 15:26:46 +0100
Subject: [PATCH 419/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ba9f4404d..a8853d334 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.3.0 - unreleased
+------------------
+
+- No changes yet.
+
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
diff --git a/setup.py b/setup.py
index 1d0099dce..62d66f3cf 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.4',
+      version='1.3.0-alpha.5-dev',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From 1b267404527af1c1a4e5a1ee200e1af9a9540c78 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 24 Jan 2016 22:37:39 +0100
Subject: [PATCH 420/600] Upgrade requirements.  Revise German translation.

---
 kotti/locale/de/LC_MESSAGES/Kotti.mo | Bin 18790 -> 18797 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po |   9 ++++-----
 requirements.txt                     |  10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index 3f3f8f8a16d6cf9626c508421197e75d72e8a6cc..d42992c6df1d9fc6b18ee2160a28ba8c087cb873 100644
GIT binary patch
delta 383
zcmXxfKTASk6vy#%HUFd`CZb}6hW|*yNn8X$@Lp4#om>iTA%sJ?q=@AzIQRluU4=`%
zg5HBmgHsS;Z$O8>4_>Fwd4A_SJm>kIYn!>YEc(XBBC@TCgwUmncrk`yyhIO{(2W&a
z-R`&Wg!~o_>|q|?@eJ4K!W}x%!B7s}sQLv%#&Sy0B*<U~)dCY#3r+3(4WpbtQ9byD
zG5kR_@2HFT(2uGgL6xUaedOA<idUT5n8lYmMSx;~N&LVFuCRcASiy@Mkr{R{jlWpN
rU}Jx;Wj*^n39V$k<_Ga}<H_tkn0IDR(!+kY|7ebq_lL*|>g}U{!4WkU

delta 376
zcmXZXze@sP7{Kx8%pav<T$Cp!=%7hA)N&9Mxag}kwPb_)A%Zx$n1l$;4KA(y1r^-v
z|KQ@#Dq>S((+&E4^`_7BllOi8rp9_|d^_=RR7CumND4zr<Pc3f#Vp3~8ui>wU?u1)
zOj2)S9Xn{_C!XUEM(`gG(8n@vQ1{Dq8H-6!WxIqe)E^k(3BCsPceKc7s2^Nl2A8Pk
zeT-wcvF{(FuIEr6QVP7qOY#T2z+r<xU;cpw{K7QO@d|&jg6XEn8@8~BE4;&_`~9Bs
hhKX3-aJ-5AoIQJVyFIrrI|{|opgZWfFP^2I!dnzPG#mf`

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index 5e364307f..992898169 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
 
 #: kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -242,7 +242,7 @@ msgstr "Bearbeiten"
 
 #: kotti/resources.py:525
 msgid "Share"
-msgstr "Teilen"
+msgstr "Freigeben"
 
 #: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
@@ -477,8 +477,7 @@ msgstr "Unsichtbar"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Lösche ${title}"
 
@@ -510,7 +509,7 @@ msgstr "${title} umbenennen"
 
 #: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
-msgstr "Teile ${title}"
+msgstr "${title} freigeben"
 
 #: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
 #: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
diff --git a/requirements.txt b/requirements.txt
index 343d86d2d..7481084ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,16 +7,16 @@ Mako==1.0.3
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==3.1.0
-Pygments==2.0.2
+Pygments==2.1
 SQLAlchemy==1.0.11
-SQLAlchemy-Utils==0.31.4
-Unidecode==0.04.18
+SQLAlchemy-Utils==0.31.6
+Unidecode==0.04.19
 WebOb==1.5.1
 alembic==0.8.4
 appdirs==1.4.0
 bleach==1.4.2
 bleach-whitelist==0.0.7
-colander==1.0
+colander==1.2
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
@@ -42,7 +42,7 @@ js.modernizr==2.5.3.1
 js.select2==3.4.1
 kotti-tinymce==0.5.4
 kotti-image==0.1.3
-lingua==4.6
+lingua==4.7
 lxml==3.5.0
 peppercorn==0.5
 plone.scale==1.4

From d5ceb70d6c20846af59cac724aefd21d9a9da94d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 1 Feb 2016 10:07:21 +0100
Subject: [PATCH 421/600] Add a fallback in contents.pt when creation_date or
 modification_date is None.

---
 CHANGES.txt                      |  3 ++-
 kotti/templates/edit/contents.pt | 24 +++++-------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a8853d334..9a7cb73c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Change History
 1.3.0 - unreleased
 ------------------
 
-- No changes yet.
+- Add a fallback in ``contents.pt`` when ``creation_date`` or
+  ``modification_date`` is ``None``.
 
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
diff --git a/kotti/templates/edit/contents.pt b/kotti/templates/edit/contents.pt
index ce0634fa6..da3f5e37c 100644
--- a/kotti/templates/edit/contents.pt
+++ b/kotti/templates/edit/contents.pt
@@ -1,16 +1,12 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      i18n:domain="Kotti"
-      metal:use-macro="api.macro('kotti:templates/view/master.pt')">
-
+<html metal:use-macro="api.macro('kotti:templates/view/master.pt')"
+      i18n:domain="Kotti">
   <div metal:fill-slot="content" class="document-view content">
     <h1>${context.title}</h1>
     <p class="description">
       ${context.description}
     </p>
-
     <div class="body">
-
       <div id="contents-path"
            tal:define="items python: reversed(api.lineage)">
         <tal:repeat tal:repeat="item items">
@@ -24,13 +20,11 @@
           </a>
         </tal:repeat>
       </div>
-
       <form id="form-contents" method="post"
             action="${request.resource_url(context, '@@contents')}">
         <tal:no-content tal:condition="not:children">
           <span class="text-info" i18n:translate="">No content items are contained here.</span>
         </tal:no-content>
-
         <table id="contents-table"
           class="table table-condensed table-striped table-hover"
           tal:condition="children">
@@ -81,26 +75,18 @@
                   </tal:hidden>
                 </tal:visibility>
               </td>
-              <td>
-                ${api.format_datetime(child.creation_date)}
-              </td>
-              <td>
-                ${api.format_datetime(child.modification_date)}
-              </td>
+              <td tal:content="api.format_datetime(child.creation_date) | None"></td>
+              <td tal:content="api.format_datetime(child.modification_date) | None"></td>
             </tr>
           </tbody>
         </table>
-
         <tal:button tal:repeat="button buttons">
-          <button name="${button.name}" type="submit"
-                  class="${button.css_class}"
+          <button name="${button.name}" type="submit" class="${button.css_class}"
                   tal:condition="children or button.no_children">
             ${button.title}
           </button>
         </tal:button>
-
       </form>
     </div>
   </div>
-
 </html>

From 6c03f8f0e3bb32384ee1b059d126cf6a4c352dad Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 16 Feb 2016 17:50:18 +0100
Subject: [PATCH 422/600] Upgrade requirements to their latest respective
 versions.

---
 requirements.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7481084ba..9aa4f13d9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
 Kotti==1.3.0-alpha.4
 Babel==2.2.0
-Beaker==1.7.0
+Beaker==1.8.0
 Chameleon==2.24
 FormEncode==1.3.0
 Mako==1.0.3
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==3.1.0
-Pygments==2.1
-SQLAlchemy==1.0.11
+Pillow==3.1.1
+Pygments==2.1.1
+SQLAlchemy==1.0.12
 SQLAlchemy-Utils==0.31.6
 Unidecode==0.04.19
 WebOb==1.5.1
@@ -45,10 +45,10 @@ kotti-image==0.1.3
 lingua==4.7
 lxml==3.5.0
 peppercorn==0.5
-plone.scale==1.4
+plone.scale==1.4.1
 polib==1.0.7
 py-bcrypt==0.4
-pyramid==1.6
+pyramid==1.6.1
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-debugtoolbar==2.4.2

From 4d4c95bbf2e639f14adb5a3ab75fe32a71842c5e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 29 Feb 2016 13:54:40 +0100
Subject: [PATCH 423/600] Add a sentence to the docs explaining where security
 system customizations should go.

---
 docs/developing/basic/security.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index f15f05d17..7a08b0b0c 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -73,6 +73,9 @@ Small recipe you can use if you want to create a new role:
 
   add_role(u'role:customer', _(u'Customer'))
 
+Practically you can add the code above to any file, as long as it is imported on application startup.
+However, good practice would be to add it to your add on's ``__init__.py`` for small amounts of changes (like in the example) or to a separate file for larger amounts.
+
 Workflows
 ---------
 

From d16389671d1f238f17e28e9413732882cab9eaaf Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 29 Feb 2016 14:46:10 +0100
Subject: [PATCH 424/600] Only test on Python 2.7.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8367a9dc9..83bedceb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ cache:
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 python:
-  - "2.6"
   - "2.7"
+#  - "2.6"
 env:
   - KOTTI_TEST_DB_STRING=postgresql://postgres@localhost:5432/kotti_testing
   - KOTTI_TEST_DB_STRING=mysql+oursql://root@localhost:3306/kotti_testing

From 081bd60975548b6eb3656373a2dbe911acc001e4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 12 Mar 2016 15:37:26 +0100
Subject: [PATCH 425/600] Update todo.txt

---
 docs/todo.txt | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/docs/todo.txt b/docs/todo.txt
index c4c149fd8..784d253ef 100644
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -14,18 +14,12 @@ Bigger tasks
   application exceptions.  Possibly other introspectable features,
   like version numbers etc.
 
-- Multilingual support (in core or kotti_multilingual add-on?), probably
-  based on annotations.
-
 Have an idea for this list?  Discuss at
 http://groups.google.com/group/kotti or #kotti on IRC.
 
 Smaller tasks
 =============
 
-- Many of the templates used in 'kotti/views/edit.py' have some legacy
-  cruft in them.  Clean up.
-
 - Move more navigation related functionality out of TemplateAPI and
   into snippets.
 
@@ -37,8 +31,3 @@ Smaller tasks
 
 - Add ordering of children and hide/show(Content.in_navigation) to the contents
   view.
-
-Upstream tasks
-==============
-
-- Release deform 0.9.6 to be able to use Button(css_class="btn-foo") feature.

From b851bb420302dd861a56d3c9dd919f2a0272071f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 15 Mar 2016 17:03:46 +0100
Subject: [PATCH 426/600] Transform workflow state title to TranslationStrings
 without eval and deprecate it.

---
 CHANGES.txt                             |   3 +
 kotti/locale/Kotti.pot                  | 652 ++++++++++++-----------
 kotti/locale/de/LC_MESSAGES/Kotti.mo    | Bin 18797 -> 18730 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po    | 434 +++++++--------
 kotti/locale/en/LC_MESSAGES/Kotti.mo    | Bin 157 -> 157 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po    | 412 ++++++++-------
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 13213 -> 13169 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po | 431 ++++++++-------
 kotti/locale/it/LC_MESSAGES/Kotti.mo    | Bin 12336 -> 12305 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po    | 431 ++++++++-------
 kotti/locale/ja/LC_MESSAGES/Kotti.mo    | Bin 12019 -> 11990 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po    | 431 ++++++++-------
 kotti/locale/ko/LC_MESSAGES/Kotti.mo    | Bin 13031 -> 13002 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po    | 431 ++++++++-------
 kotti/locale/nl/LC_MESSAGES/Kotti.mo    | Bin 10890 -> 10857 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po    | 431 ++++++++-------
 kotti/locale/pl/LC_MESSAGES/Kotti.mo    | Bin 18002 -> 17934 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po    | 670 ++++++++++++------------
 kotti/locale/pt/LC_MESSAGES/Kotti.mo    | Bin 7384 -> 7355 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po    | 443 ++++++++--------
 kotti/tests/test_deprecated.py          |  12 +
 kotti/tests/test_workflow.py            |  24 +-
 kotti/views/edit/__init__.py            |  20 +-
 kotti/workflow.zcml                     |  59 +--
 24 files changed, 2445 insertions(+), 2439 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9a7cb73c9..a514443f1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,9 @@ Change History
 - Add a fallback in ``contents.pt`` when ``creation_date`` or
   ``modification_date`` is ``None``.
 
+- Transform workflow state title to TranslationStrings without eval and
+  deprecate it.
+
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 83ed5c403..805313e37 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -1,12 +1,12 @@
 #
 # SOME DESCRIPTIVE TITLE
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2015-10-12 10:15+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
-"Generated-By: Lingua 3.11\n"
+"Generated-By: Lingua 4.7\n"
 
 #: ./kotti/populate.py:64
 msgid "Welcome to Kotti"
@@ -124,78 +124,74 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:508 ./kotti/views/edit/actions.py:456
+#: ./kotti/resources.py:516 ./kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr ""
 
-#: ./kotti/resources.py:509 ./kotti/views/edit/actions.py:457
+#: ./kotti/resources.py:517 ./kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr ""
 
-#: ./kotti/resources.py:510 ./kotti/views/edit/actions.py:453
+#: ./kotti/resources.py:518 ./kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr ""
 
-#: ./kotti/resources.py:511 ./kotti/templates/edit/rename.pt:31
-#: ./kotti/templates/edit/rename-nodes.pt:8
-#: ./kotti/templates/edit/rename-nodes.pt:42 ./kotti/views/edit/actions.py:458
+#: ./kotti/resources.py:519 ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/templates/edit/rename-nodes.pt:42
+#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr ""
 
-#: ./kotti/resources.py:512 ./kotti/templates/edit/delete.pt:24
-#: ./kotti/templates/edit/delete-nodes.pt:9
-#: ./kotti/templates/edit/delete-nodes.pt:50
-#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:443
-#: ./kotti/views/edit/actions.py:460
+#: ./kotti/resources.py:520 ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/templates/edit/delete-nodes.pt:49
+#: ./kotti/templates/edit/delete.pt:24
+#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:452
+#: ./kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr ""
 
-#: ./kotti/resources.py:637 ./kotti/views/edit/content.py:85
-msgid "Document"
-msgstr ""
-
-#: ./kotti/resources.py:726 ./kotti/views/edit/content.py:113
-#: ./kotti/views/edit/content.py:66
-msgid "File"
+#: ./kotti/resources.py:531 ./kotti/templates/view/folder.pt:15
+msgid "Contents"
 msgstr ""
 
-#: ./kotti/resources.py:772 ./kotti/views/edit/content.py:141
-msgid "Image"
+#: ./kotti/resources.py:532 ./kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
 msgstr ""
 
-#: ./kotti/resources.py:529
-msgid "Folder view"
+#: ./kotti/resources.py:533
+msgid "Share"
 msgstr ""
 
-#: ./kotti/resources.py:523 ./kotti/templates/view/folder.pt:15
-msgid "Contents"
+#: ./kotti/resources.py:534 ./kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
 msgstr ""
 
-#: ./kotti/resources.py:524 ./kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: ./kotti/resources.py:537
+msgid "Folder view"
 msgstr ""
 
-#: ./kotti/resources.py:525
-msgid "Share"
+#: ./kotti/resources.py:646 ./kotti/views/edit/content.py:85
+msgid "Document"
 msgstr ""
 
-#: ./kotti/resources.py:526 ./kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
+#: ./kotti/resources.py:781 ./kotti/views/edit/content.py:66
+#: ./kotti/views/edit/content.py:113
+msgid "File"
 msgstr ""
 
-#: ./kotti/security.py:191
+#: ./kotti/security.py:192
 msgid "Viewer"
 msgstr ""
 
-#: ./kotti/security.py:192
+#: ./kotti/security.py:193
 msgid "Editor"
 msgstr ""
 
-#: ./kotti/security.py:193
+#: ./kotti/security.py:194
 msgid "Owner"
 msgstr ""
 
-#: ./kotti/security.py:194
+#: ./kotti/security.py:195
 msgid "Admin"
 msgstr ""
 
@@ -207,6 +203,30 @@ msgstr ""
 msgid "Upload Content"
 msgstr ""
 
+#: ./kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr ""
+
+#: ./kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr ""
+
 #: ./kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr ""
@@ -236,48 +256,24 @@ msgstr ""
 msgid "Forbidden"
 msgstr ""
 
-#: ./kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:21
-msgid "View"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:44
-msgid "Navigate"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:55
-msgid "Preferences"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:60
-msgid "Site Setup"
-msgstr ""
-
-#: ./kotti/templates/editor-bar.pt:71
-msgid "Logout"
-msgstr ""
-
-#: ./kotti/templates/login.pt:15
+#: ./kotti/templates/login.pt:16
 msgid "Login"
 msgstr ""
 
-#: ./kotti/templates/login.pt:20 ./kotti/templates/login.pt:57
+#: ./kotti/templates/login.pt:21 ./kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr ""
 
-#: ./kotti/templates/login.pt:25 ./kotti/views/users.py:212
-#: ./kotti/views/login.py:257
+#: ./kotti/templates/login.pt:26 ./kotti/views/login.py:257
+#: ./kotti/views/users.py:218
 msgid "Password"
 msgstr ""
 
-#: ./kotti/templates/login.pt:33
+#: ./kotti/templates/login.pt:34
 msgid "Log in"
 msgstr ""
 
-#: ./kotti/templates/login.pt:43
+#: ./kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr ""
 
@@ -285,83 +281,33 @@ msgstr ""
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #. 
-#: ./kotti/templates/login.pt:50 ./kotti/templates/login.pt:65
+#: ./kotti/templates/login.pt:52 ./kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr ""
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: ./kotti/templates/login.pt:48
+#: ./kotti/templates/login.pt:50
 msgid ""
 "Fill out your username or email and click ${reset_password} below to receive "
 "an email with a link to reset your password."
 msgstr ""
 
-#: ./kotti/templates/login.pt:76
+#: ./kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr ""
 
-#: ./kotti/templates/login.pt:83
+#: ./kotti/templates/login.pt:85
 msgid "Register for an account on this site."
 msgstr ""
 
-#: ./kotti/templates/workflow-dropdown.pt:15
+#: ./kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr ""
 
-#: ./kotti/templates/deform/tag_it.pt:1 ./kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr ""
-
 #: ./kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr ""
 
-#: ./kotti/templates/edit/delete.pt:9
-#: ./kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr ""
-
-#: ./kotti/templates/edit/delete.pt:19
-#: ./kotti/templates/edit/change-state.pt:74
-#: ./kotti/templates/edit/delete-nodes.pt:45
-#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:78
-#: ./kotti/views/users.py:316 ./kotti/views/users.py:350
-#: ./kotti/views/users.py:442
-msgid "Cancel"
-msgstr ""
-
-#: ./kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr ""
-
-#: ./kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/rename.pt:11
-#: ./kotti/templates/edit/rename-nodes.pt:13
-msgid ""
-"Each content item has a name, which is used to create the url, and a title. "
-"Read the user manual about proper formatting of name and title if needed. You"
-" can change both below."
-msgstr ""
-
-#: ./kotti/templates/edit/rename.pt:19
-#: ./kotti/templates/edit/rename-nodes.pt:26
-#: ./kotti/templates/edit/rename-nodes.pt:28
-msgid "New name"
-msgstr ""
-
-#: ./kotti/templates/edit/rename.pt:25
-#: ./kotti/templates/edit/rename-nodes.pt:34
-#: ./kotti/templates/edit/rename-nodes.pt:36
-msgid "New title"
-msgstr ""
-
 #: ./kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr ""
@@ -371,44 +317,44 @@ msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:18
-#: ./kotti/templates/edit/contents.pt:39
-#: ./kotti/templates/edit/delete-nodes.pt:22
-#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:196
-#: ./kotti/views/edit/content.py:33
+#: ./kotti/templates/edit/contents.pt:34
+#: ./kotti/templates/edit/delete-nodes.pt:21
+#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:202
+#: ./kotti/views/edit/content.py:32
 msgid "Title"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:19
-#: ./kotti/templates/edit/contents.pt:40
-#: ./kotti/templates/edit/delete-nodes.pt:23 ./kotti/templates/edit/share.pt:47
-#: ./kotti/templates/edit/upload.pt:18 ./kotti/templates/edit/upload.pt:110
-#: ./kotti/templates/site-setup/users.pt:67 ./kotti/templates/view/folder.pt:21
+#: ./kotti/templates/edit/contents.pt:35
+#: ./kotti/templates/edit/delete-nodes.pt:22 ./kotti/templates/edit/share.pt:49
+#: ./kotti/templates/edit/upload.pt:18 ./kotti/templates/edit/upload.pt:108
+#: ./kotti/templates/site-setup/users.pt:69 ./kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:20
-#: ./kotti/templates/edit/contents.pt:41
-#: ./kotti/templates/edit/delete-nodes.pt:24
+#: ./kotti/templates/edit/contents.pt:36
+#: ./kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:21
-#: ./kotti/templates/edit/contents.pt:43
-#: ./kotti/templates/edit/delete-nodes.pt:25
+#: ./kotti/templates/edit/contents.pt:38
+#: ./kotti/templates/edit/delete-nodes.pt:24
 #: ./kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:22
-#: ./kotti/templates/edit/contents.pt:44
-#: ./kotti/templates/edit/delete-nodes.pt:26
+#: ./kotti/templates/edit/contents.pt:39
+#: ./kotti/templates/edit/delete-nodes.pt:25
 #: ./kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:28
-#: ./kotti/templates/edit/contents.pt:50
-#: ./kotti/templates/edit/delete-nodes.pt:32
+#: ./kotti/templates/edit/contents.pt:45
+#: ./kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
@@ -435,74 +381,120 @@ msgstr ""
 msgid "No change"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:72 ./kotti/templates/edit/share.pt:83
-#: ./kotti/templates/site-setup/users.pt:105
+#: ./kotti/templates/edit/change-state.pt:72 ./kotti/templates/edit/share.pt:85
+#: ./kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:30
+#: ./kotti/templates/edit/change-state.pt:74
+#: ./kotti/templates/edit/delete-nodes.pt:44
+#: ./kotti/templates/edit/delete.pt:19
+#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:81
+#: ./kotti/views/users.py:322 ./kotti/views/users.py:357
+#: ./kotti/views/users.py:451
+msgid "Cancel"
+msgstr ""
+
+#: ./kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:38
+#: ./kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:42
+#: ./kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:75
+#: ./kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr ""
 
-#: ./kotti/templates/edit/contents.pt:79
+#: ./kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr ""
 
-#: ./kotti/templates/edit/delete-nodes.pt:14
+#: ./kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
+#: ./kotti/templates/edit/delete.pt:9
+#: ./kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr ""
+
+#: ./kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr ""
+
+#: ./kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr ""
+
+#: ./kotti/templates/edit/rename-nodes.pt:13
+#: ./kotti/templates/edit/rename.pt:11
+msgid ""
+"Each content item has a name, which is used to create the url, and a title. "
+"Read the user manual about proper formatting of name and title if needed. You"
+" can change both below."
+msgstr ""
+
+#: ./kotti/templates/edit/rename-nodes.pt:26
+#: ./kotti/templates/edit/rename-nodes.pt:28
+#: ./kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr ""
+
+#: ./kotti/templates/edit/rename-nodes.pt:34
+#: ./kotti/templates/edit/rename-nodes.pt:36
+#: ./kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr ""
+
+#: ./kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr ""
+
 #: ./kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:14 ./kotti/templates/edit/share.pt:19
-#: ./kotti/templates/edit/share.pt:26 ./kotti/templates/site-setup/users.pt:47
+#: ./kotti/templates/edit/share.pt:14 ./kotti/templates/edit/share.pt:20
+#: ./kotti/templates/edit/share.pt:27 ./kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:33 ./kotti/templates/site-setup/users.pt:55
+#: ./kotti/templates/edit/share.pt:34 ./kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:42
+#: ./kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:48 ./kotti/templates/site-setup/users.pt:68
-#: ./kotti/views/users.py:207
+#: ./kotti/templates/edit/share.pt:50 ./kotti/templates/site-setup/users.pt:70
+#: ./kotti/views/users.py:213
 msgid "Name"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:59 ./kotti/templates/site-setup/users.pt:79
-#: ./kotti/views/users.py:313 ./kotti/views/users.py:501
-#: ./kotti/views/users.py:536
+#: ./kotti/templates/edit/share.pt:61 ./kotti/templates/site-setup/users.pt:81
+#: ./kotti/views/users.py:319 ./kotti/views/users.py:513
+#: ./kotti/views/users.py:548
 msgid "User"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:60 ./kotti/templates/site-setup/users.pt:80
-#: ./kotti/views/users.py:347 ./kotti/views/users.py:188
-#: ./kotti/views/users.py:501 ./kotti/views/users.py:536
+#: ./kotti/templates/edit/share.pt:62 ./kotti/templates/site-setup/users.pt:82
+#: ./kotti/views/users.py:194 ./kotti/views/users.py:354
+#: ./kotti/views/users.py:513 ./kotti/views/users.py:548
 msgid "Group"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:63 ./kotti/templates/site-setup/users.pt:83
+#: ./kotti/templates/edit/share.pt:65 ./kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr ""
 
-#: ./kotti/templates/edit/share.pt:68 ./kotti/templates/site-setup/users.pt:89
+#: ./kotti/templates/edit/share.pt:70 ./kotti/templates/site-setup/users.pt:91
 msgid "Assign role"
 msgstr ""
 
@@ -510,11 +502,11 @@ msgstr ""
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:17 ./kotti/templates/edit/upload.pt:109
+#: ./kotti/templates/edit/upload.pt:17 ./kotti/templates/edit/upload.pt:107
 msgid "Filename"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:19 ./kotti/templates/edit/upload.pt:111
+#: ./kotti/templates/edit/upload.pt:19 ./kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr ""
 
@@ -526,18 +518,26 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:86
+#: ./kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:94
+#: ./kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr ""
 
-#: ./kotti/templates/edit/upload.pt:99
+#: ./kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr ""
 
+#: ./kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr ""
+
+#: ./kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr ""
+
 #: ./kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
@@ -546,7 +546,7 @@ msgstr ""
 msgid "Back to User Management"
 msgstr ""
 
-#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:156
+#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
@@ -567,30 +567,26 @@ msgstr ""
 msgid "Find users or groups"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:39
+#: ./kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:49
+#: ./kotti/templates/site-setup/users.pt:50
 msgid "Blank search text finds all."
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:63
+#: ./kotti/templates/site-setup/users.pt:65
 msgid "Assign global roles"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:115
+#: ./kotti/templates/site-setup/users.pt:117
 msgid "Add new user"
 msgstr ""
 
-#: ./kotti/templates/site-setup/users.pt:121
+#: ./kotti/templates/site-setup/users.pt:123
 msgid "Add new group"
 msgstr ""
 
-#: ./kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr ""
-
 #: ./kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr ""
@@ -599,12 +595,8 @@ msgstr ""
 msgid "Search..."
 msgstr ""
 
-#: ./kotti/templates/http-errors/notfound.pt:6
-msgid "Not Found"
-msgstr ""
-
-#: ./kotti/templates/http-errors/notfound.pt:7
-msgid "The resource could not be found"
+#: ./kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
 msgstr ""
 
 #: ./kotti/tests/testing_view.pt:11
@@ -615,299 +607,303 @@ msgstr ""
 msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: ./kotti/views/form.py:79 ./kotti/views/users.py:69
-#: ./kotti/views/edit/actions.py:374 ./kotti/views/edit/actions.py:418
-msgid "Your changes have been saved."
-msgstr ""
-
-#: ./kotti/views/form.py:174
-msgid "Item was added."
+#: ./kotti/views/form.py:80 ./kotti/views/users.py:450
+msgid "Save"
 msgstr ""
 
-#: ./kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
+#: ./kotti/views/form.py:82 ./kotti/views/users.py:69
+#: ./kotti/views/edit/actions.py:373 ./kotti/views/edit/actions.py:417
+msgid "Your changes have been saved."
 msgstr ""
 
-#: ./kotti/views/form.py:77 ./kotti/views/users.py:441
-msgid "Save"
+#: ./kotti/views/form.py:177
+msgid "Item was added."
 msgstr ""
 
-#: ./kotti/views/form.py:198
+#: ./kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: ./kotti/views/form.py:202
+#: ./kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:378
-msgid "User Management"
+#: ./kotti/views/form.py:269
+#, python-format
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: ./kotti/views/users.py:270 ./kotti/views/login.py:65
+#: ./kotti/views/login.py:65 ./kotti/views/users.py:276
 msgid "Full name"
 msgstr ""
 
-#: ./kotti/views/users.py:267
-msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+#: ./kotti/views/login.py:68
+msgid "Username"
 msgstr ""
 
-#: ./kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
+#: ./kotti/views/login.py:73 ./kotti/views/login.py:269
+#: ./kotti/views/users.py:205
+msgid "Email"
 msgstr ""
 
-#: ./kotti/views/users.py:145
-msgid "Invalid value"
+#: ./kotti/views/login.py:82
+msgid "Register"
 msgstr ""
 
-#: ./kotti/views/users.py:151
-msgid "A user with that name already exists."
+#: ./kotti/views/login.py:89
+msgid "There was an error."
 msgstr ""
 
-#: ./kotti/views/users.py:158
-msgid "A user with that email already exists."
+#: ./kotti/views/login.py:108
+msgid ""
+"Congratulations! You are successfully registered. You should be receiving an "
+"email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: ./kotti/views/users.py:181
+#: ./kotti/views/login.py:123
 #, python-format
-msgid "No such group: ${group}"
+msgid "Register - ${title}"
 msgstr ""
 
-#: ./kotti/views/users.py:199 ./kotti/views/login.py:73
-#: ./kotti/views/login.py:269
-msgid "Email"
+#: ./kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
 msgstr ""
 
-#: ./kotti/views/users.py:219
-msgid "Active"
+#: ./kotti/views/login.py:179
+msgid ""
+"You should be receiving an email with a link to reset your password. Doing so"
+" will activate your account."
 msgstr ""
 
-#: ./kotti/views/users.py:220
-msgid "Untick this to deactivate the account."
+#: ./kotti/views/login.py:212
+msgid "Login failed."
 msgstr ""
 
-#: ./kotti/views/users.py:226
-msgid "Global roles"
+#: ./kotti/views/login.py:222
+msgid "That username or email is not known by this system."
 msgstr ""
 
-#: ./kotti/views/users.py:230
-msgid "Groups"
+#: ./kotti/views/login.py:244
+msgid "You have been logged out."
 msgstr ""
 
-#: ./kotti/views/users.py:315
-msgid "Add User"
+#: ./kotti/views/login.py:282
+msgid "You have reset your password."
 msgstr ""
 
-#: ./kotti/views/users.py:339
-#, python-format
-msgid "${title} was added."
+#: ./kotti/views/login.py:295
+msgid "Set password"
 msgstr ""
 
-#: ./kotti/views/users.py:349
-msgid "Add Group"
+#: ./kotti/views/login.py:323
+msgid "Your password reset token may have expired."
 msgstr ""
 
-#: ./kotti/views/users.py:465 ./kotti/views/users.py:71
-#: ./kotti/views/edit/actions.py:312 ./kotti/views/edit/actions.py:378
-#: ./kotti/views/edit/actions.py:424 ./kotti/views/edit/actions.py:420
-msgid "No changes were made."
+#: ./kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
 msgstr ""
 
-#: ./kotti/views/users.py:558
-msgid "No name was given."
+#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:386
+msgid "User Management"
 msgstr ""
 
-#: ./kotti/views/users.py:98
-msgid "No users or groups were found."
+#: ./kotti/views/users.py:71 ./kotti/views/users.py:475
+#: ./kotti/views/edit/actions.py:311 ./kotti/views/edit/actions.py:377
+#: ./kotti/views/edit/actions.py:419 ./kotti/views/edit/actions.py:423
+msgid "No changes were made."
 msgstr ""
 
-#: ./kotti/views/users.py:505
-#, python-format
-msgid "Edit ${principal_type} ${title}"
+#: ./kotti/views/users.py:104
+msgid "No users or groups were found."
 msgstr ""
 
-#: ./kotti/views/users.py:533
-msgid "User was not found."
+#: ./kotti/views/users.py:151
+msgid "Invalid value"
 msgstr ""
 
-#: ./kotti/views/users.py:324
-msgid "Send password registration link."
+#: ./kotti/views/users.py:157
+msgid "A user with that name already exists."
 msgstr ""
 
-#: ./kotti/views/users.py:543
-#, python-format
-msgid "${principal_type} ${title} was deleted."
+#: ./kotti/views/users.py:164
+msgid "A user with that email already exists."
 msgstr ""
 
-#: ./kotti/views/users.py:551
+#: ./kotti/views/users.py:187
 #, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr ""
-
-#: ./kotti/views/login.py:282
-msgid "You have reset your password."
+msgid "No such group: ${group}"
 msgstr ""
 
-#: ./kotti/views/login.py:154
-#, python-format
-msgid "Welcome, ${user}!"
+#: ./kotti/views/users.py:225
+msgid "Active"
 msgstr ""
 
-#: ./kotti/views/login.py:179
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so"
-" will activate your account."
+#: ./kotti/views/users.py:226
+msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: ./kotti/views/login.py:244
-msgid "You have been logged out."
+#: ./kotti/views/users.py:232
+msgid "Global roles"
 msgstr ""
 
-#: ./kotti/views/login.py:68
-msgid "Username"
+#: ./kotti/views/users.py:236
+msgid "Groups"
 msgstr ""
 
-#: ./kotti/views/login.py:108
+#: ./kotti/views/users.py:273
 msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
+"Leave this empty and tick the 'Send password registration' box below to have "
+"the user set their own password."
 msgstr ""
 
-#: ./kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
+#: ./kotti/views/users.py:321
+msgid "Add User"
 msgstr ""
 
-#: ./kotti/views/login.py:212
-msgid "Login failed."
+#: ./kotti/views/users.py:331
+msgid "Send password registration link."
 msgstr ""
 
-#: ./kotti/views/login.py:330
+#: ./kotti/views/users.py:346
 #, python-format
-msgid "Reset your password - ${title}."
-msgstr ""
-
-#: ./kotti/views/login.py:222
-msgid "That username or email is not known by this system."
-msgstr ""
-
-#: ./kotti/views/login.py:82
-msgid "Register"
-msgstr ""
-
-#: ./kotti/views/login.py:89
-msgid "There was an error."
-msgstr ""
-
-#: ./kotti/views/login.py:295
-msgid "Set password"
+msgid "${title} was added."
 msgstr ""
 
-#: ./kotti/views/login.py:323
-msgid "Your password reset token may have expired."
+#: ./kotti/views/users.py:356
+msgid "Add Group"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:38
-msgid "Description"
+#: ./kotti/views/users.py:517
+#, python-format
+msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:53
-msgid "Body"
+#: ./kotti/views/users.py:545
+msgid "User was not found."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
+#: ./kotti/views/users.py:555
+#, python-format
+msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:79
-msgid "Default view"
+#: ./kotti/views/users.py:563
+#, python-format
+msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:107
-msgid "Default view has been set."
+#: ./kotti/views/users.py:570
+msgid "No name was given."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:112
-msgid "Default view could not be set."
+#: ./kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:106
+#: ./kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:124
+#: ./kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr ""
-
-#: ./kotti/views/edit/actions.py:159
+#: ./kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:162
+#: ./kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:225
+#: ./kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr ""
+
+#: ./kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:228
+#: ./kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:277 ./kotti/views/edit/actions.py:306
+#: ./kotti/views/edit/actions.py:276 ./kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:303
+#: ./kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:339 ./kotti/views/edit/actions.py:366
+#: ./kotti/views/edit/actions.py:338 ./kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:343
+#: ./kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:465
+#: ./kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr ""
+
+#: ./kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:466
+#: ./kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:467
+#: ./kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:468
+#: ./kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:507
+#: ./kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:464
-msgid "Change State"
+#: ./kotti/views/edit/content.py:38
+msgid "Description"
+msgstr ""
+
+#: ./kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr ""
+
+#: ./kotti/views/edit/content.py:53
+msgid "Body"
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
 msgstr ""
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index d42992c6df1d9fc6b18ee2160a28ba8c087cb873..b3dfe7391338cb5873154694f94fc205481e2679 100644
GIT binary patch
delta 3959
zcmYk;3v|wP9LMo5b|b^4nVHKoyJTC_9&8iSTsE5|U9e?J%`KW-bDQ>1$x@d4VkyGH
zBK71X9jD7gold8tsE*E2QJftoheJoF4)y-*|Ks={AFto<_xzv#@A~}tb4|0|Ynla4
zMTe|6uKlDlIUH(s3CnNeFRskCX4}Hd{MfvO*@+mlJ81u@BcJJpII}eHV|yHjx8qEV
z!ez);tj2x5$9?`8rkDln2MWpDa1H6(5<8iNV=B_G`H_CDFVd&wVrv|YEwKzEu-w(3
z!AR->)O{=6=bKQ^--d;_3nS^@E>TFO;Xm|aYP?w=EJe*|6-MKB)S`TdvDkoGv7a#n
z|3(e?8mi+EK4j4>3bg_W*b8$o52xWq`nTN_axlM(H<QJv2QEV`?F!V4_M=v!0oB1#
z?25-xTXGqhgT>RRfn;L>4nPfLJZb_nP!p=afR?VB!al4)bzIcVj6XJlztr(`)B`I}
zOZXh>zADuBSK>n4fZF?ZKCh!>)E4<sE70H7A4E-{)W`bk0Z-DP2hT!vG#~YaN>^Wp
z>aZ5);udU&F-%VbOhL`C59-k6<8&N@dfs8w^S?&jf6TT2k`VA3&eFgx*cH?RqPlw{
zPedKY4CH)T7HS|PQTLBRO<)%4!HZnI3N`c9&RW!jc3={IjM{=<0~B<aE+eaNw<UUC
zOhX;MKBy%v!g=^8Y9_}~9iMddGpN07bnSmRucMw5POr%rk6MvIs1*woQD{S<1lc~D
zf+@HhLvSzZ3qjO<2T?2W6>8vTP&54(HN#MP;Rj&xr~&0*KOBNStVC_yo5&dm*gguO
zG#o;8(10QM9k#+BUHvqMQa^_p(4VM7bOm*PGe+GT!%!3Hhno3V)c2l7-8UEcV+;8!
zR=@u(6x8tnWc%$X>c&RY5?w$&=sN0bMDttI(kG$n8L0d7Fbwli10RmzI0iN2$58jr
zz$9FX-RR%yDCqDUL7jo)s3pFP{G=_ihgnZd$Ei3L)qWV$@iel{)+Uv~HRC0NzHqYw
zULLJlm`(P3dq0b}+TGk&gL>XE40NDiS>DKEQLork)QktC4&NB(Q>X_l!Av}eTH5m%
zftOtUAJpDkwl~n$sF|ms+H+AWUX;!HtD%?%9i|D`2`k(U8&E5=1IJ?!bzl3OrZHPO
z=23qF^KmQ2;#ur~*HInC^z~LY33Wz>ptfp$U)Eozw~_|kScMvC4e9~AumnHFaTv$+
zt8pF<!cdO39#n{0f%|bV7Nhoj6Y7xGqt4O+?1^6@=hm(UC}_{S^!FZ+i#i+ys0U0#
zJ)i=+VHK*QomhwOp$=O~uJ^qOs258Ws=XF9z&g}c?LkdAh+kvi5QTUOFAZ=@je0;3
zbq0<&Poh@n0%`!)P!A5f$2;YbsIwA->Nw4rg<7$JsIB=H_55?l3J2^T3R?0gHnIj2
zQ5}5jJdAPFzj5_*sDWHWAO45>zHgwnWxX(l`Y`N@<554)O7!9Lr~z(oGGO+uYdDBH
zj9;Kec+B}bYUEc@4{poGYsHdLdpHO+ped;P<~gfz7xg;SgdX5v$VX6HP==B8Z{-x!
z@gme-zleI!TGY?29yQ`WP+M{lbvQ$YcrUDY>_L41>N%59dp#R9um#u&mpk7=4df8&
ze@S+PLU;TPbxK3{EfwSKsKZ!}>Tosc^PQ*}96+tq=cossK%Ie8$ot1Gqt3{`&gKQ)
z=Pgka?OMS852cV!LmJLTE$wCu#gDKBeuBIVtpWA<dDNbV^W|iWLk%DgHJ~EbUW!`D
zrKk=!Vn?h)-T%o@)?Z8erMuyK_rb5InKU}DV=DFbh2B3N15isl5q&rZwL<H#C)Ok9
z+D>9M#ua%hxfA<S{|0^7GBAvPxhSkBx;B%?2=5!)PPE^;W|2{(xhh;Qc{FW<I(&}2
zLe%L>axb}Yg;3C}d%1=eQLCyepqI>@WEHuK%qBC)t=F1cDoK=e$o9LowOB%?xcYRb
z=s~nfx)yraYj_9IFKN7f|7@kLCT|g4?~`)!DAAtfkT=O(vX{&uH?BHY(AMZ2EO7OQ
z@NKe-@P4xmWC9sZ#u8nlNq_pkd3C;7@(R6yAB0tqGSYPNF`eiN^RV}D9(mW*_0rKH
zec9C$QQgcZQ;DB!ArF#w^uZXy+w|r&kWvKMbhE|m8OoXDao5KAu@}e(q~5iOAgOWn
zd|XbJka0u@QCA^(p6n(~^Pfhc3(;%##--E$EQun6U8CL=d1NtJM_woU$TkvAo+P2f
zNA$DPRqWC9^RA*ih@_BGvP1pr4L6x=B>hMR(UnaeCPT?mvWG;IVdOqiOP(OQI*_ND
zO5Q(Wm6R8ek>qLe2$@N4z20c54ELH6+$YO$E9pkENFQ=P(bb)-AP<mMWFi?sbiGO@
q1t+y_j0%oQD2!;Aosro)!=L5z=k&|;r)T<u^{Hhs!RWlwR{sM_z<zK5

delta 4026
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
DdPjm|

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index 992898169..875f14d7a 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: \n"
@@ -190,77 +190,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "Kopieren"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "Einfügen"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "Löschen"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Dokument"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "Datei"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "Bild"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "Ordneransicht"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhalt"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "Freigeben"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Aktionen"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Ordneransicht"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "Datei"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "Betrachter"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "Bearbeiter"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "Besitzer"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "Administrator"
 
@@ -325,24 +321,24 @@ msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich an
 msgid "Forbidden"
 msgstr "Zugriff verweigert"
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "Anmelden"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "Benutzername oder E-Mail"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "Passwort"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "Anmelden"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
@@ -350,31 +346,27 @@ msgstr "Passwort vergessen?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "Geben Sie oben Ihren Benutzernamen oder Ihre E-Mail Adresse an und klicken Sie auf ${reset_password}. Sie werden daraufhin eine E-Mail erhalten, die einen Link zum zurücksetzen Ihres Passworts enthält."
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr "Noch nicht registriert?"
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 msgid "Register for an account on this site."
 msgstr "Einen Benutzer für den Zugang zu dieser Seite erstellen."
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Setze ${state}"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Schlagworte:"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Sie sind hier:"
@@ -387,41 +379,41 @@ msgstr "Workflowstatus ändern"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/oder verwalten kann."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titel"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Typ"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "Status"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Erstellungsdatum"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Bearbeitungsdatum"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr "Element wählen"
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "Unterordner einbeziehen"
 
@@ -429,55 +421,56 @@ msgstr "Unterordner einbeziehen"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "Wenn Sie diese Option anwählen, wirkt sich die Statusänderung sowohl auf alle ausgewählte als auch auf die darin enthaltenen Dokumente aus."
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "Ändere Status in"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr "Wählen Sie den neuen Status, der für alle ausgwählten Dokumente gesetzt werden soll."
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "Keine Änderungen."
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "Änderungen übernehmen"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "Kein sichtbarer Inhalt."
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr "Alles auswählen/abwählen"
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "Unsichtbar"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Lösche ${title}"
 
@@ -511,40 +504,40 @@ msgstr "${title} umbenennen"
 msgid "Share ${title}"
 msgstr "${title} freigeben"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "Suche Benutzer und Gruppen"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "Suche"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "Lokale Rollen zuweisen"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "Name"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "Benutzer"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "Gruppe"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 msgid "Assign role"
 msgstr "Rolle zuweisen"
 
@@ -552,11 +545,11 @@ msgstr "Rolle zuweisen"
 msgid "Upload content from local file(s)"
 msgstr "Inhalte aus lokalen Dateien hochladen"
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 msgid "Filename"
 msgstr "Dateiname"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr "Größe"
 
@@ -568,15 +561,15 @@ msgstr "Status"
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr "Hochzuladene Dateien auswählen..."
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr "${number} Dateien hochladen"
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr "Alle Fehlermeldungen ausblenden"
 
@@ -596,7 +589,7 @@ msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
 msgid "Back to User Management"
 msgstr "Zurück zur Benutzerverwaltung"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bearbeite ${title}"
@@ -617,23 +610,23 @@ msgstr "Neue Gruppe"
 msgid "Find users or groups"
 msgstr "Suche Benutzer oder Gruppen"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr "Benutzer- / Gruppenname"
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 msgid "Blank search text finds all."
 msgstr "Suche mit leerem Eingabefeld liefert alle Benutzer."
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 msgid "Assign global roles"
 msgstr "Globale Rollen zuweisen"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 msgid "Add new group"
 msgstr "Neue Gruppe hinzufügen"
 
@@ -657,52 +650,35 @@ msgstr "Willkommen, ${user}! Sie sind angemeldet."
 msgid "Welcome, you are not logged in."
 msgstr "Willkommen! Sie sind nicht angemeldet."
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Übernehmen"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "Ihre Änderungen wurden übernommen."
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Dokument hinzugefügt."
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maximale Dateigröße: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Übernehmen"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${type} in ${title} erstellen"
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "${type} erstellen"
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Willkommen, ${user}!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Sie wurden abgemeldet."
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximale Dateigröße: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr "Vollständiger Name"
 
@@ -710,10 +686,18 @@ msgstr "Vollständiger Name"
 msgid "Username"
 msgstr "Benutzername"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr "E-Mail"
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registrieren"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Ein Fehler ist aufgetreten."
+
 #: kotti/views/login.py:108
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
@@ -723,26 +707,30 @@ msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mi
 msgid "Register - ${title}"
 msgstr "Registrieren - ${title}"
 
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Willkommen, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
+
 #: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Passwort zurücksetzen - ${title}"
-
 #: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Registrieren"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Sie wurden abgemeldet."
 
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "Ein Fehler ist aufgetreten."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
 #: kotti/views/login.py:295
 msgid "Set password"
@@ -752,193 +740,202 @@ msgstr "Passwort setzen"
 msgid "Your password reset token may have expired."
 msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Passwort zurücksetzen - ${title}"
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr "Benutzerverwaltung"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "Keine Änderungen."
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Meine Einstellungen - ${title}"
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "Keine Benutzer oder Gruppen gefunden."
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "Ungültige Eingabe"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "Ein Benutzer mit diesem Namen existiert bereits."
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Unbekannte Gruppe: ${group}"
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "Aktiv"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "Abwählen um das Konto zu deaktivieren."
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "Globale Rollen"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "Gruppen"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "Neuer Benutzer"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "Schicke Passwort-Registrierungs-Link"
+
+#: kotti/views/users.py:346
 #, python-format
 msgid "${title} was added."
 msgstr "${title} hinzugefügt."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "Neue Gruppe"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "Keine Änderungen."
-
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "Kein Name übergeben."
-
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "Keine Benutzer oder Gruppen gefunden."
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Bearbeite ${principal_type} ${title}"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr "Keine Benutzer oder Gruppen gefunden."
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "Schicke Passwort-Registrierungs-Link"
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} gelöscht."
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Bearbeite ${principal_type} ${title}"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "Kein Name übergeben."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Meine Einstellungen - ${title}"
+
+#: kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} kopiert."
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} ausgeschnitten."
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} verschoben."
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} eingefügt."
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr "Inhalt konnte nicht eingefügt werden, da er nicht mehr existiert."
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} verschoben."
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} wird nun in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} gelöscht."
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr "Nichts wurde gelöscht."
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "Name und Titel werden benötigt."
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr "Objekt umbenannt."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Status ändern"
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "Nach oben verschieben"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "Nach unten verschieben"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "Anzeigen"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "Verstecken"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "Status ändern"
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Beschreibung"
 
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Schlagworte:"
+
 #: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Inhalt"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "Standardansicht wurde zurückgesetzt."
-
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Standardansicht"
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Standardansicht wurde zurückgesetzt."
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Standardansicht wurde gesetzt."
@@ -947,6 +944,9 @@ msgstr "Standardansicht wurde gesetzt."
 msgid "Default view could not be set."
 msgstr "Standardansicht konnte nicht geändert werden."
 
+#~ msgid "Image"
+#~ msgstr "Bild"
+
 #, fuzzy
 #~ msgid ""
 #~ "\n"
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index 9336d47ef6e516aa48eb4f5fe4c21fb36301be9a..56919c0a7da990256ad80628eea6325a4b877ab9 100644
GIT binary patch
delta 26
hcmbQsIG1sPzkr#pfw8Wkse+-om4TtQf#Jk>I{;Xu24VmJ

delta 26
hcmbQsIG1sPzksQ(p@FV}rGk;6m4T7AfziZxI{;X6244UG

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index 070bfc9f0..504555c70 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -110,77 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr ""
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr ""
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr ""
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr ""
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr ""
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr ""
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+msgid "Contents"
 msgstr ""
 
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
 msgstr ""
 
-#: kotti/resources.py:529
-msgid "Folder view"
+#: kotti/resources.py:533
+msgid "Share"
 msgstr ""
 
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
-msgid "Contents"
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
 msgstr ""
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: kotti/resources.py:537
+msgid "Folder view"
 msgstr ""
 
-#: kotti/resources.py:525
-msgid "Share"
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
 msgstr ""
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
 msgstr ""
 
-#: kotti/security.py:191
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr ""
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr ""
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr ""
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr ""
 
@@ -245,24 +241,24 @@ msgstr ""
 msgid "Forbidden"
 msgstr ""
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr ""
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr ""
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr ""
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr ""
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr ""
 
@@ -270,31 +266,27 @@ msgstr ""
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr ""
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr ""
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 msgid "Register for an account on this site."
 msgstr ""
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr ""
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr ""
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr ""
@@ -307,41 +299,41 @@ msgstr ""
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr ""
 
@@ -349,51 +341,51 @@ msgstr ""
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr ""
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
@@ -432,40 +424,40 @@ msgstr ""
 msgid "Share ${title}"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 msgid "Assign role"
 msgstr ""
 
@@ -473,11 +465,11 @@ msgstr ""
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 msgid "Filename"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr ""
 
@@ -489,15 +481,15 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr ""
 
@@ -517,7 +509,7 @@ msgstr ""
 msgid "Back to User Management"
 msgstr ""
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
@@ -538,23 +530,23 @@ msgstr ""
 msgid "Find users or groups"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 msgid "Blank search text finds all."
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 msgid "Assign global roles"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 msgid "Add new user"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 msgid "Add new group"
 msgstr ""
 
@@ -578,52 +570,35 @@ msgstr ""
 msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
-msgid "Your changes have been saved."
-msgstr ""
-
-#: kotti/views/form.py:174
-msgid "Item was added."
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
 msgstr ""
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+msgid "Your changes have been saved."
 msgstr ""
 
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
+#: kotti/views/form.py:177
+msgid "Item was added."
 msgstr ""
 
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr ""
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr ""
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr ""
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr ""
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr ""
 
@@ -631,10 +606,18 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr ""
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr ""
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr ""
+
 #: kotti/views/login.py:108
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr ""
@@ -644,25 +627,29 @@ msgstr ""
 msgid "Register - ${title}"
 msgstr ""
 
-#: kotti/views/login.py:212
-msgid "Login failed."
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
 msgstr ""
 
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr ""
+
+#: kotti/views/login.py:212
+msgid "Login failed."
 msgstr ""
 
 #: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr ""
 
-#: kotti/views/login.py:82
-msgid "Register"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
 msgstr ""
 
-#: kotti/views/login.py:89
-msgid "There was an error."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
 msgstr ""
 
 #: kotti/views/login.py:295
@@ -673,193 +660,202 @@ msgstr ""
 msgid "Your password reset token may have expired."
 msgstr ""
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr ""
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr ""
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
 msgstr ""
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
 msgstr ""
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr ""
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr ""
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr ""
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr ""
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr ""
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr ""
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr ""
 
-#: kotti/views/users.py:315
-msgid "Add User"
-msgstr ""
-
-#: kotti/views/users.py:339
-#, python-format
-msgid "${title} was added."
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr ""
 
-#: kotti/views/users.py:349
-msgid "Add Group"
+#: kotti/views/users.py:321
+msgid "Add User"
 msgstr ""
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
+#: kotti/views/users.py:331
+msgid "Send password registration link."
 msgstr ""
 
-#: kotti/views/users.py:558
-msgid "No name was given."
+#: kotti/views/users.py:346
+#, python-format
+msgid "${title} was added."
 msgstr ""
 
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
+#: kotti/views/users.py:356
+msgid "Add Group"
 msgstr ""
 
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr ""
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr ""
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr ""
+
+#: kotti/views/users.py:599
 #, python-format
-msgid "${title} was copied."
+msgid "My preferences - ${title}"
 msgstr ""
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:105
 #, python-format
-msgid "${title} was cut."
+msgid "${title} was copied."
 msgstr ""
 
-#: kotti/views/edit/actions.py:183
+#: kotti/views/edit/actions.py:123
 #, python-format
-msgid "${title} was moved."
+msgid "${title} was cut."
 msgstr ""
 
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr ""
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr ""
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr ""
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr ""
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr ""
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr ""
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr ""
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr ""
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr ""
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr ""
 
-#: kotti/views/edit/content.py:53
-msgid "Body"
+#: kotti/views/edit/content.py:44
+msgid "Tags"
 msgstr ""
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
+#: kotti/views/edit/content.py:53
+msgid "Body"
 msgstr ""
 
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr ""
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr ""
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr ""
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index 368ef2017adedc3d64c59096fe0b5d092352550a..add63262037d5988ce857e11d2d656ab82e20578 100644
GIT binary patch
delta 3764
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

delta 3806
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
BP*wl{

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index b9c13e8d5..0763286e1 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -190,77 +190,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "Copier"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "Couper"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "Coller"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "Renommer"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "Supprimer"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Document"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "Fichier"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "Image"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "Contenus"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenus"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modifier"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "Permissions"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Actions"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Contenus"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Document"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "Fichier"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "Lecteur"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "Editeur"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -325,24 +321,24 @@ msgstr "Cliquez ici afin de définir votre mot de passe et vous connecter : ${ur
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "Identifiant"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "Identifiant ou e-mail"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "Mot de passe"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "Se connecter"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
@@ -350,31 +346,27 @@ msgstr "Mot de passe oublié ?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez sur ${reset_password} ci-dessous afin de recevoir un mail contenant le lien de réinitialisation de votre mot de passe."
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 msgid "Register for an account on this site."
 msgstr "Enregistrez-vous sur ce site."
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Rendre ${state}"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Mots-clés"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Vous êtes ici :"
@@ -387,41 +379,41 @@ msgstr "Modifier le statut de workflow"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/ou le gérer."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titre"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Type"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "Statut"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Date de création"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Date de modification"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "Inclure les contenus enfants"
 
@@ -429,51 +421,51 @@ msgstr "Inclure les contenus enfants"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "Si coché, cela modifiera le statut de tous les contenus enfants dans les documents sélectionnés et leurs documents enfants."
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "Modifier le statut à"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr "Sélectionner le nouveau statut à appliquer aux éléments choisis."
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "Aucune modification"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "Appliquer les modifications"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr "Annuler"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "Aucun contenu ici."
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "Visible"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "Caché"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
 
@@ -512,40 +504,40 @@ msgstr "Renommer ${title}"
 msgid "Share ${title}"
 msgstr "Permissions pour ${title}"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "Rechercher"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "Assigner des rôles locaux"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "Nom"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "Utilisateur"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "Groupe"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 #, fuzzy
 msgid "Assign role"
 msgstr "Assigner des rôles locaux"
@@ -554,11 +546,11 @@ msgstr "Assigner des rôles locaux"
 msgid "Upload content from local file(s)"
 msgstr "Téléverser des contenus à partir de fichiers locaux"
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 msgid "Filename"
 msgstr "Nom du fichier"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr "Poids"
 
@@ -570,15 +562,15 @@ msgstr "Statut"
 msgid "Progress"
 msgstr "Progression"
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr "Selectionner des fichiers à téléverser..."
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr "Téléverser ${number} fichiers."
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr "Ignorer toutes les erreurs"
 
@@ -598,7 +590,7 @@ msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
 msgid "Back to User Management"
 msgstr "Retour à la gestion des Utilisateurs"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Modifier ${title}"
@@ -619,23 +611,23 @@ msgstr "Ajouter un groupe"
 msgid "Find users or groups"
 msgstr "Rechercher des utilisateurs ou des groupes"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr "Utilisateur / groupe"
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 msgid "Blank search text finds all."
 msgstr "Rechercher et modifier des utilisateurs (Laissez le champ vide pour les afficher tous)."
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 msgid "Assign global roles"
 msgstr "Assigner des rôles locaux"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 msgid "Add new user"
 msgstr "Ajouter un utilisateur"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 msgid "Add new group"
 msgstr "Ajouter un groupe"
 
@@ -659,52 +651,35 @@ msgstr "Bienvenue, ${user} ! Vous êtes connecté."
 msgid "Welcome, you are not logged in."
 msgstr "Bienvenue, vous n'êtes pas connecté."
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Enregistrer"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "Vos modifications ont été enregistrées."
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "L'élément a été ajouté."
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Taille maximum d'un fichier : ${size} MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Enregistrer"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Ajouter un(e) ${type} dans ${title}."
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Ajouter ${type}."
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "Vous avez réinitialisé votre mot de passe."
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bienvenue, ${user} !"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Vous avez été déconnecté."
+msgid "Maximum file size: ${size}MB"
+msgstr "Taille maximum d'un fichier : ${size} MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr "Nom complet"
 
@@ -712,10 +687,18 @@ msgstr "Nom complet"
 msgid "Username"
 msgstr "Identifiant"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr "E-mail"
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "S'inscrire"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Il y a une erreur."
+
 #: kotti/views/login.py:108
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez recevoir un e-mail contenant le lien permettant d'initialiser votre mot de passe, afin d'activer votre compte."
@@ -725,26 +708,30 @@ msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devri
 msgid "Register - ${title}"
 msgstr "S'inscrire - ${title}"
 
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bienvenue, ${user} !"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
+
 #: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "La connexion à échouée."
 
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Réinitialiser votre mot de passe - ${title}"
-
 #: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "S'inscrire"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Vous avez été déconnecté."
 
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "Il y a une erreur."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Vous avez réinitialisé votre mot de passe."
 
 #: kotti/views/login.py:295
 #, fuzzy
@@ -755,193 +742,202 @@ msgstr "Réinitialiser le mot de passe"
 msgid "Your password reset token may have expired."
 msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Réinitialiser votre mot de passe - ${title}"
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr "Gestion des utilisateurs"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "Aucune modification a été effectuée."
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mes préférences - ${title}"
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "Aucun utilisateur ou groupe a été trouvé."
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "Valeur invalide"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "Un utilisateur avec ce nom existe déjà."
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Aucun groupe : ${group}"
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "Actif"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "Décocher cette option pour désactiver le compte."
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "Rôle global"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "Groupes"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "Ajouter un Utilisateur"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "Envoyer un lien d'initialisation de mot de passe"
+
+#: kotti/views/users.py:346
 #, python-format
 msgid "${title} was added."
 msgstr "${title} a été ajouté."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "Aucune modification a été effectuée."
-
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "Aucun nom a été indiqué."
-
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "Aucun utilisateur ou groupe a été trouvé."
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Modifier ${principal_type} ${title}"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr "Utilisateur non trouvé."
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "Envoyer un lien d'initialisation de mot de passe"
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} a été supprimé."
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Supprimer ${principal_type} ${title}"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "Aucun nom a été indiqué."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mes préférences - ${title}"
+
+#: kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} a été copié."
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} a été coupé."
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} a été déplacé."
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} a été collé."
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr "Ne peut pas coller ce contenu. Il n'existe plus."
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} a été déplacé."
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} est désormais visible dans la navigation."
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nest plus visible dans la navigation."
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} a été supprimé."
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr "Rien n'a été supprimé."
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "Le nom et le titre sont obligatoires."
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr "L'élément a été renommé."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Modifier le statut"
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "Décaler vers le haut"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "Décaler vers le bas"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "Rendre visible"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "Cacher"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr "Vous avez sélectionné des éléments afin de les traiter."
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "Modifier le statut"
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Description"
 
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Mots-clés"
+
 #: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Contenu"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "La vue par défaut a été réinitialisée."
-
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vue par défaut"
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "La vue par défaut a été réinitialisée."
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "La vue par défaut a été définie."
@@ -950,6 +946,9 @@ msgstr "La vue par défaut a été définie."
 msgid "Default view could not be set."
 msgstr "La vue par défaut ne peut pas être définie."
 
+#~ msgid "Image"
+#~ msgstr "Image"
+
 #~ msgid ""
 #~ "\n"
 #~ "<h2>Log in</h2>\n"
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index 516ba80c7b5e28481dff87599a4db8cf4accdb75..d4de1b233cb4d9cda81b9a3e3105a02faa69a8f1 100644
GIT binary patch
delta 3508
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

delta 3536
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
AnE(I)

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index 98f4a2a4a..ea800899a 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -156,77 +156,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "Copia"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "Taglia"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "Incolla"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "Rinomina"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "Elimina"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Documento"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "File"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "Immagine"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "Vista della cartella"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenuti"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modificare"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "Condividi"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Azioni"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Vista della cartella"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Documento"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "File"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "Visualizzatore"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "Proprietario"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "Admin"
 
@@ -291,24 +287,24 @@ msgstr "Premi qui per impostare la tua password e accedere: ${url}"
 msgid "Forbidden"
 msgstr "Vietato"
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "Accedi"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "Username o email"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "Password"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "Accedi"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la tua password?"
 
@@ -316,31 +312,27 @@ msgstr "Hai dimenticato la tua password?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "Resetta password"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "Inserisci il tuo username o email e premi ${reset_password} per ricevere una email con il link per resettare la tua password."
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr "Non sei ancora registrato?"
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 msgid "Register for an account on this site."
 msgstr "Registrati per avere un account su questo sito."
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Rendi ${state}"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Tags"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Sei qua:"
@@ -353,41 +345,41 @@ msgstr "Cambia lo stato del workflow"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Lo stato del workflow di un item determina chi lo può vedere, editare e/o modificare."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titolo"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Tipo"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "Stato"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data di creazione"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data di modifica"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "Includere figli"
 
@@ -395,51 +387,51 @@ msgstr "Includere figli"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "Se selezionato, verrà modificato lo stato dei figli dei documenti selezionati e i suoi sottodocumenti."
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "Cambia stato a"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr "Seleziona il nuovo stato per tutti gli elementi selezionati."
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "Nessuna modifica"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "Applica le modifiche"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr "Cancella"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "Non è presente nessun elemento di contenuto."
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "Visibilità"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "Visibile"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
 
@@ -478,40 +470,40 @@ msgstr "Rinomina ${title}"
 msgid "Share ${title}"
 msgstr "Condividi ${title}"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "Cerca utenti e gruppi"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "Cerca"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "Assegna ruoli locali"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "Nome"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "Utente"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "Gruppo"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 #, fuzzy
 msgid "Assign role"
 msgstr "Assegna ruoli locali"
@@ -520,11 +512,11 @@ msgstr "Assegna ruoli locali"
 msgid "Upload content from local file(s)"
 msgstr "Carica un contenuto da uno o più file locali"
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 msgid "Filename"
 msgstr "Nome del file"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr "Dimensione"
 
@@ -536,15 +528,15 @@ msgstr "Stato"
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr ""
 
@@ -564,7 +556,7 @@ msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Torna alla gestione degli utenti"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr " Modificare ${title}"
@@ -586,23 +578,23 @@ msgstr "Aggiungi un gruppo"
 msgid "Find users or groups"
 msgstr "Cerca utenti o gruppi"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 msgid "Blank search text finds all."
 msgstr "Lascia il testo vuoto per trovare tutti gli utenti."
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 msgid "Assign global roles"
 msgstr "Assegna ruoli globali"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 msgid "Add new group"
 msgstr "Aggiungi un nuovo gruppo"
 
@@ -626,52 +618,35 @@ msgstr "Benvenuto, ${user}! Sei loggato."
 msgid "Welcome, you are not logged in."
 msgstr "Benvenuto, non sei loggato."
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Salva"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "Le tue modifiche sono state salvate."
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "L'elemento è stato aggiunto."
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Dimensione massima del file: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Salva"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Aggiungere ${type} a ${title}."
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Aggiungere ${type}."
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "Hai resettato la tua password."
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Benvenuto, ${user}!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Sei uscito."
+msgid "Maximum file size: ${size}MB"
+msgstr "Dimensione massima del file: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr "Nome completo"
 
@@ -679,10 +654,18 @@ msgstr "Nome completo"
 msgid "Username"
 msgstr "Username"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr "Email"
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registrazione"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "C'è stato un errore."
+
 #: kotti/views/login.py:108
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per settare la tua password e attivare il tuo account."
@@ -692,26 +675,30 @@ msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link pe
 msgid "Register - ${title}"
 msgstr "Registrazione - ${title}"
 
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Benvenuto, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
+
 #: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Errore nell'accesso."
 
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Resetta la tua password - ${title}."
-
 #: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Questo username o email non è riconosciuto dal sistema."
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Registrazione"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Sei uscito."
 
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "C'è stato un errore."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Hai resettato la tua password."
 
 #: kotti/views/login.py:295
 #, fuzzy
@@ -722,193 +709,202 @@ msgstr "Resetta password"
 msgid "Your password reset token may have expired."
 msgstr "Il token per resettare la tua password è scaduto."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Resetta la tua password - ${title}."
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr "Gestione utenti"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "Non sono state fatte modifiche."
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Le mie preferenze - ${title}"
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "Utenti o gruppo non trovati"
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "Valore invalido"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "Un utente con questo nome già esiste."
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "Un utente con questa email già esiste."
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Gruppo non esistente: ${group}"
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "Attivo"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "Deseleziona questo per disattivare l'account."
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "Ruoli globali"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "Gruppi"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "Aggiungi utente"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "Invia il link della password di registrazione."
+
+#: kotti/views/users.py:346
 #, python-format
 msgid "${title} was added."
 msgstr "${title} è stato aggiunto."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "Non sono state fatte modifiche."
-
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "Non è stato dato un nome."
-
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "Utenti o gruppo non trovati"
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Modificare ${principal_type} ${title}"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr "Utente non trovato."
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "Invia il link della password di registrazione."
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} è stato cancellato."
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Elimina ${principal_type} ${title}"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "Non è stato dato un nome."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Le mie preferenze - ${title}"
+
+#: kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} è stato copiato."
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} è stato tagliato."
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} è stato spostato."
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} è stato incollato."
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr "Non si può incollare l'elemento. L'elemento non è più esistente."
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} è stato spostato."
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} è ora visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} non è più visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} è stato cancellato."
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr "Non è stato cancellato niente."
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "Nome e titolo sono obbligatori."
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr "L'elemento è stato rinominato"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Cambia stato"
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "Muovere su"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "Muovi giù"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "Mostra"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "Nascondi"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr "Devi selezionare degli elementi per fare quest'azione."
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "Cambia stato"
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Descrizione"
 
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tags"
+
 #: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Contenuto"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "La vista predefinita è stata modificata a predefinita."
-
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vista predefinita"
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "La vista predefinita è stata modificata a predefinita."
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "E' stata selezionata la vista predefinita."
@@ -917,6 +913,9 @@ msgstr "E' stata selezionata la vista predefinita."
 msgid "Default view could not be set."
 msgstr "La vista predefinita non può essere selezionata."
 
+#~ msgid "Image"
+#~ msgstr "Immagine"
+
 #, fuzzy
 #~ msgid ""
 #~ "\n"
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index 9d47d0caff761e147e5f857d81f212d3f4a80901..f6c635f51d5ed7838e2839d9fd2ec1e55bfed1a9 100644
GIT binary patch
delta 3275
zcmYk-dr%ft7{~Erg2=@b1#h4t0!o7N;svD;6im%aQfP@m7<oanFfZk;)iBbu6iLmp
z(x$vrQ_VpA)5WpLnar6S(@JsFBGR$RvMK*)n5^$__sL<0=lz^>cK4j;oIShzS@vC-
zccE+84#%;JNF+{&Id=-TMDoLNCdRpecows;T_@*m!))w^Wf+G`Fcxbu9$&Ka@7ej!
zF^%@`F%@rMgma!txz)K2G-P0V9ELqH2N}~%N99t69dW+ZtF68Y!)dR<3AhRA+nvO8
zyoe!;?CjidydAq@HTGb9S3`kGyH`+&>_rWH0Qqx`{AfmBU^X^kK6dKj+-{tTO6)SK
zpKGWUx{gXDiDl8mhM@Y*#=e-30~z0yQ|OJgs08+5e>{jv;46&ACe%Qe@B{oEHQ-*R
z(+}T54R{pQ&neW(G@-8h0oBjXs1^MKJ<Y7u8e(~%$}j;n&>&O?AykJssO!gAy#&?q
zY+QyF$fVu3s6;NICh!-Ms|#bJEXMAr{x-z1{u*F24Z5MuPP}gQ{isdZi0a@ZD)XO^
z&Eu|OFT9RQq%+y+`Z&}CLa2Uotv(TTf3Z0`p7p2f=JJz*tC7WUd$9*Lpq|xnWDNHU
zD&c=o1B7=E>bIhnHV)OEgiP9{qh^|iT8ScLKe`gsBdhc%q*16r&ERd+4ez5a{0NoE
zQB>yVF&8gm5+-v}OJ0adtORvmDXPCJjKW9l{7Td#_Uyd3g~Biz>QEUUMRj!6F1UzF
zum#m|H1DQ5?v0vJKh%9gQ8O<@J*p|F>&j6RszfES5cTMmBiDIuErk>swxX7#5%tVY
zqn5rI^^Du`(+3l92#&@oTwv|r;9%<4Z~!LqN>yS3YJzX#cszsCuy2CiGM@ip3Vs4+
zqkn=GFk7v?4?9aYj>FMdhgyN-s2QF!n{goZE67+bmaMg>GLUWK^355N@!cW{dbaCv
z8*WB*oXGUkF#|(56NlqQRKlMkxw&Rk0yj|ig|mz@9yM?(>iSW*1j}$Ko<L6n7A6HZ
zoJJ+mf|Kz#tLO4H(xxdw&7c^y0`qYk?!zo>K_wEO91NI<JUurS)n1B9Xbygf%aU1t
zoyg;XDZ?Vv1y!g-)}RKgMJ2Gu>W7fYy2HpSy9=lpx1t7&rZa8E6x4m0W-jW!38?<(
zrFg-B)ik_ALk%(sH#9Z4u^3e^M|Hdo_v3CmUyv4DHx;?nm7)^yP!rjT{JA&y(SXOS
z{gio07xHGgzp(?xvU9X~dh(-=3e4$d1!_gAtzL`zXR{N>;}O)Jh!_;SB?B;@`aP(L
zY)2*1h<>7<QP2{7jY{C0*^GLRuh{uk)CzP=50<b$^5+Wp8Hx*0_rGlJL-l(QwK5-K
zBsSqlY(aAMTmtE9Mun&jW}%j@!d!~VwARk=L_U7*RjW6mHtWZz8Ak9C(7@@a{zjtC
z=b`%DggU>+uk-v5QPA%F1U1lA%*20C9SqJ0GS5ccc!$*|p%T9r^;%Y;`gslY0Xu=?
z@H}eMCDEy7o{tl81ukcNcbI~fXat|NVk|{g$GwZ~u!MM+c#Oy+wA}w6TPdh>bv%XO
zmYYX5r3E)@?147r$yWAewQ0PoO<9|1KC#%^w&N-**WpGhSKt^z32P&l5;~R>D~L4W
zapGx0lM5#_d#xBp{pzU5yg3x~=<X**5UU9tg@nE{4-(~sjspLee`w~?`Xf=@ylSg$
z!Y8df0|#087F<W@)!0GA5KD-*2anr5U=8=-LPF1fthH^!=dGNBTdd62T2C?fZzTCP
z_}}YE*j^27j=7X;hz-QEL?>b<p?{%M2_0bp{+De6<sz$#*+eo?Pdr5Ec)?#F3Tyl-
zI}~GyWrW^Y9lRa>zt>*4i<nNVCl(QWHT|9X3`P(sL^Saf(VbXXABq_;ejcSLLPuBP
z5x>O#$66v-grM;`J2%bD#7d&9es@el=4MJy5OKs#VlAO#6!D^83V!Z{yBmIt36E&_
kwcEN5T}EbR4a*FTNDAfTW`zc4g&NlMJ{Hw5CG|k$e?(X$%K!iX

delta 3299
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
IXJecH0SIm}T>t<8

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 66199322d..1acbddd5c 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -110,77 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "コピー"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "切り取り"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "貼り付け"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "名称変更"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "削除"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "ドキュメント"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "ファイル"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "画像"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "フォルダー表示"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "編集"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "共有"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "アクション"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "フォルダー表示"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "ドキュメント"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "ファイル"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "閲覧者"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "編集者"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "所有者"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "管理者"
 
@@ -245,24 +241,24 @@ msgstr "パスワードをセットしてログインするにはこのリンク
 msgid "Forbidden"
 msgstr "表示権限がありません"
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "ログイン"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "ユーザー名またはメールアドレス"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "パスワード"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "ログイン"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "パスワードを忘れた?"
 
@@ -270,33 +266,29 @@ msgstr "パスワードを忘れた?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 #, fuzzy
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} をクリックしてください。パスワードをリセットするためのリンクが書かれたメールが送信されます。"
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 #, fuzzy
 msgid "Register for an account on this site."
 msgstr "まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "${state} にする"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "タグ"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "今の場所:"
@@ -309,41 +301,41 @@ msgstr "ワークフローの状態を変更"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフローの状態を変更します。"
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "タイトル"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "種類"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "状態"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "作成日"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "変更日"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "配下のアイテムを含める"
 
@@ -351,51 +343,51 @@ msgstr "配下のアイテムを含める"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "チェックすると、状態の変更が選択したドキュメントや、その配下のドキュメントのすべての配下のアイテムに適用されます。"
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "変更後の状態"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr "新しく設定する状態を選択して下さい。"
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "変更しない"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "変更を適用"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "ここにはコンテンツアイテムが含まれていません。"
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "表示状態"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "表示中"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "非表示"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "本当に以下のアイテムを削除しますか?"
 
@@ -434,40 +426,40 @@ msgstr "${title} の名称変更"
 msgid "Share ${title}"
 msgstr "${title} を共有"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "ユーザーとグループを検索"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "検索"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "ローカルロールに割り当て"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "名称"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "ユーザー"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "グループ"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 #, fuzzy
 msgid "Assign role"
 msgstr "ローカルロールに割り当て"
@@ -476,12 +468,12 @@ msgstr "ローカルロールに割り当て"
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 #, fuzzy
 msgid "Filename"
 msgstr "名称変更"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr ""
 
@@ -493,15 +485,15 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr ""
 
@@ -521,7 +513,7 @@ msgstr "本当に ${type} ${title} を削除しますか?"
 msgid "Back to User Management"
 msgstr "ユーザー管理に戻る"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "${title} を編集"
@@ -544,26 +536,26 @@ msgstr "グループを追加"
 msgid "Find users or groups"
 msgstr "ユーザーとグループを検索"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 #, fuzzy
 msgid "Blank search text finds all."
 msgstr "ユーザーを検索して変更する (空文字列での検索で全部表示) 。"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 #, fuzzy
 msgid "Assign global roles"
 msgstr "ローカルロールに割り当て"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 #, fuzzy
 msgid "Add new user"
 msgstr "ユーザーを追加"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 #, fuzzy
 msgid "Add new group"
 msgstr "グループを追加"
@@ -588,52 +580,35 @@ msgstr "ようこそ ${user}! ログインしています。"
 msgid "Welcome, you are not logged in."
 msgstr "ようこそ。ログインしていません。"
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "保存"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "変更内容を保存しました。"
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "${title} を追加しました。"
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "最大ファイルサイズ: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "保存"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${title} に ${type} を追加する。"
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "${type} を追加する。"
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "パスワードのリセットに成功しました。"
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "ようこそ ${user}!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "ログアウトしました。"
+msgid "Maximum file size: ${size}MB"
+msgstr "最大ファイルサイズ: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr "フルネーム"
 
@@ -641,10 +616,18 @@ msgstr "フルネーム"
 msgid "Username"
 msgstr "ユーザー名"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr "メールアドレス"
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "登録"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "エラーが発生しました。"
+
 #: kotti/views/login.py:108
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワードを設定して下さい。"
@@ -654,26 +637,30 @@ msgstr "おめでとうございます! 登録が完了しました。Eメール
 msgid "Register - ${title}"
 msgstr "登録 - ${title}"
 
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "ようこそ ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
+
 #: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "パスワードのリセット - ${title}"
-
 #: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "登録"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "ログアウトしました。"
 
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "エラーが発生しました。"
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "パスワードのリセットに成功しました。"
 
 #: kotti/views/login.py:295
 #, fuzzy
@@ -684,193 +671,202 @@ msgstr "パスワードをリセット"
 msgid "Your password reset token may have expired."
 msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "パスワードのリセット - ${title}"
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr "ユーザー管理"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "変更箇所がありませんでした。"
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "個人設定 - ${title}"
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "ユーザーもグループも見つかりませんでした。"
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "無効な値"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "同じ名称のユーザーがすでに存在します。"
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "そのメールアドレスをもつユーザーがすでに存在します。"
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "グループが見つかりません: ${group}"
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "有効"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "チェックを外すと、このアカウントは無効になります。"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "グローバルロール"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "グループ"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "ユーザーを追加"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "パスワード登録を送信する。"
+
+#: kotti/views/users.py:346
 #, python-format
 msgid "${title} was added."
 msgstr "${title} を追加しました。"
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "グループ追加"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "変更箇所がありませんでした。"
-
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "名前がありません。"
-
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "ユーザーもグループも見つかりませんでした。"
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "${principal_type} ${title} を編集"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr "ユーザーは見つかりませんでした。"
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "パスワード登録を送信する。"
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} を削除しました。"
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "${principal_type} ${title} を削除"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "名前がありません。"
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "個人設定 - ${title}"
+
+#: kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} をコピーしました。"
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} を切り取りました。"
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} を移動しました。"
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} を貼り付けました。"
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr "ノードを張り付けできません。何も存在していません。"
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} を移動しました。"
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} がナビゲーションに表示されるようになりました。"
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} がナビゲーションでは非表示になりました。"
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} を削除しました。"
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr "削除対象がありません。"
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "名称とタイトルは必須です。"
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr "名称変更しました"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "状態を変更"
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "上に移動する"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "下に移動する"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "表示中にする"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "非表示にする"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "状態を変更"
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "説明"
 
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "タグ"
+
 #: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "本文"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "デフォルト表示は既定値にリセットされました。"
-
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "デフォルト表示"
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "デフォルト表示は既定値にリセットされました。"
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "デフォルト表示が設定されました。"
@@ -879,6 +875,9 @@ msgstr "デフォルト表示が設定されました。"
 msgid "Default view could not be set."
 msgstr "デフォルト表示は設定できませんでした。"
 
+#~ msgid "Image"
+#~ msgstr "画像"
+
 #~ msgid "Submit"
 #~ msgstr "送信"
 
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index 3fa5fa76b9e8d13ce26ec8039d6ef1cddc6c488f..7572ce50e9c92674c58b32a002698ee09330a13c 100644
GIT binary patch
delta 3500
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
XBzIqr%iYE0uDzY;3a#ywRu}v~x+72i

delta 3527
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

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index be9e3e008..9bad9abf4 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -184,77 +184,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "복사"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "잘라내기"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "삭제"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "문서"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "파일"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "화상"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "폴더로 보임"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "컨텐츠 항목"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "편집"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "공유"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "동작"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "폴더로 보임"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "문서"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "파일"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "열람자"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "편집자"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "소유자"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "관리자"
 
@@ -319,24 +315,24 @@ msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
 msgid "Forbidden"
 msgstr "금지됨"
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "로그인"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "사용자 이름 혹은 전자메일"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "암호"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "로그인"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "암호를 잊으셨습니까?"
 
@@ -344,31 +340,27 @@ msgstr "암호를 잊으셨습니까?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "암호 재설정"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "사용자 이름이나 전자메일을 입력한 뒤 아래의 ${reset_password}를 누르면 암호를 재설정할 수 있는 링크를 전자메일로 받으실 수 있습니다."
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr "아직 등록하지 않으셨습니까?"
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 msgid "Register for an account on this site."
 msgstr "이 사이트에 계정을 등록하십시오."
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "\"${state}\"로(으로) 바꿈"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "태그"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "현재 위치:"
@@ -381,41 +373,41 @@ msgstr "작업 상태 바꾸기"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니다."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "제목"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "유형"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "작업 상태"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "만든 날"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "바꾼 날"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "하위 항목 포함 여부"
 
@@ -423,51 +415,51 @@ msgstr "하위 항목 포함 여부"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "체크하면, 고른 문서와 그 하위 문서 모두를 바꿉니다."
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "바꿀 상태"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr "고른 항목 모두가 갖게 될 상태를 선택하십시오."
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "바꾸지 않음"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "바꾸기 적용"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr "취소"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "여기엔 하위 항목이 없습니다."
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "가시성"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "보임"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "숨김"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "다음 항목을 정말 지우겠습니까?"
 
@@ -506,40 +498,40 @@ msgstr "\"${title}\" 이름 바꾸기"
 msgid "Share ${title}"
 msgstr "\"${title}\" 공유하기"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "사용자와 그룹 검색"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "검색"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "컨텐츠별 역할 부여"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "이름"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "사용자"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "그룹"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr ""
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 #, fuzzy
 msgid "Assign role"
 msgstr "컨텐츠별 역할 부여"
@@ -548,11 +540,11 @@ msgstr "컨텐츠별 역할 부여"
 msgid "Upload content from local file(s)"
 msgstr "내 컴퓨터에서 컨텐트 올리기"
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 msgid "Filename"
 msgstr "파일 이름"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr "크기"
 
@@ -564,15 +556,15 @@ msgstr "상태"
 msgid "Progress"
 msgstr "진행률"
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr ""
 
@@ -592,7 +584,7 @@ msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
 msgid "Back to User Management"
 msgstr "사용자 관리로 되돌아가기"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "\"${title}\" 편집"
@@ -614,23 +606,23 @@ msgstr "그룹 추가"
 msgid "Find users or groups"
 msgstr "사용자나 그룹 찾기"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr "사용자나 그룹 이름"
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 msgid "Blank search text finds all."
 msgstr "비워두면 모두 찾습니다."
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 msgid "Assign global roles"
 msgstr "사이트 전체 역할 부여"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 msgid "Add new user"
 msgstr "새 사용자 추가"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 msgid "Add new group"
 msgstr "새 그룹 추가"
 
@@ -654,52 +646,35 @@ msgstr "${user}님, 환영합니다! 로그인되었습니다."
 msgid "Welcome, you are not logged in."
 msgstr "환영합니다, 로그인되지 않았습니다."
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "저장"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "수정사항이 저장되었습니다."
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "항목이 추가되었습니다."
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "최대 파일 크기: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "저장"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${type}을(를) \"${title}\"에 추가합니다."
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "${type}을(를) 추가합니다."
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "암호를 재설정했습니다."
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "${user}님, 환영합니다!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "로그아웃되었습니다."
+msgid "Maximum file size: ${size}MB"
+msgstr "최대 파일 크기: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr "전체 이름"
 
@@ -707,10 +682,18 @@ msgstr "전체 이름"
 msgid "Username"
 msgstr "사용자 이름"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr "전자메일"
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "등록하기"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "오류가 있습니다."
+
 #: kotti/views/login.py:108
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
@@ -720,26 +703,30 @@ msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로
 msgid "Register - ${title}"
 msgstr "등록 - ${title}"
 
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "${user}님, 환영합니다!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
+
 #: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "로그인이 실패했습니다."
 
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "암호를 재설정하세요 - ${title}."
-
 #: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "등록하기"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "로그아웃되었습니다."
 
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "오류가 있습니다."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "암호를 재설정했습니다."
 
 #: kotti/views/login.py:295
 #, fuzzy
@@ -750,193 +737,202 @@ msgstr "암호 재설정"
 msgid "Your password reset token may have expired."
 msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "암호를 재설정하세요 - ${title}."
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr "사용자 관리"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "아무 것도 바뀌지 않았습니다."
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "나의 선호사항"
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "사용자나 그룹이 발견되지 않았습니다."
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "잘못된 값입니다."
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "그런 그룹이 없습니다: ${group}"
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "활성"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "계정을 비활성화하려면 체크를 해제하십시오."
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "전역 역할"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "그룹"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "사용자 추가"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "암호 등록 링크를 발송"
+
+#: kotti/views/users.py:346
 #, python-format
 msgid "${title} was added."
 msgstr "\"${title}\"이(가) 추가되었습니다."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "그룹 추가"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "아무 것도 바뀌지 않았습니다."
-
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "이름이 주어지지 않았습니다."
-
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "사용자나 그룹이 발견되지 않았습니다."
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "${principal_type} \"${title}\" 편집"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr "사용자가 없습니다."
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "암호 등록 링크를 발송"
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} \"${title}\"이(가) 지워졌습니다."
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "${principal_type} \"${title}\" 삭제"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "이름이 주어지지 않았습니다."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "나의 선호사항"
+
+#: kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr "\"${title}\"이(가) 복사되었습니다."
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr "\"${title}\"이(가) 잘라내어졌습니다."
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "\"${title}\"이(가) 옮겨졌습니다."
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr "\"${title}\"이(가) 붙여넣어졌습니다."
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr "노드를 붙여넣을 수 없습니다. 그 노드가 존재하지 않습니다."
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "\"${title}\"이(가) 옮겨졌습니다."
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr "\"${title}\"이(가) 지워졌습니다."
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr "아무것도 지워지지 않았습니다."
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "이름과 제목이 필요합니다."
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr "항목이 재명명되었습니다."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "작업 상태 바꾸기"
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "위로 옮김"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "아래로 옮김"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "보이기"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "숨기기"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr "적용할 항목을 선택해야합니다."
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "작업 상태 바꾸기"
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "설명"
 
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "태그"
+
 #: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "본문"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "기본형 보기로 재설정되었습니다."
-
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "기본형으로 보임"
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "기본형 보기로 재설정되었습니다."
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "보이는 방식이 설정되었습니다."
@@ -945,6 +941,9 @@ msgstr "보이는 방식이 설정되었습니다."
 msgid "Default view could not be set."
 msgstr "보이는 방식을 설정할 수 없었습니다."
 
+#~ msgid "Image"
+#~ msgstr "화상"
+
 #, fuzzy
 #~ msgid ""
 #~ "\n"
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index 3842121b89ab57c771f04b9f31c3e15db9474b86..daf3e8c200657982d452dbb7b8bcd91b48bd7e4c 100644
GIT binary patch
delta 3275
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

delta 3298
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
I_odPQ15vUi`2YX_

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index a9f1760e1..ce4f00a37 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -110,77 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "Knippen"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "Plakken"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Document"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "Bestand"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "Afbeelding"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "Map weergave"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhoud"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bewerken"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "Delen"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Acties"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Map weergave"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Document"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "Bestand"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "Lezer"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -245,24 +241,24 @@ msgstr "Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url
 msgid "Forbidden"
 msgstr "Verboden"
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "Aanmelden"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "Gebuikersnaam of e-mail"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "Aanmelden"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
@@ -270,33 +266,29 @@ msgstr "Wachtwoord vergeten?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "Wachtwoord herstellen"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 #, fuzzy
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "Vul je gebruikersnaam of e-mailadres in en klik op ${reset_password} hieronder om een e-mail te ontvangen om je wachtwoord te herstellen."
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 #, fuzzy
 msgid "Register for an account on this site."
 msgstr "Nog niet geregistreerd? ${register} voor een account op deze site."
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Maak ${state}"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Tags"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "U bent hier:"
@@ -309,41 +301,41 @@ msgstr "Wijzig de workflow status"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of beheren."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Titel"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Type"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "Status"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Aanmaak datum"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Wijzigingsdatum"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "Inclusief onderliggende"
 
@@ -351,51 +343,51 @@ msgstr "Inclusief onderliggende"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "Indien aangevinkt zal een poging ondernomen worden om de status van alle onderliggende items te wijzigen van de geselecteerd documenten en hun onderliggende documenten."
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "Wij status naar"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 msgid "Select the new state where all chosen items should be set."
 msgstr "Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te worden."
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "Geen wijzigingen"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "Wijzigingen toepassen"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "Bevat geen content items."
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "Zichtbaarheid"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "Zichtbaar"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
 
@@ -434,40 +426,40 @@ msgstr "Hernoemen ${title}"
 msgid "Share ${title}"
 msgstr "Delen ${title}"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "Zoeken naar gebruikers en groepen"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "Zoeken"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "Locale rollen toewijzen"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "Naam"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "gebruiker"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "Groep"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 #, fuzzy
 msgid "Assign role"
 msgstr "Locale rollen toewijzen"
@@ -476,12 +468,12 @@ msgstr "Locale rollen toewijzen"
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 #, fuzzy
 msgid "Filename"
 msgstr "Hernoemen"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr ""
 
@@ -493,15 +485,15 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr ""
 
@@ -521,7 +513,7 @@ msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
 msgid "Back to User Management"
 msgstr "Terug naar gebruiksersbeheer"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bewerken ${title}"
@@ -544,26 +536,26 @@ msgstr "Groep toevoegen"
 msgid "Find users or groups"
 msgstr "Zoeken naar gebruikers en groepen"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 #, fuzzy
 msgid "Blank search text finds all."
 msgstr "Zoek en wijzig gebruikers (laat tekstveld leeg om alle gebruikers te vinden."
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 #, fuzzy
 msgid "Assign global roles"
 msgstr "Locale rollen toewijzen"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 #, fuzzy
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 #, fuzzy
 msgid "Add new group"
 msgstr "Groep toevoegen"
@@ -588,52 +580,35 @@ msgstr "Welkom, ${user}! U bent nu aangemeld."
 msgid "Welcome, you are not logged in."
 msgstr "Wilkom, je bent niet aangemeld."
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Opslaan"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "Je wijzigingen werden opgeslagen."
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Item werd toegevoegd."
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maximale bestandsgrootte: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Opslaan"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Voeg ${type} aan ${title} toe."
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Voeg ${type} toe."
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "Je wachtwoord werd hersteld."
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Welkom, ${user}!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Je bent afgemeld."
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximale bestandsgrootte: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr "Volledige naam"
 
@@ -641,10 +616,18 @@ msgstr "Volledige naam"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr "E-mailadres"
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registreer"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Er trad een fout op."
+
 #: kotti/views/login.py:108
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om je wachtwoord in te stellen. Deze handeling zal je account activeren."
@@ -654,26 +637,30 @@ msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een li
 msgid "Register - ${title}"
 msgstr "Refistreer - ${title}"
 
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Welkom, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
+
 #: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Aanmelden mislukt."
 
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Herstel je wachtwoord - ${title}."
-
 #: kotti/views/login.py:222
 msgid "That username or email is not known by this system."
 msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Registreer"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Je bent afgemeld."
 
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "Er trad een fout op."
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Je wachtwoord werd hersteld."
 
 #: kotti/views/login.py:295
 #, fuzzy
@@ -684,193 +671,202 @@ msgstr "Wachtwoord herstellen"
 msgid "Your password reset token may have expired."
 msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Herstel je wachtwoord - ${title}."
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr "Gebruikersbeheer"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "Geen wijzigingen aangebracht."
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mijn instellingen - ${title}"
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "Geen gebruikers of groepen werden gevonden."
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "Ongeldige waarde"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "Een gebruiker met deze naam bestaat reeds."
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "Een gebruiker met deze naam bestaat reeds."
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Onbekende groep: ${group}"
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "Actief"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "Uitvinken om je account te de-activeren."
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "Globale rollen"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "Groepen"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "Gebruiker toevoegen"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "Verstuur wachtwoord registratie link."
+
+#: kotti/views/users.py:346
 #, python-format
 msgid "${title} was added."
 msgstr "${title} werd toegevoegd."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "Geen wijzigingen aangebracht."
-
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "Er werd geen naam ingevoerd."
-
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "Geen gebruikers of groepen werden gevonden."
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Bewerk ${principal_type} ${title}"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr "De gebruiker werd niet gevonden."
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "Verstuur wachtwoord registratie link."
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} werd verwijderd."
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Verwijder ${principal_type} ${title}"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "Er werd geen naam ingevoerd."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mijn instellingen - ${title}"
+
+#: kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} werd gekopieerd."
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} werd geknipt."
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} werd verplaatst."
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} werd geplakt."
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr "De node kon niet geplakt worden. Hij bestaat niet meer."
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} werd verplaatst."
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} is nu zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} is niet langer zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} werd verwijderd."
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr "Er werd niks verwijderd."
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "Naam en titel zijn vereist."
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr "Item werd hernoemd."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Wijzig Status."
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "Naar boven"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "Weergeven"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "Verbergen"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr "Je dient items te selecteren om acties uit te voeren."
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "Wijzig Status."
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Beschrijving"
 
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tags"
+
 #: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Inhoud"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "Standaard weergave werd hersteld naar standaard."
-
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Standaard weergave"
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Standaard weergave werd hersteld naar standaard."
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Standaard weergave is ingesteld."
@@ -879,6 +875,9 @@ msgstr "Standaard weergave is ingesteld."
 msgid "Default view could not be set."
 msgstr "Standaar weergave kon niet ingesteld worden."
 
+#~ msgid "Image"
+#~ msgstr "Afbeelding"
+
 #~ msgid "Submit"
 #~ msgstr "Verzenden"
 
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
index 3f10715bf1061826d8e2a4edb8556a4d2cdb765e..6c1f980ecaeedf1b98cce05b3638678ff6e33f77 100644
GIT binary patch
delta 3959
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

delta 4027
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
D>{)z8

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index fa21d933d..cae43171f 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-12 10:15+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -185,78 +185,73 @@ msgstr ""
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "Wytnij"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "Wklej"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename.pt:31
-#: kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:458
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete.pt:24
-#: kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "Usuń"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Dokument"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "Plik"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "Obraz"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "Widok katalogów"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Zawartość"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Edytuj"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "Udostępnij"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Akcje"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Widok katalogów"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "Plik"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "Czytelnik"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "Edytor"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "Właściciel"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "Administrator"
 
@@ -268,6 +263,30 @@ msgstr "Dodaj"
 msgid "Upload Content"
 msgstr "Dołącz treści"
 
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Ustaw domyślny widok"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Widok"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Nawigacja"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Ustawienia"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Ustawienia strony"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Wyloguj się"
+
 #: kotti/templates/email-reset-password.pt:2
 msgid "Reset your password for ${site_title}."
 msgstr "Zresetuj swoje hasło do ${site_title}."
@@ -297,48 +316,24 @@ msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
 msgid "Forbidden"
 msgstr "Brak dostępu"
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Ustaw domyślny widok"
-
-#: kotti/templates/editor-bar.pt:21
-msgid "View"
-msgstr "Widok"
-
-#: kotti/templates/editor-bar.pt:44
-msgid "Navigate"
-msgstr "Nawigacja"
-
-#: kotti/templates/editor-bar.pt:55
-msgid "Preferences"
-msgstr "Ustawienia"
-
-#: kotti/templates/editor-bar.pt:60
-msgid "Site Setup"
-msgstr "Ustawienia strony"
-
-#: kotti/templates/editor-bar.pt:71
-msgid "Logout"
-msgstr "Wyloguj się"
-
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "Logowanie"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "Nazwa użytkownika lub email"
 
-#: kotti/templates/login.pt:25 kotti/views/users.py:212
-#: kotti/views/login.py:257
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "Hasło"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "Zaloguj się"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "Zapomniałeś hasła?"
 
@@ -346,73 +341,31 @@ msgstr "Zapomniałeś hasła?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "Reset hasła"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "Uzupełnij pole z nazwą użytkownika lub email i kliknij na ${reset_password} poniżej, aby otrzymać email z linkiem do zresetowania hasła."
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr "Nie jesteś jeszcze zarejestrowany?"
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 msgid "Register for an account on this site."
 msgstr "Zarejestruj się na stronie."
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Zrób ${state}"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Tagi"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Jesteś tutaj:"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Usuń ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
-
-#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:45
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Nawigacja strony"
-
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Zmień nazwę ${title}"
-
-#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
-msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
-msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
-
-#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28
-msgid "New name"
-msgstr "Nowa nazwa"
-
-#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36
-msgid "New title"
-msgstr "Nowy tytuł"
-
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Zmień stan publikacji"
@@ -421,36 +374,36 @@ msgstr "Zmień stan publikacji"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub zarządzać nim."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Tytuł"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Typ"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "Stan"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data modyfikacji"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr "Wybierz obiekt"
 
@@ -475,73 +428,111 @@ msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
 msgid "No change"
 msgstr "Bez zmian"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "Zapisz zmiany"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "Brak elementów potomnych."
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr "Zaznacz / odznacz wszystko"
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "Widoczność"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "Widoczny"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
 
+#: kotti/templates/edit/delete.pt:9
+#: kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Usuń ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Nawigacja strony"
+
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
+
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Nowa nazwa"
+
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Nowy tytuł"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Zmień nazwę ${title}"
+
 #: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
 msgstr "Udostępnij ${title}"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "Szukaj użytkowników i grup"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "Szukaj"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "Przypisz lokalne role"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "Nazwa"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "Użytkownik"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "Grupa"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 msgid "Assign role"
 msgstr "Przypisz rolę"
 
@@ -549,11 +540,11 @@ msgstr "Przypisz rolę"
 msgid "Upload content from local file(s)"
 msgstr "Załącz zawartość z lokalnego pliku(ów)"
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -565,18 +556,26 @@ msgstr "Status"
 msgid "Progress"
 msgstr "Postęp"
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr "Wybierz plik(i) do przesłania..."
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr "Prześlij ${number} plików."
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr "Zignoruj wszystkie błędy"
 
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr "Nie znaleziono"
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr "Zasób nie został znaleziony"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
@@ -585,7 +584,7 @@ msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Powrót do zarządzania użytkownikami"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Edycja ${title}"
@@ -606,30 +605,26 @@ msgstr "Dodaj grupę"
 msgid "Find users or groups"
 msgstr "Znajdź użytkowników lub grupy"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr "Użytkownik- / nazwa grupy"
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 msgid "Blank search text finds all."
 msgstr "Zostaw puste, aby znaleźć wszystko."
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 msgid "Assign global roles"
 msgstr "Przypisz globalne role"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 msgid "Add new group"
 msgstr "Dodaj nową grupę"
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Otagowane z:"
-
 #: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Wyniki wyszukania"
@@ -638,13 +633,9 @@ msgstr "Wyniki wyszukania"
 msgid "Search..."
 msgstr "Szukaj..."
 
-#: kotti/templates/http-errors/notfound.pt:6
-msgid "Not Found"
-msgstr "Nie znaleziono"
-
-#: kotti/templates/http-errors/notfound.pt:7
-msgid "The resource could not be found"
-msgstr "Zasób nie został znaleziony"
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Otagowane z:"
 
 #: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
@@ -654,295 +645,302 @@ msgstr "Witaj, ${user}! Jesteś zalogowany."
 msgid "Welcome, you are not logged in."
 msgstr "Witaj, nie jesteś zalogowany."
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Zapisz"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "Twoje zmiany zostały zapisane."
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Element został dodany."
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maksymalny rozmiar pliku: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Zapisz"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Dodaj ${type} do ${title}."
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Dodaj ${type}."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
-msgid "User Management"
-msgstr "Zarządzanie użytkownikami"
+#: kotti/views/form.py:269
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maksymalny rozmiar pliku: ${size}MB"
 
-#: kotti/views/users.py:270 kotti/views/login.py:65
+#: kotti/views/login.py:65 kotti/views/users.py:276
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+msgid "Email"
+msgstr "Email"
 
-#: kotti/views/users.py:587
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Zarejestruj"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Wystąpił błąd."
+
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
+
+#: kotti/views/login.py:123
 #, python-format
-msgid "My preferences - ${title}"
-msgstr "Moje ustawienia - ${title}"
+msgid "Register - ${title}"
+msgstr "Zarejestruj - ${title}"
+
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Witaj, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
+
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Nie udało się zalogować."
+
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Nieznana nazwa użytkownika lub email."
+
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Zostałeś wylogowany."
+
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Zresetowałeś swoje hasło."
+
+#: kotti/views/login.py:295
+msgid "Set password"
+msgstr "Ustaw hasło"
 
-#: kotti/views/users.py:145
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Twój token do resetu hasła mógł stracić ważność."
+
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Resetowanie hasła - ${title}."
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+msgid "User Management"
+msgstr "Zarządzanie użytkownikami"
+
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "Nie wykonano żadnych zmian."
+
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "Nie znaleziono użytkowników ani grup."
+
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "Niepoprawna wartość"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "Użytkownik z takim imieniem już istnieje."
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "Użytkownik z takim adresem email już istnieje."
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Nie ma takiej grupy: ${group}"
 
-#: kotti/views/users.py:199 kotti/views/login.py:73 kotti/views/login.py:269
-msgid "Email"
-msgstr "Email"
-
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "Aktywne"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "Odznacz, aby dezaktywować konto."
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "Globalne role"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "Grupy"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "Dodaj użytkownika"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "Wyślij link do rejestracji na email."
+
+#: kotti/views/users.py:346
 #, python-format
 msgid "${title} was added."
 msgstr "${title} został dodany."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "Dodaj grupę"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-msgid "No changes were made."
-msgstr "Nie wykonano żadnych zmian."
-
-#: kotti/views/users.py:558
-msgid "No name was given."
-msgstr "Nie przekazano nazwy."
-
-#: kotti/views/users.py:98
-msgid "No users or groups were found."
-msgstr "Nie znaleziono użytkowników ani grup."
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Edycja ${principal_type} ${title}"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 msgid "User was not found."
 msgstr "Użytkownik nie został odnaleziony."
 
-#: kotti/views/users.py:324
-msgid "Send password registration link."
-msgstr "Wyślij link do rejestracji na email."
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} został usunięty."
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Usuń ${principal_type} ${title}"
 
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "Zresetowałeś swoje hasło."
-
-#: kotti/views/login.py:154
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Witaj, ${user}!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Zostałeś wylogowany."
-
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: kotti/views/login.py:108
-msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
-msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
-
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr "Zarejestruj - ${title}"
-
-#: kotti/views/login.py:212
-msgid "Login failed."
-msgstr "Nie udało się zalogować."
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "Nie przekazano nazwy."
 
-#: kotti/views/login.py:330
+#: kotti/views/users.py:599
 #, python-format
-msgid "Reset your password - ${title}."
-msgstr "Resetowanie hasła - ${title}."
-
-#: kotti/views/login.py:222
-msgid "That username or email is not known by this system."
-msgstr "Nieznana nazwa użytkownika lub email."
-
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Zarejestruj"
-
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "Wystąpił błąd."
-
-#: kotti/views/login.py:295
-msgid "Set password"
-msgstr "Ustaw hasło"
-
-#: kotti/views/login.py:323
-msgid "Your password reset token may have expired."
-msgstr "Twój token do resetu hasła mógł stracić ważność."
-
-#: kotti/views/edit/content.py:38
-msgid "Description"
-msgstr "Opis"
-
-#: kotti/views/edit/content.py:53
-msgid "Body"
-msgstr "Treść"
-
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "Zresetowano widok na domyślny."
-
-#: kotti/views/edit/default_views.py:79
-msgid "Default view"
-msgstr "Domyślny widok"
-
-#: kotti/views/edit/default_views.py:107
-msgid "Default view has been set."
-msgstr "Ustawiono domyślny widok."
-
-#: kotti/views/edit/default_views.py:112
-msgid "Default view could not be set."
-msgstr "Domyślny widok nie mógł zostać ustawiony."
+msgid "My preferences - ${title}"
+msgstr "Moje ustawienia - ${title}"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/edit/actions.py:105
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} został skopiowany."
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} został wycięty."
 
-#: kotti/views/edit/actions.py:183
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} został przeniesiony."
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} został wklejony."
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 msgid "Could not paste node. It no longer exists."
 msgstr "Nie można wkleić. Element już nie istnieje."
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} został przeniesiony."
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} jest teraz widoczny w nawigacji."
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nie jest już widoczny w nawigacji."
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} został usunięty."
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 msgid "Nothing was deleted."
 msgstr "Nic nie zostało usunięte"
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "Nazwa i tytuł są obowiązkowe."
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 msgid "Item was renamed."
 msgstr "Zmieniono nazwę elementu."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Zmień stan"
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "W górę"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "W dół"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "Pokaż"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "Ukryj"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 msgid "You have to select items to perform an action."
 msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "Zmień stan"
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Opis"
+
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Tagi"
+
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Treść"
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Domyślny widok"
+
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Zresetowano widok na domyślny."
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Ustawiono domyślny widok."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Domyślny widok nie mógł zostać ustawiony."
+
+#~ msgid "Image"
+#~ msgstr "Obraz"
 
 #~ msgid "Submit"
 #~ msgstr "Zatwierdź"
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index 79259d16b21dce3fae437edda93cdb735af33a3b..329fee153a389b2e5223136d093d3f53eb58ef91 100644
GIT binary patch
delta 2469
zcmXxme@xVM9LMqZ*<BupKpcjNa1@9L5qJC$fzawwQWBN4jIdNHK_oM2{aW3|v}{E)
zZ?2zAY-2V4u(g{@M@5#kTtA?iqg=V%Ty61(w#gr@wtBwqKKI$ZzmL!7`~7}?f4+>L
z8pax;=X1P=jnq#pBtE*zYzRANb0JNpnT7CsEXP^tW~Eq(i*O_A)u-`l96*||7m+G9
zh<<#{m4{t<6n$n<i<4>Lg_AfJJ#);KU>1h40c)`rb8r~*FpggQ8rAV6X5bWN;YFN>
zSFjq>dAI_bQ3HAwz4UL-lTpVnp+^1&^0Of>g*b|f@eD4&zfc`!P)QvHkUp#!)o>MR
zV9Su7HFMGXt;me69rb)O&Y^$XLPjI)LE5$`s-c%r6%L~scnkI3JE#UuptkK}%*N`>
zWQP&#qr3rCZyeRmm+tvD?*2JcUv`0v_WlxHgBeUqdsm3s+cLZkL#U3|px$4H8t5+P
z<EVPiIS*h7<wK|~`w%sd2~@qaS**Wqoacs?@S=Ng88!01kzZnZjLou{rUnp1JugAs
zuRwLsh#EjU^0Q7ZYQGQl-d<Gw0pz&Z3)!r{UO2=JE&c26g%J!;9z{L>#N9uQrIgR0
z8occ8|A!i=m*vyUa#1T;z(pNap$1%w>bMEDva6zG_*oklE!9>G;(pZDjG&f2js^HF
zR^T)iV;-MG7dBxP9>E)N0`=a%sIRGv*{H*I)Id5=D;3>FMkDXVTztlr54!R&Y6XsC
z8;-gA>Ab7~1W_GDuo8Epwqgjc$K$B_Q>c~s6}57|BXfw_3>h7!*&OZLumoFh2Wo`x
zqegrZsbHVF@(-^3Girv@Sda6rO|IZtRJ}gb1p85EY#*xKgNf(t|C{cGqlp`4A2?5-
zMm&xh@mHuVm_ju;<DUDNu4b5t>M$3zW%;Q3b=Zx|k)OTGMfJxqrtg1(j4F1`Pr4In
z+xDOi&jD10K`g}~WU_V|Id^u>J)cIMoqtgE@)^YqScKa92x{i7sKdSqquRUeWK{7L
z=P^_R-=PlSkEj`5aOFQxOF4s@p@%<<+M0CKz!su9tVTU=L`^7y`it6us{hmi_MbLv
zzkBfra$xN}R0CtEhCfHG&{@=genHLTPt*!rLA~$GPY!%87E#VY)vrN)b}La^upYId
z-TACP=g*$xhW_>sqB?pN6Mqj-GZ;Y*z8yn-UY}tZUP5&+pA*cgTRASm2v%bcYQ}G)
z2eqn7vxr^FX#X_>o%~J2-9!U%2hmM*5?Z=2p^mo_8;N^~I|-#_L=B<CnM#|<XoWPm
z5@IQ#q}A1y?<V#Vo?Bube<0dUb~%wsTFjNH0`4RpA?_#YiBu{lb336qYUl4FT8Mjy
z`v~^MRuM|g#Dl~V6-bMTbwq9Q^Gg1kp<~t+JL(UlMab<Tw#82QgRx1!H};#~ThPxP
zrAG;ERGkVWZC+c<la?24Bv(v4Mm$8c61NiUfUPHbi4}y-owiD8HL;e^*RqAs8B@B6
z=p%Flb`To~9o!6JJCRCj$lOeDw#w}RG984@mCj6%c$iS?Ns{=Co8qU^2E6grnT6i$
erIn$Y%5Ys#xV|wIt_X$WPvo@t;$P$ieE$P*AJCZq

delta 2492
zcmXxme@xVM9LMoDbq7bFz!72~LV%D*BnMo26p)sJ8VO|?X~oaD$}1zywbrh5+Ok!%
zOII2F(I%NLhuy3NwYAihW7gWTSvkd;tIb?mZm!l^&lmUMvwPp;^Z9;1-_P&w!C3f2
zICjeK*<qv&#4O_Qm1aY@HjOXRM7miGp1}b6uQIE^Mx29vsH)pA6<<S|us4xMYzTe$
zo-2>I@+f-EVs?m33l)yyG|b5`n~TL5#HCn|&!8ViFdq-02Y*6!Jb{_`D`w#(%tH?s
zYq0>Eu?;n#m(fH2wv&uH-h~?Z`^d*W;A=LHVkQ271(-r*bvO&vQ5n*g)u9@0Mh&bL
z`B)oYs=peUvGt(tM=*o_ElNfseHzvAtEh(FMm?|_)xbVfy$?|he1+@r7^>c)>1Ns3
zid?czjN$<5`Qxa1C*A#@F{T?A+=a`iGvH-fIarF?!+O*nH{mt71T}yzRQ-O`fHyf`
zLOu7o^BpXwya%;)$4~<~o5lL;!E^4yCDc;>gSwu|bTq&$<dV%m#%L9&0fgNB26ufS
zs)Kga03yi82KiEln^Didh<g5wY}TK1XG5;S9@G}>cNNAkm-6TC{&(*Bk66L=)2Ieh
zSuQo0hZ<-BY61b|V|9G#{$kXGmZAFXh>_9Ku0cN5$5%N%g~hlFwU=Y4r9X;A_zPBH
z3a>;NR%0)A;5<Bt*W+1KJwLP1Th)Z>FM=9KY#kXb)kf6FpU10lyDJa7@<*s89LGEG
zTX(&L${Iij)lnx_;}+CbB=A}sM?HTYwK9JpD;KkW$uJqq;ArbG72zUmz!rQKHNYdN
z5r2cK|Gg{!=E{GdW|%U=Y(7?@R<IZK+-B4Sx1rA1TbQo*f7n$RaTPvx<u9FIqegrj
zwb!RmTW}uLU<T9F{X*0X%TXN$P+Jys_m^XY@=ACAGt8%dJ4{9moy0i)?kYStGuhA!
zNMH5}>JaTl)!&O1IEqZ(&LHQ}F1!0ade;ifL_N0vOR*7k2D&h&rHzo$sUJk`VGQ-)
zKIb^9fpe(CcmXxj|6JL_&!U#pk6MY@s4c2Q4J?f6aD}_S3N@jw0@hzYu^YLd26iHC
z+Pkjer^o@eBd7*Wpc<Y)E%BeI0sW1dNLpcX1#(dJOHl(4U<uAcJ>QOc{dx*ne^%R~
zT+otkLC&M?K>aP)i|S}UYK0D>X7~m20@yg}H9L*hVJ0V79fXiwuoj$yU091-Q4{_I
zQ_!RRSGt0TPUey`xRv}p#44hJSV}xh+)rrff`mHmChjKgBiab1Fi}V7kWQseGFl-G
zuAG=pDCKB*wdd=I^~A#X#kAbmUF4dHsiehRGF8AwiN}cti3P+|3XoY$XpY+Xl|(CX
zFR_MTpC(^wup5bfVy+6LN}`>pPrhc!e>-%{`r_MtxzlbVH%RmlP4NT1vZ4*-l%628
zNg)+T+PD?*i@yBWP2}|B^d#{RaXX>k7FORnh_%EmgwC9{Nog6OAGlKD0Yc|X=?3C4
zLfao9?j&?(Gl^beDlI3|NN}tI)<tGDp);lPQcMgGN{=L&e1&gL97x~f@kF}^`V+zF
kC7$e1b+D$oCR|b*Y^bTNs;NzM`&+zT-H#@Q^Ygs_1L*qJ3IG5A

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 341c0cdca..9e96747a1 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-10-09 21:02+0200\n"
+"POT-Creation-Date: 2016-03-15 17:01+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -110,77 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:508 kotti/views/edit/actions.py:456
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
 msgid "Copy"
 msgstr "Copiar"
 
-#: kotti/resources.py:509 kotti/views/edit/actions.py:457
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
 msgid "Cut"
 msgstr "Cortar"
 
-#: kotti/resources.py:510 kotti/views/edit/actions.py:453
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
 msgid "Paste"
 msgstr "Colar"
 
-#: kotti/resources.py:511 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:458
+#: kotti/views/edit/actions.py:457
 msgid "Rename"
 msgstr "Renomear"
 
-#: kotti/resources.py:512 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:50 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:443
-#: kotti/views/edit/actions.py:460
+#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459
 msgid "Delete"
 msgstr "Apagar"
 
-#: kotti/resources.py:637 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Documento"
-
-#: kotti/resources.py:726 kotti/views/edit/content.py:113
-#: kotti/views/edit/content.py:66
-msgid "File"
-msgstr "Ficheiro"
-
-#: kotti/resources.py:772 kotti/views/edit/content.py:141
-msgid "Image"
-msgstr "Imagem"
-
-#: kotti/resources.py:529
-msgid "Folder view"
-msgstr "Vista de pasta"
-
-#: kotti/resources.py:523 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: kotti/resources.py:524 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Editar"
 
-#: kotti/resources.py:525
+#: kotti/resources.py:533
 msgid "Share"
 msgstr "Partilha"
 
-#: kotti/resources.py:526 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Ações"
 
-#: kotti/security.py:191
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Vista de pasta"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Documento"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "Ficheiro"
+
+#: kotti/security.py:192
 msgid "Viewer"
 msgstr "Leitor"
 
-#: kotti/security.py:192
+#: kotti/security.py:193
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:193
+#: kotti/security.py:194
 msgid "Owner"
 msgstr "Dono"
 
-#: kotti/security.py:194
+#: kotti/security.py:195
 msgid "Admin"
 msgstr "Admin"
 
@@ -248,24 +244,24 @@ msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
 msgid "Forbidden"
 msgstr "Escondido"
 
-#: kotti/templates/login.pt:15
+#: kotti/templates/login.pt:16
 msgid "Login"
 msgstr "Entrar"
 
-#: kotti/templates/login.pt:20 kotti/templates/login.pt:57
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
 msgid "Username or email"
 msgstr "Utilizador ou e-mail"
 
-#: kotti/templates/login.pt:25 kotti/views/login.py:257
-#: kotti/views/users.py:212
+#: kotti/templates/login.pt:26 kotti/views/login.py:257
+#: kotti/views/users.py:218
 msgid "Password"
 msgstr "Palavra passe"
 
-#: kotti/templates/login.pt:33
+#: kotti/templates/login.pt:34
 msgid "Log in"
 msgstr "Entrar"
 
-#: kotti/templates/login.pt:43
+#: kotti/templates/login.pt:45
 msgid "Forgot your password?"
 msgstr "Esqueceu-se da palavra passe?"
 
@@ -273,33 +269,29 @@ msgstr "Esqueceu-se da palavra passe?"
 #. ${reset_password} below to receive an email with a link to reset your
 #. password."
 #.
-#: kotti/templates/login.pt:50 kotti/templates/login.pt:65
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
 msgid "Reset password"
 msgstr "Repor a palavra passe"
 
 #. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:48
+#: kotti/templates/login.pt:50
 #, fuzzy
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr "Preencha o seu nome de utilizador com o seu e-mail e clique em ${reset_password} para receber um e-mail com uma ligação para reiniciar a sua palavra passe."
 
-#: kotti/templates/login.pt:76
+#: kotti/templates/login.pt:78
 msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/login.pt:83
+#: kotti/templates/login.pt:85
 #, fuzzy
 msgid "Register for an account on this site."
 msgstr "Não se encontra registado? ${register} para criar uma conta."
 
-#: kotti/templates/workflow-dropdown.pt:15
+#: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Tornar ${state}"
 
-#: kotti/templates/deform/tag_it.pt:1 kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Etiquetas"
-
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Você está aqui:"
@@ -312,41 +304,41 @@ msgstr "Modificar estado de workflow"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "O estado de workflow de um item define quem o pode ver, edit e/ou administrar."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:196 kotti/views/edit/content.py:33
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
 msgid "Title"
 msgstr "Título"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/share.pt:47
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:110
-#: kotti/templates/site-setup/users.pt:67 kotti/templates/view/folder.pt:21
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
 msgid "Type"
 msgstr "Tipo"
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:24
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "Estado"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:43
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:44
-#: kotti/templates/edit/delete-nodes.pt:26 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data de Modificação"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:50
-#: kotti/templates/edit/delete-nodes.pt:32
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr ""
 
 #: kotti/templates/edit/change-state.pt:40
-#: kotti/templates/edit/change-state.pt:45
+#: kotti/templates/edit/change-state.pt:48
 msgid "Include children"
 msgstr "Incluir nós interiores"
 
@@ -354,53 +346,53 @@ msgstr "Incluir nós interiores"
 msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
 msgstr "Se estiver selecionado irá tentar alterar o estado dos documentosselecionados e dos seus subdocumentos."
 
-#: kotti/templates/edit/change-state.pt:50
+#: kotti/templates/edit/change-state.pt:54
 msgid "Change state to"
 msgstr "Mudar estado para"
 
-#: kotti/templates/edit/change-state.pt:51
+#: kotti/templates/edit/change-state.pt:55
 #, fuzzy
 msgid "Select the new state where all chosen items should be set."
 msgstr "Selecione o novo estado para os items selecionados."
 
-#: kotti/templates/edit/change-state.pt:55
+#: kotti/templates/edit/change-state.pt:60
 msgid "No change"
 msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/templates/edit/change-state.pt:64 kotti/templates/edit/share.pt:83
-#: kotti/templates/site-setup/users.pt:105
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
 msgid "Apply changes"
 msgstr "Aplicar alterações"
 
-#: kotti/templates/edit/change-state.pt:66
-#: kotti/templates/edit/delete-nodes.pt:45 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:78
-#: kotti/views/users.py:316 kotti/views/users.py:350 kotti/views/users.py:442
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
+#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: kotti/templates/edit/contents.pt:30
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "Não existem items nesta pasta."
 
-#: kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr ""
 
-#: kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: kotti/templates/edit/contents.pt:75
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "Visível"
 
-#: kotti/templates/edit/contents.pt:79
+#: kotti/templates/edit/contents.pt:74
 #, fuzzy
 msgid "Hidden"
 msgstr "Escondido"
 
-#: kotti/templates/edit/delete-nodes.pt:14
+#: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Deseja realmente eliminar os items seguintes?"
 
@@ -441,40 +433,40 @@ msgstr "Renomear ${title}"
 msgid "Share ${title}"
 msgstr "Partilhar ${title}"
 
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:19
-#: kotti/templates/edit/share.pt:26 kotti/templates/site-setup/users.pt:47
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
 msgid "Search users and groups"
 msgstr "Procurar utilizadores e grupos"
 
-#: kotti/templates/edit/share.pt:33 kotti/templates/site-setup/users.pt:55
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
 msgid "Search"
 msgstr "Procurar"
 
-#: kotti/templates/edit/share.pt:42
+#: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
 msgstr "Atribuir papéis locais"
 
-#: kotti/templates/edit/share.pt:48 kotti/templates/site-setup/users.pt:68
-#: kotti/views/users.py:207
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:213
 msgid "Name"
 msgstr "Nome"
 
-#: kotti/templates/edit/share.pt:59 kotti/templates/site-setup/users.pt:79
-#: kotti/views/users.py:313 kotti/views/users.py:501 kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
 msgid "User"
 msgstr "Utilizador"
 
-#: kotti/templates/edit/share.pt:60 kotti/templates/site-setup/users.pt:80
-#: kotti/views/users.py:347 kotti/views/users.py:188 kotti/views/users.py:501
-#: kotti/views/users.py:536
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548
 msgid "Group"
 msgstr "Grupo"
 
-#: kotti/templates/edit/share.pt:63 kotti/templates/site-setup/users.pt:83
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
 
-#: kotti/templates/edit/share.pt:68 kotti/templates/site-setup/users.pt:89
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
 #, fuzzy
 msgid "Assign role"
 msgstr "Atribuir papéis locais"
@@ -483,12 +475,12 @@ msgstr "Atribuir papéis locais"
 msgid "Upload content from local file(s)"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:109
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
 #, fuzzy
 msgid "Filename"
 msgstr "Renomear"
 
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:111
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
 msgstr ""
 
@@ -500,15 +492,15 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:86
+#: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:94
+#: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
 msgstr ""
 
-#: kotti/templates/edit/upload.pt:99
+#: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
 msgstr ""
 
@@ -528,7 +520,7 @@ msgstr "Deseja realmente eliminar ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Voltar à gestão de utilizadores"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:156
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Editar ${title}"
@@ -551,28 +543,28 @@ msgstr "Adicionar grupo"
 msgid "Find users or groups"
 msgstr "Procurar utilizadores e grupos"
 
-#: kotti/templates/site-setup/users.pt:39
+#: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
 msgstr ""
 
-#: kotti/templates/site-setup/users.pt:49
+#: kotti/templates/site-setup/users.pt:50
 #, fuzzy
 msgid "Blank search text finds all."
 msgstr ""
 "Encontre e modifique utilizadores (Uma pesquisa em branco retorna\"\n"
 "\" todos os utilizadores)"
 
-#: kotti/templates/site-setup/users.pt:63
+#: kotti/templates/site-setup/users.pt:65
 #, fuzzy
 msgid "Assign global roles"
 msgstr "Atribuir papéis locais"
 
-#: kotti/templates/site-setup/users.pt:115
+#: kotti/templates/site-setup/users.pt:117
 #, fuzzy
 msgid "Add new user"
 msgstr "Adicionar utilizador"
 
-#: kotti/templates/site-setup/users.pt:121
+#: kotti/templates/site-setup/users.pt:123
 #, fuzzy
 msgid "Add new group"
 msgstr "Adicionar grupo"
@@ -597,55 +589,36 @@ msgstr "Bem-vindo, ${user}! Você está autenticado."
 msgid "Welcome, you are not logged in."
 msgstr "Bem-vindo, você não está autenticado."
 
-#: kotti/views/form.py:79 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:374 kotti/views/edit/actions.py:418
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Guardar"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
 msgid "Your changes have been saved."
 msgstr "As suas alterações foram guardadas."
 
-#: kotti/views/form.py:174
+#: kotti/views/form.py:177
 #, fuzzy
 msgid "Item was added."
 msgstr "${title} adicionado."
 
-#: kotti/views/form.py:264
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Tamanho máximo do ficheiro: ${size}MB"
-
-#: kotti/views/form.py:77 kotti/views/users.py:441
-msgid "Save"
-msgstr "Guardar"
-
-#: kotti/views/form.py:198
+#: kotti/views/form.py:201
 #, fuzzy, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Adicionar ${type} em ${title}"
 
-#: kotti/views/form.py:202
+#: kotti/views/form.py:205
 #, fuzzy, python-format
 msgid "Add ${type}."
 msgstr "Adicionar ${type}"
 
-#: kotti/views/login.py:282
-#, fuzzy
-msgid "You have reset your password."
-msgstr "Você reinicializou a palavra passe com sucesso"
-
-#: kotti/views/login.py:154
+#: kotti/views/form.py:269
 #, python-format
-msgid "Welcome, ${user}!"
-msgstr "Bem-vindo, ${user}!"
-
-#: kotti/views/login.py:179
-#, fuzzy
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Você desligou a sessão"
+msgid "Maximum file size: ${size}MB"
+msgstr "Tamanho máximo do ficheiro: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:270
+#: kotti/views/login.py:65 kotti/views/users.py:276
 #, fuzzy
 msgid "Full name"
 msgstr "Nome completo"
@@ -654,10 +627,18 @@ msgstr "Nome completo"
 msgid "Username"
 msgstr "Nome utilizador"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:199
+#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
 msgid "Email"
 msgstr "E-mail"
 
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registar-se"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Ocorreu um erro."
+
 #: kotti/views/login.py:108
 #, fuzzy
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
@@ -668,27 +649,33 @@ msgstr "Parabéns! Você está registado com sucesso. Irá receber um e-mail com
 msgid "Register - ${title}"
 msgstr "Registar ${title}"
 
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Bem-vindo, ${user}!"
+
+#: kotti/views/login.py:179
+#, fuzzy
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
+
 #: kotti/views/login.py:212
 msgid "Login failed."
 msgstr "Erro de autenticação"
 
-#: kotti/views/login.py:330
-#, fuzzy, python-format
-msgid "Reset your password - ${title}."
-msgstr "Reiniciar a sua palavra passe - ${title}"
-
 #: kotti/views/login.py:222
 #, fuzzy
 msgid "That username or email is not known by this system."
 msgstr "Este utilizador ou e-mail não são reconhecidos."
 
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Registar-se"
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Você desligou a sessão"
 
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "Ocorreu um erro."
+#: kotti/views/login.py:282
+#, fuzzy
+msgid "You have reset your password."
+msgstr "Você reinicializou a palavra passe com sucesso"
 
 #: kotti/views/login.py:295
 #, fuzzy
@@ -699,202 +686,211 @@ msgstr "Repor a palavra passe"
 msgid "Your password reset token may have expired."
 msgstr "A seu pedido para alterar a palavra passe expirou."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:378
+#: kotti/views/login.py:330
+#, fuzzy, python-format
+msgid "Reset your password - ${title}."
+msgstr "Reiniciar a sua palavra passe - ${title}"
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
 msgid "User Management"
 msgstr "Gestão de Utilizadores"
 
-#: kotti/views/users.py:267
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#, fuzzy
+msgid "No changes were made."
+msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/views/users.py:587
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Minhas preferências - ${title}"
+#: kotti/views/users.py:104
+#, fuzzy
+msgid "No users or groups were found."
+msgstr "Utilizadores e grupos não encontrados."
 
-#: kotti/views/users.py:145
+#: kotti/views/users.py:151
 msgid "Invalid value"
 msgstr "Valor inválido"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:157
 msgid "A user with that name already exists."
 msgstr "Esse utilizador com esse nome já existe."
 
-#: kotti/views/users.py:158
+#: kotti/views/users.py:164
 msgid "A user with that email already exists."
 msgstr "Esse utilizador com esse e-mail já existe."
 
-#: kotti/views/users.py:181
+#: kotti/views/users.py:187
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Grupo não encontrado: ${group}"
 
-#: kotti/views/users.py:219
+#: kotti/views/users.py:225
 msgid "Active"
 msgstr "Activo"
 
-#: kotti/views/users.py:220
+#: kotti/views/users.py:226
 msgid "Untick this to deactivate the account."
 msgstr "Retirar para desactivar a conta."
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:232
 msgid "Global roles"
 msgstr "Papéis globais"
 
-#: kotti/views/users.py:230
+#: kotti/views/users.py:236
 msgid "Groups"
 msgstr "Grupos"
 
-#: kotti/views/users.py:315
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
+
+#: kotti/views/users.py:321
 msgid "Add User"
 msgstr "Adicionar Utilizador"
 
-#: kotti/views/users.py:339
+#: kotti/views/users.py:331
+#, fuzzy
+msgid "Send password registration link."
+msgstr "Enviar ligação para registo de palavra passe"
+
+#: kotti/views/users.py:346
 #, fuzzy, python-format
 msgid "${title} was added."
 msgstr "${title} adicionado."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:356
 msgid "Add Group"
 msgstr "Adicionar Grupo"
 
-#: kotti/views/users.py:465 kotti/views/users.py:71
-#: kotti/views/edit/actions.py:312 kotti/views/edit/actions.py:378
-#: kotti/views/edit/actions.py:424 kotti/views/edit/actions.py:420
-#, fuzzy
-msgid "No changes were made."
-msgstr "Não foram efectuadas nenhumas alterações"
-
-#: kotti/views/users.py:558
-#, fuzzy
-msgid "No name was given."
-msgstr "Nenhum nome foi indicado."
-
-#: kotti/views/users.py:98
-#, fuzzy
-msgid "No users or groups were found."
-msgstr "Utilizadores e grupos não encontrados."
-
-#: kotti/views/users.py:505
+#: kotti/views/users.py:517
 #, fuzzy, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Editar ${principal_type} - ${title}"
 
-#: kotti/views/users.py:533
+#: kotti/views/users.py:545
 #, fuzzy
 msgid "User was not found."
 msgstr "Utilizador não encontrado."
 
-#: kotti/views/users.py:324
-#, fuzzy
-msgid "Send password registration link."
-msgstr "Enviar ligação para registo de palavra passe"
-
-#: kotti/views/users.py:543
+#: kotti/views/users.py:555
 #, fuzzy, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} apagado."
 
-#: kotti/views/users.py:551
+#: kotti/views/users.py:563
 #, fuzzy, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Apagar ${principal_type} - ${title}"
 
-#: kotti/views/edit/actions.py:106
+#: kotti/views/users.py:570
+#, fuzzy
+msgid "No name was given."
+msgstr "Nenhum nome foi indicado."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Minhas preferências - ${title}"
+
+#: kotti/views/edit/actions.py:105
 #, fuzzy, python-format
 msgid "${title} was copied."
 msgstr "${title} copiado."
 
-#: kotti/views/edit/actions.py:124
+#: kotti/views/edit/actions.py:123
 #, fuzzy, python-format
 msgid "${title} was cut."
 msgstr "${title} cortado."
 
-#: kotti/views/edit/actions.py:183
-#, fuzzy, python-format
-msgid "${title} was moved."
-msgstr "${title} movido."
-
-#: kotti/views/edit/actions.py:159
+#: kotti/views/edit/actions.py:158
 #, fuzzy, python-format
 msgid "${title} was pasted."
 msgstr "${title} colado."
 
-#: kotti/views/edit/actions.py:162
+#: kotti/views/edit/actions.py:161
 #, fuzzy
 msgid "Could not paste node. It no longer exists."
 msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
 
-#: kotti/views/edit/actions.py:225
+#: kotti/views/edit/actions.py:182
+#, fuzzy, python-format
+msgid "${title} was moved."
+msgstr "${title} movido."
+
+#: kotti/views/edit/actions.py:224
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} encontra-se visivel na navegação."
 
-#: kotti/views/edit/actions.py:228
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} já não está visivel na navegação."
 
-#: kotti/views/edit/actions.py:277 kotti/views/edit/actions.py:306
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
 #, fuzzy, python-format
 msgid "${title} was deleted."
 msgstr "${title} apagado."
 
-#: kotti/views/edit/actions.py:303
+#: kotti/views/edit/actions.py:302
 #, fuzzy
 msgid "Nothing was deleted."
 msgstr "Nada foi apagado."
 
-#: kotti/views/edit/actions.py:339 kotti/views/edit/actions.py:366
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
 msgid "Name and title are required."
 msgstr "Nome e título são obrigatórios."
 
-#: kotti/views/edit/actions.py:343
+#: kotti/views/edit/actions.py:342
 #, fuzzy
 msgid "Item was renamed."
 msgstr "Item renomeado"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Alterar Estado"
+
+#: kotti/views/edit/actions.py:464
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:465
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:466
 msgid "Show"
 msgstr "Mostrar"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:467
 msgid "Hide"
 msgstr "Esconder"
 
-#: kotti/views/edit/actions.py:507
+#: kotti/views/edit/actions.py:506
 #, fuzzy
 msgid "You have to select items to perform an action."
 msgstr "Terá de escolher items para executar a ação."
 
-#: kotti/views/edit/actions.py:464
-msgid "Change State"
-msgstr "Alterar Estado"
-
 #: kotti/views/edit/content.py:38
 msgid "Description"
 msgstr "Descrição"
 
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Etiquetas"
+
 #: kotti/views/edit/content.py:53
 msgid "Body"
 msgstr "Corpo"
 
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "A vista original foi indicada como a vista por defeito."
-
 #: kotti/views/edit/default_views.py:79
 msgid "Default view"
 msgstr "Vista por defeito"
 
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "A vista original foi indicada como a vista por defeito."
+
 #: kotti/views/edit/default_views.py:107
 msgid "Default view has been set."
 msgstr "Vista por defeito foi alterada."
@@ -903,6 +899,9 @@ msgstr "Vista por defeito foi alterada."
 msgid "Default view could not be set."
 msgstr "Vista por defeito não pode ser alterada."
 
+#~ msgid "Image"
+#~ msgstr "Imagem"
+
 #~ msgid "Submit"
 #~ msgstr "Enviar"
 
diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 67fa917fe..219cc6b16 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -2,6 +2,7 @@
 
 import warnings
 
+from pyramid.i18n import TranslationString
 from pytest import raises
 
 
@@ -70,3 +71,14 @@ def test_image_deprecations(self, allwarnings):
             __ = (IImage, Image, _load_image_scales, image_scales, ImageView,
                   includeme, ImageAddForm, ImageEditForm)  # pyflakes
             assert_deprecations(w, *('kotti_image', ) * 8)
+
+    def test_translate_titles_deprecated(self, allwarnings):
+        from kotti.views.edit import _translate_titles
+
+        with warnings.catch_warnings(record=True) as w:
+            info = [
+                {'data': {'title': u"_(u'Private')"}, 'title': u"_(u'Private')", },
+                {'data': {'title': u"_(u'Public')"}, 'title': u"_(u'Public')", },
+            ]
+            _translate_titles(info)
+            assert_deprecations(w, "removed in Kotti 2.0.0")
diff --git a/kotti/tests/test_workflow.py b/kotti/tests/test_workflow.py
index cdbf55041..4e7b2e848 100644
--- a/kotti/tests/test_workflow.py
+++ b/kotti/tests/test_workflow.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from mock import patch
 from pyramid.security import ALL_PERMISSIONS
 
@@ -60,7 +62,7 @@ def test_workflow_callback_event(self):
 
         events = []
 
-        listeners[WorkflowTransition].append(lambda event: events.append(event))
+        listeners[WorkflowTransition].append(lambda evt: events.append(evt))
 
         context = Dummy()
         info = Dummy()
@@ -78,8 +80,10 @@ def test_workflow_callback_event(self):
 
 
 @patch('kotti.workflow.transaction.commit')
-class TestResetWorkflow:
-    def call(self, *args, **kwargs):
+class TestResetWorkflow(object):
+
+    @staticmethod
+    def call(*args, **kwargs):
         from kotti.workflow import reset_workflow
         return reset_workflow(*args, **kwargs)
 
@@ -117,8 +121,10 @@ def test_it(self, commit):
                 reset_workflow.assert_called_with(purge_existing=True)
 
 
-class TestDefaultWorkflow:
-    def make_document(self, root):
+class TestDefaultWorkflow(object):
+
+    @staticmethod
+    def make_document(root):
         from kotti import DBSession
         from kotti.resources import Document
 
@@ -180,6 +186,14 @@ def test_reset_workflow_purge_existing(self, root, workflow, events):
             reset_workflow(purge_existing=True)
         assert content.state == u'private'
 
+    def test_translate_titles(self, root, dummy_request):
+        from pyramid.i18n import TranslationString
+        from kotti.views.edit import _state_info
+
+        content = self.make_document(root)
+        for state in _state_info(content, dummy_request):
+            assert isinstance(state['title'], TranslationString)
+
 
 class TestContentExtensibleWithWorkflow:
 
diff --git a/kotti/views/edit/__init__.py b/kotti/views/edit/__init__.py
index ffc705385..6eecb799e 100644
--- a/kotti/views/edit/__init__.py
+++ b/kotti/views/edit/__init__.py
@@ -1,24 +1,32 @@
+# -*- coding: utf-8 -*-
+
 """
 Edit views.
 """
 
-from kotti.util import _  # why is this needed?  please explain!
+import warnings
+
+from kotti.util import _
 from kotti.views.edit.content import ContentSchema
 from kotti.views.edit.content import DocumentSchema
 from kotti.workflow import get_workflow
 
-_  # make pyflakes happy
-
 # API
 ContentSchema = ContentSchema
 DocumentSchema = DocumentSchema
 
 
-def _eval_titles(info):
+def _translate_titles(info):
     result = []
     for d in info:
         d = d.copy()
-        d['title'] = eval(d['title']) if 'title' in d else d['name']
+        try:
+            d['title'] = eval(d['title']) if 'title' in d else d['name']
+            warnings.warn(u'_() in workflow.zcml is deprecated. '
+                          u'Support will be removed in Kotti 2.0.0.',
+                          DeprecationWarning)
+        except (NameError, SyntaxError):
+            d['title'] = _(d['title']) if 'title' in d else d['name']
         result.append(d)
     return result
 
@@ -27,7 +35,7 @@ def _state_info(context, request):
     wf = get_workflow(context)
     state_info = []
     if wf is not None:
-        state_info = _eval_titles(wf.state_info(context, request))
+        state_info = _translate_titles(wf.state_info(context, request))
     return state_info
 
 
diff --git a/kotti/workflow.zcml b/kotti/workflow.zcml
index d1304f911..ff6229bf7 100644
--- a/kotti/workflow.zcml
+++ b/kotti/workflow.zcml
@@ -1,66 +1,51 @@
-<!-- Kotti's default workflow file.
-
-To use, set 'kotti.use_workflow = kotti:workflow.zcml' (which is the default).
+<configure xmlns="http://namespaces.repoze.org/bfg" xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+           i18n:domain="Kotti">
 
-If your site already has content and you configure it use a workflow for the
-first time, or you use a different workflow than the one you used before, run
-the 'kotti-reset-workflow' command to reset all your content's workflow.
+  <!-- Kotti's default workflow file.
 
--->
+  To use, set 'kotti.use_workflow = kotti:workflow.zcml' (which is the default).
 
-<configure xmlns="http://namespaces.repoze.org/bfg"
-           xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-           i18n:domain="Kotti">
+  If your site already has content and you configure it use a workflow for the
+  first time, or you use a different workflow than the one you used before, run
+  the 'kotti-reset-workflow' command to reset all your content's workflow.
+  -->
 
   <include package="repoze.workflow" file="meta.zcml"/>
 
-  <workflow
-      type="security"
-      name="simple"
-      state_attr="state"
-      initial_state="private"
-      content_types="kotti.interfaces.IDefaultWorkflow"
-      permission_checker="pyramid.security.has_permission"
-      >
+  <workflow name="simple" initial_state="private"
+            type="security" state_attr="state"
+            content_types="kotti.interfaces.IDefaultWorkflow"
+            permission_checker="pyramid.security.has_permission">
 
     <state name="private" callback="kotti.workflow.workflow_callback">
-
-      <key name="title" value="_(u'Private')" />
+      <key name="title" value="Private" i18n:attributes="value"/>
       <key name="order" value="1" />
-
       <key name="inherit" value="0" />
       <key name="system.Everyone" value="" />
       <key name="role:viewer" value="view" />
       <key name="role:editor" value="view add edit delete state_change" />
       <key name="role:owner" value="view add edit delete manage state_change" />
-
     </state>
 
     <state name="public" callback="kotti.workflow.workflow_callback">
-
-      <key name="title" value="_(u'Public')" />
+      <key name="title" value="Public" i18n:attributes="value"/>
       <key name="order" value="2" />
-
       <key name="inherit" value="0" />
       <key name="system.Everyone" value="view" />
       <key name="role:viewer" value="view" />
       <key name="role:editor" value="view add edit delete state_change" />
       <key name="role:owner" value="view add edit delete manage state_change" />
-
     </state>
 
-  <transition
-      name="private_to_public"
-      from_state="private"
-      to_state="public"
-      permission="state_change" />
+    <transition name="private_to_public" permission="state_change"
+                from_state="private" to_state="public">
+      <key name="title" value="publish" i18n:attributes="value"/>
+    </transition>
 
-  <transition
-      name="public_to_private"
-      from_state="public"
-      to_state="private"
-      permission="state_change" />
+    <transition name="public_to_private" permission="state_change"
+                from_state="public" to_state="private">
+      <key name="title" value="unpublish" i18n:attributes="value"/>
+    </transition>
 
   </workflow>
-
 </configure>

From b94ef89749032bf255a41e8bfa54af489af50a4c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 15 Mar 2016 17:18:34 +0100
Subject: [PATCH 427/600] Update requirements.

---
 requirements.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9aa4f13d9..8e2844102 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,18 +1,19 @@
+# -*- coding: utf-8 -*-
 Kotti==1.3.0-alpha.4
 Babel==2.2.0
 Beaker==1.8.0
 Chameleon==2.24
 FormEncode==1.3.0
-Mako==1.0.3
+Mako==1.0.4
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==3.1.1
-Pygments==2.1.1
+Pygments==2.1.3
 SQLAlchemy==1.0.12
 SQLAlchemy-Utils==0.31.6
 Unidecode==0.04.19
 WebOb==1.5.1
-alembic==0.8.4
+alembic==0.8.5
 appdirs==1.4.0
 bleach==1.4.2
 bleach-whitelist==0.0.7
@@ -42,7 +43,7 @@ js.modernizr==2.5.3.1
 js.select2==3.4.1
 kotti-tinymce==0.5.4
 kotti-image==0.1.3
-lingua==4.7
+lingua==4.8.1
 lxml==3.5.0
 peppercorn==0.5
 plone.scale==1.4.1
@@ -57,7 +58,7 @@ pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
 pyramid-tm==0.12.1
 pyramid-zcml==1.0.0
-pytz==2015.7
+pytz==2016.1
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
@@ -74,7 +75,7 @@ wsgiref==0.1.2
 zope.component==4.2.2
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
-zope.event==4.1.0
+zope.event==4.2.0
 zope.i18nmessageid==4.0.3
 zope.interface==4.1.3
 zope.schema==4.4.2

From 3635b5d687c062a3dcbfa1e79f2d65376ad980fc Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 15 Mar 2016 17:20:02 +0100
Subject: [PATCH 428/600] Add encoding declarations.

---
 kotti/views/cache.py              | 1 +
 kotti/views/edit/actions.py       | 1 +
 kotti/views/edit/content.py       | 1 +
 kotti/views/edit/default_views.py | 1 +
 kotti/views/form.py               | 1 +
 kotti/views/image.py              | 1 +
 kotti/views/site_setup.py         | 1 +
 kotti/views/slots.py              | 1 +
 kotti/views/users.py              | 1 +
 kotti/views/util.py               | 1 +
 10 files changed, 10 insertions(+)

diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index 65d2cdaef..6909f6ccf 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import datetime
 from logging import getLogger
 
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 1d3b04d5c..205c5bff1 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Action views
 """
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 9083bf3ed..bd96b9bf5 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Content edit views
 """
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index b41ec7bf5..04212d9dd 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 :summary: Default view selctor views
 """
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 6ff61a6d3..7122b066f 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Form related base views from which you can inherit.
 
diff --git a/kotti/views/image.py b/kotti/views/image.py
index 778ae0ded..51df118f6 100644
--- a/kotti/views/image.py
+++ b/kotti/views/image.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Views for image content objects.
 """
diff --git a/kotti/views/site_setup.py b/kotti/views/site_setup.py
index bb7a0e32e..c126a2daa 100644
--- a/kotti/views/site_setup.py
+++ b/kotti/views/site_setup.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from kotti.util import _
 from kotti.util import Link
 
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index 7ba23a36f..045ff67a9 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """This module allows add-ons to assign views to slots defined in
 the overall page.  In other systems, these are called portlets or
 viewlets.
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 89ab105ce..ac3faab89 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """User management screens
 """
 
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 05f7e421c..f1e30850c 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import hashlib
 import urllib
 from collections import defaultdict

From 5b3a2ba867761545c06b490b88448ce462181c38 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 15 Mar 2016 21:38:35 +0100
Subject: [PATCH 429/600] Fix or ignore some PyCharm inspection warnings,
 replace some Python 2 only code with equivalents that also support Python 3.

---
 CHANGES.txt                                   |  4 +
 kotti/__init__.py                             |  6 +-
 kotti/alembic/env.py                          |  1 +
 kotti/alembic/script.py.mako                  |  1 +
 .../1063d7178fa_add_node_path_column.py       |  1 +
 .../37a05f6246af_enlarge_name_title_path.py   |  1 +
 .../versions/413fa5fcc581_add_filedepot.py    |  8 +-
 .../4a3de0d0804a_add_foreignkey_indices.py    |  1 +
 .../559ce6eb0949_update_node_path_column.py   |  1 +
 .../57fecf5dbd62_initialize_workflow.py       |  1 +
 ...ec72f1_add_file_columns_to_images_table.py |  1 +
 .../9398ccf41c2_add_content_state_fo.py       |  1 +
 kotti/events.py                               | 15 ++--
 kotti/filedepot.py                            | 10 ++-
 kotti/message.py                              |  1 +
 kotti/migrate.py                              |  7 +-
 kotti/populate.py                             |  6 +-
 kotti/request.py                              |  9 +-
 kotti/resources.py                            |  1 +
 kotti/sanitizers.py                           |  3 +-
 kotti/scaffolds/package/setup.py_tmpl         |  1 +
 kotti/security.py                             | 12 +--
 kotti/sqla.py                                 |  2 +
 kotti/tests/__init__.py                       |  1 +
 kotti/tests/test_cache.py                     |  1 +
 kotti/tests/test_events.py                    |  1 +
 kotti/tests/test_filedepot.py                 |  1 +
 kotti/tests/test_httpexceptions.py            |  1 +
 kotti/tests/test_migrate.py                   |  1 +
 kotti/tests/test_node.py                      |  1 +
 kotti/tests/test_node_views.py                |  5 +-
 kotti/tests/test_principals.py                |  1 +
 kotti/tests/test_register.py                  |  3 +-
 kotti/tests/test_request.py                   |  1 +
 kotti/tests/test_search.py                    |  1 +
 kotti/tests/test_security.py                  | 86 ++++++++++---------
 kotti/tests/test_security_views.py            |  3 +-
 kotti/tests/test_sqla.py                      |  1 +
 kotti/tests/test_static.py                    |  1 +
 kotti/tests/test_tags.py                      |  1 +
 kotti/tests/test_util.py                      |  1 +
 kotti/tests/test_util_views.py                |  8 +-
 kotti/tests/test_views_form.py                |  1 +
 kotti/traversal.py                            |  1 +
 kotti/url_normalizer.py                       |  1 +
 kotti/util.py                                 | 17 +++-
 kotti/views/cache.py                          |  3 +-
 kotti/views/edit/__init__.py                  |  2 +
 kotti/views/edit/actions.py                   | 13 +--
 kotti/views/edit/content.py                   |  7 ++
 kotti/views/edit/default_views.py             |  1 +
 kotti/views/edit/upload.py                    |  2 +-
 kotti/views/file.py                           |  2 +
 kotti/views/form.py                           | 11 ++-
 kotti/views/login.py                          | 14 ++-
 kotti/views/site_setup.py                     |  1 +
 kotti/views/users.py                          | 10 ++-
 kotti/views/util.py                           | 42 ++++-----
 kotti/views/view.py                           |  4 +
 kotti/workflow.py                             |  5 +-
 60 files changed, 227 insertions(+), 123 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a514443f1..d6d7b903e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,10 @@ Change History
 - Transform workflow state title to TranslationStrings without eval and
   deprecate it.
 
+- Replace some Python 2 only code with equivalents that also support Python 3.
+
+- Fix or ignore some PyCharm inspection warnings.
+
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
diff --git a/kotti/__init__.py b/kotti/__init__.py
index d3d9a8fd9..dab0cd304 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 import pkg_resources
+from six import string_types
 from sqlalchemy import engine_from_config
 from sqlalchemy import MetaData
 from sqlalchemy.ext.declarative import declarative_base
@@ -167,7 +169,7 @@ def _resolve_dotted(d, keys=conf_dotted):
 
     for key in keys:
         value = resolved[key]
-        if not isinstance(value, basestring):
+        if not isinstance(value, string_types):
             continue
         new_value = []
         for dottedname in value.split():
@@ -198,7 +200,7 @@ def base_configure(global_config, **settings):
         settings.setdefault(key, value)
 
     for key, value in settings.items():
-        if key.startswith('kotti') and isinstance(value, basestring):
+        if key.startswith('kotti') and isinstance(value, string_types):
             settings[key] = unicode(value, 'utf8')
 
     # will be removed in 2.0
diff --git a/kotti/alembic/env.py b/kotti/alembic/env.py
index bdc81a7f5..09232af28 100755
--- a/kotti/alembic/env.py
+++ b/kotti/alembic/env.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from alembic import context
 import traceback
 import transaction
diff --git a/kotti/alembic/script.py.mako b/kotti/alembic/script.py.mako
index 95702017e..928c41843 100644
--- a/kotti/alembic/script.py.mako
+++ b/kotti/alembic/script.py.mako
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """${message}
 
 Revision ID: ${up_revision}
diff --git a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
index d9fbcb6e3..f1afbe323 100644
--- a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
+++ b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Add Node.path column
 
 Revision ID: 1063d7178fa
diff --git a/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py b/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py
index b8b61bc98..348c7ab95 100644
--- a/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py
+++ b/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Enlarged name title
 
 Revision ID: 37a05f6246af
diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 00bd7e9ba..d1714520a 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Migrate binary file storage to filedepot
 
 Revision ID: 413fa5fcc581
@@ -10,12 +11,13 @@
 revision = '413fa5fcc581'
 down_revision = '559ce6eb0949'
 
-from alembic import op
 import logging
-import sqlalchemy as sa
 import sys
 import time
 
+import sqlalchemy as sa
+from alembic import op
+
 log = logging.getLogger('kotti')
 log.addHandler(logging.StreamHandler(sys.stdout))
 log.setLevel(logging.INFO)
@@ -74,7 +76,7 @@ def process(thing):
         values({files.c.data: bindparam('data')})
 
     def chunks(l, n):
-        for i in xrange(0, len(l), n):
+        for i in range(0, len(l), n):
             yield l[i:i + n]
 
     for cdata in chunks(_saved, 10):
diff --git a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
index f58fad046..570b08d3e 100644
--- a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
+++ b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Add ForeignKey indices
 
 Revision ID: 4a3de0d0804a
diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
index 369b3f32a..adbcc8f9e 100644
--- a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Update Node.path column
 
 Revision ID: 559ce6eb0949
diff --git a/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py b/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py
index eed49c6d1..d0deae1a7 100644
--- a/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py
+++ b/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Initialize workflow and publish all items.
 
 Revision ID: 57fecf5dbd62
diff --git a/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py b/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
index c93ca006c..36a0d7a39 100644
--- a/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
+++ b/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Add file columns  to images table.
 
 Revision ID: 814c4ec72f1
diff --git a/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py b/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py
index 66da75571..21f1b9755 100644
--- a/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py
+++ b/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Add 'Content.state' for workflow
 
 Revision ID: 9398ccf41c2
diff --git a/kotti/events.py b/kotti/events.py
index c523bab55..e7f87e47f 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """This module includes a simple events system that allows users to
 subscribe to specific events, and more particularly to *object events*
 of specific object types.
@@ -46,20 +47,20 @@
 class ObjectEvent(object):
     """Event related to an object."""
 
-    def __init__(self, object, request=None):
+    def __init__(self, obj, request=None):
         """Constructor.
 
-        :param object: The (content) object related to the event.  This is an
+        :param obj: The (content) object related to the event.  This is an
                        instance of :class:`kotti.resources.Node` or one its
                        descendants for content related events, but it can be
                        anything.
-        :type object: arbitrary
+        :type obj: arbitrary
 
         :param request: current request
         :type request: :class:`kotti.request.Request`
         """
 
-        self.object = object
+        self.object = obj
         self.request = request
 
 
@@ -104,11 +105,11 @@ class Dispatcher(DispatcherDict):
       >>> class SubEvent(BaseEvent): pass
       >>> class UnrelatedEvent(object): pass
       >>> def base_listener(event):
-      ...     print 'Called base listener'
+      ...     print('Called base listener')
       >>> def sub_listener(event):
-      ...     print 'Called sub listener'
+      ...     print('Called sub listener')
       >>> def unrelated_listener(event):
-      ...     print 'Called unrelated listener'
+      ...     print('Called unrelated listener')
       ...     return 1
 
       >>> dispatcher = Dispatcher()
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index a61041f99..8d05015f9 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import logging
 import mimetypes
 import uuid
@@ -132,8 +133,8 @@ def seek(self, offset, whence=0):
         Change the stream position to the given byte offset. The offset is
         interpreted relative to the position indicated by whence.
 
-        :param n: Position for the cursor
-        :type n: int
+        :param offset: Position for the cursor
+        :type offset: int
 
         :param whence: * 0 -- start of stream (the default);
                               offset should be zero or positive
@@ -197,6 +198,7 @@ class DBFileStorage(FileStorage):
     Uses `kotti.filedepot.DBStoredFile` to store blob data in an SQL database.
     """
 
+    # noinspection PyMethodOverriding
     @staticmethod
     def get(file_id):
         """Returns the file given by the file_id
@@ -595,9 +597,9 @@ def extract_depot_settings(prefix="kotti.depot.", settings=None):
       ...     'kotti.depot.1.uri': 'localhost://',
       ... }
       >>> res = extract_depot_settings('kotti.depot.', settings)
-      >>> print sorted(res[0].items())
+      >>> print(sorted(res[0].items()))
       [('backend', 'kotti.filedepot.DBFileStorage'), ('file_storage', 'var/files'), ('name', 'local')]
-      >>> print sorted(res[1].items())
+      >>> print(sorted(res[1].items()))
       [('backend', 'depot.io.gridfs.GridStorage'), ('name', 'mongodb'), ('uri', 'localhost://')]
     """
 
diff --git a/kotti/message.py b/kotti/message.py
index 2dd2f398e..b9817c0d0 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import hashlib
 import time
 import urllib
diff --git a/kotti/migrate.py b/kotti/migrate.py
index 4a5c8fdec..b1b86f414 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """This module aims to make it easier to run the Alembic migration
 scripts of Kotti and Kotti add-ons by providing a uniform access.
 
@@ -164,7 +165,7 @@ def upgrade(heads, context):
         starting_rev=None,
         destination_rev=revision,
         )
-    print
+    print()
 
 
 def upgrade_all():
@@ -189,7 +190,7 @@ def current_revision(rev, context):
             print(u"  - current revision: {0}".format(rev))
             return []
         pkg_env.run_env(current_revision)
-        print
+        print()
 
 
 def kotti_migrate_command():
@@ -249,6 +250,8 @@ def callback(arguments):
         elif arguments['stamp_head']:
             func = stamp_head
             args = args_with_location + (arguments['--rev'],)
+        else:
+            raise ValueError('Unknown command')
         func(*args)
 
     try:
diff --git a/kotti/populate.py b/kotti/populate.py
index a168a9371..ea9414544 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Populate contains two functions that are called on application startup
 (if you haven't modified kotti.populators).
@@ -5,6 +6,7 @@
 
 from pyramid.i18n import LocalizerRequestMixin
 from pyramid.threadlocal import get_current_registry
+from six import iteritems
 
 from kotti import get_settings
 from kotti.resources import DBSession
@@ -44,12 +46,12 @@ def populate():
 
     if DBSession.query(Node.id).count() == 0:
         localized_root_attrs = dict(
-            [(k, localizer.translate(v)) for k, v in _ROOT_ATTRS.iteritems()])
+            [(k, localizer.translate(v)) for k, v in iteritems(_ROOT_ATTRS)])
         root = Document(**localized_root_attrs)
         root.__acl__ = SITE_ACL
         DBSession.add(root)
         localized_about_attrs = dict(
-            [(k, localizer.translate(v)) for k, v in _ABOUT_ATTRS.iteritems()])
+            [(k, localizer.translate(v)) for k, v in iteritems(_ABOUT_ATTRS)])
         root['about'] = Document(**localized_about_attrs)
 
         wf = get_workflow(root)
diff --git a/kotti/request.py b/kotti/request.py
index 3fbaec217..79d29da42 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -1,16 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from zope.interface import implementer
-
+import pyramid.request
 from pyramid.decorator import reify
 from pyramid.interfaces import IRequest
-from pyramid.request import Request as BaseRequest
+from zope.interface import implementer
 
 from kotti.security import get_user
 
 
 @implementer(IRequest)
-class Request(BaseRequest):
+class Request(pyramid.request.Request):
     """ Kotti subclasses :class:`pyramid.request.Request` to make additional
     attributes / methods available on request objects and override Pyramid's
     :meth:`pyramid.request.Request.has_permission`.  The latter is needed to
@@ -50,4 +49,4 @@ def has_permission(self, permission, context=None):
         from kotti.security import authz_context
 
         with authz_context(context, self):
-            return BaseRequest.has_permission(self, permission, context)
+            return super(Request, self).has_permission(permission, context)
diff --git a/kotti/resources.py b/kotti/resources.py
index 48f7dfe45..f9f271ea6 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 The :mod:`~kotti.resources` module contains all the classes for Kotti's
 persistance layer, which is based on SQLAlchemy.
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index 56adf2e5f..a71d44356 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -13,6 +13,7 @@
 from bleach_whitelist import print_attrs
 from bleach_whitelist import print_tags
 from pyramid.util import DottedNameResolver
+from six import string_types
 
 from kotti import get_settings
 from kotti.events import objectevent_listeners
@@ -116,7 +117,7 @@ def _setup_sanitizers(settings):
     # step 1: resolve sanitizer functions and make ``kotti.sanitizers`` a
     # dictionary containing resolved functions
 
-    if not isinstance(settings['kotti.sanitizers'], basestring):
+    if not isinstance(settings['kotti.sanitizers'], string_types):
         return
 
     sanitizers = {}
diff --git a/kotti/scaffolds/package/setup.py_tmpl b/kotti/scaffolds/package/setup.py_tmpl
index c900d1424..364bff730 100644
--- a/kotti/scaffolds/package/setup.py_tmpl
+++ b/kotti/scaffolds/package/setup.py_tmpl
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 
 from setuptools import setup
diff --git a/kotti/security.py b/kotti/security.py
index 45e9a4ca3..69a869f5e 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import with_statement
 from contextlib import contextmanager
 from datetime import datetime
@@ -6,6 +7,7 @@
 import bcrypt
 from pyramid.location import lineage
 from pyramid.security import view_execution_permitted
+from six import string_types
 from sqlalchemy import Boolean, bindparam
 from sqlalchemy import Column
 from sqlalchemy import DateTime
@@ -262,7 +264,7 @@ def _del_acl(self):
 
 def _cachekey_list_groups_raw(name, context):
     context_id = context is not None and getattr(context, 'id', id(context))
-    return (name, context_id)
+    return name, context_id
 
 
 @request_cache(_cachekey_list_groups_raw)
@@ -297,7 +299,7 @@ def _cachekey_list_groups_ext(name, context=None, _seen=None, _inherited=None):
         raise DontCache
     else:
         context_id = getattr(context, 'id', id(context))
-        return (unicode(name), context_id)
+        return unicode(name), context_id
 
 
 @request_cache(_cachekey_list_groups_ext)
@@ -315,7 +317,7 @@ def list_groups_ext(name, context=None, _seen=None, _inherited=None):
             _inherited.update(principal.groups)
 
     if _seen is None:
-        _seen = set([name])
+        _seen = {name}
 
     # Add local groups:
     if context is not None:
@@ -435,7 +437,7 @@ def map_principals_with_local_roles(context):
 
 
 def is_user(principal):
-    if not isinstance(principal, basestring):
+    if not isinstance(principal, string_types):
         principal = principal.name
     return ':' not in principal
 
@@ -513,7 +515,7 @@ def search(self, match='any', **kwargs):
 
         for key, value in kwargs.items():
             col = getattr(self.factory, key)
-            if isinstance(value, basestring) and '*' in value:
+            if isinstance(value, string_types) and '*' in value:
                 value = value.replace('*', '%').lower()
                 filters.append(func.lower(col).like(value))
             else:
diff --git a/kotti/sqla.py b/kotti/sqla.py
index bf5fb9a6c..4503f92d3 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -40,12 +40,14 @@ class JsonType(TypeDecorator):
     """
     impl = TEXT
 
+    # noinspection PyMethodOverriding
     @staticmethod
     def process_bind_param(value, dialect):
         if value is not None:
             value = json.dumps(value, default=dump_default)
         return value
 
+    # noinspection PyMethodOverriding
     @staticmethod
     def process_result_value(value, dialect):
         if value is not None:
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 2d29cdca4..ecb415133 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -360,6 +360,7 @@ def depot_tween(request, config, dummy_request):
     _set_middleware = DepotManager.set_middleware
     TweenFactory(None, config.registry)
 
+    # noinspection PyDecorator
     @classmethod
     def set_middleware_patched(cls, mw):
         pass
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index f2370b346..f2bfe40ba 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import datetime
 import time
 
diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 49ffb5835..7868741ad 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import warnings
 
 from pytest import mark
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index ecddf9fac..73ffc6311 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import datetime
 import pytest
 
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
index 4cc044200..26225f3af 100644
--- a/kotti/tests/test_httpexceptions.py
+++ b/kotti/tests/test_httpexceptions.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """ Kotti HTTP Exception browser tests """
 
 import pytest
diff --git a/kotti/tests/test_migrate.py b/kotti/tests/test_migrate.py
index 1d6e8aacf..6544b555a 100644
--- a/kotti/tests/test_migrate.py
+++ b/kotti/tests/test_migrate.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from alembic.migration import MigrationContext
 from mock import patch
 
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index c953540c5..b1c7f9cfd 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pytest import mark
 from pytest import raises
 from pyramid.security import ALL_PERMISSIONS
diff --git a/kotti/tests/test_node_views.py b/kotti/tests/test_node_views.py
index cea46c76d..568c92c33 100644
--- a/kotti/tests/test_node_views.py
+++ b/kotti/tests/test_node_views.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from webob.multidict import MultiDict
 from pytest import raises
 from pyramid.exceptions import Forbidden
@@ -444,7 +445,7 @@ def test_apply(self, extra_principals, root):
                 [u'Your changes have been saved.'])
         assert (
             set(list_groups('bob', root)) ==
-            set(['role:owner', 'role:editor', 'role:special'])
+            {'role:owner', 'role:editor', 'role:special'}
             )
 
         # We cannot set a role that's not displayed, even if we forged
@@ -455,5 +456,5 @@ def test_apply(self, extra_principals, root):
             share_node(root, request)
         assert (
             set(list_groups('bob', root)) ==
-            set(['role:owner', 'role:editor', 'role:special'])
+            {'role:owner', 'role:editor', 'role:special'}
             )
diff --git a/kotti/tests/test_principals.py b/kotti/tests/test_principals.py
index cadf3b828..f2a5ff9d9 100644
--- a/kotti/tests/test_principals.py
+++ b/kotti/tests/test_principals.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class TestMassageGroups:
 
     def test_massage_groups_in(self):
diff --git a/kotti/tests/test_register.py b/kotti/tests/test_register.py
index fc34f89a3..be6603cc2 100644
--- a/kotti/tests/test_register.py
+++ b/kotti/tests/test_register.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from kotti.testing import DummyRequest
 from mock import patch
 from mock import call
@@ -80,7 +81,7 @@ def test_register_submit_groups_and_roles(self, root):
         form.assert_has_calls([
             call().add_user_success({
                 'name': u'test',
-                'roles': set([u'role:myrole']),
+                'roles': {u'role:myrole'},
                 'title': u'Test User',
                 'send_email': True,
                 'groups': [u'mygroup'],
diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index abd848694..84786996d 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class TestExtendingRequest:
 
     def test_it(self):
diff --git a/kotti/tests/test_search.py b/kotti/tests/test_search.py
index 82ef50c1f..371acfd00 100644
--- a/kotti/tests/test_search.py
+++ b/kotti/tests/test_search.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from kotti.testing import DummyRequest
 
 
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index 726d9ff3a..f6ed420d5 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from mock import patch
 from pytest import raises
 from pyramid.authentication import CallbackAuthenticationPolicy
@@ -25,7 +26,7 @@ def test_simple(self, db_session, root):
 
         set_groups('bob', root, ['role:editor'])
         assert list_groups('bob', root) == ['role:editor']
-        assert list_groups_raw(u'bob', root) == set(['role:editor'])
+        assert list_groups_raw(u'bob', root) == {'role:editor'}
 
     def test_not_a_node(self):
         from kotti.security import list_groups_raw
@@ -40,11 +41,11 @@ def test_overwrite_and_delete(self, db_session, root):
 
         set_groups('bob', root, ['role:editor'])
         assert list_groups('bob', root) == ['role:editor']
-        assert list_groups_raw(u'bob', root) == set(['role:editor'])
+        assert list_groups_raw(u'bob', root) == {'role:editor'}
 
         set_groups('bob', root, ['role:admin'])
         assert list_groups('bob', root) == ['role:admin']
-        assert list_groups_raw(u'bob', root) == set(['role:admin'])
+        assert list_groups_raw(u'bob', root) == {'role:admin'}
 
         set_groups('bob', root)
         assert list_groups('bob', root) == []
@@ -67,11 +68,11 @@ def test_inherit(self, db_session, root):
         set_groups('bob', child, ['group:somegroup'])
         assert (
             set(list_groups('bob', child)) ==
-            set(['group:somegroup', 'role:editor'])
+            {'group:somegroup', 'role:editor'}
             )
 
         # We can ask to list only those groups that are defined locally:
-        assert list_groups_raw(u'bob', child) == set(['group:somegroup'])
+        assert list_groups_raw(u'bob', child) == {'group:somegroup'}
 
     @staticmethod
     def add_some_groups(db_session, root):
@@ -119,19 +120,19 @@ def test_nested_groups(self, db_session, root):
         # Check bob's groups on every level:
         assert list_groups('bob', root) == ['group:bobsgroup']
         assert (set(list_groups('bob', child)) ==
-                set(['group:bobsgroup', 'group:franksgroup', 'role:editor']))
+                {'group:bobsgroup', 'group:franksgroup', 'role:editor'})
         assert (set(list_groups('bob', grandchild)) ==
-                set(['group:bobsgroup', 'group:franksgroup', 'role:editor',
-                     'role:owner']))
+                {'group:bobsgroup', 'group:franksgroup', 'role:editor',
+                 'role:owner'})
 
         # Check group:franksgroup groups on every level:
         assert (set(list_groups('frank', root)) ==
-                set(['group:franksgroup', 'role:editor']))
+                {'group:franksgroup', 'role:editor'})
         assert (set(list_groups('frank', child)) ==
-                set(['group:franksgroup', 'role:editor']))
+                {'group:franksgroup', 'role:editor'})
         assert (set(list_groups('frank', grandchild)) ==
-                set(['group:franksgroup', 'role:editor', 'role:owner',
-                     'group:bobsgroup']))
+                {'group:franksgroup', 'role:editor', 'role:owner',
+                 'group:bobsgroup'})
 
         # Sometimes it's useful to know which of the groups were
         # inherited, that's what 'list_groups_ext' is for:
@@ -141,17 +142,17 @@ def test_nested_groups(self, db_session, root):
 
         groups, inherited = list_groups_ext('bob', child)
         assert (set(groups) ==
-                set(['group:bobsgroup', 'group:franksgroup', 'role:editor']))
+                {'group:bobsgroup', 'group:franksgroup', 'role:editor'})
         assert (set(inherited) ==
-                set(['group:bobsgroup', 'group:franksgroup', 'role:editor']))
+                {'group:bobsgroup', 'group:franksgroup', 'role:editor'})
 
         groups, inherited = list_groups_ext('group:bobsgroup', child)
-        assert set(groups) == set(['group:franksgroup', 'role:editor'])
+        assert set(groups) == {'group:franksgroup', 'role:editor'}
         assert inherited == ['role:editor']
 
         groups, inherited = list_groups_ext('group:franksgroup', grandchild)
         assert (set(groups) ==
-                set(['group:bobsgroup', 'role:owner', 'role:editor']))
+                {'group:bobsgroup', 'role:owner', 'role:editor'})
         assert inherited == ['role:editor']
 
     def test_works_with_auth(self, db_session, root):
@@ -184,21 +185,22 @@ def test_works_with_auth(self, db_session, root):
         set_groups('bob', root, ['group:bobsgroup'])
         request.context = child
         assert (
-            set(auth.effective_principals(request)) == set([
-                'system.Everyone', 'system.Authenticated',
-                'bob', 'group:bobsgroup'
-                ])
+            set(auth.effective_principals(request)) == {'system.Everyone',
+                                                        'system.Authenticated',
+                                                        'bob',
+                                                        'group:bobsgroup'}
             )
 
         # define that bob belongs to franksgroup in the user db:
         get_principals()[u'bob'].groups = [u'group:franksgroup']
         set_groups('group:franksgroup', child, ['group:anothergroup'])
         assert (
-            set(auth.effective_principals(request)) == set([
-                'system.Everyone', 'system.Authenticated',
-                'bob', 'group:bobsgroup', 'group:franksgroup',
-                'group:anothergroup',
-                ])
+            set(auth.effective_principals(request)) == {'system.Everyone',
+                                                        'system.Authenticated',
+                                                        'bob',
+                                                        'group:bobsgroup',
+                                                        'group:franksgroup',
+                                                        'group:anothergroup'}
             )
 
         # And lastly test that circular group defintions are not a
@@ -209,11 +211,13 @@ def test_works_with_auth(self, db_session, root):
             groups=[u'group:funnygroup', u'group:bobsgroup'],
             )
         assert (
-            set(auth.effective_principals(request)) == set([
-                'system.Everyone', 'system.Authenticated',
-                'bob', 'group:bobsgroup', 'group:franksgroup',
-                'group:anothergroup', 'group:funnygroup',
-                ])
+            set(auth.effective_principals(request)) == {'system.Everyone',
+                                                        'system.Authenticated',
+                                                        'bob',
+                                                        'group:bobsgroup',
+                                                        'group:franksgroup',
+                                                        'group:anothergroup',
+                                                        'group:funnygroup'}
             )
 
     def test_list_groups_callback_with_groups(self, db_session):
@@ -249,15 +253,15 @@ def test_principals_with_local_roles(self, db_session, root):
 
         assert (
             set(principals_with_local_roles(child)) ==
-            set(['bob', 'group:bobsgroup', 'group:franksgroup'])
+            {'bob', 'group:bobsgroup', 'group:franksgroup'}
             )
         assert (
             set(principals_with_local_roles(child, inherit=False)) ==
-            set(['group:bobsgroup'])
+            {'group:bobsgroup'}
             )
         assert (
             set(principals_with_local_roles(root)) ==
-            set(['bob', 'group:franksgroup'])
+            {'bob', 'group:franksgroup'}
             )
 
     def test_copy_local_groups(self, db_session, root):
@@ -268,7 +272,7 @@ def test_copy_local_groups(self, db_session, root):
         child = root[u'child']
         assert (
             set(principals_with_local_roles(child)) ==
-            set(['bob', 'group:bobsgroup', 'group:franksgroup'])
+            {'bob', 'group:bobsgroup', 'group:franksgroup'}
             )
 
         # We make a copy of 'child', and we expect the local roles set
@@ -277,7 +281,7 @@ def test_copy_local_groups(self, db_session, root):
         db_session.flush()
         assert (
             set(principals_with_local_roles(child2)) ==
-            set([u'bob', u'group:franksgroup']))
+            {u'bob', u'group:franksgroup'})
         assert len(principals_with_local_roles(child)) == 3
 
         # When we now change the local roles of 'child', the copy is
@@ -310,8 +314,8 @@ def test_map_principals_with_local_roles(self, db_session, root):
         assert len(value) == 2
         bob, (bob_all, bob_inherited) = value[0]
         bobsgroup, (bobsgroup_all, bobsgroup_inherited) = value[1]
-        assert (set(bob_all) == set(['group:bobsgroup', 'role:editor']))
-        assert (set(bob_inherited) == set(['group:bobsgroup', 'role:editor']))
+        assert (set(bob_all) == {'group:bobsgroup', 'role:editor'})
+        assert (set(bob_inherited) == {'group:bobsgroup', 'role:editor'})
         assert bobsgroup_all == ['role:editor']
         assert bobsgroup_inherited == []
 
@@ -376,7 +380,7 @@ def test_users_add_and_remove(self, db_session):
         self.make_bob()
         users = self.get_principals()
         self._assert_is_bob(users[u'bob'])
-        assert set(users.keys()) == set([u'admin', u'bob'])
+        assert set(users.keys()) == {u'admin', u'bob'}
 
         del users['bob']
         with raises(KeyError):
@@ -419,9 +423,9 @@ def test_groups_from_users(self, db_session, root):
         set_groups('role:editor', child, ['group:foogroup'])
 
         assert (set(list_groups('bob', root)) ==
-                set(['group:bobsgroup', 'role:editor']))
+                {'group:bobsgroup', 'role:editor'})
         assert (set(list_groups('bob', child)) ==
-                set(['group:bobsgroup', 'role:editor', 'group:foogroup']))
+                {'group:bobsgroup', 'role:editor', 'group:foogroup'})
 
     def test_is_user(self, db_session):
         from kotti.security import is_user
@@ -621,7 +625,7 @@ def has_permission_fake(self, permission, context=None):
             args.append((permission, context))
             assert self.environ['authz_context'] == context
 
-        with patch('kotti.request.BaseRequest.has_permission',
+        with patch('kotti.request.pyramid.request.Request.has_permission',
                    new=has_permission_fake):
             request = Request.blank('/')
             request.has_permission(permission, context)
diff --git a/kotti/tests/test_security_views.py b/kotti/tests/test_security_views.py
index b39d4cd8b..48a965514 100644
--- a/kotti/tests/test_security_views.py
+++ b/kotti/tests/test_security_views.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import colander
 import pytest
 from mock import patch
@@ -69,7 +70,7 @@ def test_apply(self, extra_principals, root):
                 [u'Your changes have been saved.'])
         assert (
             set(list_groups('bob')) ==
-            set(['role:owner', 'role:editor', 'role:special'])
+            {'role:owner', 'role:editor', 'role:special'}
             )
 
     def test_group_validator(self, db_session):
diff --git a/kotti/tests/test_sqla.py b/kotti/tests/test_sqla.py
index c9736f04b..79c87c9d6 100644
--- a/kotti/tests/test_sqla.py
+++ b/kotti/tests/test_sqla.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 
 from mock import MagicMock
diff --git a/kotti/tests/test_static.py b/kotti/tests/test_static.py
index 1b7bd3539..12c9abc09 100644
--- a/kotti/tests/test_static.py
+++ b/kotti/tests/test_static.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pytest import raises
 
 
diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index ae65d67d8..d9262b419 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import colander
 from mock import Mock
 
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index af215c305..007a4262e 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from mock import Mock
 from mock import patch
 
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 6155c2f8b..f1c89a84e 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -407,7 +407,7 @@ def test_format_currency(self, db_session):
         api = self.make()
         assert u'€13.99' == api.format_currency(13.99, 'EUR')
         assert u'$15,499.12' == api.format_currency(15499.12, 'USD')
-        assert u'€1.00' == api.format_currency(1, format=u'€#,##0',
+        assert u'€1.00' == api.format_currency(1, fmt=u'€#,##0',
                                                currency='EUR')
         assert u'CHF3.14' == api.format_currency(
             decimal.Decimal((0, (3, 1, 4), -2)), 'CHF')
@@ -425,7 +425,7 @@ def test_format_datetime(self, db_session):
             api.format_datetime(time.mktime(first.timetuple())) ==
             format_datetime(first, format='medium', locale='en'))
         assert (
-            api.format_datetime(first, format='short') ==
+            api.format_datetime(first, fmt='short') ==
             format_datetime(first, format='short', locale='en'))
         api.locale_name = 'unknown'
         with raises(UnknownLocaleError):
@@ -441,7 +441,7 @@ def test_format_date(self, db_session):
             api.format_date(first) ==
             format_date(first, format='medium', locale='en'))
         assert (
-            api.format_date(first, format='short') ==
+            api.format_date(first, fmt='short') ==
             format_date(first, format='short', locale='en'))
         api.locale_name = 'unknown'
         with raises(UnknownLocaleError):
@@ -457,7 +457,7 @@ def test_format_time(self, db_session):
             api.format_time(first) ==
             format_time(first, format='medium', locale='en'))
         assert (
-            api.format_time(first, format='short') ==
+            api.format_time(first, fmt='short') ==
             format_time(first, format='short', locale='en'))
         api.locale_name = 'unknown'
         with raises(UnknownLocaleError):
diff --git a/kotti/tests/test_views_form.py b/kotti/tests/test_views_form.py
index 519f8ac33..ffe3f8de0 100644
--- a/kotti/tests/test_views_form.py
+++ b/kotti/tests/test_views_form.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import colander
 from mock import patch
 from mock import MagicMock
diff --git a/kotti/traversal.py b/kotti/traversal.py
index cc3ede51e..ccd88aeb6 100644
--- a/kotti/traversal.py
+++ b/kotti/traversal.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """ This module contains Kotti's node tree traverser.
 
 In Kotti versions < 1.3.0, Pyramid's default traverser
diff --git a/kotti/url_normalizer.py b/kotti/url_normalizer.py
index dc18c2e44..aa4899e97 100644
--- a/kotti/url_normalizer.py
+++ b/kotti/url_normalizer.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import re
 from unidecode import unidecode
 
diff --git a/kotti/util.py b/kotti/util.py
index a75874ad7..5f92e2824 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -9,8 +9,16 @@
 
 import cgi
 import re
-import urllib
-from urlparse import urlparse, urlunparse
+try:
+    # PY2
+    from urllib import unquote
+    from urlparse import urlparse
+    from urlparse import urlunparse
+except ImportError:
+    from urllib.parse import unquote
+    from urllib.parse import urlparse
+    from urllib.parse import urlunparse
+
 
 from docopt import docopt
 from pyramid.i18n import get_localizer
@@ -105,7 +113,7 @@ def selected(self, context, request):
 
         If the link name is '', it will be selected for all urls ending in '/'
         """
-        parsed = urlparse(urllib.unquote(request.url))
+        parsed = urlparse(unquote(request.url))
 
         # insert view markers @@ in last component of the path
         path = parsed.path.split('/')
@@ -149,6 +157,7 @@ def __init__(self, name, predicate=None):
     def __call__(self, context, request):
         return TemplateStructure(render_view(context, request, name=self.name))
 
+    # noinspection PyMethodOverriding
     @staticmethod
     def selected(context, request):
         return False
@@ -268,7 +277,7 @@ def extract_from_settings(prefix, settings=None):
     """
       >>> settings = {
       ...     'kotti_twitter.foo_bar': '1', 'kotti.spam_eggs': '2'}
-      >>> print extract_from_settings('kotti_twitter.', settings)
+      >>> print(extract_from_settings('kotti_twitter.', settings))
       {'foo_bar': '1'}
     """
     from kotti import get_settings
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index 6909f6ccf..10c47a98b 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -41,7 +41,7 @@ def set_max_age(response, delta, cache_ctrl=None):
             if len(kv) == 2:
                 cache_ctrl.setdefault(kv[0], kv[1])
             else:
-                cache_ctrl.setdefault(kv[0], None)
+                cache_ctrl.setdefault(kv[0])
 
     # Render the cache-control header:
     cache_control_header = []
@@ -116,6 +116,7 @@ def set_cache_headers(event):
     # CACHE_POLICY_HEADER header), we'll choose one at this point:
     caching_policy = response.headers.get(CACHE_POLICY_HEADER)
     if caching_policy is None:
+        # noinspection PyBroadException
         try:
             caching_policy = caching_policy_chooser(context, request, response)
         except:
diff --git a/kotti/views/edit/__init__.py b/kotti/views/edit/__init__.py
index 6eecb799e..5c92d0e5f 100644
--- a/kotti/views/edit/__init__.py
+++ b/kotti/views/edit/__init__.py
@@ -6,6 +6,7 @@
 
 import warnings
 
+# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.views.edit.content import ContentSchema
 from kotti.views.edit.content import DocumentSchema
@@ -44,6 +45,7 @@ def _states(context, request):
     return dict([(i['name'], i) for i in state_info])
 
 
+# noinspection PyUnusedLocal
 def includeme(config):
     """ Pyramid includeme hook.
 
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 205c5bff1..ad488c4ff 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -15,6 +15,7 @@
 from kotti.fanstatic import contents_view_js
 from kotti.interfaces import IContent
 from kotti.resources import Node
+# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.util import ActionButton
 from kotti.util import get_paste_items
@@ -541,18 +542,18 @@ def move_child_position(context, request):
 
         max_pos = len(context.children) - 1
         try:
-            oldPosition = int(data['from'])
-            newPosition = int(data['to'])
-            if not ((0 <= oldPosition <= max_pos) and
-                    (0 <= newPosition <= max_pos)):
+            old_position = int(data['from'])
+            new_position = int(data['to'])
+            if not ((0 <= old_position <= max_pos) and
+                    (0 <= new_position <= max_pos)):
                 raise ValueError
         except ValueError:
             return {'result': 'error'}
 
         # sqlalchemy.ext.orderinglist takes care of the "right" sequence
         # numbers (immediately consecutive, starting with 0) for us.
-        context.children.insert(newPosition,
-                                context.children.pop(oldPosition))
+        context.children.insert(new_position,
+                                context.children.pop(old_position))
         result = 'success'
     else:
         result = 'error'
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index bd96b9bf5..390299e90 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -16,7 +16,9 @@
 from kotti.resources import Document
 from kotti.resources import File
 from kotti.resources import Node
+# noinspection PyProtectedMember
 from kotti.util import _
+# noinspection PyProtectedMember
 from kotti.util import _to_fieldstorage
 from kotti.views.form import get_appstruct
 from kotti.views.form import AddFormView
@@ -60,6 +62,7 @@ class DocumentSchema(ContentSchema):
         )
 
 
+# noinspection PyPep8Naming
 def FileSchema(tmpstore, title_missing=None):
     class FileSchema(ContentSchema):
         file = SchemaNode(
@@ -69,6 +72,7 @@ class FileSchema(ContentSchema):
             validator=validate_file_size_limit,
             )
 
+    # noinspection PyUnusedLocal
     def set_title_missing(node, kw):
         if title_missing is not None:
             node['title'].missing = title_missing
@@ -173,8 +177,11 @@ def includeme(config):
 
 # DEPRECATED
 
+# noinspection PyPep8
 from zope.deprecation import deprecated
+# noinspection PyPep8
 from kotti_image.views.edit import ImageAddForm
+# noinspection PyPep8
 from kotti_image.views.edit import ImageEditForm
 __ = ImageAddForm, ImageEditForm   # pyflakes
 
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index 04212d9dd..7583b67e8 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -14,6 +14,7 @@
 from pyramid.view import view_defaults
 from zope.interface import providedBy
 
+# noinspection PyProtectedMember
 from kotti.util import _
 
 
diff --git a/kotti/views/edit/upload.py b/kotti/views/edit/upload.py
index 5db0ad0a8..c92ac38fd 100644
--- a/kotti/views/edit/upload.py
+++ b/kotti/views/edit/upload.py
@@ -143,7 +143,7 @@ def process_upload(self):
 
         try:
             factory = self.factory_by_name(self.request.POST['content_type'])
-        except KeyError, e:
+        except KeyError as e:
             result = {
                 'success': False,
                 'error': e.message,
diff --git a/kotti/views/file.py b/kotti/views/file.py
index c3d848155..626c2dd34 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -33,7 +33,9 @@ def includeme(config):
 
 # DEPRECATED
 
+# noinspection PyPep8
 from zope.deprecation.deprecation import deprecated
+# noinspection PyPep8
 from kotti.filedepot import StoredFileResponse
 
 
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 7122b066f..53f3eaedc 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -12,7 +12,7 @@
 from UserDict import DictMixin
 
 import colander
-import deform
+import deform.widget
 from pyramid.decorator import reify
 from pyramid.httpexceptions import HTTPFound
 from pyramid_deform import CSRFSchema
@@ -21,6 +21,7 @@
 from kotti import get_settings
 from kotti.fanstatic import tagit
 from kotti.resources import Tag
+# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.util import title_to_name
 from kotti.util import translate
@@ -87,8 +88,8 @@ class BaseFormView(FormView):
     add_template_vars = ()
 
     def __init__(self, context, request, **kwargs):
+        super(BaseFormView, self).__init__(request)
         self.context = context
-        self.request = request
         self.__dict__.update(kwargs)
 
     def __call__(self):
@@ -207,11 +208,17 @@ def first_heading(self):
 
 
 class CommaSeparatedListWidget(deform.widget.Widget):
+
+    def __init__(self, template=None, **kw):
+        super(CommaSeparatedListWidget, self).__init__(**kw)
+        self.template = template
+
     def serialize(self, field, cstruct, readonly=False):
         if cstruct in (colander.null, None):
             cstruct = []
         return field.renderer(self.template, field=field, cstruct=cstruct)
 
+    # noinspection PyMethodOverriding
     @staticmethod
     def deserialize(field, pstruct):
         if pstruct is colander.null:
diff --git a/kotti/views/login.py b/kotti/views/login.py
index c7e50f4e7..4e839794a 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -26,6 +26,7 @@
 from kotti.message import email_set_password
 from kotti.message import validate_token
 from kotti.security import get_principals
+# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.views.util import template_api
 from kotti.views.users import deferred_email_validator
@@ -42,6 +43,7 @@ def _find_user(login):
     if principal is not None:
         return principal
     else:
+        # noinspection PyBroadException
         try:
             Email().to_python(login)
         except Exception:
@@ -85,7 +87,7 @@ def register(context, request):
     if 'register' in request.POST:
         try:
             appstruct = form.validate(request.POST.items())
-        except ValidationFailure, e:
+        except ValidationFailure as e:
             request.session.flash(_(u"There was an error."), 'error')
             rendered_form = e.render()
         else:
@@ -100,7 +102,7 @@ def register(context, request):
 
             register_roles = settings['kotti.register.role']
             if register_roles:
-                appstruct['roles'] = set(['role:' + register_roles])
+                appstruct['roles'] = {'role:' + register_roles}
 
             appstruct['send_email'] = True
             form = UserAddFormView(context, request)
@@ -283,6 +285,12 @@ def set_password(context, request,
     """ Set password view.  Displays the set password form and handles its form
     submission.
 
+    :param context: Current context
+    :type context: :class:`kotti.resources.Content`
+
+    :param request: Current request
+    :type request: :class:`kotti.request.Request`
+
     :param success_msg: Message to display on successful submission handling
     :type success_msg: str or TranslationString
 
@@ -298,7 +306,7 @@ def set_password(context, request,
     if 'submit' in request.POST:
         try:
             appstruct = form.validate(request.POST.items())
-        except ValidationFailure, e:
+        except ValidationFailure as e:
             rendered_form = e.render()
         else:
             token = appstruct['token']
diff --git a/kotti/views/site_setup.py b/kotti/views/site_setup.py
index c126a2daa..864e2243a 100644
--- a/kotti/views/site_setup.py
+++ b/kotti/views/site_setup.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.util import Link
 
diff --git a/kotti/views/users.py b/kotti/views/users.py
index ac3faab89..90398d3fb 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -15,6 +15,7 @@
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from pyramid_deform import FormView
+from six import string_types
 
 from kotti.events import UserDeleted
 from kotti.events import notify
@@ -28,6 +29,7 @@
 from kotti.security import list_groups_raw
 from kotti.security import map_principals_with_local_roles
 from kotti.security import set_groups
+# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.views.form import AddFormView
 from kotti.views.form import EditFormView
@@ -377,8 +379,8 @@ class UsersManage(FormView):
     GroupAddFormView = GroupAddFormView
 
     def __init__(self, context, request):
+        super(UsersManage, self).__init__(request)
         self.context = context
-        self.request = request
 
     def __call__(self):
         api = template_api(self.context, self.request,
@@ -405,7 +407,7 @@ def groups_lister(principal_name, context):
             return HTTPFound(location=location)
 
         extra = self.request.params.get('extra') or ()
-        if extra:
+        if isinstance(extra, string_types):
             extra = extra.split(',')
         search_entries = search_principals(self.request, extra=extra)
         available_roles = [ROLES[role_name]
@@ -503,8 +505,8 @@ class UserManage(FormView):
     UserManageFormView = UserManageFormView
 
     def __init__(self, context, request):
+        super(UserManage, self).__init__(request)
         self.context = context
-        self.request = request
 
     def __call__(self):
         user_or_group = self.request.params['name']
@@ -588,8 +590,8 @@ class Preferences(FormView):
     PreferencesFormView = PreferencesFormView
 
     def __init__(self, context, request):
+        super(Preferences, self).__init__(request)
         self.context = context
-        self.request = request
 
     def __call__(self):
         user = self.request.user
diff --git a/kotti/views/util.py b/kotti/views/util.py
index f1e30850c..2e2299646 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -93,12 +93,12 @@ def __init__(self, context, request):
         self.context = context
         self.request = request
 
-    def __getattr__(self, name):
+    def __getattr__(self, key):
         for event_type in slot_events:
-            if event_type.name == name:
+            if event_type.name == key:
                 break
         else:
-            raise AttributeError(name)
+            raise AttributeError(key)
         value = []
         event = event_type(self.context, self.request)
         for snippet in objectevent_listeners(event):
@@ -107,7 +107,7 @@ def __getattr__(self, name):
                     value.extend(snippet)
                 else:
                     value.append(snippet)
-        setattr(self, name, value)
+        setattr(self, key, value)
         return value
 
 
@@ -319,26 +319,26 @@ def avatar_url(self, user=None, size="14", default_image='identicon'):
     def locale_name(self):
         return get_locale_name(self.request)
 
-    def format_date(self, d, format=None):
-        if format is None:
-            format = self.S['kotti.date_format']
-        return format_date(d, format=format, locale=self.locale_name)
+    def format_date(self, d, fmt=None):
+        if fmt is None:
+            fmt = self.S['kotti.date_format']
+        return format_date(d, format=fmt, locale=self.locale_name)
 
-    def format_datetime(self, dt, format=None):
-        if format is None:
-            format = self.S['kotti.datetime_format']
+    def format_datetime(self, dt, fmt=None):
+        if fmt is None:
+            fmt = self.S['kotti.datetime_format']
         if not isinstance(dt, datetime):
             dt = datetime.fromtimestamp(dt)
-        return format_datetime(dt, format=format, locale=self.locale_name)
+        return format_datetime(dt, format=fmt, locale=self.locale_name)
 
-    def format_time(self, t, format=None):
-        if format is None:
-            format = self.S['kotti.time_format']
-        return format_time(t, format=format, locale=self.locale_name)
+    def format_time(self, t, fmt=None):
+        if fmt is None:
+            fmt = self.S['kotti.time_format']
+        return format_time(t, format=fmt, locale=self.locale_name)
 
-    def format_currency(self, n, currency, format=None):
+    def format_currency(self, n, currency, fmt=None):
         return format_currency(n, currency,
-                               format=format, locale=self.locale_name)
+                               format=fmt, locale=self.locale_name)
 
     @staticmethod
     def get_type(name):
@@ -412,6 +412,7 @@ def children(self):
         ]
 
     def _flatten(self, item):
+        # noinspection PyProtectedMember
         yield item._node
         for ch in item.children:
             for item in self._flatten(ch):
@@ -420,8 +421,8 @@ def _flatten(self, item):
     def tolist(self):
         return list(self._flatten(self))
 
-    def __getattr__(self, name):
-        return getattr(self._node, name)
+    def __getattr__(self, key):
+        return getattr(self._node, key)
 
 
 def nodes_tree(request, context=None, permission='view'):
@@ -455,6 +456,7 @@ def search_content(search_term, request=None):
 
 def default_search_content(search_term, request=None):
 
+    # noinspection PyUnresolvedReferences
     searchstring = u'%{0}%'.format(search_term)
 
     # generic_filter can be applied to all Node (and subclassed) objects
diff --git a/kotti/views/view.py b/kotti/views/view.py
index d8a2067ed..3caa6086d 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -32,10 +32,12 @@ def view_content_default(context, request):
     return response
 
 
+# noinspection PyUnusedLocal
 def view_node(context, request):  # pragma: no cover
     return {}  # BBB
 
 
+# noinspection PyUnusedLocal
 @view_config(name='search-results', permission='view',
              renderer='kotti:templates/view/search-results.pt')
 def search_results(context, request):
@@ -46,6 +48,7 @@ def search_results(context, request):
     return {'results': results}
 
 
+# noinspection PyUnusedLocal
 @view_config(name='search-tag', permission='view',
              renderer='kotti:templates/view/search-results.pt')
 def search_results_for_tag(context, request):
@@ -59,6 +62,7 @@ def search_results_for_tag(context, request):
     return {'results': results}
 
 
+# noinspection PyUnusedLocal
 @view_config(name='search', permission='view',
              renderer='kotti:templates/view/search.pt')
 @view_config(name='folder_view', context=IContent, permission='view',
diff --git a/kotti/workflow.py b/kotti/workflow.py
index 089458352..d74c72bee 100644
--- a/kotti/workflow.py
+++ b/kotti/workflow.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pyramid.security import DENY_ALL
 from repoze.workflow import get_workflow as base_get_workflow
 import transaction
@@ -11,8 +12,8 @@
 
 
 class WorkflowTransition(ObjectEvent):
-    def __init__(self, object, info, **kwargs):
-        super(WorkflowTransition, self).__init__(object, **kwargs)
+    def __init__(self, obj, info, **kwargs):
+        super(WorkflowTransition, self).__init__(obj, **kwargs)
         self.info = info
 
 

From b9bbe8cdddfe435f8fdc9cb59db511fc2a34493e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 18 Mar 2016 23:01:38 +0100
Subject: [PATCH 430/600] Remove explicit column types from columns that are
 declares as foreign keys.

---
 kotti/resources.py                            | 34 +++++++++----------
 .../package/+package+/resources.py_tmpl       |  2 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/kotti/resources.py b/kotti/resources.py
index f9f271ea6..a3d2653a6 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -11,26 +11,26 @@
 
 import os
 import warnings
-from copy import copy
+from UserDict import DictMixin
 from cStringIO import StringIO
+from copy import copy
 from fnmatch import fnmatch
-from UserDict import DictMixin
 
-from depot.fields.sqlalchemy import _SQLAMutationTracker
 from depot.fields.sqlalchemy import UploadedFileField
+from depot.fields.sqlalchemy import _SQLAMutationTracker
 from pyramid.decorator import reify
 from pyramid.traversal import resource_path
-from sqlalchemy import bindparam
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
-from sqlalchemy import event
 from sqlalchemy import ForeignKey
 from sqlalchemy import Integer
 from sqlalchemy import String
 from sqlalchemy import Unicode
 from sqlalchemy import UnicodeText
 from sqlalchemy import UniqueConstraint
+from sqlalchemy import bindparam
+from sqlalchemy import event
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
@@ -45,12 +45,12 @@
 from transaction import commit
 from zope.interface import implementer
 
-from kotti import _resolve_dotted
 from kotti import Base
 from kotti import DBSession
+from kotti import TRUE_VALUES
+from kotti import _resolve_dotted
 from kotti import get_settings
 from kotti import metadata
-from kotti import TRUE_VALUES
 from kotti.interfaces import IContent
 from kotti.interfaces import IDefaultWorkflow
 from kotti.interfaces import IDocument
@@ -60,17 +60,17 @@
 from kotti.security import PersistentACLMixin
 from kotti.security import view_permitted
 from kotti.sqla import ACLType
-from kotti.sqla import bakery
 from kotti.sqla import JsonType
 from kotti.sqla import MutationList
 from kotti.sqla import NestedMutationDict
+from kotti.sqla import bakery
+from kotti.util import Link
+from kotti.util import LinkParent
+from kotti.util import LinkRenderer
 from kotti.util import _
 from kotti.util import _to_fieldstorage
 from kotti.util import camel_case_to_name
 from kotti.util import get_paste_items
-from kotti.util import Link
-from kotti.util import LinkParent
-from kotti.util import LinkRenderer
 
 
 class ContainerMixin(object, DictMixin):
@@ -472,12 +472,10 @@ class TagsToContents(Base):
 
     #: Foreign key referencing :attr:`Tag.id`
     #: (:class:`sqlalchemy.types.Integer`)
-    tag_id = Column(Integer, ForeignKey('tags.id'), primary_key=True,
-                    index=True)
+    tag_id = Column(ForeignKey('tags.id'), primary_key=True, index=True)
     #: Foreign key referencing :attr:`Content.id`
     #: (:class:`sqlalchemy.types.Integer`)
-    content_id = Column(Integer, ForeignKey('contents.id'), primary_key=True,
-                        index=True)
+    content_id = Column(ForeignKey('contents.id'), primary_key=True, index=True)
     #: Relation that adds a ``content_tags`` :func:`sqlalchemy.orm.backref`
     #: to :class:`~kotti.resources.Tag` instances to allow easy access to all
     #: content tagged with that tag.
@@ -552,7 +550,7 @@ def __mapper_args__(cls):
 
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
-    id = Column(Integer, ForeignKey('nodes.id'), primary_key=True)
+    id = Column(ForeignKey(Node.id), primary_key=True)
     #: Name of the view that should be displayed to the user when
     #: visiting an URL without a explicit view name appended
     #: (:class:`sqlalchemy.types.String`)
@@ -632,7 +630,7 @@ class Document(Content):
 
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
-    id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
+    id = Column(ForeignKey(Content.id), primary_key=True)
     #: Body text of the Document
     #: (:class:`sqlalchemy.types.Unicode`)
     body = Column(UnicodeText())
@@ -775,7 +773,7 @@ class File(SaveDataMixin, Content):
 
     #: Primary key column in the DB
     #: (:class:`sqlalchemy.types.Integer`)
-    id = Column(Integer(), ForeignKey('contents.id'), primary_key=True)
+    id = Column(ForeignKey(Content.id), primary_key=True)
 
     type_info = Content.type_info.copy(
         name=u'File',
diff --git a/kotti/scaffolds/package/+package+/resources.py_tmpl b/kotti/scaffolds/package/+package+/resources.py_tmpl
index c545f729c..0024e484c 100644
--- a/kotti/scaffolds/package/+package+/resources.py_tmpl
+++ b/kotti/scaffolds/package/+package+/resources.py_tmpl
@@ -21,7 +21,7 @@ class CustomContent(Content):
 
     implements(IDefaultWorkflow)
 
-    id = Column(Integer, ForeignKey('contents.id'), primary_key=True)
+    id = Column(ForeignKey('contents.id'), primary_key=True)
     custom_attribute = Column(Unicode(1000))
 
     type_info = Content.type_info.copy(

From c7c15646a50dda18be7225374c347668f496738c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 18 Mar 2016 23:02:31 +0100
Subject: [PATCH 431/600] Use set literal, remove arguments with default
 values.

---
 kotti/__init__.py   | 23 +++++++++++------------
 kotti/events.py     |  3 +--
 kotti/resources.py  |  2 +-
 kotti/sanitizers.py | 13 +++++--------
 kotti/testing.py    |  3 ++-
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index dab0cd304..dce843169 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -1,12 +1,5 @@
 # -*- coding: utf-8 -*-
 import pkg_resources
-from six import string_types
-from sqlalchemy import engine_from_config
-from sqlalchemy import MetaData
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import scoped_session
-from sqlalchemy.orm import sessionmaker
-from zope.sqlalchemy import ZopeTransactionExtension
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
@@ -14,10 +7,16 @@
 from pyramid.threadlocal import get_current_registry
 from pyramid.util import DottedNameResolver
 from pyramid_beaker import session_factory_from_settings
+from six import string_types
+from sqlalchemy import MetaData
+from sqlalchemy import engine_from_config
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import scoped_session
+from sqlalchemy.orm import sessionmaker
+from zope.sqlalchemy import ZopeTransactionExtension
 
 from kotti.sqla import Base as KottiBase
 
-
 metadata = MetaData()
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base(cls=KottiBase)
@@ -132,7 +131,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'pyramid_deform.template_search_path': 'kotti:templates/deform',
     }
 
-conf_dotted = set([
+conf_dotted = {
     'kotti.authn_policy_factory',
     'kotti.authz_policy_factory',
     'kotti.available_types',
@@ -152,7 +151,7 @@ def none_factory(**kwargs):  # pragma: no cover
     'kotti.session_factory',
     'kotti.templates.api',
     'kotti.url_normalizer',
-    ])
+}
 
 
 def get_version():
@@ -173,7 +172,7 @@ def _resolve_dotted(d, keys=conf_dotted):
             continue
         new_value = []
         for dottedname in value.split():
-            new_value.append(DottedNameResolver(None).resolve(dottedname))
+            new_value.append(DottedNameResolver().resolve(dottedname))
         resolved[key] = new_value
 
     return resolved
@@ -185,7 +184,7 @@ def main(global_config, **settings):
 
     from kotti.resources import initialize_sql
     config = base_configure(global_config, **settings)
-    engine = engine_from_config(config.registry.settings, 'sqlalchemy.')
+    engine = engine_from_config(config.registry.settings)
     initialize_sql(engine)
     return config.make_wsgi_app()
 
diff --git a/kotti/events.py b/kotti/events.py
index e7f87e47f..7afedd907 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -16,7 +16,6 @@
 from datetime import datetime
 try:  # pragma: no cover
     from collections import OrderedDict
-    OrderedDict  # pyflakes
 except ImportError:  # pragma: no cover
     from ordereddict import OrderedDict
 
@@ -236,7 +235,7 @@ def set_owner(event):
                 obj.owner = userid
             # Add owner role for userid if it's not inherited already:
             if u'role:owner' not in list_groups(userid, obj):
-                groups = list_groups_raw(userid, obj) | set([u'role:owner'])
+                groups = list_groups_raw(userid, obj) | {u'role:owner'}
                 set_groups(userid, obj, groups)
 
 
diff --git a/kotti/resources.py b/kotti/resources.py
index a3d2653a6..dea37c780 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -79,7 +79,7 @@ class ContainerMixin(object, DictMixin):
     """
 
     def __setitem__(self, key, node):
-        key = node.name = unicode(key)
+        node.name = unicode(key)
         self.children.append(node)
         self.children.reorder()
 
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index a71d44356..29c391ebc 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -56,8 +56,7 @@ def xss_protection(html):
         tags=generally_xss_safe,
         attributes=lambda self, key, value: True,
         styles=all_styles,
-        strip=True,
-        strip_comments=True)
+        strip=True)
 
     return sanitized
 
@@ -85,8 +84,7 @@ def minimal_html(html):
         tags=markdown_tags + print_tags,
         attributes=attributes,
         styles=[],
-        strip=True,
-        strip_comments=True)
+        strip=True)
 
     return sanitized
 
@@ -106,8 +104,7 @@ def no_html(html):
         tags=[],
         attributes={},
         styles=[],
-        strip=True,
-        strip_comments=True)
+        strip=True)
 
     return sanitized
 
@@ -124,7 +121,7 @@ def _setup_sanitizers(settings):
 
     for s in settings['kotti.sanitizers'].split():
         name, dottedname = s.split(':')
-        sanitizers[name.strip()] = DottedNameResolver(None).resolve(dottedname)
+        sanitizers[name.strip()] = DottedNameResolver().resolve(dottedname)
 
     settings['kotti.sanitizers'] = sanitizers
 
@@ -137,7 +134,7 @@ def _setup_listeners(settings):
         dotted, sanitizers = s.split(':')
 
         classname, attributename = dotted.rsplit('.', 1)
-        _class = DottedNameResolver(None).resolve(classname)
+        _class = DottedNameResolver().resolve(classname)
 
         def _create_handler(attributename, sanitizers):
             def handler(event):
diff --git a/kotti/testing.py b/kotti/testing.py
index c138576b1..f143fde84 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -49,7 +49,8 @@ class DummyRequest(testing.DummyRequest):
     user = None
     referrer = None
 
-    def is_response(self, ob):
+    @staticmethod
+    def is_response(ob):
         return (hasattr(ob, 'app_iter') and hasattr(ob, 'headerlist') and
                 hasattr(ob, 'status'))
 

From 5a33384e7b11994371c415b489edbec88ecbf044 Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <p@github.dev.dobrogost.net>
Date: Tue, 12 Apr 2016 17:21:15 +0200
Subject: [PATCH 432/600] Use generic SQLAlchemy type Text as base type for
 JsonType instead of (#493)

TEXT type which is not supported in Oracle. Text type is translated
to CLOB type in Oracle.
---
 CHANGES.txt   | 13 +++++++++++++
 kotti/sqla.py |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d6d7b903e..094c8bcdf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,19 @@ Change History
 
 - Fix or ignore some PyCharm inspection warnings.
 
+- Use generic SQLAlchemy type Text as base type for JsonType. This allows
+  SQLAlchemy to map Text type to the most suitable type available on given
+  database system. Previously used TEXT type is not available in Oracle
+  database. In case of existing installation of Kotti with database system,
+  for which SQLAlchemy maps generic Text type to type different than TEXT it's
+  necessary to either convert existing columns "nodes._acl" and
+  "nodes.annotations" to that type or configure SQLAlchemy to map generic Text
+  type to existing type of these two columns. For example of how to do this
+  please see http://stackoverflow.com/a/36506666/95735. For all database
+  systems for which SQLAlchemy provides dialects except Oracle (Firebird,
+  Microsoft SQL Server, MySQL, Postgres, SQLite, Sybase) there's no need to
+  do anything.
+
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
diff --git a/kotti/sqla.py b/kotti/sqla.py
index 4503f92d3..552cdd5eb 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -13,7 +13,7 @@
 from sqlalchemy.ext import baked
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.mutable import Mutable
-from sqlalchemy.types import TypeDecorator, TEXT
+from sqlalchemy.types import TypeDecorator, Text
 
 bakery = baked.bakery()
 baked.bake_lazy_loaders()
@@ -38,7 +38,7 @@ def wrapper(*args, **kwargs):
 class JsonType(TypeDecorator):
     """http://www.sqlalchemy.org/docs/core/types.html#marshal-json-strings
     """
-    impl = TEXT
+    impl = Text
 
     # noinspection PyMethodOverriding
     @staticmethod

From 0d162332e369dedb1b4936935e43de89e9665f8e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 12 Apr 2016 22:25:08 +0200
Subject: [PATCH 433/600] Upgrade all requirements to their latest respective
 version.

---
 requirements.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8e2844102..c98af7118 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 Kotti==1.3.0-alpha.4
-Babel==2.2.0
+Babel==2.3.3
 Beaker==1.8.0
 Chameleon==2.24
 FormEncode==1.3.0
 Mako==1.0.4
 MarkupSafe==0.23
 PasteDeploy==1.5.2
-Pillow==3.1.1
+Pillow==3.2.0
 Pygments==2.1.3
 SQLAlchemy==1.0.12
-SQLAlchemy-Utils==0.31.6
+SQLAlchemy-Utils==0.32.1
 Unidecode==0.04.19
-WebOb==1.5.1
+WebOb==1.6.0
 alembic==0.8.5
 appdirs==1.4.0
 bleach==1.4.2
@@ -21,8 +21,8 @@ colander==1.2
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
-filedepot==0.2.1
-html2text==2016.1.8
+filedepot==0.3.0
+html2text==2016.4.2
 html5lib==1.0b8
 iso8601==0.1.11
 js.angular==1.1.4
@@ -43,8 +43,8 @@ js.modernizr==2.5.3.1
 js.select2==3.4.1
 kotti-tinymce==0.5.4
 kotti-image==0.1.3
-lingua==4.8.1
-lxml==3.5.0
+lingua==4.9
+lxml==3.6.0
 peppercorn==0.5
 plone.scale==1.4.1
 polib==1.0.7
@@ -58,7 +58,7 @@ pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
 pyramid-tm==0.12.1
 pyramid-zcml==1.0.0
-pytz==2016.1
+pytz==2016.3
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1

From 3b80ae90e1e0e8c1013946b9c9fb2a1fa6e483e5 Mon Sep 17 00:00:00 2001
From: Adam Chainz <me@adamj.eu>
Date: Mon, 6 Jun 2016 09:12:58 +0100
Subject: [PATCH 434/600] Convert readthedocs links for their .org -> .io
 migration for hosted projects (#500)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
---
 CHANGES.txt                                      |  6 +++---
 README.rst                                       |  6 +++---
 docs/conf.py                                     | 12 ++++++------
 docs/contributing.rst                            |  8 ++++----
 docs/developing/advanced/blobs.rst               |  2 +-
 .../advanced/static-resource-management.rst      |  4 ++--
 docs/first_steps/tut-2.rst                       |  2 +-
 docs/index.rst                                   |  2 +-
 kotti/locale/Kotti.pot                           |  4 ++--
 kotti/locale/de/LC_MESSAGES/Kotti.po             | 16 ++++++++--------
 kotti/locale/en/LC_MESSAGES/Kotti.po             |  4 ++--
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po          | 16 ++++++++--------
 kotti/locale/it/LC_MESSAGES/Kotti.po             | 16 ++++++++--------
 kotti/locale/ja/LC_MESSAGES/Kotti.po             |  4 ++--
 kotti/locale/ko/LC_MESSAGES/Kotti.po             | 16 ++++++++--------
 kotti/locale/nl/LC_MESSAGES/Kotti.po             |  4 ++--
 kotti/locale/pl/LC_MESSAGES/Kotti.po             |  8 ++++----
 kotti/locale/pt/LC_MESSAGES/Kotti.po             |  4 ++--
 kotti/populate.py                                |  4 ++--
 kotti/scaffolds/__init__.py                      |  2 +-
 kotti/scaffolds/package/README.rst_tmpl          |  2 +-
 21 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 094c8bcdf..1a7c78cea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -55,7 +55,7 @@ make the universe collapse!**
 
 - Add a custom traverser, which gets all nodes in a single DB query.  For deeply
   nested trees this results in drastic perfor,ance improvements.  See
-  http://kotti.readthedocs.org/en/master/api/kotti.traversal.html for details.
+  https://kotti.readthedocs.io/en/master/api/kotti.traversal.html for details.
 
 - Bugfix: copy and paste of file nodes wouldn't create a new depot file, but
   instead lead to multiple references to a single file which would cause
@@ -76,14 +76,14 @@ make the universe collapse!**
 make the universe collapse!**
 
 - Completely revised ``Depot`` integration.  See
-  http://kotti.readthedocs.org/en/latest/developing/advanced/blobs.html
+  https://kotti.readthedocs.io/en/latest/developing/advanced/blobs.html
   for details.
 
 - Make ``kotti.resources.SaveDataMixin`` more versatile in that it now supports
   a ``data_filters`` attribute (or even a completely overridden ``data``
   attribute) on subclasses.  For an example for what this is useful, see the
   new ``kotti_image`` package's readme and the Depot documentation
-  (http://depot.readthedocs.org/en/latest/database.html#custom-behaviour-in-attachments).
+  (https://depot.readthedocs.io/en/latest/database.html#custom-behaviour-in-attachments).
 
   **These changes require a database migration.**
 
diff --git a/README.rst b/README.rst
index 9342f57a2..3323f8daf 100644
--- a/README.rst
+++ b/README.rst
@@ -80,12 +80,12 @@ Install
 
 See `installation instructions`_.
 
-.. _installation instructions: http://kotti.readthedocs.org/en/latest/first_steps/installation.html
+.. _installation instructions: https://kotti.readthedocs.io/en/latest/first_steps/installation.html
 
 Support and Documentation
 =========================
 
-Read Kotti's extensive `documentation <http://kotti.readthedocs.org/>`_ on `Read the Docs <https://readthedocs.org/>`_.
+Read Kotti's extensive `documentation <https://kotti.readthedocs.io/>`_ on `Read the Docs <https://readthedocs.org/>`_.
 
 If you have questions or need help, you can post on our `mailing list / forum <http://groups.google.com/group/kotti>`_ or join us on IRC: `#kotti on irc.freenode.net <irc://irc.freenode.net/#kotti>`_.
 
@@ -144,5 +144,5 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. |landscape| image:: https://landscape.io/github/Kotti/Kotti/master/landscape.svg?style=flat-square
 .. _landscape: https://landscape.io/github/Kotti/Kotti
 
-.. _contribution guidelines: http://kotti.readthedocs.org/en/latest/contributing.html
+.. _contribution guidelines: https://kotti.readthedocs.io/en/latest/contributing.html
 .. _Github repository: https://github.com/Kotti/Kotti
diff --git a/docs/conf.py b/docs/conf.py
index 1d0d51f73..48d52e1b5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -120,11 +120,11 @@
 
 # -- Options for Intersphinx ---------------------------------------------------
 intersphinx_mapping = {
-    'bleach': ('http://bleach.readthedocs.org/en/latest/', None),
-    'colander': ('http://colander.readthedocs.org/en/latest/', None),
-    'deform': ('http://deform.readthedocs.org/en/latest/', None),
-    'depot': ('http://depot.readthedocs.org/en/latest/', None),
+    'bleach': ('https://bleach.readthedocs.io/en/latest/', None),
+    'colander': ('https://colander.readthedocs.io/en/latest/', None),
+    'deform': ('https://deform.readthedocs.io/en/latest/', None),
+    'depot': ('https://depot.readthedocs.io/en/latest/', None),
     'fanstatic': ('http://www.fanstatic.org/en/latest/', None),
-    'pyramid': ('http://pyramid.readthedocs.org/en/latest/', None),
-    'sqlalchemy': ('http://sqlalchemy.readthedocs.org/en/latest/', None),
+    'pyramid': ('https://pyramid.readthedocs.io/en/latest/', None),
+    'sqlalchemy': ('https://sqlalchemy.readthedocs.io/en/latest/', None),
 }
diff --git a/docs/contributing.rst b/docs/contributing.rst
index ce0bce9cd..cd4262963 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -84,9 +84,9 @@ The rendered docs are built and hosted on readthedocs.org.
 .. _blockdiag: http://blockdiag.com
 .. _GitHub fork-a-repo help: https://help.github.com/articles/fork-a-repo
 .. _Kotti User Manual repo: https://github.com/Kotti/kotti_user_manual
-.. _Kotti User Manual: https://kotti-user-manual.readthedocs.org
+.. _Kotti User Manual: https://kotti-user-manual.readthedocs.io
 .. _Kotti: github.com/Kotti/Kotti
 .. _reStructuredText: http://sphinx-doc.org/rest.html
-.. _Selenium: http://selenium-python.readthedocs.org
-.. _Sphinx tool: http://sphinx.readthedocs.org
-.. _virtualenvwrapper system: http://virtualenvwrapper.readthedocs.org
+.. _Selenium: https://selenium-python.readthedocs.io
+.. _Sphinx tool: https://sphinx.readthedocs.io
+.. _virtualenvwrapper system: https://virtualenvwrapper.readthedocs.io
diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 0435d5e47..6677c9bb0 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -233,4 +233,4 @@ Now you can invoke the migration with:::
 As always when dealing with migrations, make sure you backup your data first!
 
 
-.. _Depot: http://depot.readthedocs.org/en/latest/
+.. _Depot: https://depot.readthedocs.io/en/latest/
diff --git a/docs/developing/advanced/static-resource-management.rst b/docs/developing/advanced/static-resource-management.rst
index c12d31da0..6b541441a 100644
--- a/docs/developing/advanced/static-resource-management.rst
+++ b/docs/developing/advanced/static-resource-management.rst
@@ -133,5 +133,5 @@ fanstatic:
 
 
 .. _Fanstatic: http://www.fanstatic.org/
-.. _as described in the corresponding Fanstatic documentation: http://fanstatic.readthedocs.org/en/latest/library.html
-.. _Fanstatic's documentation: http://fanstatic.readthedocs.org/
+.. _as described in the corresponding Fanstatic documentation: https://fanstatic.readthedocs.io/en/latest/library.html
+.. _Fanstatic's documentation: https://fanstatic.readthedocs.io/
diff --git a/docs/first_steps/tut-2.rst b/docs/first_steps/tut-2.rst
index f057f25b6..80970009a 100644
--- a/docs/first_steps/tut-2.rst
+++ b/docs/first_steps/tut-2.rst
@@ -312,5 +312,5 @@ Restart the application, take a look at the new ``Poll`` view and play around wi
 In the :ref:`next tutorial <tut-3>`, we will learn how to enable our users to actually vote for one of the ``Poll`` options.
 
 .. _SQLAlchemy: http://www.sqlalchemy.org/
-.. _Colander: http://colander.readthedocs.org/
+.. _Colander: https://colander.readthedocs.io/
 .. _scan: http://docs.pylonsproject.org/docs/pyramid/en/latest/api/config.html#pyramid.config.Configurator.scan
diff --git a/docs/index.rst b/docs/index.rst
index 23530f631..63c27c501 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -65,5 +65,5 @@ Future and Past
     Roadmap <https://github.com/Kotti/Kotti/milestones>
     Changelog <changes>
 
-.. _Kotti User Manual: http://kotti-user-manual.readthedocs.org/
+.. _Kotti User Manual: https://kotti-user-manual.readthedocs.io/
 .. _Roadmap: https://github.com/Kotti/Kotti/milestones
diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 805313e37..202b122d0 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -48,7 +48,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -75,7 +75,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index 875f14d7a..f92fd4ed8 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -43,7 +43,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -70,7 +70,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -93,7 +93,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -117,7 +117,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Dokumentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -970,7 +970,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -995,7 +995,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1018,7 +1018,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1042,7 +1042,7 @@ msgstr "Standardansicht konnte nicht geändert werden."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Dokumentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index 504555c70..b68a3c03f 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 0763286e1..b929021cc 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -91,7 +91,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manuelle\n"
 "            </a>\n"
 "        </p>\n"
@@ -116,7 +116,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -971,7 +971,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -996,7 +996,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1024,7 +1024,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manuelle\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1049,7 +1049,7 @@ msgstr "La vue par défaut ne peut pas être définie."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index ea800899a..9ba2e3995 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -89,7 +89,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
+"href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
 "            </a>\n"
 "        </p>\n"
 "    </div>\n"
@@ -110,7 +110,7 @@ msgstr ""
 "            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentazione\n"
 "            </a>\n"
 "        </p>\n"
@@ -939,7 +939,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -964,7 +964,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -990,7 +990,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
+#~ "href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">               Manuale di configurazione\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
 #~ "    </div>\n"
@@ -1011,7 +1011,7 @@ msgstr "La vista predefinita non può essere selezionata."
 #~ "            Ti chiedi cos'altro potresti fare con Kotti? Quale licenza ha?  Leggi il manuale per maggiori informazioni        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentazione\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 1acbddd5c..d92d3946a 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index 9bad9abf4..d3316319b 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -86,7 +86,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/configuration.html\">\n"
 "               설정 매뉴얼\n"
 "            </a>\n"
 "        </p>\n"
@@ -110,7 +110,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               기술문헌\n"
 "            </a>\n"
 "        </p>\n"
@@ -967,7 +967,7 @@ msgstr "보이는 방식을 설정할 수 없었습니다."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 #~ "               Configuration manual\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -992,7 +992,7 @@ msgstr "보이는 방식을 설정할 수 없었습니다."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               Documentation\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1015,7 +1015,7 @@ msgstr "보이는 방식을 설정할 수 없었습니다."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/developing/configuration.html\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/developing/configuration.html\">\n"
 #~ "               설정 매뉴얼\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
@@ -1039,7 +1039,7 @@ msgstr "보이는 방식을 설정할 수 없었습니다."
 #~ "        </p>\n"
 #~ "        <p>\n"
 #~ "            <a class=\"btn btn-info\"\n"
-#~ "               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+#~ "               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 #~ "               기술문헌\n"
 #~ "            </a>\n"
 #~ "        </p>\n"
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index ce4f00a37..35727160c 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index cae43171f..3cc2f95e4 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -89,7 +89,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Podręcznik konfiguracji\n"
 "            </a>\n"
 "        </p>\n"
@@ -113,7 +113,7 @@ msgstr ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Dokumentacja\n"
 "            </a>\n"
 "        </p>\n"
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 9e96747a1..2b5cbb54c 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -36,7 +36,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -63,7 +63,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
diff --git a/kotti/populate.py b/kotti/populate.py
index ea9414544..0eb01de0e 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -86,7 +86,7 @@ def populate():
         </p>
         <p>
             <a class="btn btn-info"
-               href="http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html">
+               href="https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html">
                Configuration manual
             </a>
         </p>
@@ -113,7 +113,7 @@ def populate():
         </p>
         <p>
             <a class="btn btn-info"
-               href="http://kotti.readthedocs.org/en/latest/">
+               href="https://kotti.readthedocs.io/en/latest/">
                Documentation
             </a>
         </p>
diff --git a/kotti/scaffolds/__init__.py b/kotti/scaffolds/__init__.py
index ac987f884..656745eb9 100644
--- a/kotti/scaffolds/__init__.py
+++ b/kotti/scaffolds/__init__.py
@@ -83,7 +83,7 @@ def post(self, command, output_dir, vars):  # pragma: no cover
             {0}
             Welcome to Kotti!
 
-            Documentation: http://kotti.readthedocs.org/
+            Documentation: https://kotti.readthedocs.io/
             Development:   https://github.com/Kotti/Kotti/
             Issues:        https://github.com/Kotti/Kotti/issues?state=open
             IRC:           irc://irc.freenode.net/#kotti
diff --git a/kotti/scaffolds/package/README.rst_tmpl b/kotti/scaffolds/package/README.rst_tmpl
index db36f4065..7dca69884 100644
--- a/kotti/scaffolds/package/README.rst_tmpl
+++ b/kotti/scaffolds/package/README.rst_tmpl
@@ -58,6 +58,6 @@ Contributions to {{project}} are highly welcome.
 Just clone its `Github repository`_ and submit your contributions as pull requests.
 
 .. _alembic: http://pypi.python.org/pypi/alembic
-.. _alembic documentation: http://alembic.readthedocs.org/en/latest/index.html
+.. _alembic documentation: https://alembic.readthedocs.io/en/latest/index.html
 .. _tracker: https://github.com/{{gh_user}}/{{package}}/issues
 .. _Github repository: https://github.com/{{gh_user}}/{{package}}

From 1be72fd3e4fcc24e4c4f08a64a1201daa52ae4fe Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <p@github.dev.dobrogost.net>
Date: Wed, 13 Jul 2016 14:58:19 +0200
Subject: [PATCH 435/600] Support unicode values in settings (#504)

Fixes #503
---
 kotti/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index dce843169..2a7453c2b 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -7,7 +7,7 @@
 from pyramid.threadlocal import get_current_registry
 from pyramid.util import DottedNameResolver
 from pyramid_beaker import session_factory_from_settings
-from six import string_types
+from six import binary_type, string_types
 from sqlalchemy import MetaData
 from sqlalchemy import engine_from_config
 from sqlalchemy.ext.declarative import declarative_base
@@ -199,7 +199,7 @@ def base_configure(global_config, **settings):
         settings.setdefault(key, value)
 
     for key, value in settings.items():
-        if key.startswith('kotti') and isinstance(value, string_types):
+        if key.startswith('kotti') and isinstance(value, binary_type):
             settings[key] = unicode(value, 'utf8')
 
     # will be removed in 2.0

From 89d02e8f4934893997e7ba2c4da64270a76f9069 Mon Sep 17 00:00:00 2001
From: Piotr Dobrogost <p@github.dev.dobrogost.net>
Date: Wed, 13 Jul 2016 15:49:41 +0200
Subject: [PATCH 436/600] Using normalized form of the project's version (#505)
  [ci skip]

* Using normalized form of the project's version

Fixes #492

* Using normalized form of the project's version

We use PEP 440 normalized form for the project's version thus current "1.3.0-alpha.5-dev" became "1.3.0a5.dev0".
---
 CHANGES.txt | 3 +++
 setup.py    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1a7c78cea..60236ae6c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,9 @@ Change History
   systems for which SQLAlchemy provides dialects except Oracle (Firebird,
   Microsoft SQL Server, MySQL, Postgres, SQLite, Sybase) there's no need to
   do anything.
+  
+- We use PEP 440 normalized form for the project's version thus current
+  "1.3.0-alpha.5-dev" became "1.3.0a5.dev0".
 
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
diff --git a/setup.py b/setup.py
index 62d66f3cf..1324d297a 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.3.0-alpha.5-dev',
+      version='1.3.0a5.dev0',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[

From acf97586d778ee8711d789ee707bf11b04f6abae Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 29 Jul 2016 12:02:06 +0200
Subject: [PATCH 437/600] Upgrade requirements.

---
 development.ini    |  6 +++---
 kotti/resources.py |  2 +-
 requirements.txt   | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/development.ini b/development.ini
index 1b833ba48..b8a440565 100644
--- a/development.ini
+++ b/development.ini
@@ -54,12 +54,12 @@ handlers = console
 
 [logger_kotti]
 level = DEBUG
-handlers =
+handlers = console
 qualname = kotti
 
 [logger_sqlalchemy]
-level = INFO
-handlers =
+level = WARN
+handlers = console
 qualname = sqlalchemy.engine
 # "level = INFO" logs SQL queries.
 # "level = DEBUG" logs SQL queries and results.
diff --git a/kotti/resources.py b/kotti/resources.py
index dea37c780..ad8b7078b 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
 The :mod:`~kotti.resources` module contains all the classes for Kotti's
-persistance layer, which is based on SQLAlchemy.
+persistence layer, which is based on SQLAlchemy.
 
 Inheritance Diagram
 -------------------
diff --git a/requirements.txt b/requirements.txt
index c98af7118..c10db6776 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 Kotti==1.3.0-alpha.4
-Babel==2.3.3
+Babel==2.3.4
 Beaker==1.8.0
 Chameleon==2.24
 FormEncode==1.3.0
@@ -9,20 +9,20 @@ MarkupSafe==0.23
 PasteDeploy==1.5.2
 Pillow==3.2.0
 Pygments==2.1.3
-SQLAlchemy==1.0.12
-SQLAlchemy-Utils==0.32.1
+SQLAlchemy==1.0.13
+SQLAlchemy-Utils==0.32.7
 Unidecode==0.04.19
-WebOb==1.6.0
-alembic==0.8.5
+WebOb==1.6.1
+alembic==0.8.6
 appdirs==1.4.0
-bleach==1.4.2
+bleach==1.4.3
 bleach-whitelist==0.0.7
-colander==1.2
+colander==1.3.1
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
 filedepot==0.3.0
-html2text==2016.4.2
+html2text==2016.5.29
 html5lib==1.0b8
 iso8601==0.1.11
 js.angular==1.1.4
@@ -46,19 +46,19 @@ kotti-image==0.1.3
 lingua==4.9
 lxml==3.6.0
 peppercorn==0.5
-plone.scale==1.4.1
+plone.scale==1.5.0
 polib==1.0.7
 py-bcrypt==0.4
 pyramid==1.6.1
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==2.4.2
+pyramid-debugtoolbar==3.0.1
 pyramid-deform==0.2
 pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
 pyramid-tm==0.12.1
 pyramid-zcml==1.0.0
-pytz==2016.3
+pytz==2016.4
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
@@ -66,11 +66,11 @@ repoze.zcml==1.0b1
 rfc6266==0.0.4
 shutilwhich==1.1.0
 six==1.10.0
-transaction==1.4.4
+transaction==1.6.0
 translationstring==1.3
 usersettings==1.0.7
 venusian==1.0
-waitress==0.8.10
+waitress==0.9.0
 wsgiref==0.1.2
 zope.component==4.2.2
 zope.configuration==4.0.3

From 6babe71f63ad9c437c32cfd0dfaf624f6034fed5 Mon Sep 17 00:00:00 2001
From: sbabrass <sbabrass@users.noreply.github.com>
Date: Mon, 29 Aug 2016 11:01:14 +0200
Subject: [PATCH 438/600] Check against type_info.selectable_default_views
 before setting default view. (#506)

Fixes #488
---
 kotti/views/edit/default_views.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index 7583b67e8..66eeb8bba 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -50,6 +50,14 @@ def _is_valid_view(self, view_name):
 
         return self._get_view(view_name) is not None
 
+    def _is_valid_default_view(self, view_name):
+        """Return True if a view with name view_name is a valid choice as
+        default view for context.
+        """
+
+        return self._is_valid_view(view_name) and view_name in [
+            v[0] for v in self.context.type_info.selectable_default_views]
+
     @view_config(name='default-view-selector',
                  renderer='kotti:templates/default-view-selector.pt')
     def default_view_selector(self):
@@ -103,7 +111,7 @@ def set_default_view(self):
                     'success'
                 )
             else:
-                if self._is_valid_view(view_name):
+                if self._is_valid_default_view(view_name):
                     self.context.default_view = view_name
                     self.request.session.flash(
                         _("Default view has been set."),

From 7f21f428c24824b4417570ddc8b24a386c9004f1 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 18 Sep 2016 13:03:01 +0200
Subject: [PATCH 439/600] Upgrade all requirements to their latest version,
 except ``colander``.  This change breaks Kotti's user management views:
 https://github.com/Pylons/colander/pull/212.

---
 requirements.txt | 54 ++++++++++++++++++++++++------------------------
 setup.cfg        |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c10db6776..7812c4d01 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,29 +1,20 @@
 # -*- coding: utf-8 -*-
 Kotti==1.3.0-alpha.4
+alembic==0.8.8
+appdirs==1.4.0
 Babel==2.3.4
 Beaker==1.8.0
-Chameleon==2.24
-FormEncode==1.3.0
-Mako==1.0.4
-MarkupSafe==0.23
-PasteDeploy==1.5.2
-Pillow==3.2.0
-Pygments==2.1.3
-SQLAlchemy==1.0.13
-SQLAlchemy-Utils==0.32.7
-Unidecode==0.04.19
-WebOb==1.6.1
-alembic==0.8.6
-appdirs==1.4.0
 bleach==1.4.3
 bleach-whitelist==0.0.7
-colander==1.3.1
+colander==1.2
+Chameleon==2.24
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
-filedepot==0.3.0
+filedepot==0.4.0
+FormEncode==1.3.0
 html2text==2016.5.29
-html5lib==1.0b8
+html5lib==0.9999999
 iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
@@ -44,21 +35,26 @@ js.select2==3.4.1
 kotti-tinymce==0.5.4
 kotti-image==0.1.3
 lingua==4.9
-lxml==3.6.0
+lxml==3.6.4
+Mako==1.0.4
+MarkupSafe==0.23
+PasteDeploy==1.5.2
 peppercorn==0.5
-plone.scale==1.5.0
+Pillow==3.3.1
+plone.scale==2.0
 polib==1.0.7
 py-bcrypt==0.4
-pyramid==1.6.1
+Pygments==2.1.3
+pyramid==1.7.3
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==3.0.1
+pyramid-debugtoolbar==3.0.4
 pyramid-deform==0.2
 pyramid-mailer==0.14.1
 pyramid-mako==1.0.2
-pyramid-tm==0.12.1
+pyramid-tm==1.0
 pyramid-zcml==1.0.0
-pytz==2016.4
+pytz==2016.6.1
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
@@ -66,17 +62,21 @@ repoze.zcml==1.0b1
 rfc6266==0.0.4
 shutilwhich==1.1.0
 six==1.10.0
-transaction==1.6.0
+SQLAlchemy==1.0.15
+SQLAlchemy-Utils==0.32.9
+transaction==1.6.1
 translationstring==1.3
+Unidecode==0.04.19
 usersettings==1.0.7
 venusian==1.0
-waitress==0.9.0
+waitress==1.0.0
+WebOb==1.6.1
 wsgiref==0.1.2
-zope.component==4.2.2
+zope.component==4.3.0
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
 zope.event==4.2.0
 zope.i18nmessageid==4.0.3
-zope.interface==4.1.3
+zope.interface==4.3.2
 zope.schema==4.4.2
-zope.sqlalchemy==0.7.6
+zope.sqlalchemy==0.7.7
diff --git a/setup.cfg b/setup.cfg
index e018a8925..a613fc6e2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,4 @@
-[pytest]
+[tool:pytest]
 addopts =
     --doctest-modules
     --doctest-glob='*.txt'

From a658111089a3775bab8f9094642adbb5b7b67337 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 19 Sep 2016 10:10:41 +0200
Subject: [PATCH 440/600] Use latest FormEncode and html2text.

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7812c4d01..51a208047 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,8 +12,8 @@ deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
 filedepot==0.4.0
-FormEncode==1.3.0
-html2text==2016.5.29
+FormEncode==1.3.1
+html2text==2016.6.19
 html5lib==0.9999999
 iso8601==0.1.11
 js.angular==1.1.4

From b32717fb0adaaaf551fe9006244c22ac9f9360e2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 19 Sep 2016 10:25:18 +0200
Subject: [PATCH 441/600] Pin "colander<1.3" until
 https://github.com/Pylons/colander/pull/272 is merged and released.

---
 .gitignore | 1 +
 setup.py   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 32a9eab4f..9d99779b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ node_modules
 __pycache__
 
 filestore
+share
diff --git a/setup.py b/setup.py
index 1324d297a..6d2b31d4b 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
     'alembic>=0.8.0',
     'bleach',
     'bleach-whitelist',
-    'colander>=0.9.3',
+    'colander<1.3',  # until https://github.com/Pylons/colander/pull/272 is merged and released  # noqa
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
     'docopt',
     'filedepot',

From 8febcf0e6b8f903d6d11e69e11384c0504a01bb3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 19 Sep 2016 10:35:46 +0200
Subject: [PATCH 442/600] Fix wron version in requirements.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 51a208047..c03bd9fd7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ docopt==0.6.2
 fanstatic==1.0a7
 filedepot==0.4.0
 FormEncode==1.3.1
-html2text==2016.6.19
+html2text==2016.9.19
 html5lib==0.9999999
 iso8601==0.1.11
 js.angular==1.1.4

From 37c6527ae042eaaf52904e959fb2770926358c05 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 19 Sep 2016 11:05:13 +0200
Subject: [PATCH 443/600] Try to fix travis.

---
 setup.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index a613fc6e2..df087075c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,4 @@
-[tool:pytest]
+[pytest]
 addopts =
     --doctest-modules
     --doctest-glob='*.txt'
@@ -9,6 +9,8 @@ addopts =
     --tb=native
     --cov=kotti
     --cov-report=term-missing
+    --travis-fold=auto
+
     kotti/
 python_files = test_*.py
 pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402

From 55bf691d47fca290174d6acca2ef2bd8c788abac Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 01:21:06 +0200
Subject: [PATCH 444/600] Add ``LocalGroup.__repr__``.

---
 kotti/resources.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kotti/resources.py b/kotti/resources.py
index ad8b7078b..55764b8b7 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -210,6 +210,11 @@ def copy(self, **kwargs):
 
         return self.__class__(**kwargs)
 
+    def __repr__(self):
+        return u'<{0} {1} => {2} at {3}>'.format(
+            self.__class__.__name__, self.principal_name, self.group_name,
+            resource_path(self.node))
+
 
 @implementer(INode)
 class Node(Base, ContainerMixin, PersistentACLMixin):

From ce14bccb2b12a15b95bb854cb8c65b5c03627c76 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 13:33:41 +0200
Subject: [PATCH 445/600] Upgrade tests to ``zope.testbrowser>=5.0.0``.  Move
 ``pytest`` config from ``setup.cfg`` to new ``pytest.ini``.  Rename
 ``kotti.testing.TestingRootFactory`` to   ``kotti.testing.RootFactory``.

---
 CHANGES.txt                                  | 11 ++++-
 kotti/scaffolds/package/+dot+travis.yml_tmpl |  1 -
 kotti/scaffolds/package/pytest.ini_tmpl      | 16 +++++++
 kotti/scaffolds/package/setup.cfg_tmpl       | 17 --------
 kotti/testing.py                             | 46 +++++++++-----------
 kotti/tests/__init__.py                      |  6 +--
 kotti/tests/browser-minimal.txt              |  2 +-
 kotti/tests/browser-workflow.txt             |  2 +-
 kotti/tests/test_app.py                      | 16 +++----
 kotti/tests/test_deprecated.py               |  7 +++
 kotti/tests/test_functional.py               | 19 ++++----
 kotti/tests/test_upload.py                   |  5 +--
 pytest.ini                                   | 19 ++++++++
 setup.cfg                                    | 20 ---------
 setup.py                                     |  3 +-
 15 files changed, 96 insertions(+), 94 deletions(-)
 create mode 100644 kotti/scaffolds/package/pytest.ini_tmpl
 create mode 100644 pytest.ini

diff --git a/CHANGES.txt b/CHANGES.txt
index 60236ae6c..3e94b2e18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,10 +26,19 @@ Change History
   systems for which SQLAlchemy provides dialects except Oracle (Firebird,
   Microsoft SQL Server, MySQL, Postgres, SQLite, Sybase) there's no need to
   do anything.
-  
+
 - We use PEP 440 normalized form for the project's version thus current
   "1.3.0-alpha.5-dev" became "1.3.0a5.dev0".
 
+- Upgrade tests to ``zope.testbrowser>=5.0.0``.
+
+- Move ``pytest`` config from ``setup.cfg`` to new ``pytest.ini``.  This
+  prevents a deprecation warning with ``pytest>=3.0``.
+
+- Rename ``kotti.testing.TestingRootFactory`` to
+  ``kotti.testing.RootFactory`` to prevent another deprecation warning with
+  ``pytest>=3.0``.
+
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
diff --git a/kotti/scaffolds/package/+dot+travis.yml_tmpl b/kotti/scaffolds/package/+dot+travis.yml_tmpl
index 60243d302..131eca72a 100644
--- a/kotti/scaffolds/package/+dot+travis.yml_tmpl
+++ b/kotti/scaffolds/package/+dot+travis.yml_tmpl
@@ -17,7 +17,6 @@ install:
   - travis_retry pip install psycopg2 oursql python-coveralls codecov
   - pip install -e . -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
   - pip install --pre Kotti
-  - pip install "wsgi_intercept==0.5.1"
   - python setup.py devbefore_script:
   - psql -c 'create database {{package}}_testing;' -U postgres
   - mysql -e 'create database {{package}}_testing;'
diff --git a/kotti/scaffolds/package/pytest.ini_tmpl b/kotti/scaffolds/package/pytest.ini_tmpl
new file mode 100644
index 000000000..9b766a428
--- /dev/null
+++ b/kotti/scaffolds/package/pytest.ini_tmpl
@@ -0,0 +1,16 @@
+[pytest]
+addopts =
+    --doctest-modules
+    --doctest-glob='*.txt'
+    --capture=no
+    --cov={{package}}
+    --cov-report=term-missing
+    --cov-config .coveragerc
+    --ignore={{package}}/templates/
+    --strict
+    --pep8
+    {{package}}/tests
+python_files = test*py
+markers =
+    user: mark test to be run as the given user
+pep8ignore = E501 E122 E123 E125 E128 E711 E402
diff --git a/kotti/scaffolds/package/setup.cfg_tmpl b/kotti/scaffolds/package/setup.cfg_tmpl
index 93b39155e..753c3c6cd 100644
--- a/kotti/scaffolds/package/setup.cfg_tmpl
+++ b/kotti/scaffolds/package/setup.cfg_tmpl
@@ -5,20 +5,3 @@ tag_svn_revision = true
 [aliases]
 dev = develop easy_install kotti[testing] kotti[development]
 docs = develop easy_install kotti[docs]
-
-[pytest]
-addopts =
-    --doctest-modules
-    --doctest-glob='*.txt'
-    --capture=no
-    --cov={{package}}
-    --cov-report=term-missing
-    --cov-config .coveragerc
-    --ignore={{package}}/templates/
-    --strict
-    --pep8
-    {{package}}/tests
-python_files = test*py
-markers =
-    user: mark test to be run as the given user
-pep8ignore = E501 E122 E123 E125 E128 E711 E402
diff --git a/kotti/testing.py b/kotti/testing.py
index f143fde84..17ed6964a 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -10,21 +10,19 @@
 import os
 from os.path import join, dirname
 from unittest import TestCase
-from pytest import mark
+from warnings import catch_warnings
 
+import transaction
 from pyramid import testing
 from pyramid.events import NewResponse
 from pyramid.interfaces import ILocation
 from pyramid.security import ALL_PERMISSIONS
-from zope.deprecation.deprecation import deprecate
+from pytest import mark
 from zope.interface import implementer
-import transaction
-
 
 # re-enable deprecation warnings during test runs
 # however, let the `ImportWarning` produced by Babel's
 # `localedata.py` vs `localedata/` show up once...
-from warnings import catch_warnings
 with catch_warnings():
     from babel import localedata
     import compiler
@@ -205,7 +203,7 @@ def _zope_testbrowser_pyquery(self):
 
 def setUpFunctional(global_config=None, **settings):
     from kotti import main
-    import wsgi_intercept.zope_testbrowser
+    from zope.testbrowser.wsgi import Browser
     from webtest import TestApp
 
     tearDown()
@@ -222,13 +220,15 @@ def setUpFunctional(global_config=None, **settings):
 
     host, port = BASE_URL.split(':')[-2:]
     app = main({}, **_settings)
-    wsgi_intercept.add_wsgi_intercept(host[2:], int(port), lambda: app)
-    Browser = wsgi_intercept.zope_testbrowser.WSGI_Browser
     Browser.pyquery = property(_zope_testbrowser_pyquery)
 
     return dict(
-        Browser=Browser,
-        browser=Browser(),
+        Browser=lambda: Browser(
+            'http://{}:{}/'.format(host[2:], int(port)),
+            wsgi_app=app),
+        browser=Browser(
+            'http://{}:{}/'.format(host[2:], int(port)),
+            wsgi_app=app),
         test_app=TestApp(app),
         )
 
@@ -249,26 +249,15 @@ def login(self, login=u'admin', password=u'secret'):
             status=302,
             )
 
-    @deprecate('login_testbrowser is deprecated as of Kotti 0.7.  Please use '
-               'the `browser` funcarg in conjunction with the `@user` '
-               'decorator.')
-    def login_testbrowser(self, login=u'admin', password=u'secret'):
-        browser = self.Browser()
-        browser.open(BASE_URL + '/edit')
-        browser.getControl("Username or email").value = login
-        browser.getControl("Password").value = password
-        browser.getControl(name="submit").click()
-        return browser
-
 
 @implementer(ILocation)
-class TestingRootFactory(dict):
+class RootFactory(dict):
     __name__ = ''  # root is required to have an empty name!
     __parent__ = None
     __acl__ = [('Allow', 'role:admin', ALL_PERMISSIONS)]
 
     def __init__(self, request):
-        super(TestingRootFactory, self).__init__()
+        super(RootFactory, self).__init__()
 
 
 def dummy_view(context, request):
@@ -284,7 +273,7 @@ def include_testing_view(config):
 
     config.add_view(
         dummy_view,
-        context=TestingRootFactory,
+        context=RootFactory,
         renderer='kotti:tests/testing_view.pt',
         )
 
@@ -292,7 +281,7 @@ def include_testing_view(config):
         dummy_view,
         name='secured',
         permission='view',
-        context=TestingRootFactory,
+        context=RootFactory,
         renderer='kotti:tests/testing_view.pt',
         )
 
@@ -306,7 +295,7 @@ def setUpFunctionalStrippedDownApp(global_config=None, **settings):
         'kotti.use_tables': 'principals',
         'kotti.populators': 'kotti.populate.populate_users',
         'pyramid.includes': 'kotti.testing.include_testing_view',
-        'kotti.root_factory': 'kotti.testing.TestingRootFactory',
+        'kotti.root_factory': 'kotti.testing.RootFactory',
         'kotti.site_title': 'My Stripped Down Kotti',
         }
     _settings.update(settings)
@@ -329,3 +318,8 @@ def registerDummyMailer():
     name = getattr(item, '__name__', item)
     deprecated(name, 'Unittest-style tests are deprecated as of Kotti 0.7. '
                'Please use pytest function arguments instead.')
+
+TestingRootFactory = RootFactory
+deprecated('TestingRootFactory',
+           "TestingRootFactory has been renamed to RootFactory and will be no "
+           "longer available starting with Kotti 2.0.0.")
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index ecb415133..b4f879e46 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -255,11 +255,11 @@ def browser(db_session, request, setup_app):
         pytest marker (or `pytest.mark.user`) can be used to pre-authenticate
         the browser with the given login name: `@user('admin')`.
     """
-    from wsgi_intercept import add_wsgi_intercept, zope_testbrowser
+    from zope.testbrowser.wsgi import Browser
     from kotti.testing import BASE_URL
     host, port = BASE_URL.split(':')[-2:]
-    add_wsgi_intercept(host[2:], int(port), lambda: setup_app)
-    browser = zope_testbrowser.WSGI_Browser(BASE_URL + '/')
+    browser = Browser('http://{}:{}/'.format(host[2:], int(port)),
+                      wsgi_app=setup_app)
     if 'user' in request.keywords:
         # set auth cookie directly on the browser instance...
         from pyramid.security import remember
diff --git a/kotti/tests/browser-minimal.txt b/kotti/tests/browser-minimal.txt
index 937094bd5..ed1510f33 100644
--- a/kotti/tests/browser-minimal.txt
+++ b/kotti/tests/browser-minimal.txt
@@ -32,7 +32,7 @@ User management
   >>> ctrl(name="query").value = "admin"
   >>> ctrl(name="search").click()
   >>> ctrl(name="role::admin::role:editor").value
-  False
+  []
   >>> ctrl(name="role::admin::role:admin").value
   True
 
diff --git a/kotti/tests/browser-workflow.txt b/kotti/tests/browser-workflow.txt
index 6fced8470..2c373429a 100644
--- a/kotti/tests/browser-workflow.txt
+++ b/kotti/tests/browser-workflow.txt
@@ -46,7 +46,7 @@ Make the front page public again:
   >>> browser.getLink("Make Public").click()
   >>> "Your changes have been saved" in browser.contents
   True
-  >>> browser_anonymous.reload()
+  >>> browser_anonymous.open(testing.BASE_URL)
   >>> WELCOME in browser_anonymous.contents
   True
 
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 5c1297b59..4079462a6 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from mock import patch, Mock
+from warnings import filterwarnings
 
+from mock import Mock
+from mock import patch
 from pyramid.interfaces import IAuthenticationPolicy
 from pyramid.interfaces import IAuthorizationPolicy
 from pyramid.interfaces import IView
@@ -14,12 +16,10 @@
 from zope.interface import implementedBy
 from zope.interface import providedBy
 
-from kotti.testing import TestingRootFactory
+from kotti.testing import RootFactory
 from kotti.testing import testing_db_url
 
-
 # filter deprecation warnings for code that is still tested...
-from warnings import filterwarnings
 filterwarnings('ignore', "^The 'kotti.includes' setting")
 
 
@@ -116,19 +116,19 @@ def test_root_factory(self, db_session):
         from kotti.resources import get_root
 
         settings = self.required_settings()
-        settings['kotti.root_factory'] = (TestingRootFactory,)
+        settings['kotti.root_factory'] = (RootFactory,)
         with patch('kotti.resources.initialize_sql'):
             with patch('kotti.filedepot.TweenFactory'):
                 app = main({}, **settings)
-        assert isinstance(get_root(), TestingRootFactory)
-        assert isinstance(app.root_factory(), TestingRootFactory)
+        assert isinstance(get_root(), RootFactory)
+        assert isinstance(app.root_factory(), RootFactory)
 
     def test_render_master_edit_template_minimal_root(self, no_filedepots,
                                                       settings=None):
         from kotti import main
 
         settings = settings or self.required_settings()
-        settings['kotti.root_factory'] = (TestingRootFactory,)
+        settings['kotti.root_factory'] = (RootFactory,)
         settings['kotti.site_title'] = 'My Site'
         with patch('kotti.resources.initialize_sql'):
             app = main({}, **settings)
diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 219cc6b16..3aa3955d3 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -82,3 +82,10 @@ def test_translate_titles_deprecated(self, allwarnings):
             ]
             _translate_titles(info)
             assert_deprecations(w, "removed in Kotti 2.0.0")
+
+    def test_testing_root_factory(self, allwarnings):
+        with warnings.catch_warnings(record=True) as w:
+            from kotti.testing import TestingRootFactory
+            __ = TestingRootFactory  # pyflakes
+            assert_deprecations(w, "will be no longer available starting with "
+                                   "Kotti 2.0.0.")
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index a7ff1a527..c0508f2a5 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -1,13 +1,10 @@
 # coding:utf8
 
-from StringIO import StringIO
-from mock import patch
-
 import pytest
-from webtest.forms import Upload
-
 from kotti.testing import BASE_URL
 from kotti.testing import user
+from mock import patch
+from webtest.forms import Upload
 
 
 class TestLogin:
@@ -36,8 +33,8 @@ def test_forbidden_redirect_when_authenticated(self, app):
 class TestUploadFile:
 
     def add_file(self, browser, contents='ABC'):
-        file_ctrl = browser.getControl("File").mech_control
-        file_ctrl.add_file(StringIO(contents), filename='my_image.gif')
+        file_ctrl = browser.getControl("File")
+        file_ctrl.add_file(contents, 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
 
     @user('admin')
@@ -104,8 +101,8 @@ def test_title_max_length_file_ok(self, browser):
         from kotti.resources import Node
         max_length = Node.name.property.columns[0].type.length
         browser.getControl("Title").value = '1' * max_length
-        file_ctrl = browser.getControl("File").mech_control
-        file_ctrl.add_file(StringIO("abc"), filename='my_image.gif')
+        file_ctrl = browser.getControl("File")
+        file_ctrl.add_file("abc", 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
         assert "Item was added" in browser.contents
 
@@ -115,8 +112,8 @@ def test_title_max_length_file_ko(self, browser):
         from kotti.resources import Node
         max_length = Node.name.property.columns[0].type.length
         browser.getControl("Title").value = '1' * (max_length + 1)  # the error
-        file_ctrl = browser.getControl("File").mech_control
-        file_ctrl.add_file(StringIO("abc"), filename='my_image.gif')
+        file_ctrl = browser.getControl("File")
+        file_ctrl.add_file("abc", 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
         assert "Item was added" not in browser.contents
 
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index 271bafe23..95e4f8c58 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -2,12 +2,11 @@
 
 import json
 
-from mechanize._mechanize import LinkNotFoundError
-from pytest import raises
-
 from kotti.testing import BASE_URL
 from kotti.testing import user
 from kotti.views.edit.upload import UploadView
+from pytest import raises
+from zope.testbrowser.browser import LinkNotFoundError
 
 
 def test_upload_anonymous(root, dummy_request, browser):
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 000000000..c3b47b392
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,19 @@
+[pytest]
+addopts =
+    --doctest-modules
+    --doctest-glob='*.txt'
+    --ignore=kotti/templates/
+    --capture=no
+    --strict
+    --pep8
+    --tb=native
+    --cov=kotti
+    --cov-report=term-missing
+    --travis-fold=auto
+
+    kotti/
+python_files = test_*.py
+pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
+markers =
+    user: mark test to be run as the given user
+    slow: mark test to be run only with --runslow option
diff --git a/setup.cfg b/setup.cfg
index df087075c..44bed5353 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,23 +1,3 @@
-[pytest]
-addopts =
-    --doctest-modules
-    --doctest-glob='*.txt'
-    --ignore=kotti/templates/
-    --capture=no
-    --strict
-    --pep8
-    --tb=native
-    --cov=kotti
-    --cov-report=term-missing
-    --travis-fold=auto
-
-    kotti/
-python_files = test_*.py
-pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
-markers =
-    user: mark test to be run as the given user
-    slow: mark test to be run only with --runslow option
-
 [aliases]
 dev = develop easy_install Kotti[testing] Kotti[development]
 docs = develop easy_install Kotti[docs]
diff --git a/setup.py b/setup.py
index 6d2b31d4b..c780f2b5c 100644
--- a/setup.py
+++ b/setup.py
@@ -71,8 +71,7 @@
     'pytest-travis-fold',
     'pytest-xdist',
     'virtualenv',  # needed for scaffolding tests
-    'wsgi_intercept==0.5.1',
-    'zope.testbrowser',
+    'zope.testbrowser>=5.0.0',
     ]
 
 development_requires = []

From efc44c234746d4eaec5dcdbc4a3ab6df44686d1a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 17:13:09 +0200
Subject: [PATCH 446/600] Upgrade to ``repoze.workflow==1.0b``.  Also remove
 indirect requirements in ``setup.py``.

---
 CHANGES.txt              |  6 ++++++
 kotti/tests/test_node.py | 41 ++++++++++++++++++++++------------------
 kotti/workflow.zcml      | 16 ++++++++--------
 requirements.txt         | 30 ++++++++++++++---------------
 setup.py                 |  8 +++-----
 5 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3e94b2e18..ea5fb86ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -39,6 +39,12 @@ Change History
   ``kotti.testing.RootFactory`` to prevent another deprecation warning with
   ``pytest>=3.0``.
 
+- Upgrade to ``repoze.workflow==1.0b``.  **If your application has a custom
+  ``workflow.zcml``, it needs a little modification: ``state`` and
+  ``transition`` titles are no longer ``key`` nodes, but attributes on the
+  respective ``state`` or ``transition`` nodes.  See Kotti's ``workflow.zcml``
+  for an example.**
+
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index b1c7f9cfd..2ef5b0ade 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from pytest import mark
 from pytest import raises
-from pyramid.security import ALL_PERMISSIONS
+from pyramid.security import ALL_PERMISSIONS, Deny, Everyone
 from pyramid.security import Allow
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.exc import SQLAlchemyError
@@ -11,29 +11,34 @@ class TestNode:
     def test_root_acl(self, db_session, root):
 
         # The root object has a persistent ACL set:
-        assert (
-            root.__acl__[1:] == [
-                ('Allow', 'role:owner', u'view'),
-                ('Allow', 'role:owner', u'add'),
-                ('Allow', 'role:owner', u'edit'),
-                ('Allow', 'role:owner', u'delete'),
-                ('Allow', 'role:owner', u'manage'),
-                ('Allow', 'role:owner', u'state_change'),
-                ('Allow', 'role:viewer', u'view'),
-                ('Allow', 'role:editor', u'view'),
-                ('Allow', 'role:editor', u'add'),
-                ('Allow', 'role:editor', u'edit'),
-                ('Allow', 'role:editor', u'delete'),
-                ('Allow', 'role:editor', u'state_change'),
-                ('Allow', 'system.Everyone', u'view'),
-                ('Deny', 'system.Everyone', ALL_PERMISSIONS),
-            ])
+        for ace in (
+            (Allow, 'role:owner', u'view'),
+            (Allow, 'role:owner', u'add'),
+            (Allow, 'role:owner', u'edit'),
+            (Allow, 'role:owner', u'delete'),
+            (Allow, 'role:owner', u'manage'),
+            (Allow, 'role:owner', u'state_change'),
+            (Allow, 'role:viewer', u'view'),
+            (Allow, 'role:editor', u'view'),
+            (Allow, 'role:editor', u'add'),
+            (Allow, 'role:editor', u'edit'),
+            (Allow, 'role:editor', u'delete'),
+            (Allow, 'role:editor', u'state_change'),
+            (Allow, Everyone, u'view'),
+        ):
+            assert ace in root.__acl__[1:-1]
 
         # The first ACE is here to prevent lock-out:
         assert (
             root.__acl__[0] ==
             (Allow, 'role:admin', ALL_PERMISSIONS))
 
+        # The last ACE denies everything for everyone
+        assert (
+            root.__acl__[-1] ==
+            (Deny, Everyone, ALL_PERMISSIONS)
+        )
+
     def test_set_and_get_acl(self, db_session, root):
 
         # The __acl__ attribute of Nodes allows access to the mapped
diff --git a/kotti/workflow.zcml b/kotti/workflow.zcml
index ff6229bf7..78f4cd68d 100644
--- a/kotti/workflow.zcml
+++ b/kotti/workflow.zcml
@@ -17,8 +17,8 @@
             content_types="kotti.interfaces.IDefaultWorkflow"
             permission_checker="pyramid.security.has_permission">
 
-    <state name="private" callback="kotti.workflow.workflow_callback">
-      <key name="title" value="Private" i18n:attributes="value"/>
+    <state name="private" title="Private" i18n:attributes="title"
+           callback="kotti.workflow.workflow_callback">
       <key name="order" value="1" />
       <key name="inherit" value="0" />
       <key name="system.Everyone" value="" />
@@ -27,8 +27,8 @@
       <key name="role:owner" value="view add edit delete manage state_change" />
     </state>
 
-    <state name="public" callback="kotti.workflow.workflow_callback">
-      <key name="title" value="Public" i18n:attributes="value"/>
+    <state name="public" title="Public" i18n:attributes="title"
+           callback="kotti.workflow.workflow_callback">
       <key name="order" value="2" />
       <key name="inherit" value="0" />
       <key name="system.Everyone" value="view" />
@@ -38,13 +38,13 @@
     </state>
 
     <transition name="private_to_public" permission="state_change"
-                from_state="private" to_state="public">
-      <key name="title" value="publish" i18n:attributes="value"/>
+                from_state="private" to_state="public"
+                title="publish" i18n:attributes="title">
     </transition>
 
     <transition name="public_to_private" permission="state_change"
-                from_state="public" to_state="private">
-      <key name="title" value="unpublish" i18n:attributes="value"/>
+                from_state="public" to_state="private"
+                title="unpublish" i18n:attributes="title">
     </transition>
 
   </workflow>
diff --git a/requirements.txt b/requirements.txt
index c03bd9fd7..610bf1e0f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,60 +1,59 @@
 # -*- coding: utf-8 -*-
 Kotti==1.3.0-alpha.4
+
 alembic==0.8.8
 appdirs==1.4.0
 Babel==2.3.4
 Beaker==1.8.0
 bleach==1.4.3
 bleach-whitelist==0.0.7
+Chameleon==2.25
 colander==1.2
-Chameleon==2.24
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
 filedepot==0.4.0
-FormEncode==1.3.1
+FormEncode==2.0.0a1
+funcsigs==1.0.2
 html2text==2016.9.19
 html5lib==0.9999999
 iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
-js.deform==2.0a2-3
+js.deform==2.0a2.post3
 js.fineuploader==3.3.0
 js.html5shiv==3.7.3
 js.jquery==1.9.1
-js.jquery-form==3.09
+js.jquery-form==3.9
 js.jquery-maskedinput==1.3.1
 js.jquery-maskmoney==1.4.1
 js.jquery-sortable==0.9.12
 js.jquery-tablednd==0.4
 js.jquery-timepicker-addon==1.5.3
 js.jqueryui==1.10.3
-js.jqueryui-tagit==2.0.24-2
+js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
-kotti-tinymce==0.5.4
+js.tinymce==4.2.7
 kotti-image==0.1.3
+kotti-tinymce==0.5.4
+LEPL==5.1.3
 lingua==4.9
-lxml==3.6.4
 Mako==1.0.4
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 peppercorn==0.5
-Pillow==3.3.1
-plone.scale==2.0
 polib==1.0.7
 py-bcrypt==0.4
-Pygments==2.1.3
 pyramid==1.7.3
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==3.0.4
 pyramid-deform==0.2
 pyramid-mailer==0.14.1
-pyramid-mako==1.0.2
 pyramid-tm==1.0
 pyramid-zcml==1.0.0
-pytz==2016.6.1
+python-editor==1.0.1
+pytz==2016.7
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==0.6.1
@@ -62,16 +61,15 @@ repoze.zcml==1.0b1
 rfc6266==0.0.4
 shutilwhich==1.1.0
 six==1.10.0
-SQLAlchemy==1.0.15
+SQLAlchemy==1.1.1
 SQLAlchemy-Utils==0.32.9
 transaction==1.6.1
 translationstring==1.3
-Unidecode==0.04.19
+Unidecode==0.4.19
 usersettings==1.0.7
 venusian==1.0
 waitress==1.0.0
 WebOb==1.6.1
-wsgiref==0.1.2
 zope.component==4.3.0
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
diff --git a/setup.py b/setup.py
index c780f2b5c..39cd9b1d5 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,6 @@
 install_requires = [
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
-    'Pillow',  # dependency of plone.scale
     'alembic>=0.8.0',
     'bleach',
     'bleach-whitelist',
@@ -38,18 +37,16 @@
     'js.jqueryui_tagit',
     'kotti_image',
     'lingua>=1.3',
-    'plone.scale',  # needed for image resizing capabilities
     'py_bcrypt',
     'pyramid>=1.5',  # needed for ``request.has_permission``
     'pyramid_beaker',
     'pyramid_chameleon',
-    'pyramid_debugtoolbar',
     'pyramid_deform>=0.2a3',  # language and template path config includeme
     'pyramid_mailer',
     'pyramid_tm',
     'pyramid_zcml',
     'repoze.lru',
-    'repoze.workflow',
+    'repoze.workflow>=1.0b',
     'rfc6266',
     'sqlalchemy>=1.0.0',
     'sqlalchemy-utils',
@@ -65,7 +62,8 @@
     'WebTest',
     'mock',
     'pyquery',
-    'pytest>=2.4.2',
+    'pyramid_debugtoolbar',
+    'pytest>=3.0.0',
     'pytest-cov',
     'pytest-pep8!=1.0.3',
     'pytest-travis-fold',

From 4c96e865cd02cfcba14092aa0fb35e77f8ae91f2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 19:07:06 +0200
Subject: [PATCH 447/600] Require ``py>=1.4.29`` to fix Travis problem.

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 39cd9b1d5..75bfe66e3 100644
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,7 @@
 tests_require = [
     'WebTest',
     'mock',
+    'py>=1.4.29',
     'pyquery',
     'pyramid_debugtoolbar',
     'pytest>=3.0.0',

From 67a9097d3928eb06758e73f3035570c185864881 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 19:12:22 +0200
Subject: [PATCH 448/600] Fix wrong version number.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 75bfe66e3..d42a0a8b9 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
     'pyramid_tm',
     'pyramid_zcml',
     'repoze.lru',
-    'repoze.workflow>=1.0b',
+    'repoze.workflow>=1.0b1',
     'rfc6266',
     'sqlalchemy>=1.0.0',
     'sqlalchemy-utils',

From 98d7e501a350791b5da7aa54446055039fa22849 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 19:14:05 +0200
Subject: [PATCH 449/600] Also pin in requirements.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 610bf1e0f..4fca0c01c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -56,7 +56,7 @@ python-editor==1.0.1
 pytz==2016.7
 repoze.lru==0.6
 repoze.sendmail==4.2
-repoze.workflow==0.6.1
+repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 rfc6266==0.0.4
 shutilwhich==1.1.0

From 013d5a37de35d246b48ce0168d93078f0e756c2c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 19:27:23 +0200
Subject: [PATCH 450/600] Upgrade dependencies and testing (#510)

* Upgrade tests to ``zope.testbrowser>=5.0.0``.
* Move ``pytest`` config from ``setup.cfg`` to new ``pytest.ini``.
* Rename ``kotti.testing.TestingRootFactory`` to ``kotti.testing.RootFactory``.
* Upgrade to ``repoze.workflow==1.0b``.  See CHANGES for details.
* Remove indirect requirements in ``setup.py``.
* Require ``py>=1.4.29`` to fix Travis problem.
---
 CHANGES.txt                                  | 17 +++++++-
 kotti/scaffolds/package/+dot+travis.yml_tmpl |  1 -
 kotti/scaffolds/package/pytest.ini_tmpl      | 16 +++++++
 kotti/scaffolds/package/setup.cfg_tmpl       | 17 --------
 kotti/testing.py                             | 46 +++++++++-----------
 kotti/tests/__init__.py                      |  6 +--
 kotti/tests/browser-minimal.txt              |  2 +-
 kotti/tests/browser-workflow.txt             |  2 +-
 kotti/tests/test_app.py                      | 16 +++----
 kotti/tests/test_deprecated.py               |  7 +++
 kotti/tests/test_functional.py               | 19 ++++----
 kotti/tests/test_node.py                     | 41 +++++++++--------
 kotti/tests/test_upload.py                   |  5 +--
 kotti/workflow.zcml                          | 16 +++----
 pytest.ini                                   | 19 ++++++++
 requirements.txt                             | 32 +++++++-------
 setup.cfg                                    | 20 ---------
 setup.py                                     | 12 +++--
 18 files changed, 152 insertions(+), 142 deletions(-)
 create mode 100644 kotti/scaffolds/package/pytest.ini_tmpl
 create mode 100644 pytest.ini

diff --git a/CHANGES.txt b/CHANGES.txt
index 60236ae6c..ea5fb86ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,10 +26,25 @@ Change History
   systems for which SQLAlchemy provides dialects except Oracle (Firebird,
   Microsoft SQL Server, MySQL, Postgres, SQLite, Sybase) there's no need to
   do anything.
-  
+
 - We use PEP 440 normalized form for the project's version thus current
   "1.3.0-alpha.5-dev" became "1.3.0a5.dev0".
 
+- Upgrade tests to ``zope.testbrowser>=5.0.0``.
+
+- Move ``pytest`` config from ``setup.cfg`` to new ``pytest.ini``.  This
+  prevents a deprecation warning with ``pytest>=3.0``.
+
+- Rename ``kotti.testing.TestingRootFactory`` to
+  ``kotti.testing.RootFactory`` to prevent another deprecation warning with
+  ``pytest>=3.0``.
+
+- Upgrade to ``repoze.workflow==1.0b``.  **If your application has a custom
+  ``workflow.zcml``, it needs a little modification: ``state`` and
+  ``transition`` titles are no longer ``key`` nodes, but attributes on the
+  respective ``state`` or ``transition`` nodes.  See Kotti's ``workflow.zcml``
+  for an example.**
+
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
diff --git a/kotti/scaffolds/package/+dot+travis.yml_tmpl b/kotti/scaffolds/package/+dot+travis.yml_tmpl
index 60243d302..131eca72a 100644
--- a/kotti/scaffolds/package/+dot+travis.yml_tmpl
+++ b/kotti/scaffolds/package/+dot+travis.yml_tmpl
@@ -17,7 +17,6 @@ install:
   - travis_retry pip install psycopg2 oursql python-coveralls codecov
   - pip install -e . -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
   - pip install --pre Kotti
-  - pip install "wsgi_intercept==0.5.1"
   - python setup.py devbefore_script:
   - psql -c 'create database {{package}}_testing;' -U postgres
   - mysql -e 'create database {{package}}_testing;'
diff --git a/kotti/scaffolds/package/pytest.ini_tmpl b/kotti/scaffolds/package/pytest.ini_tmpl
new file mode 100644
index 000000000..9b766a428
--- /dev/null
+++ b/kotti/scaffolds/package/pytest.ini_tmpl
@@ -0,0 +1,16 @@
+[pytest]
+addopts =
+    --doctest-modules
+    --doctest-glob='*.txt'
+    --capture=no
+    --cov={{package}}
+    --cov-report=term-missing
+    --cov-config .coveragerc
+    --ignore={{package}}/templates/
+    --strict
+    --pep8
+    {{package}}/tests
+python_files = test*py
+markers =
+    user: mark test to be run as the given user
+pep8ignore = E501 E122 E123 E125 E128 E711 E402
diff --git a/kotti/scaffolds/package/setup.cfg_tmpl b/kotti/scaffolds/package/setup.cfg_tmpl
index 93b39155e..753c3c6cd 100644
--- a/kotti/scaffolds/package/setup.cfg_tmpl
+++ b/kotti/scaffolds/package/setup.cfg_tmpl
@@ -5,20 +5,3 @@ tag_svn_revision = true
 [aliases]
 dev = develop easy_install kotti[testing] kotti[development]
 docs = develop easy_install kotti[docs]
-
-[pytest]
-addopts =
-    --doctest-modules
-    --doctest-glob='*.txt'
-    --capture=no
-    --cov={{package}}
-    --cov-report=term-missing
-    --cov-config .coveragerc
-    --ignore={{package}}/templates/
-    --strict
-    --pep8
-    {{package}}/tests
-python_files = test*py
-markers =
-    user: mark test to be run as the given user
-pep8ignore = E501 E122 E123 E125 E128 E711 E402
diff --git a/kotti/testing.py b/kotti/testing.py
index f143fde84..17ed6964a 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -10,21 +10,19 @@
 import os
 from os.path import join, dirname
 from unittest import TestCase
-from pytest import mark
+from warnings import catch_warnings
 
+import transaction
 from pyramid import testing
 from pyramid.events import NewResponse
 from pyramid.interfaces import ILocation
 from pyramid.security import ALL_PERMISSIONS
-from zope.deprecation.deprecation import deprecate
+from pytest import mark
 from zope.interface import implementer
-import transaction
-
 
 # re-enable deprecation warnings during test runs
 # however, let the `ImportWarning` produced by Babel's
 # `localedata.py` vs `localedata/` show up once...
-from warnings import catch_warnings
 with catch_warnings():
     from babel import localedata
     import compiler
@@ -205,7 +203,7 @@ def _zope_testbrowser_pyquery(self):
 
 def setUpFunctional(global_config=None, **settings):
     from kotti import main
-    import wsgi_intercept.zope_testbrowser
+    from zope.testbrowser.wsgi import Browser
     from webtest import TestApp
 
     tearDown()
@@ -222,13 +220,15 @@ def setUpFunctional(global_config=None, **settings):
 
     host, port = BASE_URL.split(':')[-2:]
     app = main({}, **_settings)
-    wsgi_intercept.add_wsgi_intercept(host[2:], int(port), lambda: app)
-    Browser = wsgi_intercept.zope_testbrowser.WSGI_Browser
     Browser.pyquery = property(_zope_testbrowser_pyquery)
 
     return dict(
-        Browser=Browser,
-        browser=Browser(),
+        Browser=lambda: Browser(
+            'http://{}:{}/'.format(host[2:], int(port)),
+            wsgi_app=app),
+        browser=Browser(
+            'http://{}:{}/'.format(host[2:], int(port)),
+            wsgi_app=app),
         test_app=TestApp(app),
         )
 
@@ -249,26 +249,15 @@ def login(self, login=u'admin', password=u'secret'):
             status=302,
             )
 
-    @deprecate('login_testbrowser is deprecated as of Kotti 0.7.  Please use '
-               'the `browser` funcarg in conjunction with the `@user` '
-               'decorator.')
-    def login_testbrowser(self, login=u'admin', password=u'secret'):
-        browser = self.Browser()
-        browser.open(BASE_URL + '/edit')
-        browser.getControl("Username or email").value = login
-        browser.getControl("Password").value = password
-        browser.getControl(name="submit").click()
-        return browser
-
 
 @implementer(ILocation)
-class TestingRootFactory(dict):
+class RootFactory(dict):
     __name__ = ''  # root is required to have an empty name!
     __parent__ = None
     __acl__ = [('Allow', 'role:admin', ALL_PERMISSIONS)]
 
     def __init__(self, request):
-        super(TestingRootFactory, self).__init__()
+        super(RootFactory, self).__init__()
 
 
 def dummy_view(context, request):
@@ -284,7 +273,7 @@ def include_testing_view(config):
 
     config.add_view(
         dummy_view,
-        context=TestingRootFactory,
+        context=RootFactory,
         renderer='kotti:tests/testing_view.pt',
         )
 
@@ -292,7 +281,7 @@ def include_testing_view(config):
         dummy_view,
         name='secured',
         permission='view',
-        context=TestingRootFactory,
+        context=RootFactory,
         renderer='kotti:tests/testing_view.pt',
         )
 
@@ -306,7 +295,7 @@ def setUpFunctionalStrippedDownApp(global_config=None, **settings):
         'kotti.use_tables': 'principals',
         'kotti.populators': 'kotti.populate.populate_users',
         'pyramid.includes': 'kotti.testing.include_testing_view',
-        'kotti.root_factory': 'kotti.testing.TestingRootFactory',
+        'kotti.root_factory': 'kotti.testing.RootFactory',
         'kotti.site_title': 'My Stripped Down Kotti',
         }
     _settings.update(settings)
@@ -329,3 +318,8 @@ def registerDummyMailer():
     name = getattr(item, '__name__', item)
     deprecated(name, 'Unittest-style tests are deprecated as of Kotti 0.7. '
                'Please use pytest function arguments instead.')
+
+TestingRootFactory = RootFactory
+deprecated('TestingRootFactory',
+           "TestingRootFactory has been renamed to RootFactory and will be no "
+           "longer available starting with Kotti 2.0.0.")
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index ecb415133..b4f879e46 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -255,11 +255,11 @@ def browser(db_session, request, setup_app):
         pytest marker (or `pytest.mark.user`) can be used to pre-authenticate
         the browser with the given login name: `@user('admin')`.
     """
-    from wsgi_intercept import add_wsgi_intercept, zope_testbrowser
+    from zope.testbrowser.wsgi import Browser
     from kotti.testing import BASE_URL
     host, port = BASE_URL.split(':')[-2:]
-    add_wsgi_intercept(host[2:], int(port), lambda: setup_app)
-    browser = zope_testbrowser.WSGI_Browser(BASE_URL + '/')
+    browser = Browser('http://{}:{}/'.format(host[2:], int(port)),
+                      wsgi_app=setup_app)
     if 'user' in request.keywords:
         # set auth cookie directly on the browser instance...
         from pyramid.security import remember
diff --git a/kotti/tests/browser-minimal.txt b/kotti/tests/browser-minimal.txt
index 937094bd5..ed1510f33 100644
--- a/kotti/tests/browser-minimal.txt
+++ b/kotti/tests/browser-minimal.txt
@@ -32,7 +32,7 @@ User management
   >>> ctrl(name="query").value = "admin"
   >>> ctrl(name="search").click()
   >>> ctrl(name="role::admin::role:editor").value
-  False
+  []
   >>> ctrl(name="role::admin::role:admin").value
   True
 
diff --git a/kotti/tests/browser-workflow.txt b/kotti/tests/browser-workflow.txt
index 6fced8470..2c373429a 100644
--- a/kotti/tests/browser-workflow.txt
+++ b/kotti/tests/browser-workflow.txt
@@ -46,7 +46,7 @@ Make the front page public again:
   >>> browser.getLink("Make Public").click()
   >>> "Your changes have been saved" in browser.contents
   True
-  >>> browser_anonymous.reload()
+  >>> browser_anonymous.open(testing.BASE_URL)
   >>> WELCOME in browser_anonymous.contents
   True
 
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 5c1297b59..4079462a6 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from mock import patch, Mock
+from warnings import filterwarnings
 
+from mock import Mock
+from mock import patch
 from pyramid.interfaces import IAuthenticationPolicy
 from pyramid.interfaces import IAuthorizationPolicy
 from pyramid.interfaces import IView
@@ -14,12 +16,10 @@
 from zope.interface import implementedBy
 from zope.interface import providedBy
 
-from kotti.testing import TestingRootFactory
+from kotti.testing import RootFactory
 from kotti.testing import testing_db_url
 
-
 # filter deprecation warnings for code that is still tested...
-from warnings import filterwarnings
 filterwarnings('ignore', "^The 'kotti.includes' setting")
 
 
@@ -116,19 +116,19 @@ def test_root_factory(self, db_session):
         from kotti.resources import get_root
 
         settings = self.required_settings()
-        settings['kotti.root_factory'] = (TestingRootFactory,)
+        settings['kotti.root_factory'] = (RootFactory,)
         with patch('kotti.resources.initialize_sql'):
             with patch('kotti.filedepot.TweenFactory'):
                 app = main({}, **settings)
-        assert isinstance(get_root(), TestingRootFactory)
-        assert isinstance(app.root_factory(), TestingRootFactory)
+        assert isinstance(get_root(), RootFactory)
+        assert isinstance(app.root_factory(), RootFactory)
 
     def test_render_master_edit_template_minimal_root(self, no_filedepots,
                                                       settings=None):
         from kotti import main
 
         settings = settings or self.required_settings()
-        settings['kotti.root_factory'] = (TestingRootFactory,)
+        settings['kotti.root_factory'] = (RootFactory,)
         settings['kotti.site_title'] = 'My Site'
         with patch('kotti.resources.initialize_sql'):
             app = main({}, **settings)
diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 219cc6b16..3aa3955d3 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -82,3 +82,10 @@ def test_translate_titles_deprecated(self, allwarnings):
             ]
             _translate_titles(info)
             assert_deprecations(w, "removed in Kotti 2.0.0")
+
+    def test_testing_root_factory(self, allwarnings):
+        with warnings.catch_warnings(record=True) as w:
+            from kotti.testing import TestingRootFactory
+            __ = TestingRootFactory  # pyflakes
+            assert_deprecations(w, "will be no longer available starting with "
+                                   "Kotti 2.0.0.")
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index a7ff1a527..c0508f2a5 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -1,13 +1,10 @@
 # coding:utf8
 
-from StringIO import StringIO
-from mock import patch
-
 import pytest
-from webtest.forms import Upload
-
 from kotti.testing import BASE_URL
 from kotti.testing import user
+from mock import patch
+from webtest.forms import Upload
 
 
 class TestLogin:
@@ -36,8 +33,8 @@ def test_forbidden_redirect_when_authenticated(self, app):
 class TestUploadFile:
 
     def add_file(self, browser, contents='ABC'):
-        file_ctrl = browser.getControl("File").mech_control
-        file_ctrl.add_file(StringIO(contents), filename='my_image.gif')
+        file_ctrl = browser.getControl("File")
+        file_ctrl.add_file(contents, 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
 
     @user('admin')
@@ -104,8 +101,8 @@ def test_title_max_length_file_ok(self, browser):
         from kotti.resources import Node
         max_length = Node.name.property.columns[0].type.length
         browser.getControl("Title").value = '1' * max_length
-        file_ctrl = browser.getControl("File").mech_control
-        file_ctrl.add_file(StringIO("abc"), filename='my_image.gif')
+        file_ctrl = browser.getControl("File")
+        file_ctrl.add_file("abc", 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
         assert "Item was added" in browser.contents
 
@@ -115,8 +112,8 @@ def test_title_max_length_file_ko(self, browser):
         from kotti.resources import Node
         max_length = Node.name.property.columns[0].type.length
         browser.getControl("Title").value = '1' * (max_length + 1)  # the error
-        file_ctrl = browser.getControl("File").mech_control
-        file_ctrl.add_file(StringIO("abc"), filename='my_image.gif')
+        file_ctrl = browser.getControl("File")
+        file_ctrl.add_file("abc", 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
         assert "Item was added" not in browser.contents
 
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index b1c7f9cfd..2ef5b0ade 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from pytest import mark
 from pytest import raises
-from pyramid.security import ALL_PERMISSIONS
+from pyramid.security import ALL_PERMISSIONS, Deny, Everyone
 from pyramid.security import Allow
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.exc import SQLAlchemyError
@@ -11,29 +11,34 @@ class TestNode:
     def test_root_acl(self, db_session, root):
 
         # The root object has a persistent ACL set:
-        assert (
-            root.__acl__[1:] == [
-                ('Allow', 'role:owner', u'view'),
-                ('Allow', 'role:owner', u'add'),
-                ('Allow', 'role:owner', u'edit'),
-                ('Allow', 'role:owner', u'delete'),
-                ('Allow', 'role:owner', u'manage'),
-                ('Allow', 'role:owner', u'state_change'),
-                ('Allow', 'role:viewer', u'view'),
-                ('Allow', 'role:editor', u'view'),
-                ('Allow', 'role:editor', u'add'),
-                ('Allow', 'role:editor', u'edit'),
-                ('Allow', 'role:editor', u'delete'),
-                ('Allow', 'role:editor', u'state_change'),
-                ('Allow', 'system.Everyone', u'view'),
-                ('Deny', 'system.Everyone', ALL_PERMISSIONS),
-            ])
+        for ace in (
+            (Allow, 'role:owner', u'view'),
+            (Allow, 'role:owner', u'add'),
+            (Allow, 'role:owner', u'edit'),
+            (Allow, 'role:owner', u'delete'),
+            (Allow, 'role:owner', u'manage'),
+            (Allow, 'role:owner', u'state_change'),
+            (Allow, 'role:viewer', u'view'),
+            (Allow, 'role:editor', u'view'),
+            (Allow, 'role:editor', u'add'),
+            (Allow, 'role:editor', u'edit'),
+            (Allow, 'role:editor', u'delete'),
+            (Allow, 'role:editor', u'state_change'),
+            (Allow, Everyone, u'view'),
+        ):
+            assert ace in root.__acl__[1:-1]
 
         # The first ACE is here to prevent lock-out:
         assert (
             root.__acl__[0] ==
             (Allow, 'role:admin', ALL_PERMISSIONS))
 
+        # The last ACE denies everything for everyone
+        assert (
+            root.__acl__[-1] ==
+            (Deny, Everyone, ALL_PERMISSIONS)
+        )
+
     def test_set_and_get_acl(self, db_session, root):
 
         # The __acl__ attribute of Nodes allows access to the mapped
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index 271bafe23..95e4f8c58 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -2,12 +2,11 @@
 
 import json
 
-from mechanize._mechanize import LinkNotFoundError
-from pytest import raises
-
 from kotti.testing import BASE_URL
 from kotti.testing import user
 from kotti.views.edit.upload import UploadView
+from pytest import raises
+from zope.testbrowser.browser import LinkNotFoundError
 
 
 def test_upload_anonymous(root, dummy_request, browser):
diff --git a/kotti/workflow.zcml b/kotti/workflow.zcml
index ff6229bf7..78f4cd68d 100644
--- a/kotti/workflow.zcml
+++ b/kotti/workflow.zcml
@@ -17,8 +17,8 @@
             content_types="kotti.interfaces.IDefaultWorkflow"
             permission_checker="pyramid.security.has_permission">
 
-    <state name="private" callback="kotti.workflow.workflow_callback">
-      <key name="title" value="Private" i18n:attributes="value"/>
+    <state name="private" title="Private" i18n:attributes="title"
+           callback="kotti.workflow.workflow_callback">
       <key name="order" value="1" />
       <key name="inherit" value="0" />
       <key name="system.Everyone" value="" />
@@ -27,8 +27,8 @@
       <key name="role:owner" value="view add edit delete manage state_change" />
     </state>
 
-    <state name="public" callback="kotti.workflow.workflow_callback">
-      <key name="title" value="Public" i18n:attributes="value"/>
+    <state name="public" title="Public" i18n:attributes="title"
+           callback="kotti.workflow.workflow_callback">
       <key name="order" value="2" />
       <key name="inherit" value="0" />
       <key name="system.Everyone" value="view" />
@@ -38,13 +38,13 @@
     </state>
 
     <transition name="private_to_public" permission="state_change"
-                from_state="private" to_state="public">
-      <key name="title" value="publish" i18n:attributes="value"/>
+                from_state="private" to_state="public"
+                title="publish" i18n:attributes="title">
     </transition>
 
     <transition name="public_to_private" permission="state_change"
-                from_state="public" to_state="private">
-      <key name="title" value="unpublish" i18n:attributes="value"/>
+                from_state="public" to_state="private"
+                title="unpublish" i18n:attributes="title">
     </transition>
 
   </workflow>
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 000000000..c3b47b392
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,19 @@
+[pytest]
+addopts =
+    --doctest-modules
+    --doctest-glob='*.txt'
+    --ignore=kotti/templates/
+    --capture=no
+    --strict
+    --pep8
+    --tb=native
+    --cov=kotti
+    --cov-report=term-missing
+    --travis-fold=auto
+
+    kotti/
+python_files = test_*.py
+pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
+markers =
+    user: mark test to be run as the given user
+    slow: mark test to be run only with --runslow option
diff --git a/requirements.txt b/requirements.txt
index c03bd9fd7..4fca0c01c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,77 +1,75 @@
 # -*- coding: utf-8 -*-
 Kotti==1.3.0-alpha.4
+
 alembic==0.8.8
 appdirs==1.4.0
 Babel==2.3.4
 Beaker==1.8.0
 bleach==1.4.3
 bleach-whitelist==0.0.7
+Chameleon==2.25
 colander==1.2
-Chameleon==2.24
 deform==2.0a2
 docopt==0.6.2
 fanstatic==1.0a7
 filedepot==0.4.0
-FormEncode==1.3.1
+FormEncode==2.0.0a1
+funcsigs==1.0.2
 html2text==2016.9.19
 html5lib==0.9999999
 iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
-js.deform==2.0a2-3
+js.deform==2.0a2.post3
 js.fineuploader==3.3.0
 js.html5shiv==3.7.3
 js.jquery==1.9.1
-js.jquery-form==3.09
+js.jquery-form==3.9
 js.jquery-maskedinput==1.3.1
 js.jquery-maskmoney==1.4.1
 js.jquery-sortable==0.9.12
 js.jquery-tablednd==0.4
 js.jquery-timepicker-addon==1.5.3
 js.jqueryui==1.10.3
-js.jqueryui-tagit==2.0.24-2
+js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
-kotti-tinymce==0.5.4
+js.tinymce==4.2.7
 kotti-image==0.1.3
+kotti-tinymce==0.5.4
+LEPL==5.1.3
 lingua==4.9
-lxml==3.6.4
 Mako==1.0.4
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 peppercorn==0.5
-Pillow==3.3.1
-plone.scale==2.0
 polib==1.0.7
 py-bcrypt==0.4
-Pygments==2.1.3
 pyramid==1.7.3
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
-pyramid-debugtoolbar==3.0.4
 pyramid-deform==0.2
 pyramid-mailer==0.14.1
-pyramid-mako==1.0.2
 pyramid-tm==1.0
 pyramid-zcml==1.0.0
-pytz==2016.6.1
+python-editor==1.0.1
+pytz==2016.7
 repoze.lru==0.6
 repoze.sendmail==4.2
-repoze.workflow==0.6.1
+repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 rfc6266==0.0.4
 shutilwhich==1.1.0
 six==1.10.0
-SQLAlchemy==1.0.15
+SQLAlchemy==1.1.1
 SQLAlchemy-Utils==0.32.9
 transaction==1.6.1
 translationstring==1.3
-Unidecode==0.04.19
+Unidecode==0.4.19
 usersettings==1.0.7
 venusian==1.0
 waitress==1.0.0
 WebOb==1.6.1
-wsgiref==0.1.2
 zope.component==4.3.0
 zope.configuration==4.0.3
 zope.deprecation==4.1.2
diff --git a/setup.cfg b/setup.cfg
index df087075c..44bed5353 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,23 +1,3 @@
-[pytest]
-addopts =
-    --doctest-modules
-    --doctest-glob='*.txt'
-    --ignore=kotti/templates/
-    --capture=no
-    --strict
-    --pep8
-    --tb=native
-    --cov=kotti
-    --cov-report=term-missing
-    --travis-fold=auto
-
-    kotti/
-python_files = test_*.py
-pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
-markers =
-    user: mark test to be run as the given user
-    slow: mark test to be run only with --runslow option
-
 [aliases]
 dev = develop easy_install Kotti[testing] Kotti[development]
 docs = develop easy_install Kotti[docs]
diff --git a/setup.py b/setup.py
index 6d2b31d4b..d42a0a8b9 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,6 @@
 install_requires = [
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
-    'Pillow',  # dependency of plone.scale
     'alembic>=0.8.0',
     'bleach',
     'bleach-whitelist',
@@ -38,18 +37,16 @@
     'js.jqueryui_tagit',
     'kotti_image',
     'lingua>=1.3',
-    'plone.scale',  # needed for image resizing capabilities
     'py_bcrypt',
     'pyramid>=1.5',  # needed for ``request.has_permission``
     'pyramid_beaker',
     'pyramid_chameleon',
-    'pyramid_debugtoolbar',
     'pyramid_deform>=0.2a3',  # language and template path config includeme
     'pyramid_mailer',
     'pyramid_tm',
     'pyramid_zcml',
     'repoze.lru',
-    'repoze.workflow',
+    'repoze.workflow>=1.0b1',
     'rfc6266',
     'sqlalchemy>=1.0.0',
     'sqlalchemy-utils',
@@ -64,15 +61,16 @@
 tests_require = [
     'WebTest',
     'mock',
+    'py>=1.4.29',
     'pyquery',
-    'pytest>=2.4.2',
+    'pyramid_debugtoolbar',
+    'pytest>=3.0.0',
     'pytest-cov',
     'pytest-pep8!=1.0.3',
     'pytest-travis-fold',
     'pytest-xdist',
     'virtualenv',  # needed for scaffolding tests
-    'wsgi_intercept==0.5.1',
-    'zope.testbrowser',
+    'zope.testbrowser>=5.0.0',
     ]
 
 development_requires = []

From 33d0e47efa2f2a4f1808e7cacdcfc96a4b97383f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sun, 9 Oct 2016 20:32:32 +0200
Subject: [PATCH 451/600] Try to get the scaffold test pass.

---
 kotti/scaffolds/package/requirements.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 26fd678cf..462d57473 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1 +1,3 @@
--r https://raw.githubusercontent.com/Kotti/Kotti/testing/requirements.txt
+-e git://github.com/Kotti/Kotti.git#egg=Kotti
+
+# -r https://raw.githubusercontent.com/Kotti/Kotti/testing/requirements.txt

From e9151f48c80534c9693a8eaf1055c5abf2630872 Mon Sep 17 00:00:00 2001
From: Anders Nylund <nylund.anders@gmail.com>
Date: Mon, 10 Oct 2016 10:17:35 +0300
Subject: [PATCH 452/600] Add Swedish translations

---
 kotti/locale/sv/LC_MESSAGES/Kotti.mo | Bin 0 -> 18257 bytes
 kotti/locale/sv/LC_MESSAGES/Kotti.po | 957 +++++++++++++++++++++++++++
 2 files changed, 957 insertions(+)
 create mode 100644 kotti/locale/sv/LC_MESSAGES/Kotti.mo
 create mode 100644 kotti/locale/sv/LC_MESSAGES/Kotti.po

diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.mo b/kotti/locale/sv/LC_MESSAGES/Kotti.mo
new file mode 100644
index 0000000000000000000000000000000000000000..34782e11bd4d824269113853d72ecf7749d9966c
GIT binary patch
literal 18257
zcmeI236LCDdB+<p+aQi$C+4s*wAP0#TQj?oCCgr|B(JnO9Gz%&a9Z@v^v?87PxrXH
zXI5(?3<L*4xDOjJ2@p#r5Y7+`l~k@;CnS}sP)P`cBn1?tLZ}o;QHCliU?;!-d)+-V
zT1i$aAwX5S_U*s>_3L+h_j})b_0nbUa=1Q2c`oJQ3mxaXVE7dNagF_)<2-PY<E#On
zc!A^m?PZR$lKQ`UHt*EnIgWEZum=2j@TK4{fF1A>@E(v)ocr?kAIsnWF?cQYUjnZI
z9|alOx$1JqxfompGOV)(WLW2BkRhE3@TuTo@X6o|_#`mQpS$4Gc)lA{yEo<U-wUe$
z2f&@+he5UbF1QN(PjC&m>I%nM2fhT<dfp0N3Z4W-lFx$A0vAEi>mR^n;158}_fb&e
zF5@L6b1nh3{uSU_a09pnoCDtjegxbAPF-o&@d{A=-2;lQZvZvV&w!%CBB=g94?Yk4
zA}D@50<r|>3Mw^^o4^&|CQ$P@25SB>sP)_hif(TPKMCFkYTRAVcO3qlz5LU-ZBYH)
z1&V&J0oCsHpuT?-xB%V@ito>G?Kszf;?EjT>))6^zW~(yUjpj;Ca8Yz05#4$sP?bS
zpWg{;y!*in`~dh2@G=&s`CSWYed|EU+Z5OakAUj$VNm`51*rCamDhhQfBt6>7C7Gn
z_5CFycHUQklEVs!Xgcdb&0{~P_J=^t{|-?7-kCqY9@M(umgD`P)^iHH8vH#_^#3|2
zIeG+y^v+YRvfo_~O77NyqUSEK2fhr{I=%>M+`rGCzX^)3-_Gm5pW|bo`ni}vuK}+B
zMUP2P^x6eJ9eg1O>zoF7E%-Wc8TfHf?LQ5w-S2{;!=Hni_cuYU^M|0;cOioy`py-g
z=Cc7D2e*MP_)1WGdp{`te-gY9{C!aUFM`X!zXq3sU(TPu0ba=Sw?NJ3JD|S*9;o(D
zVA3~&7lB&GIH+~M7}R$WsCF61pR>R}&Hn?S#{C=!>z&VoYWHnW^!YbX{X7OrE-ppM
zME9#fJy$@r-vV9)PJx>DZt!C82&nbm4yt_&UJbq))I1*qB{zQxivM2(Mc+q2RM~mj
zb&gX7ZvX@E#h~gR25$hr0m5SE>8sG8CtzE^zhol!V>F&{0rq8$<$H)R8>8LZL4CIf
zO0NDL6djhWw|4cp;4^t%pW`0za-M6TzJDdi5Y8vSCxTxAwcdXOMdxqj&))$>&mVxI
z-{m)1I#j{Sc;1pf9|rY)7L;ATGk^aMP<;6?_;T=b;4{JJY_Rkg1F3S3fj5Kqg3kiK
z0IJ=$K+*Lv5D{^nN+YdfE%;<`FDQN;1tmwfgW^vM6dz82+ramMN5QXy4}v$};y94p
z`5LHxo`i5;3|<OCO6PJ={q6^!1ReoJpJSl-Gzapj^JY+b@@Jsh{}U*B{VOQBd)h{;
zKUad9*D6r`Z3I6HPUX)(0@d$@6L~vO^V$fCAKSqTz}=wcxgXRzj)Gd}V|o3Ro9sNV
z0VQ8!pzPB=P<-$}jo$&)?*gd)?gqub*X8y1gVKi&f-Uet@LAxcn=SvZ2QTM&BPcmP
z0=@?9fa?DdQ1to{sCE}`vGpUM_;~|(C3p*{@sEOrzB$f;S5V&tHIKJ}l81Xi_5U$Y
z>v;$io&F@pFXZ)K0rmaAfX@b(-D>G@CHP#P$H0}~UQpk6L9Op@Q2KNq_$u(Dp!iyu
zwC&b`n&)OvcJVe)^EsT?-wsMI0#N<m4QhQK0%bowk-z^V@LHa~1XjUELGfetR=eJ{
zpyYW2C^}7nE5I30{k;|xJ>Ceq-~*uO@i4dw{2TB(@KI3XUW*clzZ*c&b2lhH9LS$<
z&)?TT^*;}4K6is!|2?4A`^NnF-5`I?`}wDNd=u0-{{iZ|r%YLSy#!p#^JSpqU>B%)
z)IiO19uz%42ue;r3O*0~Ls0#G71TVx4@%B1*ly>4C8&9hfa2fv`SUtZ^q&C5$AjQX
zumOsGZvjQuPk~o~e*kLSZ{*M42T@(;IXkR89|G0x%OED$`C<NC*@<1|`CSxUzec&8
zf_ZUHQnW^0cTf&do~Q?|U$J23EWW>n@<s}3;=GCSi<IJ8#*JiG^wagrlnczArS)p=
z-%1&!B$Svkc)fk#;cD*1zt7}#?*Ly&Y2?rC90iga$&#)G3(mVi(NVNLMuAMu+bF+5
z(e>Mukn%E$=(~aPeo999I3=YN*Ms?u_<s%Mc>a74{1D~C6wH}(FQrD=O?fdz*I^2#
zvb?0rgV&8bY@^&onW4xA|0d-Iimr<+IG+N0luzW(k~!InU(KJz^SdeYlz<}Me}M7=
z%10?jD4Qt7bt^Zr1Me*=z%FHs@^Xr<U6j{Seuwf~l;Zj{H}~ZaQ{d|;ucEw^@@9&z
zos?gqd_)gia}?PH=|pi!-cL|2p=`}7rE^;-ub{k>@;=HZDGyLCrZg!RQe2AcpRS`8
z%zowd+)q-jrM!f4igF8Omhv8obfrSkbrWTpvV-z!%Eu^|Qf{N{q1;dLD7v0WX_-5#
z->>BUPRf2tM0pXVLm9k&ec)k5et!@6LCW(f>nZCf`zX3bC~u$~pe(1<DSIip-a_$p
zvwWhtcJrRN;ReyfD7VWeI-8ffTrY~dZq19_3D2#CUYc$inaLuTQc1hDnxCd4ZZq*`
zH;sgGBZx*e1Evpevzx{4LflQ<G{}6@mlxIDH1m?otu?)f<}}Sxw-!g4A7yFPb#I&1
zCvMa0`O!)>i&H;xJ-5Ti^KnvlXXC_lWjgli?SQwnTHK8?cfrqA)8EQ4bi<(KhYRkE
z?@svb&3DZENwzRC%58P|#3&0Z7PmjD`5JI#;=4?|;n$h_YEwfmsqed4({~$*zu@}y
zAd3@s#-sRQJa67)amUOi@_IqT%Yqonc!}1Lx$^;Cc%hnVNf0BQ53*X5&$D@-RjEgj
zKvd}k{=DuP&U9GoCJ7{A-3{OMQkIqX*Xj7oprC9ofVOdx7R#y!y@E?gJU?PNI5ALL
zi^EF0URjsF5`)F~ZE-XkG`fjzd9P|+1)1!V>+T4cYTV7-rq&;earQH<FmZRsSr)8J
z-7LsLW=-3+7cICki?U2B`bm8nMvc_%riK7WNV~%)nSVTUX9MnFtLf4_qzh^0x2uLQ
zW?Eul(bws7Tq>tQG#ihU?ep)f%r>*EGd?=n(!{HY@70-VJ+7tIIBAUf(P-#pewvNe
z{T?juFxSx;FAZv=#lj8CtIez(4iGdSp`fW13n<a`!l7AAjCuphDAqJF3cJpmag+6W
zC63Z_vu)Ciy6qW1apPInvmXo#CS>>FmSlal8`UJoUKnJs&Zy%s^9+}bPX8D=(pl&P
z)y_iJj3dJfJ#V?@#!1giZc~a9)SB0N?as!`PuiOd1DCSEN@TI-|8?R|#kFo5Ej1iI
zHw%u&Q5^=%H@(bl$5<Pg1ew)(jACa^JJT&gQ#`81VNmm<6oo+PymYw1K?K$?%?g)n
zqwQQ0pR}!TmR%ad_kXE1OZhQGuySIW(>Zk^R|$NS(ff&@jnNFVO(U~G&&LRbaWdNt
z-R;M-#B;Y#-Z(bqdO^|&y~t19*>FKN27^-4#2AA#scjm`^}pK*W3OJF4_ZMRtLzz(
z(^E%JXnVVjl8t6f)M#}5==%ETzBrLpi;nFH8qF*{wxgu?T&FR5)4H+F@ya>dm^sV`
z7@SQbG{=eh>S@!+jT>$naYu1cG6;pE+K+X`{e^YD@M-GR@95%2{UjYP8lu<<-dL7n
zM;yCH)p}wkQCF_JX6=pczIdJ)`|fm>`0|v~UEH#}VZ(;9)&92ETJ0X4gdexueDk_B
z;Nj`X^7RdCD(lB?sjOeWzB0CEY^<zjP7OaxZ=H?fc?PZe$I;8suR=B^SI$donMm7s
zL}Gx2(1(5a{Yo0#>5sdn-cJx2IqU<?Sl%U(ha5M4+Z`#W=~{}j$Xvol+?fS;N7!xb
z_LFcep3ut!lAO6Y_s+oG(H*#&@uK51vXTjHi#rR6c!Lbh#uC)(^8Hi<*hpfGPIo2@
zQrw0_44GImz8{&PjVM*+S0q@YMp%z+pR6FQBb!Uv)uYh`xEs_UA`~>V*=*#&x%#e7
z5=6D2<Aukvg^qv1z4|WWZcn)Lgb8&&^fSL+rCnYdq;3=w+e8h_kHUo+>s@8*`%%m3
zAIzUuQ;i6FhsIM~4Oh9evYQQza^}gZwjKADd`t9aRy9e$AS)_^naMi(Z7)!eCD%=e
zc05RlBAq48BCkz6a(b&7A{l4WIF!_2&vz#4brn(7P!};QNJ+o_7xrOi5_dbM`Y`h{
zH;u9?^5=;hiw1hq<V~aehTzqij4<tfo2Uu>Zp|uMBtk|p>o78*1tx61i8A0Th(}kO
zs8O-isEoZADLxFK>}02dFq*L1XEnKpNeStUtC{x*CRvOXkaA61&Zp&&m_7a%CW?p^
z_Zqv);!-|J)1VQ#jWC|^LN|#+P14qdaqaXfy?3^HwU(wV(z<)iO66>wt=RPzv`_?4
zM2t}#NesiPvo)?SINLnJ`q0^?J%;QZ<SZU6ZL_#|9wxf84R_nZzCtxdCQP+aXu11P
zOlvnd<Iu31geUS(vL=ca2270au)|Bg%=kbXp<`At``@FQiI;T=H3_@Y6=uWbF@b!0
zg=d4YiQhoBnOD7P8l=s*8`ibKN&K20^h_Admcr<R(GRbj&XUPg-Kkg~q>4SXNkIpC
zk~tG{=i8~OLjb#UX4;tzPc4WbY8YYwO=M`kGut^j=)ep!(J0nlh819q>V8%GqrO=x
z^mZF+Z1zx7hGS^wlt1fr!^~`th90mnTEDu52CT3;{F+#a7i_XDFO1}yuFlpj??UF2
zo&@mgY__)F!ZMTRw3Y-NP2QOb(sqy<d360GVRz;fagVdzLuT1Lh(1Q|71Xi4m4RA~
zo(H@}kgyK~cE$sWEz&4tZME4_d3JkMb<5~a)<mX&{e|nvsJWda?oej~9<#?Jkhexq
zVZPa(1=RSyjCZ-kx7Nd*VZ#RTP~fVw9S>~&or@Z3#QU5UdWsWgyF}5Ehc*8+x^6<V
ze>8%od7DXL$#O%^>}o~@ufEGL?pUFDC+vi*c1hs1zdW<JpF#Voj7--WFm)NtnB~;j
z5r+!OwfE*enF;V^k?tCZm6>8O{1#^iYG_F4>>RXVI};Dh@e;?n0`ot0cKMjU)sRFZ
z<_f>U*=73&e1~(6TGOw!{Q7Fx3(Kt{W?0LPG1Tq29?UKn*2`vfnKzp^=1^+}A(0+#
zgOd+-*D1nU!#lE*u)7iDNlYf5<m9D0Q&v}<+oD?7C4MZrprXe<kJAS)>@p_?H&I0H
z)5~W@gL_03dwglXnXl%#U`LY4l!&gJ)+VwbS#Gj0Z79V`gz9*og~o^&sg~%<KH2HU
z^HKRdqnVQ=0e;f_cW03)Gm*F<=e^f!NllGWKf%-SpxtfT0|XmZ%H-bZpV+(A*(-Vm
zwE_FGmp}ue%}2cB4oAM1XpW;StStT`bt`?D-Y4nRzkJ2!d;=Su_;+*z8D(CY6Cky+
zH|{jX-r0xS7xB!EQ4nVzdTl&Y{|@%c<+MFaqp2OR5U`V1vKb!1K;1Ye(@5PKb~Vt3
z$W-AnnpU{wUW}BVP=BWhz8!6rLo-brS>K^sbJzDXI!@c7x~5#kP`swy2vK!M;)m#p
zks$$?+O;u5v-lI@4s+bVo&eD{`vYs$B(<vX5xOMs?HL0kvy74Cs-UgiG)n?38n&$7
zttqVAKOYf49mr1tbpwG9^clu|%u!vMItO!aS>6otvUq8>%NUX3_>i+ZBiVA&RlYQA
zv(OiWgT}QNGES={&UIiY^|JImR#`I3D7j^*I@73?Gi@T899+J{@ukJ1ICx#U${n@r
z<#zCmRr%bi*?y{3x;3VOZ|Y1#Rze1(sMX1udc@7-+u!~d%&lFt6L%H7+Q`XnA*~%U
zN3&|0y8Up(_|dZ)0uz*IW*L(j@a?K7sXE>C66m4-eacUB=IBVLT-u_n(<rtxZDKq9
z@21Wn&m7<?`We>)HQFPHbVgT7H-pS7aA-xcH*6j)+wCDE-$<=f&NDe09*Q!I!stEI
zl0L`*$-h^fL-MH3Ap&LRaKye%_E3tUc)JX)M94C>I&4lHSe-qYJ7J6#GM?8HdMQLG
z9*c-!Hi_HBpNf}r_Bn@Ho%uHyBCFC&QOnHrTy>Q~evE9ZX6Qz)(Kuq~h+Lxn(fJW=
z8Uq~%+FMq7)DO{r6C<0Luc#<o-iZ}UYs$Em_}QMbSNn~08YXUQz60-Hlvj)7<4*B3
zNAN0JbD9$AwQ(#a?#p|@OH|E=<_&y3Jun}53%hbPu|mx=QIvuxv08lOFw%6^7x%}H
zzRxt~`NiKX2s>+BMLMvu6k~ziHg5}+DZ|_rfkE3_u+9DB9qXJ-TWi{_KQ^{+h<-Aj
zbC`(AZS~3#!X(x@?jD%jwtI5tc6Uv6Z25uxhbl#YUQvKP?yenMb5mu_SY>Pjx8q|s
z-Y~}L1q~|)eVsJK(dq5hyKC2s-?+}U+k^eC97?<>W$P0s<L;!6NK<#;LWnnVC(<l#
zwTNQcw>A_?>Nsih@;z+ny6kx?hkUO+?oQ8hM3gqmY7UZm%lF>4cYA*gntQHJ6=~?W
z*)xuEIv7M7McxFN*mU^Nj>^sbcA6D&KxKPWBW{Qq<L=EfLAHFSj|XDu^~%<TaSoz1
z7k6EC!}0@RH}S#>p<_E8ccYGZOgF9F=-S&&*G2A%P41di8<&@vwuXnB8_u;&b=?-C
zwlsxt)>K>GiIQ!Kt(j{-+ZGcH%q%{X%z5tO$*9iRD1LxcQWW{k#Z&B-U3Y)mt#_%x
zszM0Gft;yi=-}c*<lRiZjSkF7Em1xGLkTxFq7Z@83XBv{Zn}7i{u4US+|-MrnB-gb
zIC-~ezCp2Y0@B&U=sc#H*|#`r#duNgF&+os2y`Q%`M}UfR?0C#%QX{2SonZUT!$#g
z-K!93Zt-N;alIaMqDLr7cREbu49qk1!E&=>wF@IE%SbRXgj%OqSo4*gM?MMmRI?C5
z^z{g1)5V8cn5+M3)@^r@KI2HQaqj%V9z)@v;Wn`etR~G^A}bKd3Z|!S(w#|ymMg}$
z7f(e92f-9eHgwW4yDsh5^|5Ryq;J4y3>?HRDFhk(hy<$96da8kFa`~{{n<>#6@)fH
zCda8imQ>s!6maom<8c_dU0Ose4{`JMR^+Vadr?oS>RD+MQ@WXCO=-E7{12=VGom4m
z{_JJsinR|d<D5AlN$z<hvZvzK`KII!OEru#^+==TMn}e?fu?&@<Of>AIkzK0C?9Ln
za>jOHEry$*s~lq+A)}?S8|wY1Hz_wjvh!!i*^_ddBFtj08XO)*n9ISm9Lczb@^Z?`
zDIpQa3)n>E&t6jQ$l@tHm_5=a=d}1xqs5+<L)xE$oLnQpV8qF-|DTi7@x)IoCzo)d
zqr%RvI3HDJjm@Kpx$qYpv6H~zjHvhl5y92sNn)w~2Xg&7=v#<F0)TV34K<i?EdwJe
z!fGieN7yzv6H^}soesaj8p_V;g`N76_9!ml(vs>HIZ#D~S{SFsI-0bejMd4KDx~r|
zF^32yOD(%d97@FE*S)iRK!(6;M+B8aE%&#bT?93xS_od8Nt|NO!QeLd=@kBS;Fj%S
zp2AaLTu`4=#j<hHVyF(q>2wAg^%pW&yQCQmI#b=5zaFTa>_^nN9Y^6oJ@;X$yRt}6
ztsIKl6oC@LnLxRRwN=b2$CZ*pD1$hHz)=(A;-rZ0P4v%R_)xwXF!aMZ2kuPLZ8?jt
zwPEGr$rff=!LWi40?nSNXJw%z;+FGnep>4Ayhg!chI6o3hqKl*ZQ+0=<fuOMN^47o
zkm$ExAI2?@*QZzO*)*E*2%;n*IW<_m_6GxuI0O+D*PGv<;gYm7)Oi^++nOvsR9C$-
z*_%lgGL~<`YSg#k4?S2R%wL~{d(LiUIOH(UYZD!qO@@idwI#H%c7F$^XkMoodRJx*
z^FE|jrXN`n#U*8bi>KhZ4fNUfDSGesXc`Ue{>y&JXON0ST9Os+l---<=LRw!bkrbu
z*frZqD9LcA=vg~Pqugk^xFp_5>6wq2SASN;gqEzb>aw@a_aQd^(st65dTTP0M6(F9
z=d6%zSu)K?`&jIY<bs*zxyaj!&91ZC8bD{a_KP%S%bOc5(Og+cc8^mcp)pK@_L=j_
zme=tzajw(BRO;N3C_Sn776xwFYWDliS8DBHzd7t;H3Q7SVj8g&PuPCz=-Ym(?HL1`
zff&brXkX=4_MmYtjs=wStl7%4MV_JC>Zh$F=xGEbTCo~C4hRQ7Nt+iTv~$Eu=K4x#
zCN56PDjSoND-S=h($?4rvB+e^fpn$WhC)vU^*L+6?xt81<*b`=&y~rF`Hd?_1vUgk
zTyv!~14!!4msqG$ON*eo>h6=@D7N<b>BfvKyE(eIJALP1vE@G(ZTf9;>hKkEXN<8N
zmXek#nw7I-0Sl7vhRa!%^VLRtz{wc`AY)SYrTI*9Ii4iGBp$l--_WE15jtJJt7IB=
zq)|?gLlkpXU>p=ybFYUKBf2|S<jfoy!3>{jbgY4qXiLop?S)N#O7tQKYXu<Bf|eF{
zAP*}4xl>-0k#_lW#hGxK2Av}7>Nz_Z$eBXNjrp>tKC2}a(tBA(okfxHW+I}HIdQ?c
zwYnTl_VgP{rSs5qE4SthsBjmqc~S?6bx}#Kv!&!GUko*Nc3`kDGpvh%B_TCi$iL<W
zRYI?k>nJ}R$Q@Gts=oM;LZ`TGB8WELRFgLg%3{bU8K%>4j?}1#H)st@Yn+z$74ct5
zszrib3PlK?2RVu6>2RxO`{g$t#X%iY$bAGWmAf$7-M>W<^{a$%0ckYxsBMldgA*np
zrBq6uM78+^4q%heZ^<_lSyb!U&<PU-GTEfK71#IbbgamrDg`l|L5-9_jSN-tgQ^yx
zZZEYdQ#e!J*fTn3AEBl(H{9iCTP%(PD|?<P^Tp#}Kw~)8nB!!TICqzEu(>s-*?=hU
zdqr!<I8OF@w6)!Glqu>PJsHTLnnBK{O>R@lW=Lw(E_MAmy2HJ|a-34hUa!8z4r6|h
zVM8kOncYW<<$mThjPT2^ljt^{RPF&Mr~^mB>K^7Y)(o}18#cp%9B!LY8~jM0Ls%Q|
z5GQu>qrSk{8+P7?2StvxN(4hJ?GxVShraT2istb}WquWQIy(}tP0qD}Vb!mZNb!2b
ztw-wtZuc7)lV-ejdBkcIMEOsCD}x51KLwT%rn7iY8NT#oe5iKVMhy(kdIml|t(j4*
zq0k2(+hO+3G_jxgN5Y28E8bo;gGN;9Y((QaKOz09xBe{CJYyTkr4~xV9x*0h)Tk`K
zgW$|SzBaGsOm&n(FJ@|}5nH&rQC|C9DYf=7l1`YwGdB`)+ozej^E5WBeDNf`5j6FK
z8J!F(ASw+DMw-d$U!Oaq1R<Dmv4hbH`>|<jGR#iNW@q!ftT|z;o3yOiw-viX`A&4v
z`lkWkX>?p?W{ff8v$??v8Uon^X#L*nAbcWsW1|3n&gx-mc2I;dB(*yjFcM{l6n`i=
ztG$mQe`%$m8-tsE<!CTpdB90*LT-aW_P`802L5t5RZG&h{|XahGb(4Qb7#q3Ku>K@
zbb@ZV&F?<(3?jR){VY;6Xypgq4h5CQ)L^apACu8FB59(NvU=&$Acd92^~9o7qfeV-
zg(fk8y|aR89I|3Jq`{_mC4RQH@aSZD%gQ9`*Ahl|jTH-wBjShk{dP1Xl$T*PtnIhR
zKap)1cX&`*uq)*v<gn8?O>1dm+_StMPFUv`dDTE@bb2Ub+K?L24-uh1`%E`lJf)v|
ziT~Y9qTspu@tl{RwreY_S^`13S2~Shsrkw5d#2=JB{zzd2~I=-etzEL_jjqRn0`N0
knsK~YX+&jEa#i7s(&`d9Ku*Bn4!!o>6b-FL4AI;9FKcJqod5s;

literal 0
HcmV?d00001

diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.po b/kotti/locale/sv/LC_MESSAGES/Kotti.po
new file mode 100644
index 000000000..5bcf6a4b8
--- /dev/null
+++ b/kotti/locale/sv/LC_MESSAGES/Kotti.po
@@ -0,0 +1,957 @@
+#
+# Swedish translations for PACKAGE package
+# This file is distributed under the same license as the PACKAGE package.
+# Anders Nylund <stokkheim@gmail.com>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE 1.0\n"
+"POT-Creation-Date: 2016-10-07 20:03+0300\n"
+"PO-Revision-Date: 2016-10-05 21:34+0300\n"
+"Last-Translator: Anders Nylund <stokkheim@gmail.com>\n"
+"Language-Team: Swedish\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Lingua 4.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: kotti/security.py:192
+msgid "Viewer"
+msgstr "Läsare"
+
+#: kotti/security.py:193
+msgid "Editor"
+msgstr "Redaktör"
+
+#: kotti/security.py:194
+msgid "Owner"
+msgstr "Ägare"
+
+#: kotti/security.py:195
+msgid "Admin"
+msgstr "Administratör"
+
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+msgid "Copy"
+msgstr "Kopiera"
+
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+msgid "Paste"
+msgstr "Klistra in"
+
+#: kotti/resources.py:519 kotti/views/edit/actions.py:457
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Rename"
+msgstr "Döp om"
+
+#: kotti/resources.py:520 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24
+msgid "Delete"
+msgstr "Radera"
+
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Innehåll"
+
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Redigera"
+
+#: kotti/resources.py:533
+msgid "Share"
+msgstr "Dela"
+
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Handlingar"
+
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Mapp vy"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "Fil"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Välkommen till Kotti"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Gratulerar! Du har nu installerat Kotti."
+
+#: kotti/populate.py:66
+#, c-format
+msgid ""
+"\n"
+"<h2>Log in</h2>\n"
+"<p>\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
+"    and start changing its contents.  If you haven't chosen a password for\n"
+"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Once you're logged in, you'll see the grey editor bar below the top\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
+"    current page as it will appear to your visitors.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Configure</h2>\n"
+"        <p>\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               Configuration manual\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Add-ons</h2>\n"
+"        <p>\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+"                Kotti add-ons\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Documentation</h2>\n"
+"        <p>\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               Documentation\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+msgstr ""
+"\n"
+"<h2>Logga in</h2>\n"
+"<p>\n"
+"    Du kan <a class=\"btn btn-success\" href=\"login\">logga in</a> till din site\n"
+"    och börja ändra dess innehåll.  Om du inte har valt ett lösenord för\n"
+"    ditt administratorkonto, så är det sannolikt <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Så fort du har loggat in kommer du att se en grå administrationsbalk \n"
+"    under toppen. Med hjälp av den kan du redigera siten eller\n"
+"    titta på den som den kommer att se ut för dina besökare.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Konfigurering</h2>\n"
+"        <p>\n"
+"            Lär dig hur du ställer in din sites rubrik och många andra \n"
+"            inställningar genom att redigera en enkel textfil i ditt filsystem.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               Konfigurationsmanual\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Tillägg</h2>\n"
+"        <p>\n"
+"            Ett antal tillägg som du kan använda för att utöka funktionen i din\n"
+"            Kotti site.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+"                Kotti tillägg\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Dokumentation</h2>\n"
+"        <p>\n"
+"            Undrar du vad mer du kan göra med Kotti?\n"
+"            Vilken licens har den?\n"
+"            Läs manualen för mer information.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               Dokumentation\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+
+#: kotti/populate.py:123
+msgid "About"
+msgstr "Om"
+
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Vårt företag är den ledande tillverkaren av foo grunkor som används i en mängd olika tillämpningar inom flyg och industri."
+
+#: kotti/populate.py:125
+msgid ""
+"\n"
+"<p>\n"
+"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Our worldwide headquarters:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
+"</small></p>\n"
+msgstr ""
+"\n"
+"<p>\n"
+"  <img alt=\"fem färggranna Extra EA300 flygplan flyger i formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Vårt globala högkvarter:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  grunkor@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
+"</small></p>\n"
+
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Spara"
+
+#: kotti/views/form.py:81 kotti/views/users.py:322 kotti/views/users.py:357
+#: kotti/views/users.py:451 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/rename-nodes.pt:44
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+msgid "Your changes have been saved."
+msgstr "Dina ändringar har blivit sparade."
+
+#: kotti/views/form.py:159 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "Redigera ${title}"
+
+#: kotti/views/form.py:177
+msgid "Item was added."
+msgstr "Dokumentet har lagts till."
+
+#: kotti/views/form.py:201
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Lägg till ${type} till ${title}."
+
+#: kotti/views/form.py:205
+#, python-format
+msgid "Add ${type}."
+msgstr "Lägg till ${type}."
+
+#: kotti/views/form.py:269
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximal filstorlek: ${size}MB"
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+msgid "User Management"
+msgstr "Hantera användare"
+
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "Inga ändringar har gjorts."
+
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "Inga användare eller grupper hittades."
+
+#: kotti/views/users.py:151
+msgid "Invalid value"
+msgstr "Felaktigt värde"
+
+#: kotti/views/users.py:157
+msgid "A user with that name already exists."
+msgstr "En användare med det namnet finns redan."
+
+#: kotti/views/users.py:164
+msgid "A user with that email already exists."
+msgstr "En användare med den epostadressen finns redan."
+
+#: kotti/views/users.py:187
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Ingen sådan grupp: ${group}"
+
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548 kotti/templates/edit/share.pt:62
+#: kotti/templates/site-setup/users.pt:82
+msgid "Group"
+msgstr "Grupp"
+
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+msgid "Title"
+msgstr "Titel"
+
+#: kotti/views/users.py:205 kotti/views/login.py:73 kotti/views/login.py:269
+msgid "Email"
+msgstr "Epost"
+
+#: kotti/views/users.py:213 kotti/templates/edit/share.pt:50
+#: kotti/templates/site-setup/users.pt:70
+msgid "Name"
+msgstr "Namn"
+
+#: kotti/views/users.py:218 kotti/views/login.py:257
+#: kotti/templates/login.pt:26
+msgid "Password"
+msgstr "Lösenord"
+
+#: kotti/views/users.py:225
+msgid "Active"
+msgstr "Aktiv"
+
+#: kotti/views/users.py:226
+msgid "Untick this to deactivate the account."
+msgstr "Ta bort det här valet för att inaktivera kontot."
+
+#: kotti/views/users.py:232
+msgid "Global roles"
+msgstr "Globala roller"
+
+#: kotti/views/users.py:236
+msgid "Groups"
+msgstr "Grupper"
+
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lämna det här tomt och välj 'Sänd länk för lösenordsregistrering' nedan för att låta användaren själv välja lösenord."
+
+#: kotti/views/users.py:276 kotti/views/login.py:65
+msgid "Full name"
+msgstr "Fullständigt namn"
+
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+msgid "User"
+msgstr "Användare"
+
+#: kotti/views/users.py:321
+msgid "Add User"
+msgstr "Lägg till användare"
+
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "Sänd länk för lösenordsregistrering."
+
+#: kotti/views/users.py:346
+#, python-format
+msgid "${title} was added."
+msgstr "${title} lades till."
+
+#: kotti/views/users.py:356
+msgid "Add Group"
+msgstr "Lägg till grupp"
+
+#: kotti/views/users.py:517
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Redigera ${principal_type} ${title}"
+
+#: kotti/views/users.py:545
+msgid "User was not found."
+msgstr "Användaren kunde inte hittas."
+
+#: kotti/views/users.py:555
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} raderades."
+
+#: kotti/views/users.py:563
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Radera ${principal_type} ${title}"
+
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "Inget namn angavs."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mina preferenser - ${title}"
+
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Användarnamn"
+
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registrera"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Ett fel uppstod."
+
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulerar! Du har registrerat dig. Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
+
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "Registrara - ${title}"
+
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Välkommen, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
+
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Inloggningen misslyckades."
+
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Användarnamnet eller epostadressen är inte bekanta för systemet."
+
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Du har loggats ut."
+
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Du har återställt ditt lösenord."
+
+#: kotti/views/login.py:295
+msgid "Set password"
+msgstr "Ställ in lösenord"
+
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Lösenordsåterställningen kan vara föråldrad."
+
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Återställ ditt lösenord - ${title}."
+
+#: kotti/views/edit/actions.py:105
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} har kopierats."
+
+#: kotti/views/edit/actions.py:123
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} har klippts ut."
+
+#: kotti/views/edit/actions.py:158
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} har klistrats in."
+
+#: kotti/views/edit/actions.py:161
+msgid "Could not paste node. It no longer exists."
+msgstr "Kunde inte klistra in noden. Den finns inte längre."
+
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} har flyttats."
+
+#: kotti/views/edit/actions.py:224
+#, python-format
+msgid "${title} is now visible in the navigation."
+msgstr "${title} är ny synlig i navigationsträdet"
+
+#: kotti/views/edit/actions.py:227
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} visas inte längre i navigationsträdet"
+
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} har raderats."
+
+#: kotti/views/edit/actions.py:302
+msgid "Nothing was deleted."
+msgstr "Ingenting raderades."
+
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+msgid "Name and title are required."
+msgstr "Namn och rubrik krävs"
+
+#: kotti/views/edit/actions.py:342
+msgid "Item was renamed."
+msgstr "Dokumentet har döpts om."
+
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Ändra läge"
+
+#: kotti/views/edit/actions.py:464
+msgid "Move up"
+msgstr "Flytta upp"
+
+#: kotti/views/edit/actions.py:465
+msgid "Move down"
+msgstr "Flytta ner"
+
+#: kotti/views/edit/actions.py:466
+msgid "Show"
+msgstr "Visa"
+
+#: kotti/views/edit/actions.py:467
+msgid "Hide"
+msgstr "Göm"
+
+#: kotti/views/edit/actions.py:506
+msgid "You have to select items to perform an action."
+msgstr "Du måste välja något att utföra operationen på först"
+
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Beskrivning"
+
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Taggar"
+
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Brödtext"
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Standardvy"
+
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Standardvyn har återställts till förvald inställning."
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Standadvyn har ställts in."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Standardvyn kunde inte ställas in."
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Gör ${state}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Lägg till"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Ladda upp innehåll"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Din registrering för ${site_title}"
+
+#: kotti/templates/email-set-password.pt:4
+#: kotti/templates/email-reset-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Hej, ${user_title}!"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Du ansluter dig till ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klicka här för att ställa in ditt lösenord och logga in: ${url}"
+
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Förbjudet"
+
+#: kotti/templates/login.pt:16
+msgid "Login"
+msgstr "Inloggning"
+
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
+msgid "Username or email"
+msgstr "Användarnamn eller epost"
+
+#: kotti/templates/login.pt:34
+msgid "Log in"
+msgstr "Logga in"
+
+#: kotti/templates/login.pt:45
+msgid "Forgot your password?"
+msgstr "Har du glömt ditt lösenord?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
+msgid "Reset password"
+msgstr "Återställ lösenord"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:50
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Fyll i ditt användarnamn och din epostadress och klicka ${reset_password} nedanom för att få ett epostmeddelande med en länk för att återställa ditt lösenord."
+
+#: kotti/templates/login.pt:78
+msgid "Not registered yet?"
+msgstr "Inte ännu registrerad?"
+
+#: kotti/templates/login.pt:85
+msgid "Register for an account on this site."
+msgstr "Registrera ett konto på den här siten"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Återställ ditt lösenord för ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klicka den här länken för att återställa ditt lösenord för ${site_title}: ${url}"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Sätt standardvy"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Visa"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigera"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Preferenser"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Site inställningar"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Logga ut"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr "Hittas ej"
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr "Resursen kan ej hittas"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Du är här:"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Ladda upp innehåll från lokal fil/filer"
+
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
+msgid "Filename"
+msgstr "Filnamn"
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
+msgid "Size"
+msgstr "Storlek"
+
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Status"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Framsteg"
+
+#: kotti/templates/edit/upload.pt:84
+msgid "Select file(s) to upload..."
+msgstr "Välj fil/filer för uppladdning"
+
+#: kotti/templates/edit/upload.pt:92
+msgid "Upload ${number} files."
+msgstr "Ladda upp ${number} filer."
+
+#: kotti/templates/edit/upload.pt:97
+msgid "Dismiss all errors"
+msgstr "Avfärda alla fel"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Ändra 'workflow' inställning"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Ett dokuments 'workflow' inställning bestämmer vem som kan se, redigera och/eller hantera det."
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/delete-nodes.pt:23
+msgid "State"
+msgstr "Läge"
+
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+msgid "Creation Date"
+msgstr "Skapat"
+
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Ändrat"
+
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:51
+#: kotti/templates/edit/delete-nodes.pt:31
+msgid "Select item"
+msgstr "Välj dokument"
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:48
+msgid "Include children"
+msgstr "Inkludera underdokument"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Det här kommer, om det är valt, att försöka rekursivt modifiera alla underdokument under valda dokument"
+
+#: kotti/templates/edit/change-state.pt:54
+msgid "Change state to"
+msgstr "Ändra läge till"
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "Select the new state where all chosen items should be set."
+msgstr "Välj nytt läge för alla valda dokument"
+
+#: kotti/templates/edit/change-state.pt:60
+msgid "No change"
+msgstr "Ingen ändring"
+
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Ta ändringarna i bruk"
+
+#: kotti/templates/edit/contents.pt:31
+msgid "No content items are contained here."
+msgstr "Här finns inga dokument"
+
+#: kotti/templates/edit/contents.pt:39
+msgid "Select / deselect all"
+msgstr "Välj / väl bort alla"
+
+#: kotti/templates/edit/contents.pt:43
+msgid "Visibility"
+msgstr "Synlighet"
+
+#: kotti/templates/edit/contents.pt:76
+msgid "Visible"
+msgstr "Synliga"
+
+#: kotti/templates/edit/contents.pt:80
+msgid "Hidden"
+msgstr "Dolda"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Döp om ${title}"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Varje dokument har ett namn som används för att skapa ett url och en titel. Läs vid behov om korrekt formattering av namn och titel i användarmanualen. Nedan kan du ändra bägge."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
+msgid "New name"
+msgstr "Nytt namn"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
+msgid "New title"
+msgstr "Ny rubrik"
+
+#: kotti/templates/edit/delete-nodes.pt:13
+msgid "Are you sure you want to delete the following items?"
+msgstr "Är du säker på att du vill radera följande dokument?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Dela ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Sök efter användare och grupper"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Sök"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Tilldela lokala roller"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "Tilldela roll"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigera siten"
+
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Radera ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Är du säker på att du vill radera ${title}?"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Är du säker på att du vill radera ${type} ${title}?"
+
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Sök användare och grupp(er)"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Lägg till användare"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Lägg till grupp"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Hitta användare eller grupper"
+
+#: kotti/templates/site-setup/users.pt:40
+msgid "User- / groupname"
+msgstr "Användare- /gruppnamn"
+
+#: kotti/templates/site-setup/users.pt:50
+msgid "Blank search text finds all."
+msgstr "Tom söktext matchar allt."
+
+#: kotti/templates/site-setup/users.pt:65
+msgid "Assign global roles"
+msgstr "Tilldela globala roller"
+
+#: kotti/templates/site-setup/users.pt:117
+msgid "Add new user"
+msgstr "Lägg till ny användare"
+
+#: kotti/templates/site-setup/users.pt:123
+msgid "Add new group"
+msgstr "Lägg till ny grupp"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Tillbaka till hantering av användare"
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Taggad med:"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Sökresultat"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Sök..."
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Välkommern, ${user}!. Du är inloggad."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Välkommen, du är inte inloggad."

From c7a0907cd83e8db7ce0abe61c717a809194046b3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 10 Oct 2016 13:28:56 +0200
Subject: [PATCH 453/600] Use ``pytest-virtualenv`` and ``pytest-warnings``.
 Adjust the scaffold tests accordingly.

---
 .travis.yml                              |   2 +-
 kotti/scaffolds/package/requirements.txt |  13 ++-
 kotti/tests/test_zzz_scaffolds.py        | 108 +++++------------------
 requirements.txt                         |   6 +-
 setup.py                                 |   8 +-
 5 files changed, 45 insertions(+), 92 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83bedceb5..083253146 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
   - psql -c 'create database kotti_testing;' -U postgres
   - mysql -e 'create database kotti_testing;'
 script:
-  - py.test --runslow --tb=native --cov=kotti --cov-report=term-missing
+  - py.test -rw --runslow --tb=native --cov=kotti --cov-report=term-missing
 after_success:
   - coveralls
   - codecov
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 462d57473..54e884995 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -1,3 +1,12 @@
--e git://github.com/Kotti/Kotti.git#egg=Kotti
+# ``master`` is where development happens:
+# -e git://github.com/Kotti/Kotti.git#egg=kotti
 
-# -r https://raw.githubusercontent.com/Kotti/Kotti/testing/requirements.txt
+# ``testing`` is *always* the latest non final release (alpha, beta, etc.):
+# -e git://github.com/Kotti/Kotti.git@testing#egg=kotti
+
+# ``production`` is *always* the latest final release:
+# -e git://github.com/Kotti/Kotti.git@production#egg=kotti
+
+# You can also install a specific version with its pinned requirements:
+# -r https://raw.githubusercontent.com/Kotti/Kotti/1.3.0-alpha.4/requirements.txt
+# Kotti == 1.3.0-alpha.4
diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index 62663fc4f..f035b570c 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -3,7 +3,7 @@
 """ This module contains the tests for the scaffolds.  Each test tries to
 simulate actual usage of the scaffolds as much as possible.  A clean virtualenv
 is created, a package created from a scaffold and the tests of that package are
-run.  Because the is potentially really time consuming the scaffolding tests
+run.  Because this is potentially really time consuming the scaffolding tests
 are marked with ``slow`` and are not run unless ``py.test`` is invoked with the
 ``--runslow`` option.
 
@@ -12,109 +12,49 @@
 """
 
 import os
-import shutil
-import subprocess
-import sys
-from copy import copy
-from tempfile import mkdtemp
 
-from pytest import fixture
+from pkg_resources import working_set
 from pytest import mark
 
 slow = mark.slow
 
 
-@fixture
-def virtualenv(request, travis):
-    """ Create a virtualenv and ``chdir`` into it.  Remove it and ``chdir``
-    into the previous working directory again when the test has been run.
-    """
+@slow
+def test_scaffold_kotti_addon(virtualenv, travis):
 
+    # install kotti and dependencies in a fresh virtualenv
     with travis.folding_output():
-        import virtualenv
-        from virtualenv import Logger
-
-        # create a temp directory
-        cwd = os.getcwd()
-        virtualenv_directory = mkdtemp()
-
-        # install a virtualenv
-        logger = Logger([(Logger.level_for_integer(2), sys.stdout)])
-        virtualenv.logger = logger
-        virtualenv.create_environment(
-            virtualenv_directory,
-            site_packages=False,
-            clear=True,
-            unzip_setuptools=True)
-
-        # chdir into the virtualenv directory
-        os.chdir(virtualenv_directory)
-
-        # update setuptools in the virtualenv
-        subprocess.check_call([
-            os.path.join('bin', 'pip'),
-            'install', '-U', 'pip', 'wheel', 'setuptools', ])
-
-        # create a local copy of the environment, where we can override
-        # VIRTUAL_ENV to make pip-accel work
-        env = copy(os.environ)
-        env.update({'VIRTUAL_ENV': virtualenv_directory, })
-
-        # install requirements.txt into the virtualenv
-        subprocess.check_call([
-            os.path.join('bin', 'pip'),
-            'install', '-r',
-            os.path.join(cwd, 'requirements.txt')],
-            env=env)
-
-        # setuptools-git is required to be able to call setup.py install
-        # sucessfully.  also install psycopg2 and oursql.
-        subprocess.check_call([
-            os.path.join('bin', 'pip'),
-            'install', 'setuptools-git', 'psycopg2', 'oursql'],
-            env=env)
-
-        shutil.copytree(cwd, os.path.join(virtualenv_directory, 'kotti'))
-
-        # install Kotti into the virtualenv
-        os.chdir('kotti')
-        subprocess.check_call([
-            os.path.join('..', 'bin', 'python'), 'setup.py', 'develop'])
-        os.chdir('..')
-
-    def delete_virtualenv():
-        shutil.rmtree(virtualenv_directory)
-        os.chdir(cwd)
-
-    request.addfinalizer(delete_virtualenv)
 
+        for pkgname in ('pip', 'wheel', 'setuptools', 'setuptools-git',
+                        'psycopg2', 'oursql', ):
+            virtualenv.run('pip install -U ' + pkgname)
 
-@slow
-def test_scaffold_kotti_addon(virtualenv, travis):
+        pkg = [p for p in working_set if p.project_name == 'Kotti'][0]
+        d = {'python': virtualenv.python, 'src_dir': pkg.location, }
+
+        virtualenv.run('pip install -r %(src_dir)s/requirements.txt' % d)
+        if 'Kotti' in [p for p in virtualenv.installed_packages()]:
+            virtualenv.run('pip uninstall -y Kotti')
+        virtualenv.run('cd %(src_dir)s; %(python)s setup.py develop' % d)
+        virtualenv.run('cd %(src_dir)s; %(python)s setup.py dev' % d)
 
+    # create and develop an addon with the scaffold and run the generated tests
     with travis.folding_output():
+
         # print available scaffolds
-        subprocess.check_call([os.path.join('bin', 'pcreate'), '-l'])
+        virtualenv.run('pcreate -l')
 
         # set some environment variables to make pcreate non interactive
         os.environ["author"] = "Kotti developers"
         os.environ["email"] = "kotti@googlegroups.com"
         os.environ["gh_user"] = "Kotti"
 
-        # create a project from the scaffold
-        subprocess.check_call([
-            os.path.join('bin', 'pcreate'),
-            '-s', 'kotti', 'kotti_my_addon'])
+        virtualenv.run('pcreate -s kotti kotti_my_addon', env=os.environ)
 
         # develop the package
-        os.chdir('kotti_my_addon')
-        subprocess.check_call([
-            os.path.join('..', 'bin', 'python'),
-            'setup.py', 'develop'])
-        subprocess.check_call([
-            os.path.join('..', 'bin', 'python'),
-            'setup.py', 'dev'])
+        cwd = os.path.join(virtualenv.workspace, 'kotti_my_addon')
+        virtualenv.run('python setup.py develop', cwd=cwd)
+        virtualenv.run('python setup.py dev', cwd=cwd)
 
         # run the tests
-        subprocess.check_call([
-            os.path.join('..', 'bin', 'py.test')])
+        virtualenv.run('py.test', cwd=cwd)
diff --git a/requirements.txt b/requirements.txt
index 4fca0c01c..79549dcf6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-Kotti==1.3.0-alpha.4
+# Kotti==1.3.0a5.dev0
 
 alembic==0.8.8
 appdirs==1.4.0
@@ -35,10 +35,10 @@ js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.2.7
-kotti-image==0.1.3
+kotti-image==0.1.4
 kotti-tinymce==0.5.4
 LEPL==5.1.3
-lingua==4.9
+lingua==4.10
 Mako==1.0.4
 MarkupSafe==0.23
 PasteDeploy==1.5.2
diff --git a/setup.py b/setup.py
index d42a0a8b9..93b511c60 100644
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@
     'usersettings',
     'waitress',
     'zope.deprecation',
+    'zope.interface',
     'zope.sqlalchemy',
     ]
 
@@ -63,17 +64,20 @@
     'mock',
     'py>=1.4.29',
     'pyquery',
-    'pyramid_debugtoolbar',
     'pytest>=3.0.0',
     'pytest-cov',
     'pytest-pep8!=1.0.3',
     'pytest-travis-fold',
+    'pytest-virtualenv',
+    'pytest-warnings',
     'pytest-xdist',
     'virtualenv',  # needed for scaffolding tests
     'zope.testbrowser>=5.0.0',
     ]
 
-development_requires = []
+development_requires = [
+    'pyramid_debugtoolbar',
+]
 
 docs_require = [
     'Sphinx',

From db8c195a779ba89d14a27cbc7e41af7f5ed0d9ae Mon Sep 17 00:00:00 2001
From: Anders Nylund <nylund.anders@gmail.com>
Date: Mon, 10 Oct 2016 10:17:35 +0300
Subject: [PATCH 454/600] Add Swedish translations

---
 kotti/locale/sv/LC_MESSAGES/Kotti.mo | Bin 0 -> 18257 bytes
 kotti/locale/sv/LC_MESSAGES/Kotti.po | 957 +++++++++++++++++++++++++++
 2 files changed, 957 insertions(+)
 create mode 100644 kotti/locale/sv/LC_MESSAGES/Kotti.mo
 create mode 100644 kotti/locale/sv/LC_MESSAGES/Kotti.po

diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.mo b/kotti/locale/sv/LC_MESSAGES/Kotti.mo
new file mode 100644
index 0000000000000000000000000000000000000000..34782e11bd4d824269113853d72ecf7749d9966c
GIT binary patch
literal 18257
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

literal 0
HcmV?d00001

diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.po b/kotti/locale/sv/LC_MESSAGES/Kotti.po
new file mode 100644
index 000000000..5bcf6a4b8
--- /dev/null
+++ b/kotti/locale/sv/LC_MESSAGES/Kotti.po
@@ -0,0 +1,957 @@
+#
+# Swedish translations for PACKAGE package
+# This file is distributed under the same license as the PACKAGE package.
+# Anders Nylund <stokkheim@gmail.com>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE 1.0\n"
+"POT-Creation-Date: 2016-10-07 20:03+0300\n"
+"PO-Revision-Date: 2016-10-05 21:34+0300\n"
+"Last-Translator: Anders Nylund <stokkheim@gmail.com>\n"
+"Language-Team: Swedish\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Lingua 4.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: kotti/security.py:192
+msgid "Viewer"
+msgstr "Läsare"
+
+#: kotti/security.py:193
+msgid "Editor"
+msgstr "Redaktör"
+
+#: kotti/security.py:194
+msgid "Owner"
+msgstr "Ägare"
+
+#: kotti/security.py:195
+msgid "Admin"
+msgstr "Administratör"
+
+#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+msgid "Copy"
+msgstr "Kopiera"
+
+#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+msgid "Paste"
+msgstr "Klistra in"
+
+#: kotti/resources.py:519 kotti/views/edit/actions.py:457
+#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42
+msgid "Rename"
+msgstr "Döp om"
+
+#: kotti/resources.py:520 kotti/views/users.py:452
+#: kotti/views/edit/actions.py:459 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24
+msgid "Delete"
+msgstr "Radera"
+
+#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Innehåll"
+
+#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Redigera"
+
+#: kotti/resources.py:533
+msgid "Share"
+msgstr "Dela"
+
+#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Handlingar"
+
+#: kotti/resources.py:537
+msgid "Folder view"
+msgstr "Mapp vy"
+
+#: kotti/resources.py:646 kotti/views/edit/content.py:85
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:781 kotti/views/edit/content.py:66
+#: kotti/views/edit/content.py:113
+msgid "File"
+msgstr "Fil"
+
+#: kotti/populate.py:64
+msgid "Welcome to Kotti"
+msgstr "Välkommen till Kotti"
+
+#: kotti/populate.py:65
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Gratulerar! Du har nu installerat Kotti."
+
+#: kotti/populate.py:66
+#, c-format
+msgid ""
+"\n"
+"<h2>Log in</h2>\n"
+"<p>\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
+"    and start changing its contents.  If you haven't chosen a password for\n"
+"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Once you're logged in, you'll see the grey editor bar below the top\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
+"    current page as it will appear to your visitors.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Configure</h2>\n"
+"        <p>\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               Configuration manual\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Add-ons</h2>\n"
+"        <p>\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+"                Kotti add-ons\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Documentation</h2>\n"
+"        <p>\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               Documentation\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+msgstr ""
+"\n"
+"<h2>Logga in</h2>\n"
+"<p>\n"
+"    Du kan <a class=\"btn btn-success\" href=\"login\">logga in</a> till din site\n"
+"    och börja ändra dess innehåll.  Om du inte har valt ett lösenord för\n"
+"    ditt administratorkonto, så är det sannolikt <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Så fort du har loggat in kommer du att se en grå administrationsbalk \n"
+"    under toppen. Med hjälp av den kan du redigera siten eller\n"
+"    titta på den som den kommer att se ut för dina besökare.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Konfigurering</h2>\n"
+"        <p>\n"
+"            Lär dig hur du ställer in din sites rubrik och många andra \n"
+"            inställningar genom att redigera en enkel textfil i ditt filsystem.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               Konfigurationsmanual\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Tillägg</h2>\n"
+"        <p>\n"
+"            Ett antal tillägg som du kan använda för att utöka funktionen i din\n"
+"            Kotti site.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+"                Kotti tillägg\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Dokumentation</h2>\n"
+"        <p>\n"
+"            Undrar du vad mer du kan göra med Kotti?\n"
+"            Vilken licens har den?\n"
+"            Läs manualen för mer information.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               Dokumentation\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+
+#: kotti/populate.py:123
+msgid "About"
+msgstr "Om"
+
+#: kotti/populate.py:124
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Vårt företag är den ledande tillverkaren av foo grunkor som används i en mängd olika tillämpningar inom flyg och industri."
+
+#: kotti/populate.py:125
+msgid ""
+"\n"
+"<p>\n"
+"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Our worldwide headquarters:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
+"</small></p>\n"
+msgstr ""
+"\n"
+"<p>\n"
+"  <img alt=\"fem färggranna Extra EA300 flygplan flyger i formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Vårt globala högkvarter:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  grunkor@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
+"</small></p>\n"
+
+#: kotti/views/form.py:80 kotti/views/users.py:450
+msgid "Save"
+msgstr "Spara"
+
+#: kotti/views/form.py:81 kotti/views/users.py:322 kotti/views/users.py:357
+#: kotti/views/users.py:451 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/rename-nodes.pt:44
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: kotti/views/form.py:82 kotti/views/users.py:69
+#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+msgid "Your changes have been saved."
+msgstr "Dina ändringar har blivit sparade."
+
+#: kotti/views/form.py:159 kotti/templates/site-setup/user.pt:21
+#, python-format
+msgid "Edit ${title}"
+msgstr "Redigera ${title}"
+
+#: kotti/views/form.py:177
+msgid "Item was added."
+msgstr "Dokumentet har lagts till."
+
+#: kotti/views/form.py:201
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Lägg till ${type} till ${title}."
+
+#: kotti/views/form.py:205
+#, python-format
+msgid "Add ${type}."
+msgstr "Lägg till ${type}."
+
+#: kotti/views/form.py:269
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximal filstorlek: ${size}MB"
+
+#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+msgid "User Management"
+msgstr "Hantera användare"
+
+#: kotti/views/users.py:71 kotti/views/users.py:475
+#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
+#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+msgid "No changes were made."
+msgstr "Inga ändringar har gjorts."
+
+#: kotti/views/users.py:104
+msgid "No users or groups were found."
+msgstr "Inga användare eller grupper hittades."
+
+#: kotti/views/users.py:151
+msgid "Invalid value"
+msgstr "Felaktigt värde"
+
+#: kotti/views/users.py:157
+msgid "A user with that name already exists."
+msgstr "En användare med det namnet finns redan."
+
+#: kotti/views/users.py:164
+msgid "A user with that email already exists."
+msgstr "En användare med den epostadressen finns redan."
+
+#: kotti/views/users.py:187
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Ingen sådan grupp: ${group}"
+
+#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
+#: kotti/views/users.py:548 kotti/templates/edit/share.pt:62
+#: kotti/templates/site-setup/users.pt:82
+msgid "Group"
+msgstr "Grupp"
+
+#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:40
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+msgid "Title"
+msgstr "Titel"
+
+#: kotti/views/users.py:205 kotti/views/login.py:73 kotti/views/login.py:269
+msgid "Email"
+msgstr "Epost"
+
+#: kotti/views/users.py:213 kotti/templates/edit/share.pt:50
+#: kotti/templates/site-setup/users.pt:70
+msgid "Name"
+msgstr "Namn"
+
+#: kotti/views/users.py:218 kotti/views/login.py:257
+#: kotti/templates/login.pt:26
+msgid "Password"
+msgstr "Lösenord"
+
+#: kotti/views/users.py:225
+msgid "Active"
+msgstr "Aktiv"
+
+#: kotti/views/users.py:226
+msgid "Untick this to deactivate the account."
+msgstr "Ta bort det här valet för att inaktivera kontot."
+
+#: kotti/views/users.py:232
+msgid "Global roles"
+msgstr "Globala roller"
+
+#: kotti/views/users.py:236
+msgid "Groups"
+msgstr "Grupper"
+
+#: kotti/views/users.py:273
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lämna det här tomt och välj 'Sänd länk för lösenordsregistrering' nedan för att låta användaren själv välja lösenord."
+
+#: kotti/views/users.py:276 kotti/views/login.py:65
+msgid "Full name"
+msgstr "Fullständigt namn"
+
+#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+msgid "User"
+msgstr "Användare"
+
+#: kotti/views/users.py:321
+msgid "Add User"
+msgstr "Lägg till användare"
+
+#: kotti/views/users.py:331
+msgid "Send password registration link."
+msgstr "Sänd länk för lösenordsregistrering."
+
+#: kotti/views/users.py:346
+#, python-format
+msgid "${title} was added."
+msgstr "${title} lades till."
+
+#: kotti/views/users.py:356
+msgid "Add Group"
+msgstr "Lägg till grupp"
+
+#: kotti/views/users.py:517
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Redigera ${principal_type} ${title}"
+
+#: kotti/views/users.py:545
+msgid "User was not found."
+msgstr "Användaren kunde inte hittas."
+
+#: kotti/views/users.py:555
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} raderades."
+
+#: kotti/views/users.py:563
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Radera ${principal_type} ${title}"
+
+#: kotti/views/users.py:570
+msgid "No name was given."
+msgstr "Inget namn angavs."
+
+#: kotti/views/users.py:599
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mina preferenser - ${title}"
+
+#: kotti/views/login.py:68
+msgid "Username"
+msgstr "Användarnamn"
+
+#: kotti/views/login.py:82
+msgid "Register"
+msgstr "Registrera"
+
+#: kotti/views/login.py:89
+msgid "There was an error."
+msgstr "Ett fel uppstod."
+
+#: kotti/views/login.py:108
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulerar! Du har registrerat dig. Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
+
+#: kotti/views/login.py:123
+#, python-format
+msgid "Register - ${title}"
+msgstr "Registrara - ${title}"
+
+#: kotti/views/login.py:154
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Välkommen, ${user}!"
+
+#: kotti/views/login.py:179
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
+
+#: kotti/views/login.py:212
+msgid "Login failed."
+msgstr "Inloggningen misslyckades."
+
+#: kotti/views/login.py:222
+msgid "That username or email is not known by this system."
+msgstr "Användarnamnet eller epostadressen är inte bekanta för systemet."
+
+#: kotti/views/login.py:244
+msgid "You have been logged out."
+msgstr "Du har loggats ut."
+
+#: kotti/views/login.py:282
+msgid "You have reset your password."
+msgstr "Du har återställt ditt lösenord."
+
+#: kotti/views/login.py:295
+msgid "Set password"
+msgstr "Ställ in lösenord"
+
+#: kotti/views/login.py:323
+msgid "Your password reset token may have expired."
+msgstr "Lösenordsåterställningen kan vara föråldrad."
+
+#: kotti/views/login.py:330
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Återställ ditt lösenord - ${title}."
+
+#: kotti/views/edit/actions.py:105
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} har kopierats."
+
+#: kotti/views/edit/actions.py:123
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} har klippts ut."
+
+#: kotti/views/edit/actions.py:158
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} har klistrats in."
+
+#: kotti/views/edit/actions.py:161
+msgid "Could not paste node. It no longer exists."
+msgstr "Kunde inte klistra in noden. Den finns inte längre."
+
+#: kotti/views/edit/actions.py:182
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} har flyttats."
+
+#: kotti/views/edit/actions.py:224
+#, python-format
+msgid "${title} is now visible in the navigation."
+msgstr "${title} är ny synlig i navigationsträdet"
+
+#: kotti/views/edit/actions.py:227
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} visas inte längre i navigationsträdet"
+
+#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} har raderats."
+
+#: kotti/views/edit/actions.py:302
+msgid "Nothing was deleted."
+msgstr "Ingenting raderades."
+
+#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+msgid "Name and title are required."
+msgstr "Namn och rubrik krävs"
+
+#: kotti/views/edit/actions.py:342
+msgid "Item was renamed."
+msgstr "Dokumentet har döpts om."
+
+#: kotti/views/edit/actions.py:463
+msgid "Change State"
+msgstr "Ändra läge"
+
+#: kotti/views/edit/actions.py:464
+msgid "Move up"
+msgstr "Flytta upp"
+
+#: kotti/views/edit/actions.py:465
+msgid "Move down"
+msgstr "Flytta ner"
+
+#: kotti/views/edit/actions.py:466
+msgid "Show"
+msgstr "Visa"
+
+#: kotti/views/edit/actions.py:467
+msgid "Hide"
+msgstr "Göm"
+
+#: kotti/views/edit/actions.py:506
+msgid "You have to select items to perform an action."
+msgstr "Du måste välja något att utföra operationen på först"
+
+#: kotti/views/edit/content.py:38
+msgid "Description"
+msgstr "Beskrivning"
+
+#: kotti/views/edit/content.py:44
+msgid "Tags"
+msgstr "Taggar"
+
+#: kotti/views/edit/content.py:53
+msgid "Body"
+msgstr "Brödtext"
+
+#: kotti/views/edit/default_views.py:79
+msgid "Default view"
+msgstr "Standardvy"
+
+#: kotti/views/edit/default_views.py:100
+msgid "Default view has been reset to default."
+msgstr "Standardvyn har återställts till förvald inställning."
+
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been set."
+msgstr "Standadvyn har ställts in."
+
+#: kotti/views/edit/default_views.py:112
+msgid "Default view could not be set."
+msgstr "Standardvyn kunde inte ställas in."
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Gör ${state}"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Lägg till"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Ladda upp innehåll"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Din registrering för ${site_title}"
+
+#: kotti/templates/email-set-password.pt:4
+#: kotti/templates/email-reset-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Hej, ${user_title}!"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Du ansluter dig till ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klicka här för att ställa in ditt lösenord och logga in: ${url}"
+
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Förbjudet"
+
+#: kotti/templates/login.pt:16
+msgid "Login"
+msgstr "Inloggning"
+
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
+msgid "Username or email"
+msgstr "Användarnamn eller epost"
+
+#: kotti/templates/login.pt:34
+msgid "Log in"
+msgstr "Logga in"
+
+#: kotti/templates/login.pt:45
+msgid "Forgot your password?"
+msgstr "Har du glömt ditt lösenord?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
+msgid "Reset password"
+msgstr "Återställ lösenord"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:50
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Fyll i ditt användarnamn och din epostadress och klicka ${reset_password} nedanom för att få ett epostmeddelande med en länk för att återställa ditt lösenord."
+
+#: kotti/templates/login.pt:78
+msgid "Not registered yet?"
+msgstr "Inte ännu registrerad?"
+
+#: kotti/templates/login.pt:85
+msgid "Register for an account on this site."
+msgstr "Registrera ett konto på den här siten"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Återställ ditt lösenord för ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klicka den här länken för att återställa ditt lösenord för ${site_title}: ${url}"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Sätt standardvy"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Visa"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigera"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Preferenser"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Site inställningar"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Logga ut"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr "Hittas ej"
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr "Resursen kan ej hittas"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Du är här:"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Ladda upp innehåll från lokal fil/filer"
+
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
+msgid "Filename"
+msgstr "Filnamn"
+
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:41
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
+msgid "Size"
+msgstr "Storlek"
+
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Status"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Framsteg"
+
+#: kotti/templates/edit/upload.pt:84
+msgid "Select file(s) to upload..."
+msgstr "Välj fil/filer för uppladdning"
+
+#: kotti/templates/edit/upload.pt:92
+msgid "Upload ${number} files."
+msgstr "Ladda upp ${number} filer."
+
+#: kotti/templates/edit/upload.pt:97
+msgid "Dismiss all errors"
+msgstr "Avfärda alla fel"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Ändra 'workflow' inställning"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Ett dokuments 'workflow' inställning bestämmer vem som kan se, redigera och/eller hantera det."
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/delete-nodes.pt:23
+msgid "State"
+msgstr "Läge"
+
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+msgid "Creation Date"
+msgstr "Skapat"
+
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Ändrat"
+
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:51
+#: kotti/templates/edit/delete-nodes.pt:31
+msgid "Select item"
+msgstr "Välj dokument"
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:48
+msgid "Include children"
+msgstr "Inkludera underdokument"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Det här kommer, om det är valt, att försöka rekursivt modifiera alla underdokument under valda dokument"
+
+#: kotti/templates/edit/change-state.pt:54
+msgid "Change state to"
+msgstr "Ändra läge till"
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "Select the new state where all chosen items should be set."
+msgstr "Välj nytt läge för alla valda dokument"
+
+#: kotti/templates/edit/change-state.pt:60
+msgid "No change"
+msgstr "Ingen ändring"
+
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Ta ändringarna i bruk"
+
+#: kotti/templates/edit/contents.pt:31
+msgid "No content items are contained here."
+msgstr "Här finns inga dokument"
+
+#: kotti/templates/edit/contents.pt:39
+msgid "Select / deselect all"
+msgstr "Välj / väl bort alla"
+
+#: kotti/templates/edit/contents.pt:43
+msgid "Visibility"
+msgstr "Synlighet"
+
+#: kotti/templates/edit/contents.pt:76
+msgid "Visible"
+msgstr "Synliga"
+
+#: kotti/templates/edit/contents.pt:80
+msgid "Hidden"
+msgstr "Dolda"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Döp om ${title}"
+
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Varje dokument har ett namn som används för att skapa ett url och en titel. Läs vid behov om korrekt formattering av namn och titel i användarmanualen. Nedan kan du ändra bägge."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
+msgid "New name"
+msgstr "Nytt namn"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
+msgid "New title"
+msgstr "Ny rubrik"
+
+#: kotti/templates/edit/delete-nodes.pt:13
+msgid "Are you sure you want to delete the following items?"
+msgstr "Är du säker på att du vill radera följande dokument?"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Dela ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Sök efter användare och grupper"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Sök"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Tilldela lokala roller"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "Tilldela roll"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigera siten"
+
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Radera ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Är du säker på att du vill radera ${title}?"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Är du säker på att du vill radera ${type} ${title}?"
+
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Sök användare och grupp(er)"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Lägg till användare"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Lägg till grupp"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Hitta användare eller grupper"
+
+#: kotti/templates/site-setup/users.pt:40
+msgid "User- / groupname"
+msgstr "Användare- /gruppnamn"
+
+#: kotti/templates/site-setup/users.pt:50
+msgid "Blank search text finds all."
+msgstr "Tom söktext matchar allt."
+
+#: kotti/templates/site-setup/users.pt:65
+msgid "Assign global roles"
+msgstr "Tilldela globala roller"
+
+#: kotti/templates/site-setup/users.pt:117
+msgid "Add new user"
+msgstr "Lägg till ny användare"
+
+#: kotti/templates/site-setup/users.pt:123
+msgid "Add new group"
+msgstr "Lägg till ny grupp"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Tillbaka till hantering av användare"
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Taggad med:"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Sökresultat"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Sök..."
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Välkommern, ${user}!. Du är inloggad."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Välkommen, du är inte inloggad."

From c8e12cc182305695c6f56009be39f98d2c78ad6e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 10 Oct 2016 16:50:26 +0200
Subject: [PATCH 455/600] Prepare release.

---
 AUTHORS.txt                                   |    2 +-
 CHANGES.txt                                   |   28 +-
 CONTRIBUTORS.txt                              |    2 +-
 MANIFEST.in                                   |   31 +-
 docs/first_steps/installation.rst             |    3 +-
 docs/first_steps/overview.rst                 |    2 +-
 kotti/locale/Kotti.pot                        |  226 ++--
 kotti/locale/de/LC_MESSAGES/Kotti.mo          |  Bin 18730 -> 18730 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/en/LC_MESSAGES/Kotti.mo          |  Bin 157 -> 157 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo       |  Bin 13169 -> 13169 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po       |  219 ++--
 kotti/locale/it/LC_MESSAGES/Kotti.mo          |  Bin 12305 -> 12305 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/ja/LC_MESSAGES/Kotti.mo          |  Bin 11990 -> 11990 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/ko/LC_MESSAGES/Kotti.mo          |  Bin 13002 -> 13002 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/nl/LC_MESSAGES/Kotti.mo          |  Bin 10857 -> 10857 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/pl/LC_MESSAGES/Kotti.mo          |  Bin 17934 -> 17934 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/pt/LC_MESSAGES/Kotti.mo          |  Bin 7355 -> 7355 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po          |  219 ++--
 kotti/locale/sv/LC_MESSAGES/Kotti.mo          |  Bin 18257 -> 14798 bytes
 kotti/locale/sv/LC_MESSAGES/Kotti.po          | 1104 ++++++++---------
 kotti/scaffolds/package/+dot+travis.yml_tmpl  |    1 -
 .../overrides/kotti/static/icons/.gitkeep     |    0
 kotti/scaffolds/package/requirements.txt      |    4 +-
 kotti/scaffolds/package/setup.py_tmpl         |   30 +-
 prepare-release.sh                            |    0
 requirements.txt                              |    3 -
 setup.cfg                                     |    7 +
 setup.py                                      |   84 +-
 35 files changed, 1787 insertions(+), 1711 deletions(-)
 create mode 100644 kotti/scaffolds/package/+package+/overrides/kotti/static/icons/.gitkeep
 create mode 100644 prepare-release.sh

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 10d2577f5..7dcbfb109 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,7 +1,7 @@
 Authors
 =======
 
-Kotti was created by Daniel Nouri.
+Kotti was created by Daniel Nouri and is currently maintained by Andreas Kaiser.
 
 Major contributing authors include:
 
diff --git a/CHANGES.txt b/CHANGES.txt
index ea5fb86ef..e1ee86979 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,21 @@
 Change History
 ==============
 
-1.3.0 - unreleased
+1.3.0 - 2016-10-10
 ------------------
 
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+- Upgrade to ``repoze.workflow==1.0b``.  **If your application has a custom
+  ``workflow.zcml``, it needs a little modification: ``state`` and
+  ``transition`` titles are no longer ``key`` nodes, but attributes on the
+  respective ``state`` or ``transition`` nodes.  See Kotti's ``workflow.zcml``
+  for an example.**
+
+Features and Fixes
+~~~~~~~~~~~~~~~~~~
+
 - Add a fallback in ``contents.pt`` when ``creation_date`` or
   ``modification_date`` is ``None``.
 
@@ -12,8 +24,6 @@ Change History
 
 - Replace some Python 2 only code with equivalents that also support Python 3.
 
-- Fix or ignore some PyCharm inspection warnings.
-
 - Use generic SQLAlchemy type Text as base type for JsonType. This allows
   SQLAlchemy to map Text type to the most suitable type available on given
   database system. Previously used TEXT type is not available in Oracle
@@ -30,7 +40,9 @@ Change History
 - We use PEP 440 normalized form for the project's version thus current
   "1.3.0-alpha.5-dev" became "1.3.0a5.dev0".
 
-- Upgrade tests to ``zope.testbrowser>=5.0.0``.
+- Upgrade tests to ``zope.testbrowser>=5.0.0``.  This removes the ``mechanize``
+  and ``wsgi_intercept`` dependencies and thus the last blocker for Python 3
+  compatibility.
 
 - Move ``pytest`` config from ``setup.cfg`` to new ``pytest.ini``.  This
   prevents a deprecation warning with ``pytest>=3.0``.
@@ -39,12 +51,6 @@ Change History
   ``kotti.testing.RootFactory`` to prevent another deprecation warning with
   ``pytest>=3.0``.
 
-- Upgrade to ``repoze.workflow==1.0b``.  **If your application has a custom
-  ``workflow.zcml``, it needs a little modification: ``state`` and
-  ``transition`` titles are no longer ``key`` nodes, but attributes on the
-  respective ``state`` or ``transition`` nodes.  See Kotti's ``workflow.zcml``
-  for an example.**
-
 1.3.0-alpha.4 - 2015-01-15
 --------------------------
 
@@ -72,7 +78,7 @@ make the universe collapse!**
 make the universe collapse!**
 
 - Add a custom traverser, which gets all nodes in a single DB query.  For deeply
-  nested trees this results in drastic perfor,ance improvements.  See
+  nested trees this results in drastic performance improvements.  See
   https://kotti.readthedocs.io/en/master/api/kotti.traversal.html for details.
 
 - Bugfix: copy and paste of file nodes wouldn't create a new depot file, but
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 3eb9a1e89..a150abaab 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -12,7 +12,7 @@ below, and b) the resulting document is accepted into the canonical
 version control repository.
 
 Treatment of Account
----------------------
+--------------------
 
 Contributor will not allow anyone other than the Contributor to use
 his or her username or source repository login to submit code to a
diff --git a/MANIFEST.in b/MANIFEST.in
index ae2af8a1b..f8d97748b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,27 @@
+include *.rst
+include *.txt
+include Dockerfile
+include app.ini
+include development.ini
+include pytest.ini
+include tox.ini
+include .coveragerc
+
+exclude .checkignore
+exclude Makefile
+exclude i18n.sh
 recursive-exclude * *.pyc
 recursive-exclude * __pycache__
+recursive-exclude * ._DS_Store
 recursive-exclude website *
-recursive-include kotti *.zcml
-recursive-include kotti/alembic *
-recursive-include kotti/locale *
-recursive-include kotti/scaffolds *
-recursive-include kotti/static *
-recursive-include kotti/templates *
-recursive-include kotti/tests *
+
+recursive-include kotti *
+
+include docs/Makefile
+include docs/_static/README
+recursive-include docs *.rst
+recursive-include docs *.py
+recursive-include docs *.svg
+recursive-include docs *.txt
+prune docs/_build
+
diff --git a/docs/first_steps/installation.rst b/docs/first_steps/installation.rst
index 9cedcda27..5d2cef7fd 100644
--- a/docs/first_steps/installation.rst
+++ b/docs/first_steps/installation.rst
@@ -6,7 +6,7 @@ Installation
 Requirements
 ------------
 
-- Python 2.6 or 2.7 (Python 3 support will land in future versions)
+- Python 2.7 (Python 3 will be supported soon)
 - virtualenv_
 - ``build_essential`` and ``python-dev`` (on Debian or Ubuntu) or
 - ``Xcode`` (on OS X) or
@@ -22,6 +22,7 @@ It is recommended to install Kotti inside a virtualenv:
   virtualenv mysite
   cd mysite
   bin/pip install -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
+  bin/pip install Kotti
 
 This will install the latest released version of Kotti and all its requirements into your virtualenv.
 
diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index 9fbab1a5a..f447ac221 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -79,7 +79,7 @@ Use this command:
 Support
 -------
 
-- Python 2.6 or 2.7 (Python 3 coming soon)
+- Python 2.7 (Python 3 coming soon)
 - Support for PostgreSQL, MySQL and SQLite (tested regularly), and a list of `other SQL databases`_
 - Support for WSGI and a `variety of web servers`_, including Apache
 
diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 202b122d0..28dacec93 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\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"
@@ -14,17 +14,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
-"Generated-By: Lingua 4.7\n"
+"Generated-By: Lingua 4.9\n"
 
-#: ./kotti/populate.py:64
+#: ./kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: ./kotti/populate.py:65
+#: ./kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: ./kotti/populate.py:66
+#: ./kotti/populate.py:68
 #, c-format
 msgid ""
 "\n"
@@ -83,17 +83,17 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: ./kotti/populate.py:123
+#: ./kotti/populate.py:125
 msgid "About"
 msgstr ""
 
-#: ./kotti/populate.py:124
+#: ./kotti/populate.py:126
 msgid ""
 "Our company is the leading manufacturer of foo widgets used in a wide variety"
 " of aviation and and industrial products."
 msgstr ""
 
-#: ./kotti/populate.py:125
+#: ./kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -124,74 +124,74 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:516 ./kotti/views/edit/actions.py:455
+#: ./kotti/resources.py:520 ./kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr ""
 
-#: ./kotti/resources.py:517 ./kotti/views/edit/actions.py:456
+#: ./kotti/resources.py:521 ./kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr ""
 
-#: ./kotti/resources.py:518 ./kotti/views/edit/actions.py:452
+#: ./kotti/resources.py:522 ./kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr ""
 
-#: ./kotti/resources.py:519 ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/resources.py:523 ./kotti/templates/edit/rename-nodes.pt:8
 #: ./kotti/templates/edit/rename-nodes.pt:42
-#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:457
+#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr ""
 
-#: ./kotti/resources.py:520 ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/resources.py:524 ./kotti/templates/edit/delete-nodes.pt:9
 #: ./kotti/templates/edit/delete-nodes.pt:49
 #: ./kotti/templates/edit/delete.pt:24
-#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:452
-#: ./kotti/views/edit/actions.py:459
+#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:455
+#: ./kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr ""
 
-#: ./kotti/resources.py:531 ./kotti/templates/view/folder.pt:15
+#: ./kotti/resources.py:535 ./kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr ""
 
-#: ./kotti/resources.py:532 ./kotti/templates/edit/nav-tree.pt:10
+#: ./kotti/resources.py:536 ./kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: ./kotti/resources.py:533
+#: ./kotti/resources.py:537
 msgid "Share"
 msgstr ""
 
-#: ./kotti/resources.py:534 ./kotti/templates/actions-dropdown.pt:3
+#: ./kotti/resources.py:538 ./kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr ""
 
-#: ./kotti/resources.py:537
+#: ./kotti/resources.py:541
 msgid "Folder view"
 msgstr ""
 
-#: ./kotti/resources.py:646 ./kotti/views/edit/content.py:85
+#: ./kotti/resources.py:650 ./kotti/views/edit/content.py:90
 msgid "Document"
 msgstr ""
 
-#: ./kotti/resources.py:781 ./kotti/views/edit/content.py:66
-#: ./kotti/views/edit/content.py:113
+#: ./kotti/resources.py:785 ./kotti/views/edit/content.py:70
+#: ./kotti/views/edit/content.py:118
 msgid "File"
 msgstr ""
 
-#: ./kotti/security.py:192
+#: ./kotti/security.py:194
 msgid "Viewer"
 msgstr ""
 
-#: ./kotti/security.py:193
+#: ./kotti/security.py:195
 msgid "Editor"
 msgstr ""
 
-#: ./kotti/security.py:194
+#: ./kotti/security.py:196
 msgid "Owner"
 msgstr ""
 
-#: ./kotti/security.py:195
+#: ./kotti/security.py:197
 msgid "Admin"
 msgstr ""
 
@@ -264,8 +264,8 @@ msgstr ""
 msgid "Username or email"
 msgstr ""
 
-#: ./kotti/templates/login.pt:26 ./kotti/views/login.py:257
-#: ./kotti/views/users.py:218
+#: ./kotti/templates/login.pt:26 ./kotti/views/login.py:259
+#: ./kotti/views/users.py:221
 msgid "Password"
 msgstr ""
 
@@ -319,8 +319,8 @@ msgstr ""
 #: ./kotti/templates/edit/change-state.pt:18
 #: ./kotti/templates/edit/contents.pt:34
 #: ./kotti/templates/edit/delete-nodes.pt:21
-#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:202
-#: ./kotti/views/edit/content.py:32
+#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:205
+#: ./kotti/views/edit/content.py:35
 msgid "Title"
 msgstr ""
 
@@ -389,9 +389,9 @@ msgstr ""
 #: ./kotti/templates/edit/change-state.pt:74
 #: ./kotti/templates/edit/delete-nodes.pt:44
 #: ./kotti/templates/edit/delete.pt:19
-#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:81
-#: ./kotti/views/users.py:322 ./kotti/views/users.py:357
-#: ./kotti/views/users.py:451
+#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:83
+#: ./kotti/views/users.py:325 ./kotti/views/users.py:360
+#: ./kotti/views/users.py:454
 msgid "Cancel"
 msgstr ""
 
@@ -474,19 +474,19 @@ msgid "Assign local roles"
 msgstr ""
 
 #: ./kotti/templates/edit/share.pt:50 ./kotti/templates/site-setup/users.pt:70
-#: ./kotti/views/users.py:213
+#: ./kotti/views/users.py:216
 msgid "Name"
 msgstr ""
 
 #: ./kotti/templates/edit/share.pt:61 ./kotti/templates/site-setup/users.pt:81
-#: ./kotti/views/users.py:319 ./kotti/views/users.py:513
-#: ./kotti/views/users.py:548
+#: ./kotti/views/users.py:322 ./kotti/views/users.py:516
+#: ./kotti/views/users.py:551
 msgid "User"
 msgstr ""
 
 #: ./kotti/templates/edit/share.pt:62 ./kotti/templates/site-setup/users.pt:82
-#: ./kotti/views/users.py:194 ./kotti/views/users.py:354
-#: ./kotti/views/users.py:513 ./kotti/views/users.py:548
+#: ./kotti/views/users.py:197 ./kotti/views/users.py:357
+#: ./kotti/views/users.py:516 ./kotti/views/users.py:551
 msgid "Group"
 msgstr ""
 
@@ -546,7 +546,7 @@ msgstr ""
 msgid "Back to User Management"
 msgstr ""
 
-#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:159
+#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
@@ -607,303 +607,303 @@ msgstr ""
 msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: ./kotti/views/form.py:80 ./kotti/views/users.py:450
+#: ./kotti/views/form.py:82 ./kotti/views/users.py:453
 msgid "Save"
 msgstr ""
 
-#: ./kotti/views/form.py:82 ./kotti/views/users.py:69
-#: ./kotti/views/edit/actions.py:373 ./kotti/views/edit/actions.py:417
+#: ./kotti/views/form.py:84 ./kotti/views/users.py:72
+#: ./kotti/views/edit/actions.py:375 ./kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr ""
 
-#: ./kotti/views/form.py:177
+#: ./kotti/views/form.py:179
 msgid "Item was added."
 msgstr ""
 
-#: ./kotti/views/form.py:201
+#: ./kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: ./kotti/views/form.py:205
+#: ./kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/views/form.py:269
+#: ./kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: ./kotti/views/login.py:65 ./kotti/views/users.py:276
+#: ./kotti/views/login.py:67 ./kotti/views/users.py:279
 msgid "Full name"
 msgstr ""
 
-#: ./kotti/views/login.py:68
+#: ./kotti/views/login.py:70
 msgid "Username"
 msgstr ""
 
-#: ./kotti/views/login.py:73 ./kotti/views/login.py:269
-#: ./kotti/views/users.py:205
+#: ./kotti/views/login.py:75 ./kotti/views/login.py:271
+#: ./kotti/views/users.py:208
 msgid "Email"
 msgstr ""
 
-#: ./kotti/views/login.py:82
+#: ./kotti/views/login.py:84
 msgid "Register"
 msgstr ""
 
-#: ./kotti/views/login.py:89
+#: ./kotti/views/login.py:91
 msgid "There was an error."
 msgstr ""
 
-#: ./kotti/views/login.py:108
+#: ./kotti/views/login.py:110
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: ./kotti/views/login.py:123
+#: ./kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr ""
 
-#: ./kotti/views/login.py:154
+#: ./kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr ""
 
-#: ./kotti/views/login.py:179
+#: ./kotti/views/login.py:181
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing so"
 " will activate your account."
 msgstr ""
 
-#: ./kotti/views/login.py:212
+#: ./kotti/views/login.py:214
 msgid "Login failed."
 msgstr ""
 
-#: ./kotti/views/login.py:222
+#: ./kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr ""
 
-#: ./kotti/views/login.py:244
+#: ./kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr ""
 
-#: ./kotti/views/login.py:282
+#: ./kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr ""
 
-#: ./kotti/views/login.py:295
+#: ./kotti/views/login.py:303
 msgid "Set password"
 msgstr ""
 
-#: ./kotti/views/login.py:323
+#: ./kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr ""
 
-#: ./kotti/views/login.py:330
+#: ./kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: ./kotti/views/site_setup.py:6 ./kotti/views/users.py:386
+#: ./kotti/views/site_setup.py:8 ./kotti/views/users.py:389
 msgid "User Management"
 msgstr ""
 
-#: ./kotti/views/users.py:71 ./kotti/views/users.py:475
-#: ./kotti/views/edit/actions.py:311 ./kotti/views/edit/actions.py:377
-#: ./kotti/views/edit/actions.py:419 ./kotti/views/edit/actions.py:423
+#: ./kotti/views/users.py:74 ./kotti/views/users.py:478
+#: ./kotti/views/edit/actions.py:313 ./kotti/views/edit/actions.py:379
+#: ./kotti/views/edit/actions.py:421 ./kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr ""
 
-#: ./kotti/views/users.py:104
+#: ./kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr ""
 
-#: ./kotti/views/users.py:151
+#: ./kotti/views/users.py:154
 msgid "Invalid value"
 msgstr ""
 
-#: ./kotti/views/users.py:157
+#: ./kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr ""
 
-#: ./kotti/views/users.py:164
+#: ./kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr ""
 
-#: ./kotti/views/users.py:187
+#: ./kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr ""
 
-#: ./kotti/views/users.py:225
+#: ./kotti/views/users.py:228
 msgid "Active"
 msgstr ""
 
-#: ./kotti/views/users.py:226
+#: ./kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: ./kotti/views/users.py:232
+#: ./kotti/views/users.py:235
 msgid "Global roles"
 msgstr ""
 
-#: ./kotti/views/users.py:236
+#: ./kotti/views/users.py:239
 msgid "Groups"
 msgstr ""
 
-#: ./kotti/views/users.py:273
+#: ./kotti/views/users.py:276
 msgid ""
 "Leave this empty and tick the 'Send password registration' box below to have "
 "the user set their own password."
 msgstr ""
 
-#: ./kotti/views/users.py:321
+#: ./kotti/views/users.py:324
 msgid "Add User"
 msgstr ""
 
-#: ./kotti/views/users.py:331
+#: ./kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr ""
 
-#: ./kotti/views/users.py:346
+#: ./kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr ""
 
-#: ./kotti/views/users.py:356
+#: ./kotti/views/users.py:359
 msgid "Add Group"
 msgstr ""
 
-#: ./kotti/views/users.py:517
+#: ./kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/users.py:545
+#: ./kotti/views/users.py:548
 msgid "User was not found."
 msgstr ""
 
-#: ./kotti/views/users.py:555
+#: ./kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/users.py:563
+#: ./kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/users.py:570
+#: ./kotti/views/users.py:573
 msgid "No name was given."
 msgstr ""
 
-#: ./kotti/views/users.py:599
+#: ./kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:105
+#: ./kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:123
+#: ./kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:158
+#: ./kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:161
+#: ./kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:182
+#: ./kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:224
+#: ./kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:227
+#: ./kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:276 ./kotti/views/edit/actions.py:305
+#: ./kotti/views/edit/actions.py:278 ./kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:302
+#: ./kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:338 ./kotti/views/edit/actions.py:365
+#: ./kotti/views/edit/actions.py:340 ./kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:342
+#: ./kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:463
+#: ./kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:464
+#: ./kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:465
+#: ./kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:466
+#: ./kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:467
+#: ./kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:506
+#: ./kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: ./kotti/views/edit/content.py:38
+#: ./kotti/views/edit/content.py:41
 msgid "Description"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:44
+#: ./kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:53
+#: ./kotti/views/edit/content.py:56
 msgid "Body"
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:79
+#: ./kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:100
+#: ./kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:107
+#: ./kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr ""
 
-#: ./kotti/views/edit/default_views.py:112
+#: ./kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr ""
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index b3dfe7391338cb5873154694f94fc205481e2679..94d95e38a092364e57ad6b3a76ec3d77eb10b4d9 100644
GIT binary patch
delta 144
zcmZ2AiE-5=#tk#LC4Cqmpc6`S0%<)Up0{};w=^Ro)8?~0rx_WWCeP$^W}LS9E}tJW
zWAWrfQBkJM{K@^gOE<p|s$@cla2d*Po*{Z%n9tBa*U&)0(8S8rSlhs8bFL;A3tZLa
Oe%)k*DVw<r6(j&qTP5=V

delta 208
zcmZ2AiE-5=#tk#LC7Bo?pc6`S0%<)UZrZ$&Tbhw^+UB!7rx_W2CeP$^W}LVAE}tK>
zgq6O2c791ore0BMVoFIyYD#``v0i>r`s9AyrJG*}RWjjL!DT4Fd4}k5VLk(6T|-j^
fLvt$wLu~`Y&AFOfEI4&-?$=GmZR=((Lj?%{dW}F?

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index f92fd4ed8..eee728bed 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: \n"
@@ -11,15 +11,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr "Willkommen bei Kotti"
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Herzlichen Glückwunsch! Sie haben Kotti erfolgreich installiert."
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, c-format
 msgid ""
 "\n"
@@ -124,15 +124,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr "Über"
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Unsere Firma is der führende Hersteller von Foo Produkten, welche gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen Industriesektoren eingesetzt werden."
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -190,73 +190,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Kopieren"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Einfügen"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Löschen"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhalt"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "Freigeben"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Aktionen"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "Ordneransicht"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "Datei"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "Betrachter"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "Bearbeiter"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "Besitzer"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "Administrator"
 
@@ -329,8 +329,8 @@ msgstr "Anmelden"
 msgid "Username or email"
 msgstr "Benutzername oder E-Mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "Passwort"
 
@@ -381,7 +381,7 @@ msgstr "Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten u
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titel"
 
@@ -440,8 +440,8 @@ msgstr "Änderungen übernehmen"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -469,8 +469,7 @@ msgstr "Unsichtbar"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Lösche ${title}"
 
@@ -518,18 +517,18 @@ msgid "Assign local roles"
 msgstr "Lokale Rollen zuweisen"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "Name"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "Benutzer"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "Gruppe"
 
@@ -589,7 +588,7 @@ msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
 msgid "Back to User Management"
 msgstr "Zurück zur Benutzerverwaltung"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bearbeite ${title}"
@@ -650,297 +649,297 @@ msgstr "Willkommen, ${user}! Sie sind angemeldet."
 msgid "Welcome, you are not logged in."
 msgstr "Willkommen! Sie sind nicht angemeldet."
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "Übernehmen"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Ihre Änderungen wurden übernommen."
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr "Dokument hinzugefügt."
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${type} in ${title} erstellen"
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr "${type} erstellen"
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximale Dateigröße: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "Benutzername"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "E-Mail"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "Registrieren"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "Ein Fehler ist aufgetreten."
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrieren - ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Willkommen, ${user}!"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "Sie wurden abgemeldet."
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Passwort zurücksetzen - ${title}"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "Benutzerverwaltung"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Keine Änderungen."
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr "Keine Benutzer oder Gruppen gefunden."
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "Ungültige Eingabe"
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "Ein Benutzer mit diesem Namen existiert bereits."
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Unbekannte Gruppe: ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "Aktiv"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "Abwählen um das Konto zu deaktivieren."
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "Globale Rollen"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "Gruppen"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "Neuer Benutzer"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr "Schicke Passwort-Registrierungs-Link"
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr "${title} hinzugefügt."
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "Neue Gruppe"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Bearbeite ${principal_type} ${title}"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr "Keine Benutzer oder Gruppen gefunden."
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} gelöscht."
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Bearbeite ${principal_type} ${title}"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr "Kein Name übergeben."
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Meine Einstellungen - ${title}"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} kopiert."
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} ausgeschnitten."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} eingefügt."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr "Inhalt konnte nicht eingefügt werden, da er nicht mehr existiert."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} verschoben."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} wird nun in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} gelöscht."
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr "Nichts wurde gelöscht."
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "Name und Titel werden benötigt."
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr "Objekt umbenannt."
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "Status ändern"
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "Nach oben verschieben"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "Nach unten verschieben"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "Anzeigen"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "Verstecken"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "Beschreibung"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "Schlagworte:"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "Inhalt"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "Standardansicht"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "Standardansicht wurde zurückgesetzt."
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "Standardansicht wurde gesetzt."
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "Standardansicht konnte nicht geändert werden."
 
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index 56919c0a7da990256ad80628eea6325a4b877ab9..1c220f2300688d376064c11946aa73ce3571bc02 100644
GIT binary patch
delta 24
fcmbQsIG1rkAfKUuuAzZ~p^25Lv9^KH#CSUZOx^|k

delta 24
fcmbQsIG1rkAfJJ;uA!-dp}CcTp|*kH#CSUZO(F&V

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index b68a3c03f..f52f550c3 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr ""
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr ""
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr ""
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr ""
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr ""
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr ""
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr ""
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr ""
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr ""
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr ""
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr ""
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr ""
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr ""
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr ""
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr ""
 
@@ -249,8 +249,8 @@ msgstr ""
 msgid "Username or email"
 msgstr ""
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr ""
 
@@ -301,7 +301,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr ""
 
@@ -360,8 +360,8 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr ""
 
@@ -389,8 +389,7 @@ msgstr ""
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr ""
 
@@ -438,18 +437,18 @@ msgid "Assign local roles"
 msgstr ""
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr ""
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr ""
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr ""
 
@@ -509,7 +508,7 @@ msgstr ""
 msgid "Back to User Management"
 msgstr ""
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
@@ -570,296 +569,296 @@ msgstr ""
 msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr ""
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr ""
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr ""
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr ""
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr ""
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr ""
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr ""
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr ""
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr ""
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr ""
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr ""
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr ""
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr ""
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr ""
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr ""
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 msgid "Set password"
 msgstr ""
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr ""
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr ""
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr ""
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr ""
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr ""
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr ""
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr ""
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr ""
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr ""
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr ""
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr ""
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr ""
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr ""
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr ""
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr ""
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr ""
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr ""
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr ""
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr ""
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr ""
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr ""
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr ""
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr ""
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr ""
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr ""
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr ""
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr ""
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr ""
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr ""
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr ""
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr ""
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr ""
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr ""
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr ""
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr ""
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr ""
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index add63262037d5988ce857e11d2d656ab82e20578..835b97c5bfadd58632901ebe2e0d181016db5ef8 100644
GIT binary patch
delta 27
icmeyE_AzZkmK>j<fv%x}f}x3(sj;?!(dG)dpCSN>@Cfbz

delta 27
icmeyE_AzZkmK>jfv96)1f}y#UfuXj6;pPgtpCSN?I0*0n

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index b929021cc..70ec1305f 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr "Bienvenue dans Kotti"
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -123,15 +123,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr "A propos"
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Notre société est spécialisée dans la conception de pièces foo utilisées dans une grande variétée de produits."
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 #, fuzzy
 msgid ""
 "\n"
@@ -190,73 +190,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Copier"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Couper"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Coller"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Renommer"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Supprimer"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenus"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modifier"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "Permissions"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Actions"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "Contenus"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "Fichier"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "Lecteur"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "Editeur"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -329,8 +329,8 @@ msgstr "Identifiant"
 msgid "Username or email"
 msgstr "Identifiant ou e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -381,7 +381,7 @@ msgstr "Le statut de workflow d'un élément détermine qui peut le voir, l'édi
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titre"
 
@@ -440,8 +440,8 @@ msgstr "Appliquer les modifications"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -469,8 +469,7 @@ msgstr "Caché"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Supprimer ${title}"
 
@@ -518,18 +517,18 @@ msgid "Assign local roles"
 msgstr "Assigner des rôles locaux"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "Nom"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "Utilisateur"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "Groupe"
 
@@ -590,7 +589,7 @@ msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
 msgid "Back to User Management"
 msgstr "Retour à la gestion des Utilisateurs"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr "Modifier ${title}"
@@ -651,298 +650,298 @@ msgstr "Bienvenue, ${user} ! Vous êtes connecté."
 msgid "Welcome, you are not logged in."
 msgstr "Bienvenue, vous n'êtes pas connecté."
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "Enregistrer"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Vos modifications ont été enregistrées."
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr "L'élément a été ajouté."
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Ajouter un(e) ${type} dans ${title}."
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr "Ajouter ${type}."
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Taille maximum d'un fichier : ${size} MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr "Nom complet"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "Identifiant"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "E-mail"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "S'inscrire"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "Il y a une erreur."
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez recevoir un e-mail contenant le lien permettant d'initialiser votre mot de passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr "S'inscrire - ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bienvenue, ${user} !"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "La connexion à échouée."
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "Vous avez été déconnecté."
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr "Vous avez réinitialisé votre mot de passe."
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 #, fuzzy
 msgid "Set password"
 msgstr "Réinitialiser le mot de passe"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Réinitialiser votre mot de passe - ${title}"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "Gestion des utilisateurs"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Aucune modification a été effectuée."
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr "Aucun utilisateur ou groupe a été trouvé."
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "Valeur invalide"
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "Un utilisateur avec ce nom existe déjà."
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Aucun groupe : ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "Actif"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "Décocher cette option pour désactiver le compte."
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "Rôle global"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "Groupes"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "Ajouter un Utilisateur"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr "Envoyer un lien d'initialisation de mot de passe"
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr "${title} a été ajouté."
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Modifier ${principal_type} ${title}"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr "Utilisateur non trouvé."
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} a été supprimé."
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Supprimer ${principal_type} ${title}"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr "Aucun nom a été indiqué."
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Mes préférences - ${title}"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} a été copié."
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} a été coupé."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} a été collé."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr "Ne peut pas coller ce contenu. Il n'existe plus."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} a été déplacé."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} est désormais visible dans la navigation."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nest plus visible dans la navigation."
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} a été supprimé."
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr "Rien n'a été supprimé."
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "Le nom et le titre sont obligatoires."
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr "L'élément a été renommé."
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "Modifier le statut"
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "Décaler vers le haut"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "Décaler vers le bas"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "Rendre visible"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "Cacher"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr "Vous avez sélectionné des éléments afin de les traiter."
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "Description"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "Mots-clés"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "Contenu"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "Vue par défaut"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "La vue par défaut a été réinitialisée."
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "La vue par défaut a été définie."
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "La vue par défaut ne peut pas être définie."
 
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index d4de1b233cb4d9cda81b9a3e3105a02faa69a8f1..0ce38ef02b2dd6504c6c77a39a6f56ad24d96418 100644
GIT binary patch
delta 27
icmbQ3Ffn1nVOc&y16@M{1w#`nQ)6udqs<p(9fSaU!Uz`t

delta 27
icmbQ3Ffn1nVOc%{V_id21w(Ty14C^C!_60E9fSaV3J4hh

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index 9ba2e3995..85bf74f06 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr "Benvenuto in Kotti"
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Congratulazioni! Avete installato Kotti con successo."
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -117,15 +117,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr "Chi siamo"
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "La nostra azienda è il leader nella produzione di foo widget, usati in una grande varietà di prodotti per l'aviazione e industriali."
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -156,73 +156,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Copia"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Taglia"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Incolla"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Rinomina"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Elimina"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenuti"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modificare"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "Condividi"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Azioni"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "Vista della cartella"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "File"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "Visualizzatore"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "Proprietario"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "Admin"
 
@@ -295,8 +295,8 @@ msgstr "Accedi"
 msgid "Username or email"
 msgstr "Username o email"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "Password"
 
@@ -347,7 +347,7 @@ msgstr "Lo stato del workflow di un item determina chi lo può vedere, editare e
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titolo"
 
@@ -406,8 +406,8 @@ msgstr "Applica le modifiche"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -435,8 +435,7 @@ msgstr "Nascosto"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Elimina ${title}"
 
@@ -484,18 +483,18 @@ msgid "Assign local roles"
 msgstr "Assegna ruoli locali"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "Nome"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "Utente"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "Gruppo"
 
@@ -556,7 +555,7 @@ msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Torna alla gestione degli utenti"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr " Modificare ${title}"
@@ -618,298 +617,298 @@ msgstr "Benvenuto, ${user}! Sei loggato."
 msgid "Welcome, you are not logged in."
 msgstr "Benvenuto, non sei loggato."
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "Salva"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Le tue modifiche sono state salvate."
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr "L'elemento è stato aggiunto."
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Aggiungere ${type} a ${title}."
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr "Aggiungere ${type}."
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Dimensione massima del file: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr "Nome completo"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "Username"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "Email"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "Registrazione"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "C'è stato un errore."
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per settare la tua password e attivare il tuo account."
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrazione - ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Benvenuto, ${user}!"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "Errore nell'accesso."
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr "Questo username o email non è riconosciuto dal sistema."
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "Sei uscito."
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr "Hai resettato la tua password."
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 #, fuzzy
 msgid "Set password"
 msgstr "Resetta password"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "Il token per resettare la tua password è scaduto."
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetta la tua password - ${title}."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "Gestione utenti"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Non sono state fatte modifiche."
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr "Utenti o gruppo non trovati"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "Valore invalido"
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "Un utente con questo nome già esiste."
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "Un utente con questa email già esiste."
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Gruppo non esistente: ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "Attivo"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "Deseleziona questo per disattivare l'account."
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "Ruoli globali"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "Gruppi"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "Aggiungi utente"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr "Invia il link della password di registrazione."
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr "${title} è stato aggiunto."
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Modificare ${principal_type} ${title}"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr "Utente non trovato."
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} è stato cancellato."
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Elimina ${principal_type} ${title}"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr "Non è stato dato un nome."
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Le mie preferenze - ${title}"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} è stato copiato."
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} è stato tagliato."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} è stato incollato."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr "Non si può incollare l'elemento. L'elemento non è più esistente."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} è stato spostato."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} è ora visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} non è più visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} è stato cancellato."
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr "Non è stato cancellato niente."
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "Nome e titolo sono obbligatori."
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr "L'elemento è stato rinominato"
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "Cambia stato"
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "Muovere su"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "Muovi giù"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "Mostra"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "Nascondi"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr "Devi selezionare degli elementi per fare quest'azione."
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "Descrizione"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "Contenuto"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "Vista predefinita"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "La vista predefinita è stata modificata a predefinita."
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "E' stata selezionata la vista predefinita."
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "La vista predefinita non può essere selezionata."
 
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index f6c635f51d5ed7838e2839d9fd2ec1e55bfed1a9..ebdf2d0ce6c39ace0e16a5f13b6830f991c0fca6 100644
GIT binary patch
delta 27
icmcZ>do6ZDgcP5lfv%x}f}x3(sj;?!(dIO%0ucazYzOfG

delta 27
icmcZ>do6ZDgcP5Fv96)1f}y#UfuXj6;pQ}{0ucazv<LG5

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index d92d3946a..7c76d75df 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "コピー"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "切り取り"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "貼り付け"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "名称変更"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "削除"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "編集"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "共有"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "アクション"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "フォルダー表示"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "ドキュメント"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "ファイル"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "閲覧者"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "編集者"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "所有者"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "管理者"
 
@@ -249,8 +249,8 @@ msgstr "ログイン"
 msgid "Username or email"
 msgstr "ユーザー名またはメールアドレス"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "パスワード"
 
@@ -303,7 +303,7 @@ msgstr "アイテムを誰が閲覧できるか、編集できるか、管理で
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "タイトル"
 
@@ -362,8 +362,8 @@ msgstr "変更を適用"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -391,8 +391,7 @@ msgstr "非表示"
 msgid "Are you sure you want to delete the following items?"
 msgstr "本当に以下のアイテムを削除しますか?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "${title} を削除する"
 
@@ -440,18 +439,18 @@ msgid "Assign local roles"
 msgstr "ローカルロールに割り当て"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "名称"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "ユーザー"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "グループ"
 
@@ -513,7 +512,7 @@ msgstr "本当に ${type} ${title} を削除しますか?"
 msgid "Back to User Management"
 msgstr "ユーザー管理に戻る"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr "${title} を編集"
@@ -580,298 +579,298 @@ msgstr "ようこそ ${user}! ログインしています。"
 msgid "Welcome, you are not logged in."
 msgstr "ようこそ。ログインしていません。"
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "保存"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "変更内容を保存しました。"
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr "${title} を追加しました。"
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${title} に ${type} を追加する。"
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr "${type} を追加する。"
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "最大ファイルサイズ: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr "フルネーム"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "ユーザー名"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "メールアドレス"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "登録"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "エラーが発生しました。"
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワードを設定して下さい。"
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr "登録 - ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "ようこそ ${user}!"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "ログアウトしました。"
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr "パスワードのリセットに成功しました。"
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 #, fuzzy
 msgid "Set password"
 msgstr "パスワードをリセット"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "パスワードのリセット - ${title}"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "ユーザー管理"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "変更箇所がありませんでした。"
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr "ユーザーもグループも見つかりませんでした。"
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "無効な値"
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "同じ名称のユーザーがすでに存在します。"
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "そのメールアドレスをもつユーザーがすでに存在します。"
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "グループが見つかりません: ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "有効"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "チェックを外すと、このアカウントは無効になります。"
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "グローバルロール"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "グループ"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "ユーザーを追加"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr "パスワード登録を送信する。"
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr "${title} を追加しました。"
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "グループ追加"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "${principal_type} ${title} を編集"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr "ユーザーは見つかりませんでした。"
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} を削除しました。"
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "${principal_type} ${title} を削除"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr "名前がありません。"
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "個人設定 - ${title}"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} をコピーしました。"
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} を切り取りました。"
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} を貼り付けました。"
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr "ノードを張り付けできません。何も存在していません。"
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} を移動しました。"
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} がナビゲーションに表示されるようになりました。"
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} がナビゲーションでは非表示になりました。"
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} を削除しました。"
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr "削除対象がありません。"
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "名称とタイトルは必須です。"
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr "名称変更しました"
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "状態を変更"
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "上に移動する"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "下に移動する"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "表示中にする"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "非表示にする"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "説明"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "タグ"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "本文"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "デフォルト表示"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "デフォルト表示は既定値にリセットされました。"
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "デフォルト表示が設定されました。"
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "デフォルト表示は設定できませんでした。"
 
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index 7572ce50e9c92674c58b32a002698ee09330a13c..f74164d471ddc45fe93633245be0fe2cf416b732 100644
GIT binary patch
delta 27
jcmX?=dMb6p8CgC<16@M{1w#`nQ)6udqs_NuKZpPTi<}8p

delta 27
jcmX?=dMb6p8CgC9V_id21w(Ty14C^C!_Bv3KZpPTi{uGe

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index d3316319b..076dbf72d 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr "Kotti에 오신 것을 환영합니다"
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "축하합니다! 성공적으로 Kotti를 설치했습니다."
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -117,15 +117,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr "이 사이트에 대하여"
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조업체입니다."
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 #, fuzzy
 msgid ""
 "\n"
@@ -184,73 +184,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "복사"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "잘라내기"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "삭제"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "컨텐츠 항목"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "편집"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "공유"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "동작"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "폴더로 보임"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "문서"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "파일"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "열람자"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "편집자"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "소유자"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "관리자"
 
@@ -323,8 +323,8 @@ msgstr "로그인"
 msgid "Username or email"
 msgstr "사용자 이름 혹은 전자메일"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "암호"
 
@@ -375,7 +375,7 @@ msgstr "항목의 작업 상태에 따라 항목을 누가 읽거나 고치고,
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "제목"
 
@@ -434,8 +434,8 @@ msgstr "바꾸기 적용"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "취소"
 
@@ -463,8 +463,7 @@ msgstr "숨김"
 msgid "Are you sure you want to delete the following items?"
 msgstr "다음 항목을 정말 지우겠습니까?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "\"${title}\" 삭제"
 
@@ -512,18 +511,18 @@ msgid "Assign local roles"
 msgstr "컨텐츠별 역할 부여"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "이름"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "사용자"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "그룹"
 
@@ -584,7 +583,7 @@ msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
 msgid "Back to User Management"
 msgstr "사용자 관리로 되돌아가기"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr "\"${title}\" 편집"
@@ -646,298 +645,298 @@ msgstr "${user}님, 환영합니다! 로그인되었습니다."
 msgid "Welcome, you are not logged in."
 msgstr "환영합니다, 로그인되지 않았습니다."
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "저장"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "수정사항이 저장되었습니다."
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr "항목이 추가되었습니다."
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${type}을(를) \"${title}\"에 추가합니다."
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr "${type}을(를) 추가합니다."
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "최대 파일 크기: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr "전체 이름"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "사용자 이름"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "전자메일"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "등록하기"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "오류가 있습니다."
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr "등록 - ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "${user}님, 환영합니다!"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "로그인이 실패했습니다."
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "로그아웃되었습니다."
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr "암호를 재설정했습니다."
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 #, fuzzy
 msgid "Set password"
 msgstr "암호 재설정"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "암호를 재설정하세요 - ${title}."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "사용자 관리"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "아무 것도 바뀌지 않았습니다."
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr "사용자나 그룹이 발견되지 않았습니다."
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "잘못된 값입니다."
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "그런 그룹이 없습니다: ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "활성"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "계정을 비활성화하려면 체크를 해제하십시오."
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "전역 역할"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "그룹"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "사용자 추가"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr "암호 등록 링크를 발송"
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr "\"${title}\"이(가) 추가되었습니다."
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "그룹 추가"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "${principal_type} \"${title}\" 편집"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr "사용자가 없습니다."
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} \"${title}\"이(가) 지워졌습니다."
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "${principal_type} \"${title}\" 삭제"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr "이름이 주어지지 않았습니다."
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "나의 선호사항"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr "\"${title}\"이(가) 복사되었습니다."
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr "\"${title}\"이(가) 잘라내어졌습니다."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr "\"${title}\"이(가) 붙여넣어졌습니다."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr "노드를 붙여넣을 수 없습니다. 그 노드가 존재하지 않습니다."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr "\"${title}\"이(가) 옮겨졌습니다."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr "\"${title}\"이(가) 지워졌습니다."
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr "아무것도 지워지지 않았습니다."
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "이름과 제목이 필요합니다."
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr "항목이 재명명되었습니다."
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "작업 상태 바꾸기"
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "위로 옮김"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "아래로 옮김"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "보이기"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "숨기기"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr "적용할 항목을 선택해야합니다."
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "설명"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "태그"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "본문"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "기본형으로 보임"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "기본형 보기로 재설정되었습니다."
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "보이는 방식이 설정되었습니다."
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "보이는 방식을 설정할 수 없었습니다."
 
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index daf3e8c200657982d452dbb7b8bcd91b48bd7e4c..2abc55e615b738c8c30aa2c3483714a4b638b602 100644
GIT binary patch
delta 27
icmaDE@-k#YgcP5lfv%x}f}x3(sj;?!(dINMW&r?zs0Wk)

delta 27
icmaDE@-k#YgcP5Fv96)1f}y#UfuXj6;pQ|cW&r?z@CTLv

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index 35727160c..89e0f4a21 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Knippen"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Plakken"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhoud"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bewerken"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "Delen"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Acties"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "Map weergave"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "Bestand"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "Lezer"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -249,8 +249,8 @@ msgstr "Aanmelden"
 msgid "Username or email"
 msgstr "Gebuikersnaam of e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -303,7 +303,7 @@ msgstr "Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of b
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titel"
 
@@ -362,8 +362,8 @@ msgstr "Wijzigingen toepassen"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -391,8 +391,7 @@ msgstr "Verborgen"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Verwijder ${title}"
 
@@ -440,18 +439,18 @@ msgid "Assign local roles"
 msgstr "Locale rollen toewijzen"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "Naam"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "gebruiker"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "Groep"
 
@@ -513,7 +512,7 @@ msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
 msgid "Back to User Management"
 msgstr "Terug naar gebruiksersbeheer"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bewerken ${title}"
@@ -580,298 +579,298 @@ msgstr "Welkom, ${user}! U bent nu aangemeld."
 msgid "Welcome, you are not logged in."
 msgstr "Wilkom, je bent niet aangemeld."
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "Opslaan"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Je wijzigingen werden opgeslagen."
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr "Item werd toegevoegd."
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Voeg ${type} aan ${title} toe."
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr "Voeg ${type} toe."
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximale bestandsgrootte: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "E-mailadres"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "Registreer"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "Er trad een fout op."
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om je wachtwoord in te stellen. Deze handeling zal je account activeren."
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr "Refistreer - ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Welkom, ${user}!"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "Aanmelden mislukt."
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "Je bent afgemeld."
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr "Je wachtwoord werd hersteld."
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 #, fuzzy
 msgid "Set password"
 msgstr "Wachtwoord herstellen"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Herstel je wachtwoord - ${title}."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "Gebruikersbeheer"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Geen wijzigingen aangebracht."
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr "Geen gebruikers of groepen werden gevonden."
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "Ongeldige waarde"
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "Een gebruiker met deze naam bestaat reeds."
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "Een gebruiker met deze naam bestaat reeds."
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Onbekende groep: ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "Actief"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "Uitvinken om je account te de-activeren."
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "Globale rollen"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "Groepen"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "Gebruiker toevoegen"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr "Verstuur wachtwoord registratie link."
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr "${title} werd toegevoegd."
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Bewerk ${principal_type} ${title}"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr "De gebruiker werd niet gevonden."
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} werd verwijderd."
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Verwijder ${principal_type} ${title}"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr "Er werd geen naam ingevoerd."
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Mijn instellingen - ${title}"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} werd gekopieerd."
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} werd geknipt."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} werd geplakt."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr "De node kon niet geplakt worden. Hij bestaat niet meer."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} werd verplaatst."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} is nu zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} is niet langer zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} werd verwijderd."
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr "Er werd niks verwijderd."
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "Naam en titel zijn vereist."
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr "Item werd hernoemd."
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "Wijzig Status."
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "Naar boven"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "Weergeven"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "Verbergen"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr "Je dient items te selecteren om acties uit te voeren."
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "Beschrijving"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "Inhoud"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "Standaard weergave"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "Standaard weergave werd hersteld naar standaard."
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "Standaard weergave is ingesteld."
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "Standaar weergave kon niet ingesteld worden."
 
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
index 6c1f980ecaeedf1b98cce05b3638678ff6e33f77..f9e95268fae798d288efe93b4edce9b6bcb50677 100644
GIT binary patch
delta 144
zcmeC{VeIQ++%SV%(uV;8I-xWtkk$j@d7C$KOEWSuZ9dC$nvt<-@=QKw#%Y`H^7%0{
z7EewT6=llIpS)kkVRN(4Jtnxw=1S3v!hD7Xx`qY{h9*{~#@Yr(n<F&+5qdW7*Re<N
OCRd8eZ#Ff!DGC57t|rj{

delta 140
zcmeC{VeIQ++%SV%l8FHVI-xWtkk$j@rp+6<r5PEgZ9dC$nvv0G@=QKw#(A6X^7%1O
z{;w~}oL`hadB2Xs=4PRLOfZ4Xm7*7g`3#J84NVmc&8-X!wG9k6M`-%Pb!^_RV-M#{
Nt`wEuY-(^*6aYY~DW?Dc

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index 3cc2f95e4..2f9126ad9 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr "Witaj w Kotti"
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, c-format
 msgid ""
 "\n"
@@ -120,15 +120,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr "Informacje"
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim asortymencie produktów dla lotnictwa i przemysłu."
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -185,73 +185,73 @@ msgstr ""
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Wytnij"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Wklej"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Usuń"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Zawartość"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Edytuj"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "Udostępnij"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Akcje"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "Widok katalogów"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "Plik"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "Czytelnik"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "Edytor"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "Właściciel"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "Administrator"
 
@@ -324,8 +324,8 @@ msgstr "Logowanie"
 msgid "Username or email"
 msgstr "Nazwa użytkownika lub email"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "Hasło"
 
@@ -376,7 +376,7 @@ msgstr "Stan publikacji elementu określa kto może go zobaczyć, edytować i/lu
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Tytuł"
 
@@ -435,8 +435,8 @@ msgstr "Zapisz zmiany"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -464,8 +464,7 @@ msgstr "Ukryty"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Usuń ${title}"
 
@@ -513,18 +512,18 @@ msgid "Assign local roles"
 msgstr "Przypisz lokalne role"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "Nazwa"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "Użytkownik"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "Grupa"
 
@@ -584,7 +583,7 @@ msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Powrót do zarządzania użytkownikami"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr "Edycja ${title}"
@@ -645,297 +644,297 @@ msgstr "Witaj, ${user}! Jesteś zalogowany."
 msgid "Welcome, you are not logged in."
 msgstr "Witaj, nie jesteś zalogowany."
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "Zapisz"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Twoje zmiany zostały zapisane."
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 msgid "Item was added."
 msgstr "Element został dodany."
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Dodaj ${type} do ${title}."
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, python-format
 msgid "Add ${type}."
 msgstr "Dodaj ${type}."
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maksymalny rozmiar pliku: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "Email"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "Wystąpił błąd."
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, python-format
 msgid "Register - ${title}"
 msgstr "Zarejestruj - ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Witaj, ${user}!"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "Nie udało się zalogować."
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 msgid "That username or email is not known by this system."
 msgstr "Nieznana nazwa użytkownika lub email."
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "Zostałeś wylogowany."
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 msgid "You have reset your password."
 msgstr "Zresetowałeś swoje hasło."
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 msgid "Set password"
 msgstr "Ustaw hasło"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "Twój token do resetu hasła mógł stracić ważność."
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetowanie hasła - ${title}."
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "Zarządzanie użytkownikami"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Nie wykonano żadnych zmian."
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 msgid "No users or groups were found."
 msgstr "Nie znaleziono użytkowników ani grup."
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "Niepoprawna wartość"
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "Użytkownik z takim imieniem już istnieje."
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "Użytkownik z takim adresem email już istnieje."
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Nie ma takiej grupy: ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "Aktywne"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "Odznacz, aby dezaktywować konto."
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "Globalne role"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "Grupy"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "Dodaj użytkownika"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 msgid "Send password registration link."
 msgstr "Wyślij link do rejestracji na email."
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, python-format
 msgid "${title} was added."
 msgstr "${title} został dodany."
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "Dodaj grupę"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Edycja ${principal_type} ${title}"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 msgid "User was not found."
 msgstr "Użytkownik nie został odnaleziony."
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} został usunięty."
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Usuń ${principal_type} ${title}"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 msgid "No name was given."
 msgstr "Nie przekazano nazwy."
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Moje ustawienia - ${title}"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} został skopiowany."
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} został wycięty."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} został wklejony."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 msgid "Could not paste node. It no longer exists."
 msgstr "Nie można wkleić. Element już nie istnieje."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} został przeniesiony."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} jest teraz widoczny w nawigacji."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nie jest już widoczny w nawigacji."
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} został usunięty."
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 msgid "Nothing was deleted."
 msgstr "Nic nie zostało usunięte"
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "Nazwa i tytuł są obowiązkowe."
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 msgid "Item was renamed."
 msgstr "Zmieniono nazwę elementu."
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "Zmień stan"
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "W górę"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "W dół"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "Pokaż"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "Ukryj"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 msgid "You have to select items to perform an action."
 msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "Opis"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "Tagi"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "Treść"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "Domyślny widok"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "Zresetowano widok na domyślny."
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "Ustawiono domyślny widok."
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "Domyślny widok nie mógł zostać ustawiony."
 
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index 329fee153a389b2e5223136d093d3f53eb58ef91..16e26cb2c811b7033062dfdd8f649fe5686f52a1 100644
GIT binary patch
delta 27
icmdmOx!ZC>un?c2fv%x}f}x3(sj;?!(dI;<C@uhTa0fX6

delta 27
icmdmOx!ZC>un?btv96)1f}y#UfuXj6;pRl4C@uhTxCc7`

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 2b5cbb54c..39b95f370 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-03-15 17:01+0100\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Copiar"
 
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Cortar"
 
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Colar"
 
-#: kotti/resources.py:519 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:457
+#: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Renomear"
 
-#: kotti/resources.py:520 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Apagar"
 
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Editar"
 
-#: kotti/resources.py:533
+#: kotti/resources.py:537
 msgid "Share"
 msgstr "Partilha"
 
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Ações"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Folder view"
 msgstr "Vista de pasta"
 
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
 msgid "File"
 msgstr "Ficheiro"
 
-#: kotti/security.py:192
+#: kotti/security.py:194
 msgid "Viewer"
 msgstr "Leitor"
 
-#: kotti/security.py:193
+#: kotti/security.py:195
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:194
+#: kotti/security.py:196
 msgid "Owner"
 msgstr "Dono"
 
-#: kotti/security.py:195
+#: kotti/security.py:197
 msgid "Admin"
 msgstr "Admin"
 
@@ -252,8 +252,8 @@ msgstr "Entrar"
 msgid "Username or email"
 msgstr "Utilizador ou e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:257
-#: kotti/views/users.py:218
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
 msgid "Password"
 msgstr "Palavra passe"
 
@@ -306,7 +306,7 @@ msgstr "O estado de workflow de um item define quem o pode ver, edit e/ou admini
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Título"
 
@@ -366,8 +366,8 @@ msgstr "Aplicar alterações"
 
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:81
-#: kotti/views/users.py:322 kotti/views/users.py:357 kotti/views/users.py:451
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -396,8 +396,7 @@ msgstr "Escondido"
 msgid "Are you sure you want to delete the following items?"
 msgstr "Deseja realmente eliminar os items seguintes?"
 
-#: kotti/templates/edit/delete.pt:9
-#: kotti/templates/site-setup/delete-user.pt:9
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
 msgid "Delete ${title}"
 msgstr "Apagar ${title}"
 
@@ -447,18 +446,18 @@ msgid "Assign local roles"
 msgstr "Atribuir papéis locais"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:213
+#: kotti/views/users.py:216
 msgid "Name"
 msgstr "Nome"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
 msgid "User"
 msgstr "Utilizador"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
 msgid "Group"
 msgstr "Grupo"
 
@@ -520,7 +519,7 @@ msgstr "Deseja realmente eliminar ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Voltar à gestão de utilizadores"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
 #, python-format
 msgid "Edit ${title}"
 msgstr "Editar ${title}"
@@ -589,313 +588,313 @@ msgstr "Bem-vindo, ${user}! Você está autenticado."
 msgid "Welcome, you are not logged in."
 msgstr "Bem-vindo, você não está autenticado."
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
+#: kotti/views/form.py:82 kotti/views/users.py:453
 msgid "Save"
 msgstr "Guardar"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "As suas alterações foram guardadas."
 
-#: kotti/views/form.py:177
+#: kotti/views/form.py:179
 #, fuzzy
 msgid "Item was added."
 msgstr "${title} adicionado."
 
-#: kotti/views/form.py:201
+#: kotti/views/form.py:203
 #, fuzzy, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Adicionar ${type} em ${title}"
 
-#: kotti/views/form.py:205
+#: kotti/views/form.py:207
 #, fuzzy, python-format
 msgid "Add ${type}."
 msgstr "Adicionar ${type}"
 
-#: kotti/views/form.py:269
+#: kotti/views/form.py:277
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Tamanho máximo do ficheiro: ${size}MB"
 
-#: kotti/views/login.py:65 kotti/views/users.py:276
+#: kotti/views/login.py:67 kotti/views/users.py:279
 #, fuzzy
 msgid "Full name"
 msgstr "Nome completo"
 
-#: kotti/views/login.py:68
+#: kotti/views/login.py:70
 msgid "Username"
 msgstr "Nome utilizador"
 
-#: kotti/views/login.py:73 kotti/views/login.py:269 kotti/views/users.py:205
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
 msgid "Email"
 msgstr "E-mail"
 
-#: kotti/views/login.py:82
+#: kotti/views/login.py:84
 msgid "Register"
 msgstr "Registar-se"
 
-#: kotti/views/login.py:89
+#: kotti/views/login.py:91
 msgid "There was an error."
 msgstr "Ocorreu um erro."
 
-#: kotti/views/login.py:108
+#: kotti/views/login.py:110
 #, fuzzy
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/views/login.py:123
+#: kotti/views/login.py:125
 #, fuzzy, python-format
 msgid "Register - ${title}"
 msgstr "Registar ${title}"
 
-#: kotti/views/login.py:154
+#: kotti/views/login.py:156
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bem-vindo, ${user}!"
 
-#: kotti/views/login.py:179
+#: kotti/views/login.py:181
 #, fuzzy
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/views/login.py:212
+#: kotti/views/login.py:214
 msgid "Login failed."
 msgstr "Erro de autenticação"
 
-#: kotti/views/login.py:222
+#: kotti/views/login.py:224
 #, fuzzy
 msgid "That username or email is not known by this system."
 msgstr "Este utilizador ou e-mail não são reconhecidos."
 
-#: kotti/views/login.py:244
+#: kotti/views/login.py:246
 msgid "You have been logged out."
 msgstr "Você desligou a sessão"
 
-#: kotti/views/login.py:282
+#: kotti/views/login.py:284
 #, fuzzy
 msgid "You have reset your password."
 msgstr "Você reinicializou a palavra passe com sucesso"
 
-#: kotti/views/login.py:295
+#: kotti/views/login.py:303
 #, fuzzy
 msgid "Set password"
 msgstr "Repor a palavra passe"
 
-#: kotti/views/login.py:323
+#: kotti/views/login.py:331
 msgid "Your password reset token may have expired."
 msgstr "A seu pedido para alterar a palavra passe expirou."
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:338
 #, fuzzy, python-format
 msgid "Reset your password - ${title}."
 msgstr "Reiniciar a sua palavra passe - ${title}"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
 msgid "User Management"
 msgstr "Gestão de Utilizadores"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 #, fuzzy
 msgid "No changes were made."
 msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/views/users.py:104
+#: kotti/views/users.py:107
 #, fuzzy
 msgid "No users or groups were found."
 msgstr "Utilizadores e grupos não encontrados."
 
-#: kotti/views/users.py:151
+#: kotti/views/users.py:154
 msgid "Invalid value"
 msgstr "Valor inválido"
 
-#: kotti/views/users.py:157
+#: kotti/views/users.py:160
 msgid "A user with that name already exists."
 msgstr "Esse utilizador com esse nome já existe."
 
-#: kotti/views/users.py:164
+#: kotti/views/users.py:167
 msgid "A user with that email already exists."
 msgstr "Esse utilizador com esse e-mail já existe."
 
-#: kotti/views/users.py:187
+#: kotti/views/users.py:190
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Grupo não encontrado: ${group}"
 
-#: kotti/views/users.py:225
+#: kotti/views/users.py:228
 msgid "Active"
 msgstr "Activo"
 
-#: kotti/views/users.py:226
+#: kotti/views/users.py:229
 msgid "Untick this to deactivate the account."
 msgstr "Retirar para desactivar a conta."
 
-#: kotti/views/users.py:232
+#: kotti/views/users.py:235
 msgid "Global roles"
 msgstr "Papéis globais"
 
-#: kotti/views/users.py:236
+#: kotti/views/users.py:239
 msgid "Groups"
 msgstr "Grupos"
 
-#: kotti/views/users.py:273
+#: kotti/views/users.py:276
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
 
-#: kotti/views/users.py:321
+#: kotti/views/users.py:324
 msgid "Add User"
 msgstr "Adicionar Utilizador"
 
-#: kotti/views/users.py:331
+#: kotti/views/users.py:334
 #, fuzzy
 msgid "Send password registration link."
 msgstr "Enviar ligação para registo de palavra passe"
 
-#: kotti/views/users.py:346
+#: kotti/views/users.py:349
 #, fuzzy, python-format
 msgid "${title} was added."
 msgstr "${title} adicionado."
 
-#: kotti/views/users.py:356
+#: kotti/views/users.py:359
 msgid "Add Group"
 msgstr "Adicionar Grupo"
 
-#: kotti/views/users.py:517
+#: kotti/views/users.py:520
 #, fuzzy, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Editar ${principal_type} - ${title}"
 
-#: kotti/views/users.py:545
+#: kotti/views/users.py:548
 #, fuzzy
 msgid "User was not found."
 msgstr "Utilizador não encontrado."
 
-#: kotti/views/users.py:555
+#: kotti/views/users.py:558
 #, fuzzy, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} apagado."
 
-#: kotti/views/users.py:563
+#: kotti/views/users.py:566
 #, fuzzy, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Apagar ${principal_type} - ${title}"
 
-#: kotti/views/users.py:570
+#: kotti/views/users.py:573
 #, fuzzy
 msgid "No name was given."
 msgstr "Nenhum nome foi indicado."
 
-#: kotti/views/users.py:599
+#: kotti/views/users.py:602
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Minhas preferências - ${title}"
 
-#: kotti/views/edit/actions.py:105
+#: kotti/views/edit/actions.py:107
 #, fuzzy, python-format
 msgid "${title} was copied."
 msgstr "${title} copiado."
 
-#: kotti/views/edit/actions.py:123
+#: kotti/views/edit/actions.py:125
 #, fuzzy, python-format
 msgid "${title} was cut."
 msgstr "${title} cortado."
 
-#: kotti/views/edit/actions.py:158
+#: kotti/views/edit/actions.py:160
 #, fuzzy, python-format
 msgid "${title} was pasted."
 msgstr "${title} colado."
 
-#: kotti/views/edit/actions.py:161
+#: kotti/views/edit/actions.py:163
 #, fuzzy
 msgid "Could not paste node. It no longer exists."
 msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
 
-#: kotti/views/edit/actions.py:182
+#: kotti/views/edit/actions.py:184
 #, fuzzy, python-format
 msgid "${title} was moved."
 msgstr "${title} movido."
 
-#: kotti/views/edit/actions.py:224
+#: kotti/views/edit/actions.py:226
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} encontra-se visivel na navegação."
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:229
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} já não está visivel na navegação."
 
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
 #, fuzzy, python-format
 msgid "${title} was deleted."
 msgstr "${title} apagado."
 
-#: kotti/views/edit/actions.py:302
+#: kotti/views/edit/actions.py:304
 #, fuzzy
 msgid "Nothing was deleted."
 msgstr "Nada foi apagado."
 
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
 msgid "Name and title are required."
 msgstr "Nome e título são obrigatórios."
 
-#: kotti/views/edit/actions.py:342
+#: kotti/views/edit/actions.py:344
 #, fuzzy
 msgid "Item was renamed."
 msgstr "Item renomeado"
 
-#: kotti/views/edit/actions.py:463
+#: kotti/views/edit/actions.py:465
 msgid "Change State"
 msgstr "Alterar Estado"
 
-#: kotti/views/edit/actions.py:464
+#: kotti/views/edit/actions.py:466
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:467
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:468
 msgid "Show"
 msgstr "Mostrar"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:469
 msgid "Hide"
 msgstr "Esconder"
 
-#: kotti/views/edit/actions.py:506
+#: kotti/views/edit/actions.py:508
 #, fuzzy
 msgid "You have to select items to perform an action."
 msgstr "Terá de escolher items para executar a ação."
 
-#: kotti/views/edit/content.py:38
+#: kotti/views/edit/content.py:41
 msgid "Description"
 msgstr "Descrição"
 
-#: kotti/views/edit/content.py:44
+#: kotti/views/edit/content.py:47
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: kotti/views/edit/content.py:53
+#: kotti/views/edit/content.py:56
 msgid "Body"
 msgstr "Corpo"
 
-#: kotti/views/edit/default_views.py:79
+#: kotti/views/edit/default_views.py:89
 msgid "Default view"
 msgstr "Vista por defeito"
 
-#: kotti/views/edit/default_views.py:100
+#: kotti/views/edit/default_views.py:110
 msgid "Default view has been reset to default."
 msgstr "A vista original foi indicada como a vista por defeito."
 
-#: kotti/views/edit/default_views.py:107
+#: kotti/views/edit/default_views.py:117
 msgid "Default view has been set."
 msgstr "Vista por defeito foi alterada."
 
-#: kotti/views/edit/default_views.py:112
+#: kotti/views/edit/default_views.py:122
 msgid "Default view could not be set."
 msgstr "Vista por defeito não pode ser alterada."
 
diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.mo b/kotti/locale/sv/LC_MESSAGES/Kotti.mo
index 34782e11bd4d824269113853d72ecf7749d9966c..260f9fe061830328fb5d4f903a25cce767103fbc 100644
GIT binary patch
delta 3935
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
Rn7Gmf5n*1X(_()L{uefOal-%r

delta 7417
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

diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.po b/kotti/locale/sv/LC_MESSAGES/Kotti.po
index 5bcf6a4b8..4e42f79dc 100644
--- a/kotti/locale/sv/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/sv/LC_MESSAGES/Kotti.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2016-10-07 20:03+0300\n"
+"POT-Creation-Date: 2016-10-10 14:53+0200\n"
 "PO-Revision-Date: 2016-10-05 21:34+0300\n"
 "Last-Translator: Anders Nylund <stokkheim@gmail.com>\n"
 "Language-Team: Swedish\n"
@@ -16,86 +16,16 @@ msgstr ""
 "Generated-By: Lingua 4.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: kotti/security.py:192
-msgid "Viewer"
-msgstr "Läsare"
-
-#: kotti/security.py:193
-msgid "Editor"
-msgstr "Redaktör"
-
-#: kotti/security.py:194
-msgid "Owner"
-msgstr "Ägare"
-
-#: kotti/security.py:195
-msgid "Admin"
-msgstr "Administratör"
-
-#: kotti/resources.py:516 kotti/views/edit/actions.py:455
-msgid "Copy"
-msgstr "Kopiera"
-
-#: kotti/resources.py:517 kotti/views/edit/actions.py:456
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: kotti/resources.py:518 kotti/views/edit/actions.py:452
-msgid "Paste"
-msgstr "Klistra in"
-
-#: kotti/resources.py:519 kotti/views/edit/actions.py:457
-#: kotti/templates/edit/rename.pt:31 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42
-msgid "Rename"
-msgstr "Döp om"
-
-#: kotti/resources.py:520 kotti/views/users.py:452
-#: kotti/views/edit/actions.py:459 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24
-msgid "Delete"
-msgstr "Radera"
-
-#: kotti/resources.py:531 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Innehåll"
-
-#: kotti/resources.py:532 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Redigera"
-
-#: kotti/resources.py:533
-msgid "Share"
-msgstr "Dela"
-
-#: kotti/resources.py:534 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Handlingar"
-
-#: kotti/resources.py:537
-msgid "Folder view"
-msgstr "Mapp vy"
-
-#: kotti/resources.py:646 kotti/views/edit/content.py:85
-msgid "Document"
-msgstr "Dokument"
-
-#: kotti/resources.py:781 kotti/views/edit/content.py:66
-#: kotti/views/edit/content.py:113
-msgid "File"
-msgstr "Fil"
-
-#: kotti/populate.py:64
+#: kotti/populate.py:66
 msgid "Welcome to Kotti"
 msgstr "Välkommen till Kotti"
 
-#: kotti/populate.py:65
+#: kotti/populate.py:67
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulerar! Du har nu installerat Kotti."
 
-#: kotti/populate.py:66
-#, c-format
+#: kotti/populate.py:68
+#, fuzzy, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
@@ -118,7 +48,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/developing/basic/configuration.html\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
 "               Configuration manual\n"
 "            </a>\n"
 "        </p>\n"
@@ -145,7 +75,7 @@ msgid ""
 "        </p>\n"
 "        <p>\n"
 "            <a class=\"btn btn-info\"\n"
-"               href=\"http://kotti.readthedocs.org/en/latest/\">\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
 "               Documentation\n"
 "            </a>\n"
 "        </p>\n"
@@ -207,15 +137,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:123
+#: kotti/populate.py:125
 msgid "About"
 msgstr "Om"
 
-#: kotti/populate.py:124
+#: kotti/populate.py:126
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Vårt företag är den ledande tillverkaren av foo grunkor som används i en mängd olika tillämpningar inom flyg och industri."
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid ""
 "\n"
 "<p>\n"
@@ -273,400 +203,170 @@ msgstr ""
 "article.\n"
 "</small></p>\n"
 
-#: kotti/views/form.py:80 kotti/views/users.py:450
-msgid "Save"
-msgstr "Spara"
+#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+msgid "Copy"
+msgstr "Kopiera"
 
-#: kotti/views/form.py:81 kotti/views/users.py:322 kotti/views/users.py:357
-#: kotti/views/users.py:451 kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/rename-nodes.pt:44
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-msgid "Cancel"
-msgstr "Avbryt"
+#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+msgid "Cut"
+msgstr "Klipp ut"
 
-#: kotti/views/form.py:82 kotti/views/users.py:69
-#: kotti/views/edit/actions.py:373 kotti/views/edit/actions.py:417
-msgid "Your changes have been saved."
-msgstr "Dina ändringar har blivit sparade."
+#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+msgid "Paste"
+msgstr "Klistra in"
 
-#: kotti/views/form.py:159 kotti/templates/site-setup/user.pt:21
-#, python-format
-msgid "Edit ${title}"
-msgstr "Redigera ${title}"
+#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:459
+msgid "Rename"
+msgstr "Döp om"
 
-#: kotti/views/form.py:177
-msgid "Item was added."
-msgstr "Dokumentet har lagts till."
+#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/views/edit/actions.py:461
+msgid "Delete"
+msgstr "Radera"
 
-#: kotti/views/form.py:201
-#, python-format
-msgid "Add ${type} to ${title}."
-msgstr "Lägg till ${type} till ${title}."
+#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Innehåll"
 
-#: kotti/views/form.py:205
-#, python-format
-msgid "Add ${type}."
-msgstr "Lägg till ${type}."
+#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Redigera"
 
-#: kotti/views/form.py:269
-#, python-format
-msgid "Maximum file size: ${size}MB"
-msgstr "Maximal filstorlek: ${size}MB"
+#: kotti/resources.py:537
+msgid "Share"
+msgstr "Dela"
 
-#: kotti/views/site_setup.py:6 kotti/views/users.py:386
-msgid "User Management"
-msgstr "Hantera användare"
+#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Handlingar"
 
-#: kotti/views/users.py:71 kotti/views/users.py:475
-#: kotti/views/edit/actions.py:311 kotti/views/edit/actions.py:377
-#: kotti/views/edit/actions.py:419 kotti/views/edit/actions.py:423
-msgid "No changes were made."
-msgstr "Inga ändringar har gjorts."
+#: kotti/resources.py:541
+msgid "Folder view"
+msgstr "Mapp vy"
 
-#: kotti/views/users.py:104
-msgid "No users or groups were found."
-msgstr "Inga användare eller grupper hittades."
+#: kotti/resources.py:650 kotti/views/edit/content.py:90
+msgid "Document"
+msgstr "Dokument"
 
-#: kotti/views/users.py:151
-msgid "Invalid value"
-msgstr "Felaktigt värde"
+#: kotti/resources.py:785 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:118
+msgid "File"
+msgstr "Fil"
 
-#: kotti/views/users.py:157
-msgid "A user with that name already exists."
-msgstr "En användare med det namnet finns redan."
+#: kotti/security.py:194
+msgid "Viewer"
+msgstr "Läsare"
 
-#: kotti/views/users.py:164
-msgid "A user with that email already exists."
-msgstr "En användare med den epostadressen finns redan."
+#: kotti/security.py:195
+msgid "Editor"
+msgstr "Redaktör"
 
-#: kotti/views/users.py:187
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Ingen sådan grupp: ${group}"
+#: kotti/security.py:196
+msgid "Owner"
+msgstr "Ägare"
 
-#: kotti/views/users.py:194 kotti/views/users.py:354 kotti/views/users.py:513
-#: kotti/views/users.py:548 kotti/templates/edit/share.pt:62
-#: kotti/templates/site-setup/users.pt:82
-msgid "Group"
-msgstr "Grupp"
+#: kotti/security.py:197
+msgid "Admin"
+msgstr "Administratör"
 
-#: kotti/views/users.py:202 kotti/views/edit/content.py:32
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:40
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-msgid "Title"
-msgstr "Titel"
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Lägg till"
 
-#: kotti/views/users.py:205 kotti/views/login.py:73 kotti/views/login.py:269
-msgid "Email"
-msgstr "Epost"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Ladda upp innehåll"
 
-#: kotti/views/users.py:213 kotti/templates/edit/share.pt:50
-#: kotti/templates/site-setup/users.pt:70
-msgid "Name"
-msgstr "Namn"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Sätt standardvy"
 
-#: kotti/views/users.py:218 kotti/views/login.py:257
-#: kotti/templates/login.pt:26
-msgid "Password"
-msgstr "Lösenord"
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Visa"
 
-#: kotti/views/users.py:225
-msgid "Active"
-msgstr "Aktiv"
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigera"
 
-#: kotti/views/users.py:226
-msgid "Untick this to deactivate the account."
-msgstr "Ta bort det här valet för att inaktivera kontot."
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Preferenser"
 
-#: kotti/views/users.py:232
-msgid "Global roles"
-msgstr "Globala roller"
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Site inställningar"
 
-#: kotti/views/users.py:236
-msgid "Groups"
-msgstr "Grupper"
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Logga ut"
 
-#: kotti/views/users.py:273
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Lämna det här tomt och välj 'Sänd länk för lösenordsregistrering' nedan för att låta användaren själv välja lösenord."
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Återställ ditt lösenord för ${site_title}."
 
-#: kotti/views/users.py:276 kotti/views/login.py:65
-msgid "Full name"
-msgstr "Fullständigt namn"
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Hej, ${user_title}!"
 
-#: kotti/views/users.py:319 kotti/views/users.py:513 kotti/views/users.py:548
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-msgid "User"
-msgstr "Användare"
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klicka den här länken för att återställa ditt lösenord för ${site_title}: ${url}"
 
-#: kotti/views/users.py:321
-msgid "Add User"
-msgstr "Lägg till användare"
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Din registrering för ${site_title}"
 
-#: kotti/views/users.py:331
-msgid "Send password registration link."
-msgstr "Sänd länk för lösenordsregistrering."
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Du ansluter dig till ${site_title}."
 
-#: kotti/views/users.py:346
-#, python-format
-msgid "${title} was added."
-msgstr "${title} lades till."
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klicka här för att ställa in ditt lösenord och logga in: ${url}"
 
-#: kotti/views/users.py:356
-msgid "Add Group"
-msgstr "Lägg till grupp"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Förbjudet"
 
-#: kotti/views/users.py:517
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Redigera ${principal_type} ${title}"
+#: kotti/templates/login.pt:16
+msgid "Login"
+msgstr "Inloggning"
 
-#: kotti/views/users.py:545
-msgid "User was not found."
-msgstr "Användaren kunde inte hittas."
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
+msgid "Username or email"
+msgstr "Användarnamn eller epost"
 
-#: kotti/views/users.py:555
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} raderades."
+#: kotti/templates/login.pt:26 kotti/views/login.py:259
+#: kotti/views/users.py:221
+msgid "Password"
+msgstr "Lösenord"
 
-#: kotti/views/users.py:563
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Radera ${principal_type} ${title}"
+#: kotti/templates/login.pt:34
+msgid "Log in"
+msgstr "Logga in"
 
-#: kotti/views/users.py:570
-msgid "No name was given."
-msgstr "Inget namn angavs."
+#: kotti/templates/login.pt:45
+msgid "Forgot your password?"
+msgstr "Har du glömt ditt lösenord?"
 
-#: kotti/views/users.py:599
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mina preferenser - ${title}"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
+msgid "Reset password"
+msgstr "Återställ lösenord"
 
-#: kotti/views/login.py:68
-msgid "Username"
-msgstr "Användarnamn"
-
-#: kotti/views/login.py:82
-msgid "Register"
-msgstr "Registrera"
-
-#: kotti/views/login.py:89
-msgid "There was an error."
-msgstr "Ett fel uppstod."
-
-#: kotti/views/login.py:108
-msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
-msgstr "Gratulerar! Du har registrerat dig. Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
-
-#: kotti/views/login.py:123
-#, python-format
-msgid "Register - ${title}"
-msgstr "Registrara - ${title}"
-
-#: kotti/views/login.py:154
-#, python-format
-msgid "Welcome, ${user}!"
-msgstr "Välkommen, ${user}!"
-
-#: kotti/views/login.py:179
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
-msgstr "Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
-
-#: kotti/views/login.py:212
-msgid "Login failed."
-msgstr "Inloggningen misslyckades."
-
-#: kotti/views/login.py:222
-msgid "That username or email is not known by this system."
-msgstr "Användarnamnet eller epostadressen är inte bekanta för systemet."
-
-#: kotti/views/login.py:244
-msgid "You have been logged out."
-msgstr "Du har loggats ut."
-
-#: kotti/views/login.py:282
-msgid "You have reset your password."
-msgstr "Du har återställt ditt lösenord."
-
-#: kotti/views/login.py:295
-msgid "Set password"
-msgstr "Ställ in lösenord"
-
-#: kotti/views/login.py:323
-msgid "Your password reset token may have expired."
-msgstr "Lösenordsåterställningen kan vara föråldrad."
-
-#: kotti/views/login.py:330
-#, python-format
-msgid "Reset your password - ${title}."
-msgstr "Återställ ditt lösenord - ${title}."
-
-#: kotti/views/edit/actions.py:105
-#, python-format
-msgid "${title} was copied."
-msgstr "${title} har kopierats."
-
-#: kotti/views/edit/actions.py:123
-#, python-format
-msgid "${title} was cut."
-msgstr "${title} har klippts ut."
-
-#: kotti/views/edit/actions.py:158
-#, python-format
-msgid "${title} was pasted."
-msgstr "${title} har klistrats in."
-
-#: kotti/views/edit/actions.py:161
-msgid "Could not paste node. It no longer exists."
-msgstr "Kunde inte klistra in noden. Den finns inte längre."
-
-#: kotti/views/edit/actions.py:182
-#, python-format
-msgid "${title} was moved."
-msgstr "${title} har flyttats."
-
-#: kotti/views/edit/actions.py:224
-#, python-format
-msgid "${title} is now visible in the navigation."
-msgstr "${title} är ny synlig i navigationsträdet"
-
-#: kotti/views/edit/actions.py:227
-#, python-format
-msgid "${title} is no longer visible in the navigation."
-msgstr "${title} visas inte längre i navigationsträdet"
-
-#: kotti/views/edit/actions.py:276 kotti/views/edit/actions.py:305
-#, python-format
-msgid "${title} was deleted."
-msgstr "${title} har raderats."
-
-#: kotti/views/edit/actions.py:302
-msgid "Nothing was deleted."
-msgstr "Ingenting raderades."
-
-#: kotti/views/edit/actions.py:338 kotti/views/edit/actions.py:365
-msgid "Name and title are required."
-msgstr "Namn och rubrik krävs"
-
-#: kotti/views/edit/actions.py:342
-msgid "Item was renamed."
-msgstr "Dokumentet har döpts om."
-
-#: kotti/views/edit/actions.py:463
-msgid "Change State"
-msgstr "Ändra läge"
-
-#: kotti/views/edit/actions.py:464
-msgid "Move up"
-msgstr "Flytta upp"
-
-#: kotti/views/edit/actions.py:465
-msgid "Move down"
-msgstr "Flytta ner"
-
-#: kotti/views/edit/actions.py:466
-msgid "Show"
-msgstr "Visa"
-
-#: kotti/views/edit/actions.py:467
-msgid "Hide"
-msgstr "Göm"
-
-#: kotti/views/edit/actions.py:506
-msgid "You have to select items to perform an action."
-msgstr "Du måste välja något att utföra operationen på först"
-
-#: kotti/views/edit/content.py:38
-msgid "Description"
-msgstr "Beskrivning"
-
-#: kotti/views/edit/content.py:44
-msgid "Tags"
-msgstr "Taggar"
-
-#: kotti/views/edit/content.py:53
-msgid "Body"
-msgstr "Brödtext"
-
-#: kotti/views/edit/default_views.py:79
-msgid "Default view"
-msgstr "Standardvy"
-
-#: kotti/views/edit/default_views.py:100
-msgid "Default view has been reset to default."
-msgstr "Standardvyn har återställts till förvald inställning."
-
-#: kotti/views/edit/default_views.py:107
-msgid "Default view has been set."
-msgstr "Standadvyn har ställts in."
-
-#: kotti/views/edit/default_views.py:112
-msgid "Default view could not be set."
-msgstr "Standardvyn kunde inte ställas in."
-
-#: kotti/templates/workflow-dropdown.pt:14
-msgid "Make ${state}"
-msgstr "Gör ${state}"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Lägg till"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Ladda upp innehåll"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Din registrering för ${site_title}"
-
-#: kotti/templates/email-set-password.pt:4
-#: kotti/templates/email-reset-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Hej, ${user_title}!"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Du ansluter dig till ${site_title}."
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Klicka här för att ställa in ditt lösenord och logga in: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Förbjudet"
-
-#: kotti/templates/login.pt:16
-msgid "Login"
-msgstr "Inloggning"
-
-#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
-msgid "Username or email"
-msgstr "Användarnamn eller epost"
-
-#: kotti/templates/login.pt:34
-msgid "Log in"
-msgstr "Logga in"
-
-#: kotti/templates/login.pt:45
-msgid "Forgot your password?"
-msgstr "Har du glömt ditt lösenord?"
-
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
-msgid "Reset password"
-msgstr "Återställ lösenord"
-
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:50
-msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
-msgstr "Fyll i ditt användarnamn och din epostadress och klicka ${reset_password} nedanom för att få ett epostmeddelande med en länk för att återställa ditt lösenord."
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:50
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Fyll i ditt användarnamn och din epostadress och klicka ${reset_password} nedanom för att få ett epostmeddelande med en länk för att återställa ditt lösenord."
 
 #: kotti/templates/login.pt:78
 msgid "Not registered yet?"
@@ -676,89 +376,14 @@ msgstr "Inte ännu registrerad?"
 msgid "Register for an account on this site."
 msgstr "Registrera ett konto på den här siten"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Återställ ditt lösenord för ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Klicka den här länken för att återställa ditt lösenord för ${site_title}: ${url}"
-
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Sätt standardvy"
-
-#: kotti/templates/editor-bar.pt:21
-msgid "View"
-msgstr "Visa"
-
-#: kotti/templates/editor-bar.pt:44
-msgid "Navigate"
-msgstr "Navigera"
-
-#: kotti/templates/editor-bar.pt:55
-msgid "Preferences"
-msgstr "Preferenser"
-
-#: kotti/templates/editor-bar.pt:60
-msgid "Site Setup"
-msgstr "Site inställningar"
-
-#: kotti/templates/editor-bar.pt:71
-msgid "Logout"
-msgstr "Logga ut"
-
-#: kotti/templates/http-errors/notfound.pt:6
-msgid "Not Found"
-msgstr "Hittas ej"
-
-#: kotti/templates/http-errors/notfound.pt:7
-msgid "The resource could not be found"
-msgstr "Resursen kan ej hittas"
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Gör ${state}"
 
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Du är här:"
 
-#: kotti/templates/edit/upload.pt:10
-msgid "Upload content from local file(s)"
-msgstr "Ladda upp innehåll från lokal fil/filer"
-
-#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
-msgid "Filename"
-msgstr "Filnamn"
-
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:41
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Typ"
-
-#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
-msgid "Size"
-msgstr "Storlek"
-
-#: kotti/templates/edit/upload.pt:20
-msgid "Status"
-msgstr "Status"
-
-#: kotti/templates/edit/upload.pt:21
-msgid "Progress"
-msgstr "Framsteg"
-
-#: kotti/templates/edit/upload.pt:84
-msgid "Select file(s) to upload..."
-msgstr "Välj fil/filer för uppladdning"
-
-#: kotti/templates/edit/upload.pt:92
-msgid "Upload ${number} files."
-msgstr "Ladda upp ${number} filer."
-
-#: kotti/templates/edit/upload.pt:97
-msgid "Dismiss all errors"
-msgstr "Avfärda alla fel"
-
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Ändra 'workflow' inställning"
@@ -767,22 +392,35 @@ msgstr "Ändra 'workflow' inställning"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Ett dokuments 'workflow' inställning bestämmer vem som kan se, redigera och/eller hantera det."
 
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:42
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+msgid "Title"
+msgstr "Titel"
+
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
 #: kotti/templates/edit/delete-nodes.pt:23
 msgid "State"
 msgstr "Läge"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:44
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
 #: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Skapat"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
 #: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Ändrat"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:51
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
 #: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
 msgstr "Välj dokument"
@@ -813,47 +451,66 @@ msgstr "Ingen ändring"
 msgid "Apply changes"
 msgstr "Ta ändringarna i bruk"
 
-#: kotti/templates/edit/contents.pt:31
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: kotti/templates/edit/contents.pt:26
 msgid "No content items are contained here."
 msgstr "Här finns inga dokument"
 
-#: kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
 msgstr "Välj / väl bort alla"
 
-#: kotti/templates/edit/contents.pt:43
+#: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: kotti/templates/edit/contents.pt:76
+#: kotti/templates/edit/contents.pt:70
 msgid "Visible"
 msgstr "Synliga"
 
-#: kotti/templates/edit/contents.pt:80
+#: kotti/templates/edit/contents.pt:74
 msgid "Hidden"
 msgstr "Dolda"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Döp om ${title}"
+#: kotti/templates/edit/delete-nodes.pt:13
+msgid "Are you sure you want to delete the following items?"
+msgstr "Är du säker på att du vill radera följande dokument?"
+
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Radera ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Är du säker på att du vill radera ${title}?"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigera siten"
 
-#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "Varje dokument har ett namn som används för att skapa ett url och en titel. Läs vid behov om korrekt formattering av namn och titel i användarmanualen. Nedan kan du ändra bägge."
 
-#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr "Nytt namn"
 
-#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr "Ny rubrik"
 
-#: kotti/templates/edit/delete-nodes.pt:13
-msgid "Are you sure you want to delete the following items?"
-msgstr "Är du säker på att du vill radera följande dokument?"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Döp om ${title}"
 
 #: kotti/templates/edit/share.pt:8
 msgid "Share ${title}"
@@ -872,6 +529,22 @@ msgstr "Sök"
 msgid "Assign local roles"
 msgstr "Tilldela lokala roller"
 
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:216
+msgid "Name"
+msgstr "Namn"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+msgid "User"
+msgstr "Användare"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
+#: kotti/views/users.py:551
+msgid "Group"
+msgstr "Grupp"
+
 #: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
 msgid "Gravatar"
 msgstr "Gravatar"
@@ -880,22 +553,59 @@ msgstr "Gravatar"
 msgid "Assign role"
 msgstr "Tilldela roll"
 
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Navigera siten"
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Ladda upp innehåll från lokal fil/filer"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Radera ${title}"
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
+msgid "Filename"
+msgstr "Filnamn"
+
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
+msgid "Size"
+msgstr "Storlek"
+
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Status"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Framsteg"
+
+#: kotti/templates/edit/upload.pt:84
+msgid "Select file(s) to upload..."
+msgstr "Välj fil/filer för uppladdning"
+
+#: kotti/templates/edit/upload.pt:92
+msgid "Upload ${number} files."
+msgstr "Ladda upp ${number} filer."
+
+#: kotti/templates/edit/upload.pt:97
+msgid "Dismiss all errors"
+msgstr "Avfärda alla fel"
 
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Är du säker på att du vill radera ${title}?"
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr "Hittas ej"
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr "Resursen kan ej hittas"
 
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Är du säker på att du vill radera ${type} ${title}?"
 
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Tillbaka till hantering av användare"
+
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#, python-format
+msgid "Edit ${title}"
+msgstr "Redigera ${title}"
+
 #: kotti/templates/site-setup/users.pt:12
 msgid "Search user(s) / group(s)"
 msgstr "Sök användare och grupp(er)"
@@ -932,14 +642,6 @@ msgstr "Lägg till ny användare"
 msgid "Add new group"
 msgstr "Lägg till ny grupp"
 
-#: kotti/templates/site-setup/user.pt:12
-msgid "Back to User Management"
-msgstr "Tillbaka till hantering av användare"
-
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Taggad med:"
-
 #: kotti/templates/view/search-results.pt:9
 msgid "Search Results"
 msgstr "Sökresultat"
@@ -948,6 +650,10 @@ msgstr "Sökresultat"
 msgid "Search..."
 msgstr "Sök..."
 
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Taggad med:"
+
 #: kotti/tests/testing_view.pt:11
 msgid "Welcome, ${user}! You are logged in."
 msgstr "Välkommern, ${user}!. Du är inloggad."
@@ -955,3 +661,297 @@ msgstr "Välkommern, ${user}!. Du är inloggad."
 #: kotti/tests/testing_view.pt:15
 msgid "Welcome, you are not logged in."
 msgstr "Välkommen, du är inte inloggad."
+
+#: kotti/views/form.py:82 kotti/views/users.py:453
+msgid "Save"
+msgstr "Spara"
+
+#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
+msgid "Your changes have been saved."
+msgstr "Dina ändringar har blivit sparade."
+
+#: kotti/views/form.py:179
+msgid "Item was added."
+msgstr "Dokumentet har lagts till."
+
+#: kotti/views/form.py:203
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Lägg till ${type} till ${title}."
+
+#: kotti/views/form.py:207
+#, python-format
+msgid "Add ${type}."
+msgstr "Lägg till ${type}."
+
+#: kotti/views/form.py:277
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximal filstorlek: ${size}MB"
+
+#: kotti/views/login.py:67 kotti/views/users.py:279
+msgid "Full name"
+msgstr "Fullständigt namn"
+
+#: kotti/views/login.py:70
+msgid "Username"
+msgstr "Användarnamn"
+
+#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+msgid "Email"
+msgstr "Epost"
+
+#: kotti/views/login.py:84
+msgid "Register"
+msgstr "Registrera"
+
+#: kotti/views/login.py:91
+msgid "There was an error."
+msgstr "Ett fel uppstod."
+
+#: kotti/views/login.py:110
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulerar! Du har registrerat dig. Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
+
+#: kotti/views/login.py:125
+#, python-format
+msgid "Register - ${title}"
+msgstr "Registrara - ${title}"
+
+#: kotti/views/login.py:156
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Välkommen, ${user}!"
+
+#: kotti/views/login.py:181
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
+
+#: kotti/views/login.py:214
+msgid "Login failed."
+msgstr "Inloggningen misslyckades."
+
+#: kotti/views/login.py:224
+msgid "That username or email is not known by this system."
+msgstr "Användarnamnet eller epostadressen är inte bekanta för systemet."
+
+#: kotti/views/login.py:246
+msgid "You have been logged out."
+msgstr "Du har loggats ut."
+
+#: kotti/views/login.py:284
+msgid "You have reset your password."
+msgstr "Du har återställt ditt lösenord."
+
+#: kotti/views/login.py:303
+msgid "Set password"
+msgstr "Ställ in lösenord"
+
+#: kotti/views/login.py:331
+msgid "Your password reset token may have expired."
+msgstr "Lösenordsåterställningen kan vara föråldrad."
+
+#: kotti/views/login.py:338
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Återställ ditt lösenord - ${title}."
+
+#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+msgid "User Management"
+msgstr "Hantera användare"
+
+#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
+msgid "No changes were made."
+msgstr "Inga ändringar har gjorts."
+
+#: kotti/views/users.py:107
+msgid "No users or groups were found."
+msgstr "Inga användare eller grupper hittades."
+
+#: kotti/views/users.py:154
+msgid "Invalid value"
+msgstr "Felaktigt värde"
+
+#: kotti/views/users.py:160
+msgid "A user with that name already exists."
+msgstr "En användare med det namnet finns redan."
+
+#: kotti/views/users.py:167
+msgid "A user with that email already exists."
+msgstr "En användare med den epostadressen finns redan."
+
+#: kotti/views/users.py:190
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Ingen sådan grupp: ${group}"
+
+#: kotti/views/users.py:228
+msgid "Active"
+msgstr "Aktiv"
+
+#: kotti/views/users.py:229
+msgid "Untick this to deactivate the account."
+msgstr "Ta bort det här valet för att inaktivera kontot."
+
+#: kotti/views/users.py:235
+msgid "Global roles"
+msgstr "Globala roller"
+
+#: kotti/views/users.py:239
+msgid "Groups"
+msgstr "Grupper"
+
+#: kotti/views/users.py:276
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lämna det här tomt och välj 'Sänd länk för lösenordsregistrering' nedan för att låta användaren själv välja lösenord."
+
+#: kotti/views/users.py:324
+msgid "Add User"
+msgstr "Lägg till användare"
+
+#: kotti/views/users.py:334
+msgid "Send password registration link."
+msgstr "Sänd länk för lösenordsregistrering."
+
+#: kotti/views/users.py:349
+#, python-format
+msgid "${title} was added."
+msgstr "${title} lades till."
+
+#: kotti/views/users.py:359
+msgid "Add Group"
+msgstr "Lägg till grupp"
+
+#: kotti/views/users.py:520
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Redigera ${principal_type} ${title}"
+
+#: kotti/views/users.py:548
+msgid "User was not found."
+msgstr "Användaren kunde inte hittas."
+
+#: kotti/views/users.py:558
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} raderades."
+
+#: kotti/views/users.py:566
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Radera ${principal_type} ${title}"
+
+#: kotti/views/users.py:573
+msgid "No name was given."
+msgstr "Inget namn angavs."
+
+#: kotti/views/users.py:602
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mina preferenser - ${title}"
+
+#: kotti/views/edit/actions.py:107
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} har kopierats."
+
+#: kotti/views/edit/actions.py:125
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} har klippts ut."
+
+#: kotti/views/edit/actions.py:160
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} har klistrats in."
+
+#: kotti/views/edit/actions.py:163
+msgid "Could not paste node. It no longer exists."
+msgstr "Kunde inte klistra in noden. Den finns inte längre."
+
+#: kotti/views/edit/actions.py:184
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} har flyttats."
+
+#: kotti/views/edit/actions.py:226
+#, python-format
+msgid "${title} is now visible in the navigation."
+msgstr "${title} är ny synlig i navigationsträdet"
+
+#: kotti/views/edit/actions.py:229
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} visas inte längre i navigationsträdet"
+
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} har raderats."
+
+#: kotti/views/edit/actions.py:304
+msgid "Nothing was deleted."
+msgstr "Ingenting raderades."
+
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+msgid "Name and title are required."
+msgstr "Namn och rubrik krävs"
+
+#: kotti/views/edit/actions.py:344
+msgid "Item was renamed."
+msgstr "Dokumentet har döpts om."
+
+#: kotti/views/edit/actions.py:465
+msgid "Change State"
+msgstr "Ändra läge"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move up"
+msgstr "Flytta upp"
+
+#: kotti/views/edit/actions.py:467
+msgid "Move down"
+msgstr "Flytta ner"
+
+#: kotti/views/edit/actions.py:468
+msgid "Show"
+msgstr "Visa"
+
+#: kotti/views/edit/actions.py:469
+msgid "Hide"
+msgstr "Göm"
+
+#: kotti/views/edit/actions.py:508
+msgid "You have to select items to perform an action."
+msgstr "Du måste välja något att utföra operationen på först"
+
+#: kotti/views/edit/content.py:41
+msgid "Description"
+msgstr "Beskrivning"
+
+#: kotti/views/edit/content.py:47
+msgid "Tags"
+msgstr "Taggar"
+
+#: kotti/views/edit/content.py:56
+msgid "Body"
+msgstr "Brödtext"
+
+#: kotti/views/edit/default_views.py:89
+msgid "Default view"
+msgstr "Standardvy"
+
+#: kotti/views/edit/default_views.py:110
+msgid "Default view has been reset to default."
+msgstr "Standardvyn har återställts till förvald inställning."
+
+#: kotti/views/edit/default_views.py:117
+msgid "Default view has been set."
+msgstr "Standadvyn har ställts in."
+
+#: kotti/views/edit/default_views.py:122
+msgid "Default view could not be set."
+msgstr "Standardvyn kunde inte ställas in."
diff --git a/kotti/scaffolds/package/+dot+travis.yml_tmpl b/kotti/scaffolds/package/+dot+travis.yml_tmpl
index 131eca72a..7768a2c0f 100644
--- a/kotti/scaffolds/package/+dot+travis.yml_tmpl
+++ b/kotti/scaffolds/package/+dot+travis.yml_tmpl
@@ -6,7 +6,6 @@ cache:
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 python:
-  - "2.6"
   - "2.7"
 env:
   - KOTTI_TEST_DB_STRING=postgresql://postgres@localhost:5432/{{package}}_testing
diff --git a/kotti/scaffolds/package/+package+/overrides/kotti/static/icons/.gitkeep b/kotti/scaffolds/package/+package+/overrides/kotti/static/icons/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
index 54e884995..378a55dd8 100644
--- a/kotti/scaffolds/package/requirements.txt
+++ b/kotti/scaffolds/package/requirements.txt
@@ -8,5 +8,5 @@
 # -e git://github.com/Kotti/Kotti.git@production#egg=kotti
 
 # You can also install a specific version with its pinned requirements:
-# -r https://raw.githubusercontent.com/Kotti/Kotti/1.3.0-alpha.4/requirements.txt
-# Kotti == 1.3.0-alpha.4
+-r https://raw.githubusercontent.com/Kotti/Kotti/1.3.0/requirements.txt
+Kotti == 1.3.0
diff --git a/kotti/scaffolds/package/setup.py_tmpl b/kotti/scaffolds/package/setup.py_tmpl
index ae4587687..2d7aea7ab 100644
--- a/kotti/scaffolds/package/setup.py_tmpl
+++ b/kotti/scaffolds/package/setup.py_tmpl
@@ -28,14 +28,28 @@ setup(
     description="Add on for Kotti",
     long_description='\n\n'.join([README, CHANGES]),
     classifiers=[
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Framework :: Pylons",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-        "License :: Repoze Public License",
+        'Development Status :: 3 - Alpha',
+        # 'Development Status :: 4 - Beta',
+        # 'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Framework :: Pylons',
+        'Framework :: Pyramid',
+        'License :: Repoze Public License',
+        'Operating System :: POSIX',
+        'Operating System :: Unix',
+        # 'Programming Language :: JavaScript',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        # 'Programming Language :: Python :: 3',
+        # 'Programming Language :: Python :: 3.3',
+        # 'Programming Language :: Python :: 3.4',
+        # 'Programming Language :: Python :: 3.5',
+        # 'Programming Language :: Python :: 3.6',
+        'Topic :: Internet',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet :: WWW/HTTP :: WSGI',
+        'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
     ],
     author='Kotti developers',
     author_email='kotti@googlegroups.com',
diff --git a/prepare-release.sh b/prepare-release.sh
new file mode 100644
index 000000000..e69de29bb
diff --git a/requirements.txt b/requirements.txt
index 79549dcf6..8d462cb25 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-# Kotti==1.3.0a5.dev0
-
 alembic==0.8.8
 appdirs==1.4.0
 Babel==2.3.4
diff --git a/setup.cfg b/setup.cfg
index 44bed5353..73f635d71 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,10 @@
 [aliases]
 dev = develop easy_install Kotti[testing] Kotti[development]
 docs = develop easy_install Kotti[docs]
+
+[check-manifest]
+ignore =
+  .travis.yml
+  *.graffle
+ignore-bad-ideas =
+  *.mo
diff --git a/setup.py b/setup.py
index 93b511c60..2c974dcf0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,24 @@
+# -*- coding: utf-8 -*-
+
+import codecs
 import os
-import sys
 
-from setuptools import setup
 from setuptools import find_packages
+from setuptools import setup
 
 here = os.path.abspath(os.path.dirname(__file__))
-try:
-    README = open(os.path.join(here, 'README.rst')).read()
-    AUTHORS = open(os.path.join(here, 'AUTHORS.txt')).read()
-    CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
-except IOError:
-    README = AUTHORS = CHANGES = ''
+
+def read(*parts):
+    """ Build an absolute path from *parts* and and return the contents of the
+    resulting file.  Assume UTF-8 encoding.
+
+    Copied from
+    https://hynek.me/articles/sharing-your-labor-of-love-pypi-quick-and-dirty/
+    """
+
+    with codecs.open(os.path.join(here, *parts), "rb", "utf-8") as f:
+        return f.read()
+
 
 install_requires = [
     'Babel',
@@ -76,6 +84,8 @@
     ]
 
 development_requires = [
+    'check-manifest',
+    'pipdeptree',
     'pyramid_debugtoolbar',
 ]
 
@@ -86,22 +96,55 @@
     'sphinx_rtd_theme',
     ]
 
-if sys.version_info[:3] < (2, 7, 0):
-    install_requires.append('ordereddict')
+setup_requires = [
+    'setuptools_git>=0.3',
+]
 
 setup(name='Kotti',
-      version='1.3.0a5.dev0',
+      version='1.3.0',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
-      long_description='\n\n'.join([README, AUTHORS, CHANGES]),
+      long_description='\n\n'.join([
+          read('README.rst'),
+          read('AUTHORS.txt'),
+          read('CHANGES.txt'),
+      ]),
       classifiers=[
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Framework :: Pylons",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-        "License :: Repoze Public License",
+          # 'Development Status :: 3 - Alpha',
+          # 'Development Status :: 4 - Beta',
+          'Development Status :: 5 - Production/Stable',
+          'Environment :: Web Environment',
+          'Framework :: Pylons',
+          'Framework :: Pyramid',
+          'License :: Repoze Public License',
+          'Natural Language :: Dutch',
+          'Natural Language :: English',
+          'Natural Language :: French',
+          'Natural Language :: German',
+          'Natural Language :: Italian',
+          'Natural Language :: Japanese',
+          'Natural Language :: Polish',
+          'Natural Language :: Portuguese',
+          'Natural Language :: Swedish',
+          'Operating System :: POSIX',
+          'Operating System :: Unix',
+          # 'Programming Language :: JavaScript',
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          # 'Programming Language :: Python :: 3',
+          # 'Programming Language :: Python :: 3.3',
+          # 'Programming Language :: Python :: 3.4',
+          # 'Programming Language :: Python :: 3.5',
+          # 'Programming Language :: Python :: 3.6',
+          'Programming Language :: SQL',
+          'Topic :: Internet',
+          'Topic :: Internet :: WWW/HTTP',
+          'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+          'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries',  # noqa
+          'Topic :: Internet :: WWW/HTTP :: WSGI',
+          'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
+          'Topic :: Software Development',
+          'Topic :: Software Development :: Libraries :: Application Frameworks',  # noqa
       ],
       author='Kotti developers',
       author_email='kotti@googlegroups.com',
@@ -112,6 +155,7 @@
       include_package_data=True,
       zip_safe=False,
       install_requires=install_requires,
+      setup_requires=setup_requires,
       tests_require=tests_require,
       dependency_links=[],
       entry_points="""\

From 5fb71f48fe675cb87313438bdc32cab361848b27 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 10 Oct 2016 16:52:44 +0200
Subject: [PATCH 456/600] Untrack prepare-release script.

---
 prepare-release.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 prepare-release.sh

diff --git a/prepare-release.sh b/prepare-release.sh
deleted file mode 100644
index e69de29bb..000000000

From c55f6d371d26315125f9dd5cec5c5f2af1610e7c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 10 Oct 2016 17:05:52 +0200
Subject: [PATCH 457/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e1ee86979..aa563cd9e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.3.1.dev0 - unreleased
+-----------------------
+
+- No changes yet.
+
 1.3.0 - 2016-10-10
 ------------------
 
diff --git a/setup.py b/setup.py
index 2c974dcf0..c9005297c 100644
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,7 @@ def read(*parts):
 ]
 
 setup(name='Kotti',
-      version='1.3.0',
+      version='1.3.1.dev0',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([
           read('README.rst'),

From 564f1d8e12a8caf299ed4be82cbf9277c2843f68 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 11 Oct 2016 11:23:38 +0200
Subject: [PATCH 458/600] Add __future__ imports everywhere.

---
 kotti/__init__.py                                 |  5 ++++-
 kotti/alembic/env.py                              |  5 ++++-
 kotti/events.py                                   | 12 ++++++++----
 kotti/fanstatic.py                                |  6 +++---
 kotti/filedepot.py                                | 11 +++++++----
 kotti/interfaces.py                               |  5 ++---
 kotti/message.py                                  |  3 ++-
 kotti/migrate.py                                  |  6 +++---
 kotti/populate.py                                 |  6 ++++--
 kotti/request.py                                  |  1 +
 kotti/resources.py                                |  2 ++
 kotti/sanitizers.py                               |  3 ++-
 kotti/scaffolds/__init__.py                       |  4 +++-
 .../scaffolds/package/+package+/fanstatic.py_tmpl |  2 +-
 .../package/+package+/views/edit.py_tmpl          |  2 +-
 kotti/security.py                                 | 13 ++++++++-----
 kotti/sqla.py                                     |  4 +++-
 kotti/testing.py                                  |  2 +-
 kotti/tests/__init__.py                           |  4 ++--
 kotti/tests/conftest.py                           |  1 +
 kotti/tests/test_app.py                           |  1 +
 kotti/tests/test_cache.py                         |  8 +++++---
 kotti/tests/test_default_view_selection.py        |  2 ++
 kotti/tests/test_deprecated.py                    |  2 +-
 kotti/tests/test_events.py                        |  2 ++
 kotti/tests/test_file.py                          | 15 +++++++--------
 kotti/tests/test_filedepot.py                     |  6 +++++-
 kotti/tests/test_functional.py                    |  8 +++++---
 kotti/tests/test_httpexceptions.py                |  2 +-
 kotti/tests/test_message.py                       |  4 +++-
 kotti/tests/test_migrate.py                       |  2 ++
 kotti/tests/test_node.py                          |  8 ++++++--
 kotti/tests/test_node_views.py                    |  7 ++++---
 kotti/tests/test_principals.py                    |  3 +++
 kotti/tests/test_register.py                      |  7 +++++--
 kotti/tests/test_request.py                       |  3 +++
 kotti/tests/test_sanitizers.py                    |  1 +
 kotti/tests/test_search.py                        |  2 ++
 kotti/tests/test_security.py                      |  4 +++-
 kotti/tests/test_security_views.py                |  4 +++-
 kotti/tests/test_sqla.py                          |  2 ++
 kotti/tests/test_static.py                        |  2 ++
 kotti/tests/test_tags.py                          |  2 ++
 kotti/tests/test_upload.py                        |  6 ++++--
 .../{url_normalizer.py => test_url_normalizer.py} |  4 +++-
 kotti/tests/test_util.py                          |  2 ++
 kotti/tests/test_util_views.py                    | 15 ++++++++-------
 kotti/tests/test_views_form.py                    |  4 +++-
 kotti/tests/test_workflow.py                      |  1 +
 kotti/tests/test_zzz_scaffolds.py                 |  2 +-
 kotti/traversal.py                                |  4 +++-
 kotti/url_normalizer.py                           |  5 +++--
 kotti/util.py                                     |  3 +++
 kotti/views/__init__.py                           |  1 +
 kotti/views/cache.py                              |  4 +++-
 kotti/views/edit/__init__.py                      |  3 +--
 kotti/views/edit/actions.py                       |  6 +++---
 kotti/views/edit/content.py                       |  6 +++---
 kotti/views/edit/default_views.py                 |  2 +-
 kotti/views/edit/upload.py                        |  5 ++---
 kotti/views/file.py                               |  1 +
 kotti/views/form.py                               |  2 +-
 kotti/views/image.py                              |  7 ++++---
 kotti/views/login.py                              | 15 +++++++--------
 kotti/views/navigation.py                         |  2 +-
 kotti/views/site_setup.py                         |  6 +++---
 kotti/views/slots.py                              |  1 +
 kotti/views/users.py                              |  5 +++--
 kotti/views/util.py                               |  6 ++++--
 kotti/views/view.py                               |  1 +
 kotti/workflow.py                                 |  8 +++++---
 71 files changed, 208 insertions(+), 113 deletions(-)
 rename kotti/tests/{url_normalizer.py => test_url_normalizer.py} (96%)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index 2a7453c2b..78906231a 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import pkg_resources
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
@@ -7,7 +9,8 @@
 from pyramid.threadlocal import get_current_registry
 from pyramid.util import DottedNameResolver
 from pyramid_beaker import session_factory_from_settings
-from six import binary_type, string_types
+from six import binary_type
+from six import string_types
 from sqlalchemy import MetaData
 from sqlalchemy import engine_from_config
 from sqlalchemy.ext.declarative import declarative_base
diff --git a/kotti/alembic/env.py b/kotti/alembic/env.py
index 09232af28..1c855bf45 100755
--- a/kotti/alembic/env.py
+++ b/kotti/alembic/env.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
-from alembic import context
+from __future__ import absolute_import, division, print_function
+
 import traceback
+
 import transaction
+from alembic import context
 from zope.sqlalchemy import mark_changed
 
 from kotti import DBSession
diff --git a/kotti/events.py b/kotti/events.py
index 7afedd907..2ecaba640 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 """This module includes a simple events system that allows users to
 subscribe to specific events, and more particularly to *object events*
 of specific object types.
@@ -12,16 +13,19 @@
 
 """
 
+from __future__ import absolute_import, division, print_function
+
 from collections import defaultdict
 from datetime import datetime
+
 try:  # pragma: no cover
     from collections import OrderedDict
 except ImportError:  # pragma: no cover
     from ordereddict import OrderedDict
 
 import sqlalchemy.event
-from sqlalchemy.orm import load_only
 import venusian
+from sqlalchemy.orm import load_only
 from sqlalchemy.orm import mapper
 from sqlalchemy_utils.functions import has_changes
 from pyramid.location import lineage
@@ -431,14 +435,14 @@ class subscribe(object):
         @subscribe()
         def on_all_events(event):
             # this will be executed on *every* event
-            print "Some kind of event occured"
+            print("Some kind of event occured")
 
         @subscribe(ObjectInsert)
         def on_insert(event):
             # this will be executed on every object insert
             context = event.object
             request = event.request
-            print "Object insert"
+            print("Object insert")
 
         @subscribe(ObjectInsert, Document)
         def on_document_insert(event):
@@ -446,7 +450,7 @@ def on_document_insert(event):
             # is an instance of Document
             context = event.object
             request = event.request
-            print "Document insert"
+            print("Document insert")
 
     """
 
diff --git a/kotti/fanstatic.py b/kotti/fanstatic.py
index 9740738fa..f4b103902 100644
--- a/kotti/fanstatic.py
+++ b/kotti/fanstatic.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 
 from fanstatic import Group
 from fanstatic import Library
 from fanstatic import Resource
 from js.angular import angular
-from js.bootstrap import bootstrap_js
 from js.bootstrap import bootstrap_css
-from js.html5shiv import html5shiv
+from js.bootstrap import bootstrap_js
 from js.fineuploader import fineuploader
+from js.html5shiv import html5shiv
 from js.jquery import jquery
 from js.jquery_form import jquery_form
 from js.jquery_tablednd import jquery_tablednd
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 8d05015f9..8955ecde4 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import logging
 import mimetypes
 import uuid
@@ -11,25 +13,26 @@
 from pyramid import tweens
 from pyramid.httpexceptions import HTTPMovedPermanently
 from pyramid.httpexceptions import HTTPNotFound
-from pyramid.response import _BLOCK_SIZE
 from pyramid.response import FileIter
 from pyramid.response import Response
+from pyramid.response import _BLOCK_SIZE
 from sqlalchemy import Column
 from sqlalchemy import DateTime
-from sqlalchemy import event
 from sqlalchemy import Integer
 from sqlalchemy import LargeBinary
 from sqlalchemy import String
 from sqlalchemy import Unicode
+from sqlalchemy import event
 from sqlalchemy.orm import deferred
 from unidecode import unidecode
 
-from kotti import Base, get_settings
+from kotti import Base
+from kotti import get_settings
 from kotti import DBSession
+from kotti.util import _to_fieldstorage
 from kotti.util import camel_case_to_name
 from kotti.util import command
 from kotti.util import extract_from_settings
-from kotti.util import _to_fieldstorage
 
 _marker = object()
 
diff --git a/kotti/interfaces.py b/kotti/interfaces.py
index 9f30547a9..f4b70efba 100644
--- a/kotti/interfaces.py
+++ b/kotti/interfaces.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-"""
-"""
+from __future__ import absolute_import, division, print_function
 
-from zope.interface import Interface
 from pyramid.interfaces import ILocation
+from zope.interface import Interface
 
 
 class INode(ILocation):
diff --git a/kotti/message.py b/kotti/message.py
index b9817c0d0..a53fe404b 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import hashlib
 import time
 import urllib
@@ -10,7 +12,6 @@
 
 from kotti import get_settings
 
-
 _inject_mailer = []
 
 
diff --git a/kotti/migrate.py b/kotti/migrate.py
index b1b86f414..5fdd91012 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -39,20 +39,20 @@ def kotti_configure(settings):
 ``kotti-migrate`` commands 'list_all', 'upgrade_all' and
 'stamp_heads' will then include the add-on.
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 
 import os
-import pkg_resources
 
+import pkg_resources
 from alembic.config import Config
 from alembic.environment import EnvironmentContext
 from alembic.script import ScriptDirectory
 from alembic.util import load_python_file
 from zope.sqlalchemy import mark_changed
 
+from kotti import DBSession
 from kotti import conf_defaults
 from kotti import get_settings
-from kotti import DBSession
 from kotti.util import command
 
 
diff --git a/kotti/populate.py b/kotti/populate.py
index 0eb01de0e..5a2adcbc7 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -4,16 +4,18 @@
 (if you haven't modified kotti.populators).
 """
 
+from __future__ import absolute_import, division, print_function
+
 from pyramid.i18n import LocalizerRequestMixin
 from pyramid.threadlocal import get_current_registry
 from six import iteritems
 
 from kotti import get_settings
 from kotti.resources import DBSession
-from kotti.resources import Node
 from kotti.resources import Document
-from kotti.security import get_principals
+from kotti.resources import Node
 from kotti.security import SITE_ACL
+from kotti.security import get_principals
 from kotti.util import _
 from kotti.workflow import get_workflow
 
diff --git a/kotti/request.py b/kotti/request.py
index 79d29da42..d5aa34a59 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 import pyramid.request
 from pyramid.decorator import reify
diff --git a/kotti/resources.py b/kotti/resources.py
index 55764b8b7..5890fd54f 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -9,6 +9,8 @@
 .. inheritance-diagram:: kotti.resources
 """
 
+from __future__ import absolute_import, division, print_function
+
 import os
 import warnings
 from UserDict import DictMixin
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index 29c391ebc..7662c3c0b 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -4,6 +4,7 @@
 For a high level introduction and available configuration options
 see :ref:`sanitizers`.
 """
+from __future__ import absolute_import, division, print_function
 
 from bleach import clean
 from bleach_whitelist import all_styles
@@ -16,9 +17,9 @@
 from six import string_types
 
 from kotti import get_settings
-from kotti.events import objectevent_listeners
 from kotti.events import ObjectInsert
 from kotti.events import ObjectUpdate
+from kotti.events import objectevent_listeners
 
 
 def sanitize(html, sanitizer):
diff --git a/kotti/scaffolds/__init__.py b/kotti/scaffolds/__init__.py
index 656745eb9..a46e98bfe 100644
--- a/kotti/scaffolds/__init__.py
+++ b/kotti/scaffolds/__init__.py
@@ -11,12 +11,14 @@
 subprocesses which seems to be not recorded by coverage.
 """
 
+from __future__ import absolute_import, division, print_function
+
 import datetime
 import os
+from textwrap import dedent
 
 from pyramid.decorator import reify
 from pyramid.scaffolds import PyramidTemplate
-from textwrap import dedent
 from usersettings import Settings
 
 
diff --git a/kotti/scaffolds/package/+package+/fanstatic.py_tmpl b/kotti/scaffolds/package/+package+/fanstatic.py_tmpl
index 8d0f89fa6..43b0163aa 100644
--- a/kotti/scaffolds/package/+package+/fanstatic.py_tmpl
+++ b/kotti/scaffolds/package/+package+/fanstatic.py_tmpl
@@ -5,7 +5,7 @@ Created on {{date}}
 :author: {{author}} ({{email}})
 """
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 
 from fanstatic import Group
 from fanstatic import Library
diff --git a/kotti/scaffolds/package/+package+/views/edit.py_tmpl b/kotti/scaffolds/package/+package+/views/edit.py_tmpl
index f4d46bcbf..1b935a17b 100644
--- a/kotti/scaffolds/package/+package+/views/edit.py_tmpl
+++ b/kotti/scaffolds/package/+package+/views/edit.py_tmpl
@@ -23,7 +23,7 @@ class CustomContentSchema(ContentSchema):
         title=_(u"Custom attribute"))
 
 
-@view_config(name=CustomContent.type_info.add_view, 
+@view_config(name=CustomContent.type_info.add_view,
              permission=CustomContent.type_info.add_permission,
              renderer='kotti:templates/edit/node.pt')
 class CustomContentAddForm(AddFormView):
diff --git a/kotti/security.py b/kotti/security.py
index 69a869f5e..fdfd41aa2 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -1,19 +1,22 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 from __future__ import with_statement
+
+from UserDict import DictMixin
 from contextlib import contextmanager
 from datetime import datetime
-from UserDict import DictMixin
 
 import bcrypt
 from pyramid.location import lineage
 from pyramid.security import view_execution_permitted
 from six import string_types
-from sqlalchemy import Boolean, bindparam
+from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
-from sqlalchemy import func
 from sqlalchemy import Integer
 from sqlalchemy import Unicode
+from sqlalchemy import bindparam
+from sqlalchemy import func
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.sql.expression import and_
 from sqlalchemy.sql.expression import or_
@@ -22,12 +25,12 @@
 from kotti import Base
 from kotti import DBSession
 from kotti import get_settings
-from kotti.sqla import bakery
 from kotti.sqla import JsonType
 from kotti.sqla import MutationList
+from kotti.sqla import bakery
+from kotti.util import DontCache
 from kotti.util import _
 from kotti.util import request_cache
-from kotti.util import DontCache
 
 
 def get_principals():
diff --git a/kotti/sqla.py b/kotti/sqla.py
index 552cdd5eb..581f1727c 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -6,6 +6,7 @@
 
 .. inheritance-diagram:: kotti.sqla
 """
+from __future__ import absolute_import, division, print_function
 
 from pyramid.compat import json
 from pyramid.security import ALL_PERMISSIONS
@@ -13,7 +14,8 @@
 from sqlalchemy.ext import baked
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.mutable import Mutable
-from sqlalchemy.types import TypeDecorator, Text
+from sqlalchemy.types import Text
+from sqlalchemy.types import TypeDecorator
 
 bakery = baked.bakery()
 baked.bake_lazy_loaders()
diff --git a/kotti/testing.py b/kotti/testing.py
index 17ed6964a..17fc05524 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-
 """
 Inheritance Diagram
 -------------------
 
 .. inheritance-diagram:: kotti.testing
 """
+from __future__ import absolute_import, division, print_function
 
 import os
 from os.path import join, dirname
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index b4f879e46..7b4f3e91a 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -44,13 +44,13 @@
 
 """
 
-# public pytest fixtures
+from __future__ import absolute_import, division, print_function
 
 import warnings
 from datetime import datetime
 
-from pytest import fixture
 from mock import MagicMock
+from pytest import fixture
 
 from kotti import testing
 
diff --git a/kotti/tests/conftest.py b/kotti/tests/conftest.py
index 178fe09c9..7d1bdf6be 100644
--- a/kotti/tests/conftest.py
+++ b/kotti/tests/conftest.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 from pytest import fixture
 from pytest import skip
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 4079462a6..200614b4e 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 from warnings import filterwarnings
 
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index f2bfe40ba..8a09e196a 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -1,15 +1,17 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import datetime
 import time
 
-from mock import patch
-from mock import MagicMock
 import pytest
+from mock import MagicMock
+from mock import patch
 
 from kotti.resources import File
 from kotti.resources import Image
-from kotti.testing import asset
 from kotti.testing import Dummy
+from kotti.testing import asset
 from kotti.views.cache import set_max_age
 
 
diff --git a/kotti/tests/test_default_view_selection.py b/kotti/tests/test_default_view_selection.py
index fbb8f9e11..194b765a2 100644
--- a/kotti/tests/test_default_view_selection.py
+++ b/kotti/tests/test_default_view_selection.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import warnings
 
 from pyramid.httpexceptions import HTTPFound
diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 3aa3955d3..05b59d53b 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 import warnings
 
-from pyramid.i18n import TranslationString
 from pytest import raises
 
 
diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 7868741ad..2c13a2aa2 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import warnings
 
 from pytest import mark
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 8e462d5e0..79f574e15 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -1,18 +1,19 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 from StringIO import StringIO
-from colander import null
-from pyramid.httpexceptions import HTTPMovedPermanently
 
-from mock import MagicMock
 import pytest
+from colander import null
+from mock import MagicMock
+from pyramid.httpexceptions import HTTPMovedPermanently
 
+from kotti.filedepot import StoredFileResponse
 from kotti.testing import DummyRequest
 from kotti.testing import asset
-from kotti.views.file import inline_view
-from kotti.views.file import attachment_view
 from kotti.views.file import UploadedFileResponse
-from kotti.filedepot import StoredFileResponse
+from kotti.views.file import attachment_view
+from kotti.views.file import inline_view
 
 
 class TestFileViews:
@@ -31,8 +32,6 @@ def _test_common_headers(self, headers):
                               (attachment_view, 'attachment')])
     def test_file_views(self, params, config, filedepot, dummy_request,
                         depot_tween):
-        from kotti.filedepot import TweenFactory
-
         view, disposition = params
         self._create_file(config)
 
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 73ffc6311..e1025e2cb 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import datetime
+
 import pytest
 
-from kotti.filedepot import DBFileStorage, DBStoredFile
+from kotti.filedepot import DBFileStorage
+from kotti.filedepot import DBStoredFile
 from kotti.resources import File
 from kotti.resources import Image
 
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index c0508f2a5..bd0a710f0 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -1,11 +1,13 @@
-# coding:utf8
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 import pytest
-from kotti.testing import BASE_URL
-from kotti.testing import user
 from mock import patch
 from webtest.forms import Upload
 
+from kotti.testing import BASE_URL
+from kotti.testing import user
+
 
 class TestLogin:
     def test_it(self, app):
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
index 26225f3af..a45fd721c 100644
--- a/kotti/tests/test_httpexceptions.py
+++ b/kotti/tests/test_httpexceptions.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-""" Kotti HTTP Exception browser tests """
+from __future__ import absolute_import, division, print_function
 
 import pytest
 
diff --git a/kotti/tests/test_message.py b/kotti/tests/test_message.py
index 571276740..d11f6c208 100644
--- a/kotti/tests/test_message.py
+++ b/kotti/tests/test_message.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+from warnings import filterwarnings
 
 from mock import patch
 from pytest import raises
@@ -8,7 +11,6 @@
 
 
 # filter deprecation warnings for code that is still tested...
-from warnings import filterwarnings
 filterwarnings('ignore', '^send_set_password is deprecated')
 
 
diff --git a/kotti/tests/test_migrate.py b/kotti/tests/test_migrate.py
index 6544b555a..0d9ea4912 100644
--- a/kotti/tests/test_migrate.py
+++ b/kotti/tests/test_migrate.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 from alembic.migration import MigrationContext
 from mock import patch
 
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 2ef5b0ade..924b86ee5 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+from pyramid.security import ALL_PERMISSIONS
+from pyramid.security import Allow
+from pyramid.security import Deny
+from pyramid.security import Everyone
 from pytest import mark
 from pytest import raises
-from pyramid.security import ALL_PERMISSIONS, Deny, Everyone
-from pyramid.security import Allow
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.exc import SQLAlchemyError
 
diff --git a/kotti/tests/test_node_views.py b/kotti/tests/test_node_views.py
index 568c92c33..2ce4823a8 100644
--- a/kotti/tests/test_node_views.py
+++ b/kotti/tests/test_node_views.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-from webob.multidict import MultiDict
-from pytest import raises
-from pyramid.exceptions import Forbidden
+from __future__ import absolute_import, division, print_function
 
 from kotti.testing import DummyRequest
+from pyramid.exceptions import Forbidden
+from pytest import raises
+from webob.multidict import MultiDict
 
 
 class TestAddableTypes:
diff --git a/kotti/tests/test_principals.py b/kotti/tests/test_principals.py
index f2a5ff9d9..68b023b5f 100644
--- a/kotti/tests/test_principals.py
+++ b/kotti/tests/test_principals.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+
 class TestMassageGroups:
 
     def test_massage_groups_in(self):
diff --git a/kotti/tests/test_register.py b/kotti/tests/test_register.py
index be6603cc2..8ebdc5800 100644
--- a/kotti/tests/test_register.py
+++ b/kotti/tests/test_register.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
-from kotti.testing import DummyRequest
-from mock import patch
+from __future__ import absolute_import, division, print_function
+
 from mock import call
+from mock import patch
+
+from kotti.testing import DummyRequest
 
 
 class TestRegister:
diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index 84786996d..1bcbda156 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+
 class TestExtendingRequest:
 
     def test_it(self):
diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
index 26386dad5..7e9d82797 100644
--- a/kotti/tests/test_sanitizers.py
+++ b/kotti/tests/test_sanitizers.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 unsanitized = u'''
 <h1>Title</h1>
diff --git a/kotti/tests/test_search.py b/kotti/tests/test_search.py
index 371acfd00..f2222bbf7 100644
--- a/kotti/tests/test_search.py
+++ b/kotti/tests/test_search.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 from kotti.testing import DummyRequest
 
 
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index f6ed420d5..e3302e538 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 from mock import patch
-from pytest import raises
 from pyramid.authentication import CallbackAuthenticationPolicy
+from pytest import raises
 
 from kotti.testing import DummyRequest
 
diff --git a/kotti/tests/test_security_views.py b/kotti/tests/test_security_views.py
index 48a965514..1795b32ea 100644
--- a/kotti/tests/test_security_views.py
+++ b/kotti/tests/test_security_views.py
@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import colander
 import pytest
-from mock import patch
 from mock import Mock
+from mock import patch
 from pytest import raises
 
 from kotti.testing import DummyRequest
diff --git a/kotti/tests/test_sqla.py b/kotti/tests/test_sqla.py
index 79c87c9d6..03dcac967 100644
--- a/kotti/tests/test_sqla.py
+++ b/kotti/tests/test_sqla.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import json
 
 from mock import MagicMock
diff --git a/kotti/tests/test_static.py b/kotti/tests/test_static.py
index 12c9abc09..72635f3ef 100644
--- a/kotti/tests/test_static.py
+++ b/kotti/tests/test_static.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 from pytest import raises
 
 
diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index d9262b419..a28f17aa3 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import colander
 from mock import Mock
 
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index 95e4f8c58..baa3af402 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 import json
 
+from pytest import raises
+from zope.testbrowser.browser import LinkNotFoundError
+
 from kotti.testing import BASE_URL
 from kotti.testing import user
 from kotti.views.edit.upload import UploadView
-from pytest import raises
-from zope.testbrowser.browser import LinkNotFoundError
 
 
 def test_upload_anonymous(root, dummy_request, browser):
diff --git a/kotti/tests/url_normalizer.py b/kotti/tests/test_url_normalizer.py
similarity index 96%
rename from kotti/tests/url_normalizer.py
rename to kotti/tests/test_url_normalizer.py
index b3e8e783f..3a1e205e2 100644
--- a/kotti/tests/url_normalizer.py
+++ b/kotti/tests/test_url_normalizer.py
@@ -1,4 +1,6 @@
-# encoding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 from kotti import get_settings
 from kotti.url_normalizer import url_normalizer
 
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 007a4262e..2c2dd44f3 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 from mock import Mock
 from mock import patch
 
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index f1c89a84e..e8d0a4bae 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -1,9 +1,13 @@
-# coding:utf8
-import time
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import decimal
-from mock import patch
-from mock import Mock
+import time
+from warnings import filterwarnings
+
 from mock import MagicMock
+from mock import Mock
+from mock import patch
 from pyramid.interfaces import ILocation
 from pyramid.request import Response
 from pytest import raises
@@ -12,9 +16,6 @@
 from kotti.testing import Dummy
 from kotti.testing import DummyRequest
 
-
-# filter deprecation warnings for code that is still tested...
-from warnings import filterwarnings
 filterwarnings('ignore', '^kotti.views.slots.register is deprecated')
 
 
diff --git a/kotti/tests/test_views_form.py b/kotti/tests/test_views_form.py
index ffe3f8de0..e761712a9 100644
--- a/kotti/tests/test_views_form.py
+++ b/kotti/tests/test_views_form.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import colander
-from mock import patch
 from mock import MagicMock
+from mock import patch
 
 from kotti.testing import Dummy
 from kotti.testing import DummyRequest
diff --git a/kotti/tests/test_workflow.py b/kotti/tests/test_workflow.py
index 4e7b2e848..029144e0b 100644
--- a/kotti/tests/test_workflow.py
+++ b/kotti/tests/test_workflow.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 from mock import patch
 from pyramid.security import ALL_PERMISSIONS
diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
index f035b570c..330ff7d03 100644
--- a/kotti/tests/test_zzz_scaffolds.py
+++ b/kotti/tests/test_zzz_scaffolds.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 """ This module contains the tests for the scaffolds.  Each test tries to
 simulate actual usage of the scaffolds as much as possible.  A clean virtualenv
 is created, a package created from a scaffold and the tests of that package are
@@ -10,6 +9,7 @@
 The module name starts with ``test_zzz`` to make the contained tests always the
 last in a complete test run.
 """
+from __future__ import absolute_import, division, print_function
 
 import os
 
diff --git a/kotti/traversal.py b/kotti/traversal.py
index ccd88aeb6..ec8ed70b3 100644
--- a/kotti/traversal.py
+++ b/kotti/traversal.py
@@ -33,13 +33,15 @@
 
 """
 
+from __future__ import absolute_import, division, print_function
+
 from pyramid.compat import decode_path_info
 from pyramid.compat import is_nonstr_iter
 from pyramid.exceptions import URLDecodeError
 from pyramid.interfaces import ITraverser
 from pyramid.interfaces import VH_ROOT_KEY
-from pyramid.traversal import empty
 from pyramid.traversal import ResourceTreeTraverser
+from pyramid.traversal import empty
 from pyramid.traversal import slash
 from pyramid.traversal import split_path_info
 from sqlalchemy import or_
diff --git a/kotti/url_normalizer.py b/kotti/url_normalizer.py
index aa4899e97..ba50dcd61 100644
--- a/kotti/url_normalizer.py
+++ b/kotti/url_normalizer.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import re
-from unidecode import unidecode
 
 from pyramid.settings import asbool
+from unidecode import unidecode
 
 from kotti import get_settings
 
-
 # Define and compile static regexes
 FILENAME_REGEX = re.compile(r"^(.+)\.(\w{,4})$", re.U)
 IGNORE_REGEX = re.compile(r"['\"]", re.U)
diff --git a/kotti/util.py b/kotti/util.py
index 5f92e2824..08fd946cf 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -7,8 +7,11 @@
 .. inheritance-diagram:: kotti.util
 """
 
+from __future__ import absolute_import, division, print_function
+
 import cgi
 import re
+
 try:
     # PY2
     from urllib import unquote
diff --git a/kotti/views/__init__.py b/kotti/views/__init__.py
index 464a06a1c..53ebdf37f 100644
--- a/kotti/views/__init__.py
+++ b/kotti/views/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 from kotti.views.util import RootOnlyPredicate
 from kotti.views.util import SettingHasValuePredicate
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index 10c47a98b..609201530 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import datetime
 from logging import getLogger
 
-from pyramid.events import subscriber
 from pyramid.events import NewResponse
+from pyramid.events import subscriber
 from pyramid.response import FileResponse
 from sqlalchemy.orm.exc import DetachedInstanceError
 
diff --git a/kotti/views/edit/__init__.py b/kotti/views/edit/__init__.py
index 5c92d0e5f..7e788545d 100644
--- a/kotti/views/edit/__init__.py
+++ b/kotti/views/edit/__init__.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
-
 """
 Edit views.
 """
+from __future__ import absolute_import, division, print_function
 
 import warnings
 
-# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.views.edit.content import ContentSchema
 from kotti.views.edit.content import DocumentSchema
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index ad488c4ff..91b62348d 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -2,11 +2,12 @@
 """
 Action views
 """
+from __future__ import absolute_import, division, print_function
 
+from pyramid.exceptions import Forbidden
 from pyramid.httpexceptions import HTTPFound
 from pyramid.url import resource_url
 from pyramid.view import view_config
-from pyramid.exceptions import Forbidden
 from pyramid.view import view_defaults
 from zope.deprecation import deprecated
 
@@ -15,9 +16,8 @@
 from kotti.fanstatic import contents_view_js
 from kotti.interfaces import IContent
 from kotti.resources import Node
-# noinspection PyProtectedMember
-from kotti.util import _
 from kotti.util import ActionButton
+from kotti.util import _
 from kotti.util import get_paste_items
 from kotti.util import title_to_name
 from kotti.views.edit import _state_info
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 390299e90..1d283fdad 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -2,9 +2,11 @@
 """
 Content edit views
 """
+from __future__ import absolute_import, division, print_function
 
 import random
 from StringIO import StringIO
+
 import colander
 from colander import SchemaNode
 from colander import null
@@ -16,16 +18,14 @@
 from kotti.resources import Document
 from kotti.resources import File
 from kotti.resources import Node
-# noinspection PyProtectedMember
 from kotti.util import _
-# noinspection PyProtectedMember
 from kotti.util import _to_fieldstorage
-from kotti.views.form import get_appstruct
 from kotti.views.form import AddFormView
 from kotti.views.form import EditFormView
 from kotti.views.form import FileUploadTempStore
 from kotti.views.form import ObjectType
 from kotti.views.form import deferred_tag_it_widget
+from kotti.views.form import get_appstruct
 from kotti.views.form import validate_file_size_limit
 
 
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index 66eeb8bba..a4a47cfbe 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -2,6 +2,7 @@
 """
 :summary: Default view selctor views
 """
+from __future__ import absolute_import, division, print_function
 
 import warnings
 
@@ -14,7 +15,6 @@
 from pyramid.view import view_defaults
 from zope.interface import providedBy
 
-# noinspection PyProtectedMember
 from kotti.util import _
 
 
diff --git a/kotti/views/edit/upload.py b/kotti/views/edit/upload.py
index c92ac38fd..7270d8869 100644
--- a/kotti/views/edit/upload.py
+++ b/kotti/views/edit/upload.py
@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
-
 """
 Created on 2013-02-23
 """
+from __future__ import absolute_import, division, print_function
 
 import json
 from cgi import FieldStorage
 from logging import getLogger
 
 from pyramid.response import Response
-from pyramid.view import view_defaults
 from pyramid.view import view_config
+from pyramid.view import view_defaults
 
-# from kotti import get_settings
 from kotti.fanstatic import upload
 from kotti.util import title_to_name
 from kotti.views.edit.actions import content_type_factories
diff --git a/kotti/views/file.py b/kotti/views/file.py
index 626c2dd34..a41315095 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 from pyramid.view import view_config
 
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 53f3eaedc..fad85e2f0 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -7,6 +7,7 @@
 
 .. inheritance-diagram:: kotti.views.form
 """
+from __future__ import absolute_import, division, print_function
 
 from StringIO import StringIO
 from UserDict import DictMixin
@@ -21,7 +22,6 @@
 from kotti import get_settings
 from kotti.fanstatic import tagit
 from kotti.resources import Tag
-# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.util import title_to_name
 from kotti.util import translate
diff --git a/kotti/views/image.py b/kotti/views/image.py
index 51df118f6..99497aaba 100644
--- a/kotti/views/image.py
+++ b/kotti/views/image.py
@@ -2,14 +2,15 @@
 """
 Views for image content objects.
 """
+from __future__ import absolute_import, division, print_function
 
+from zope.deprecation import deprecated
+
+from kotti_image.views import ImageView
 from kotti_image.views import _load_image_scales
 from kotti_image.views import image_scales
-from kotti_image.views import ImageView
 from kotti_image.views import includeme
 
-from zope.deprecation import deprecated
-
 __ = _load_image_scales, image_scales, ImageView, includeme  # pyflakes
 
 deprecated(('_load_image_scales', 'image_scales', 'ImageView', 'includeme'),
diff --git a/kotti/views/login.py b/kotti/views/login.py
index 4e839794a..297cf6ddf 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-
 """
 Login / logout and forbidden views and forms.
 """
+from __future__ import absolute_import, division, print_function
 
 from datetime import datetime
 
@@ -18,23 +18,22 @@
 from pyramid.httpexceptions import HTTPFound
 from pyramid.security import forget
 from pyramid.security import remember
+from pyramid.settings import asbool
 from pyramid.url import resource_url
 from pyramid.view import view_config
-from pyramid.settings import asbool
 
 from kotti import get_settings
+from kotti.events import ObjectEvent
+from kotti.events import notify
 from kotti.message import email_set_password
 from kotti.message import validate_token
 from kotti.security import get_principals
-# noinspection PyProtectedMember
 from kotti.util import _
-from kotti.views.util import template_api
+from kotti.views.users import UserAddFormView
 from kotti.views.users import deferred_email_validator
-from kotti.views.users import name_pattern_validator
 from kotti.views.users import name_new_validator
-from kotti.views.users import UserAddFormView
-from kotti.events import ObjectEvent
-from kotti.events import notify
+from kotti.views.users import name_pattern_validator
+from kotti.views.util import template_api
 
 
 def _find_user(login):
diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index 36f2a0f37..1a90f5f5f 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-
 """
 This module contains navigation related views.
 """
+from __future__ import absolute_import, division, print_function
 
 from pyramid.view import view_config
 
diff --git a/kotti/views/site_setup.py b/kotti/views/site_setup.py
index 864e2243a..d71a23ead 100644
--- a/kotti/views/site_setup.py
+++ b/kotti/views/site_setup.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# noinspection PyProtectedMember
-from kotti.util import _
-from kotti.util import Link
+from __future__ import absolute_import, division, print_function
 
+from kotti.util import Link
+from kotti.util import _
 
 CONTROL_PANEL_LINKS = [
     Link('setup-users', title=_(u'User Management')),
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index 045ff67a9..ae0841bdb 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -38,6 +38,7 @@ def view(request, context):
 users of your package to include your slot assignments through the
 ``pyramid.includes`` configuration setting.
 """
+from __future__ import absolute_import, division, print_function
 
 import urllib
 
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 90398d3fb..0bf5e03e6 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
-"""User management screens
 """
+User management screens
+"""
+from __future__ import absolute_import, division, print_function
 
 import re
 from urllib import urlencode
@@ -29,7 +31,6 @@
 from kotti.security import list_groups_raw
 from kotti.security import map_principals_with_local_roles
 from kotti.security import set_groups
-# noinspection PyProtectedMember
 from kotti.util import _
 from kotti.views.form import AddFormView
 from kotti.views.form import EditFormView
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 2e2299646..bd090cca1 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
 import hashlib
 import urllib
 from collections import defaultdict
@@ -27,13 +29,13 @@
 from kotti.interfaces import INavigationRoot
 from kotti.resources import Content
 from kotti.resources import Document
-from kotti.resources import get_root
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
+from kotti.resources import get_root
 from kotti.sanitizers import sanitize
 from kotti.security import view_permitted
-from kotti.util import render_view
 from kotti.util import TemplateStructure
+from kotti.util import render_view
 from kotti.views.site_setup import CONTROL_PANEL_LINKS
 from kotti.views.slots import slot_events
 
diff --git a/kotti/views/view.py b/kotti/views/view.py
index 3caa6086d..fff87d363 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 
 import warnings
 
diff --git a/kotti/workflow.py b/kotti/workflow.py
index d74c72bee..99f7ba7fc 100644
--- a/kotti/workflow.py
+++ b/kotti/workflow.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+import transaction
 from pyramid.security import DENY_ALL
 from repoze.workflow import get_workflow as base_get_workflow
-import transaction
 
-from kotti import TRUE_VALUES
 from kotti import DBSession
-from kotti.events import notify
+from kotti import TRUE_VALUES
 from kotti.events import ObjectEvent
+from kotti.events import notify
 from kotti.resources import Content
 from kotti.util import command
 

From 037f18a0c2ed3aedc2c0f445bbc19780f8db2789 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 11 Oct 2016 11:58:29 +0200
Subject: [PATCH 459/600] Revise setup.py for easier maintainability.

---
 Makefile |  8 ++++----
 setup.py | 49 +++++++++++++++++++++++++++++++------------------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 09b0c233a..ead25369b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,18 +6,18 @@ test: bin/py.test
 	bin/py.test -q -n4
 
 bin/py.test: .pip.log *.py *.cfg
-	bin/python setup.py dev
+	bin/pip install -e ".[testing]"
 	@touch $@
 
-.pip.log: bin/python requirements.txt
-	bin/pip install -r requirements.txt --log .pip.log
+.pip.log: bin/python
+	bin/pip install -e ".[development]" --log .pip.log
 
 bin/python:
 	virtualenv-$(version) --no-site-packages --distribute .
 	@touch $@
 
 clean:
-	@rm -rfv bin/ include/ lib/
+	@rm -rfv bin/ include/ lib/ share/ .Python
 
 .PHONY: test clean
 
diff --git a/setup.py b/setup.py
index c9005297c..e58673375 100644
--- a/setup.py
+++ b/setup.py
@@ -6,18 +6,16 @@
 from setuptools import find_packages
 from setuptools import setup
 
-here = os.path.abspath(os.path.dirname(__file__))
 
-def read(*parts):
-    """ Build an absolute path from *parts* and and return the contents of the
-    resulting file.  Assume UTF-8 encoding.
-
-    Copied from
-    https://hynek.me/articles/sharing-your-labor-of-love-pypi-quick-and-dirty/
-    """
-
-    with codecs.open(os.path.join(here, *parts), "rb", "utf-8") as f:
-        return f.read()
+version = '1.3.1.dev0'
+description = "A high-level, Pythonic web application framework based on " \
+              "Pyramid and SQLAlchemy.  It includes an extensible Content " \
+              "Management System called the Kotti CMS."
+author = 'Kotti developers'
+author_email = 'kotti@googlegroups.com'
+url = 'http://kotti.pylonsproject.org/'
+keywords = 'kotti web cms wcms pylons pyramid sqlalchemy bootstrap'
+license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"
 
 
 install_requires = [
@@ -100,9 +98,24 @@ def read(*parts):
     'setuptools_git>=0.3',
 ]
 
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+def read(*parts):
+    """ Build an absolute path from *parts* and and return the contents of the
+    resulting file.  Assume UTF-8 encoding.
+
+    Copied from
+    https://hynek.me/articles/sharing-your-labor-of-love-pypi-quick-and-dirty/
+    """
+
+    with codecs.open(os.path.join(here, *parts), "rb", "utf-8") as f:
+        return f.read()
+
+
 setup(name='Kotti',
-      version='1.3.1.dev0',
-      description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
+      version=version,
+      description=description,
       long_description='\n\n'.join([
           read('README.rst'),
           read('AUTHORS.txt'),
@@ -146,11 +159,11 @@ def read(*parts):
           'Topic :: Software Development',
           'Topic :: Software Development :: Libraries :: Application Frameworks',  # noqa
       ],
-      author='Kotti developers',
-      author_email='kotti@googlegroups.com',
-      url='http://kotti.pylonsproject.org/',
-      keywords='kotti web cms wcms pylons pyramid sqlalchemy bootstrap',
-      license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
+      author=author,
+      author_email=author_email,
+      url=url,
+      keywords=keywords,
+      license=license,
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,

From da2c065f207c8881739fae64918b909143b4c27b Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Mon, 31 Oct 2016 21:22:14 +0200
Subject: [PATCH 460/600] In contentfactories view, test if add_view is None on
 all content factories (#512)

* Fix a bug when TypeInfo.add_view on a content type is None

* For TypeInfo.addable, test if add_view is None

* Better tests
---
 CHANGES.txt                    |  4 +++-
 kotti/resources.py             |  2 ++
 kotti/tests/test_node.py       | 11 ++++++++++
 kotti/tests/test_util_views.py | 40 ++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa563cd9e..72414155e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Change History
 1.3.1.dev0 - unreleased
 -----------------------
 
-- No changes yet.
+- Bugfix: when showing addable content in the menu, check if the factory has
+  a defined add_view. This avoids a hard crash with, for example, a content
+  type derived from Content that has no add_view defined.
 
 1.3.0 - 2016-10-10
 ------------------
diff --git a/kotti/resources.py b/kotti/resources.py
index 5890fd54f..ef2de5c3f 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -404,6 +404,8 @@ def addable(self, context, request):
         :rtype: Boolean
         """
 
+        if self.add_view is None:
+            return False
         if context.type_info.name in self.addable_to:
             return view_permitted(context, request, self.add_view)
         else:
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 924b86ee5..693880744 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, print_function
 
+from mock import Mock
+from mock import patch
 from pyramid.security import ALL_PERMISSIONS
 from pyramid.security import Allow
 from pyramid.security import Deny
@@ -475,3 +477,12 @@ def test_type_info_add_permission_custom(self):
         from kotti.resources import TypeInfo
         type_info = TypeInfo(add_permission='customadd')
         assert type_info.add_permission == 'customadd'
+
+    def test_type_info_unaddable(self):
+        from kotti.resources import TypeInfo
+        type_info = TypeInfo(add_view=None, addable_to=['Document'])
+        context = Mock(type_info=Mock())
+        context.type_info.name = 'Document'
+        with patch('kotti.resources.view_permitted') as vp:
+            res = type_info.addable(context, None)
+            assert vp.call_count == 0
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index e8d0a4bae..988d206e0 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -146,6 +146,46 @@ def test_has_permission(self, db_session):
             api.has_permission('drink')
             has_permission.assert_called_with('drink', api.root)
 
+    def test_contenttypefactories_add_links(self, config):
+        from kotti.views.edit.actions import content_type_factories
+        from kotti.resources import Document, File
+        from kotti.views.edit import content
+
+        config.include(content)
+
+        res = content_type_factories(Document(''), DummyRequest())
+        assert res['factories'] == [Document, File]
+
+    def test_contenttypefactories_with_invalid_add_link(self, config):
+        from kotti.resources import Content, Document, File
+        from kotti.resources import default_type_info
+        from kotti.views.edit import content
+        from kotti.views.edit.actions import content_type_factories
+        from sqlalchemy import Column, Integer, ForeignKey
+
+        class TestContent(object):
+            type_info = default_type_info.copy(
+                name=u'TestContent',
+                title=u'Test Content',
+                add_view=None,
+                addable_to=[u'Document'],
+            )
+
+        config.include(content)
+        req = DummyRequest()
+        root = Document('')
+
+        with patch('kotti.views.edit.actions.get_settings') as gs:
+            gs.return_value = {'kotti.available_types':
+                               [TestContent, Document, File]}
+            res = content_type_factories(root, req)
+
+            assert res['factories'] == [Document, File]
+
+            TestContent.type_info.add_view = 'add_document'
+            res = content_type_factories(root, req)
+            assert res['factories'] == [TestContent, Document, File]
+
     def test_edit_links(self, config, db_session):
         from kotti import views
         from kotti.views.edit import actions, content, default_views

From bb9fbe17aa528e65247e3b0897037b185697cb80 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 6 Nov 2016 22:20:08 +0200
Subject: [PATCH 461/600] In Link.selected,  use request.view_name instead of
 request.url

---
 kotti/templates/editor-bar.pt |  2 +-
 kotti/tests/test_util.py      | 37 ++++-------------------------------
 kotti/util.py                 | 18 ++++++++---------
 3 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/kotti/templates/editor-bar.pt b/kotti/templates/editor-bar.pt
index 269bb32b9..e302b92af 100644
--- a/kotti/templates/editor-bar.pt
+++ b/kotti/templates/editor-bar.pt
@@ -17,7 +17,7 @@
           <li tal:replace="api.render_view('workflow-dropdown')" />
         </tal:condition>
 
-        <li class="${api.url() == request.url and 'active' or None}">
+        <li class="${api.url() == (request.url.endswith('/') and request.url or request.url + '/') and 'active' or None}">
           <a href="${api.url()}" i18n:translate="">View</a>
         </li>
 
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 2c2dd44f3..fedf4db56 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -140,44 +140,15 @@ def test_link_selected(self):
         from kotti.testing import DummyRequest
 
         req = DummyRequest()
-        req.url = "http://example.com/@@manage"
+        req.view_name = "manage"
 
         assert Link('manage').selected(Mock(__name__=None), req)
 
-        req.url = "http://example.com/@@manage_cats"
+        req.view_name = 'manage_cats'
         assert not Link('manage').selected(Mock(__name__=None), req)
 
-    def test_link_selected_no_view_markers(self):
-        from kotti.util import Link
-        from kotti.testing import DummyRequest
-        from mock import Mock
-
-        req = DummyRequest()
-        root = Mock(__name__=None)
-        manage = Mock(__name__='manage',
-                      __parent__=Mock(__name__=None))
-
-        req.url = "http://example.com/manage"
-        assert Link('manage').selected(root, req)
-
-        req.url = "http://example.com/manage/"
-        assert not Link('manage').selected(root, req)
-
-        req.url = "http://example.com/"
-        assert Link('').selected(root, req)
-
-        req.url = "http://example.com/manage/"
-        link = Link('')
-        assert link.selected(manage, req)
-
-        req.url = "http://example.com/manage"
-        assert not link.selected(manage, req)
-
-        req.url = "http://example.com/"
-        assert link.selected(root, req)
-
-        req.url = "http://example.com"
-        assert link.selected(root, req)
+        req.view_name = ''
+        assert Link('').selected(Mock(__name__=None), req)
 
     def test_link_target(self):
         from kotti.util import Link
diff --git a/kotti/util.py b/kotti/util.py
index 08fd946cf..79cf01ce8 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -116,14 +116,11 @@ def selected(self, context, request):
 
         If the link name is '', it will be selected for all urls ending in '/'
         """
-        parsed = urlparse(unquote(request.url))
-
-        # insert view markers @@ in last component of the path
-        path = parsed.path.split('/')
-        if '@@' not in path[-1]:
-            path[-1] = '@@' + path[-1]
-        path = '/'.join(path)
-        url = urlunparse((parsed[0], parsed[1], path, '', '', ''))
+        if request.view_name:
+            url = '@@'.join([resource_url(context, request),
+                             request.view_name])
+        else:
+            url = resource_url(context, request)
 
         return url == self.url(context, request)
 
@@ -197,7 +194,10 @@ def __init__(self, name, title=None, predicate=None, target=None):
         self.target = target
 
     def url(self, context, request):
-        return resource_url(context, request) + '@@' + self.name
+        if self.name:
+            return resource_url(context, request) + '@@' + self.name
+        else:
+            return resource_url(context, request)
 
     def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)

From bf65afe7d8c235008ee5ecd6a4ca90468e273f4b Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 13 Nov 2016 20:49:01 +0200
Subject: [PATCH 462/600] Simplify 404 view template; Added nav-bar slot. Added
 editor-bar slot to view master

---
 CHANGES.txt                             |  4 ++++
 kotti/templates/edit/master.pt          | 11 ++++++++---
 kotti/templates/http-errors/notfound.pt | 22 ++++++++++++++++++++++
 kotti/templates/view/master.pt          | 11 ++++++++---
 kotti/tests/test_functional.py          |  6 ++++++
 5 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 72414155e..8a050bdf3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,10 @@ Change History
   a defined add_view. This avoids a hard crash with, for example, a content
   type derived from Content that has no add_view defined.
 
+- Added "nav_bar" and "edit_bar" slots in view/master.pt and edit/master.pt
+
+- Bugfix: Simplify 404 page, no longer crash when authenticated
+
 1.3.0 - 2016-10-10
 ------------------
 
diff --git a/kotti/templates/edit/master.pt b/kotti/templates/edit/master.pt
index 4c0b4314f..524d4d239 100644
--- a/kotti/templates/edit/master.pt
+++ b/kotti/templates/edit/master.pt
@@ -27,9 +27,14 @@
   </head>
 
   <body class="view-${request.view_name or 'default'} ${api.body_css_class} logged-in">
-    <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
-    <metal:editorbar define-slot="editor-bar" tal:condition="request.user is not None"
-                     tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+
+    <nav tal:omit-tag="" metal:define-slot="nav-bar">
+      <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" ></nav>
+    </nav>
+    <editbar tal:omit-tag="" metal:define-slot="editor-bar">
+      <div tal:condition="request.user is not None"
+        tal:replace="api.render_template('kotti:templates/editor-bar.pt')" ></div>
+    </editbar>
 
     <div class="container">
       <div class="row">
diff --git a/kotti/templates/http-errors/notfound.pt b/kotti/templates/http-errors/notfound.pt
index efeade1cc..e5a382b4e 100644
--- a/kotti/templates/http-errors/notfound.pt
+++ b/kotti/templates/http-errors/notfound.pt
@@ -2,6 +2,28 @@
 <html i18n:domain="Kotti"
       metal:use-macro="api.macro('kotti:templates/view/master.pt')">
 
+    <div metal:fill-slot="top_nav">
+      <nav xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+        xmlns:tal="http://xml.zope.org/namespaces/tal"
+        class="navbar navbar-static-top navbar-inverse"
+        role="navigation"
+        id="navbar-view">
+        <div class="container-fluid">
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-view-collapse">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="${request.application_url}/">
+              ${api.site_title}
+            </a>
+          </div>
+        </div>
+      </nav>
+    </div>
+
     <div metal:fill-slot="content" class="notfound">
       <h1 i18n:translate="">Not Found</h1>
       <p i18n:translate="">The resource could not be found</p>
diff --git a/kotti/templates/view/master.pt b/kotti/templates/view/master.pt
index 5757295ba..d91b81ea6 100644
--- a/kotti/templates/view/master.pt
+++ b/kotti/templates/view/master.pt
@@ -30,9 +30,14 @@
   <body class="${request.user is not None and 'logged-in'}
                view-${request.view_name or 'default'}
                ${api.body_css_class}">
-    <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
-    <div tal:condition="request.user is not None and has_location_context"
-         tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+
+    <nav tal:omit-tag="" metal:define-slot="nav-bar">
+      <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
+    </nav>
+    <editbar tal:omit-tag="" metal:define-slot="editor-bar">
+      <div tal:condition="request.user is not None and has_location_context"
+           tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+    </editbar>
 
     <div class="container">
       <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')" />
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index bd0a710f0..4de82bdaa 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -198,6 +198,12 @@ def test_login(self, webtest):
         resp = form.submit('submit').maybe_follow()
         assert "Welcome, Administrator" in resp.body
 
+    @pytest.mark.user('admin')
+    def test_exception_views(self, webtest):
+        app = webtest.app
+        resp = app.get('/this-does-not-exist', status=404)
+        assert "<h1>Not Found</h1>" in resp.body
+
     @pytest.mark.user('admin')
     def test_content_management(self, webtest):
 

From 653ababa9ce2542ded7e7c18cef75dba9ebb7c44 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 13 Nov 2016 21:53:58 +0200
Subject: [PATCH 463/600] No need to calculate URLs to see if link is selected

---
 kotti/util.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/kotti/util.py b/kotti/util.py
index 79cf01ce8..608d9c337 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -116,13 +116,9 @@ def selected(self, context, request):
 
         If the link name is '', it will be selected for all urls ending in '/'
         """
-        if request.view_name:
-            url = '@@'.join([resource_url(context, request),
-                             request.view_name])
-        else:
-            url = resource_url(context, request)
-
-        return url == self.url(context, request)
+        if request.view_name is not None:
+            return request.view_name == self.name
+        return False
 
     def permitted(self, context, request):
         from kotti.security import view_permitted

From 7b3d19a6194e6114c1fb36923fa26dbc5994d257 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 6 Nov 2016 22:20:08 +0200
Subject: [PATCH 464/600] Simplify Link.selected code, use request.view_name
 instead of request.url

---
 kotti/templates/editor-bar.pt |  2 +-
 kotti/tests/test_util.py      | 37 ++++-------------------------------
 kotti/util.py                 | 18 +++++++----------
 3 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/kotti/templates/editor-bar.pt b/kotti/templates/editor-bar.pt
index 269bb32b9..e302b92af 100644
--- a/kotti/templates/editor-bar.pt
+++ b/kotti/templates/editor-bar.pt
@@ -17,7 +17,7 @@
           <li tal:replace="api.render_view('workflow-dropdown')" />
         </tal:condition>
 
-        <li class="${api.url() == request.url and 'active' or None}">
+        <li class="${api.url() == (request.url.endswith('/') and request.url or request.url + '/') and 'active' or None}">
           <a href="${api.url()}" i18n:translate="">View</a>
         </li>
 
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 2c2dd44f3..fedf4db56 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -140,44 +140,15 @@ def test_link_selected(self):
         from kotti.testing import DummyRequest
 
         req = DummyRequest()
-        req.url = "http://example.com/@@manage"
+        req.view_name = "manage"
 
         assert Link('manage').selected(Mock(__name__=None), req)
 
-        req.url = "http://example.com/@@manage_cats"
+        req.view_name = 'manage_cats'
         assert not Link('manage').selected(Mock(__name__=None), req)
 
-    def test_link_selected_no_view_markers(self):
-        from kotti.util import Link
-        from kotti.testing import DummyRequest
-        from mock import Mock
-
-        req = DummyRequest()
-        root = Mock(__name__=None)
-        manage = Mock(__name__='manage',
-                      __parent__=Mock(__name__=None))
-
-        req.url = "http://example.com/manage"
-        assert Link('manage').selected(root, req)
-
-        req.url = "http://example.com/manage/"
-        assert not Link('manage').selected(root, req)
-
-        req.url = "http://example.com/"
-        assert Link('').selected(root, req)
-
-        req.url = "http://example.com/manage/"
-        link = Link('')
-        assert link.selected(manage, req)
-
-        req.url = "http://example.com/manage"
-        assert not link.selected(manage, req)
-
-        req.url = "http://example.com/"
-        assert link.selected(root, req)
-
-        req.url = "http://example.com"
-        assert link.selected(root, req)
+        req.view_name = ''
+        assert Link('').selected(Mock(__name__=None), req)
 
     def test_link_target(self):
         from kotti.util import Link
diff --git a/kotti/util.py b/kotti/util.py
index 08fd946cf..608d9c337 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -116,16 +116,9 @@ def selected(self, context, request):
 
         If the link name is '', it will be selected for all urls ending in '/'
         """
-        parsed = urlparse(unquote(request.url))
-
-        # insert view markers @@ in last component of the path
-        path = parsed.path.split('/')
-        if '@@' not in path[-1]:
-            path[-1] = '@@' + path[-1]
-        path = '/'.join(path)
-        url = urlunparse((parsed[0], parsed[1], path, '', '', ''))
-
-        return url == self.url(context, request)
+        if request.view_name is not None:
+            return request.view_name == self.name
+        return False
 
     def permitted(self, context, request):
         from kotti.security import view_permitted
@@ -197,7 +190,10 @@ def __init__(self, name, title=None, predicate=None, target=None):
         self.target = target
 
     def url(self, context, request):
-        return resource_url(context, request) + '@@' + self.name
+        if self.name:
+            return resource_url(context, request) + '@@' + self.name
+        else:
+            return resource_url(context, request)
 
     def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)

From 69d5b72e0bb9a4bb1228e8069a88dcf23dc1775b Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Mon, 14 Nov 2016 13:32:40 +0200
Subject: [PATCH 465/600] Added CHANGELOG entry

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 72414155e..58b4b063f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,10 @@ Change History
   a defined add_view. This avoids a hard crash with, for example, a content
   type derived from Content that has no add_view defined.
 
+- Change: simplify `kotti.util.LinkBase.selected()`: use request.view_name
+  instead of deriving the view name from request.url. Also, consider the View
+  editor bar entry as selected even when the url doesn't end with a slash '/'
+
 1.3.0 - 2016-10-10
 ------------------
 

From faf7c48e0b707d62a5395941fbf9b51bde4af689 Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Thu, 17 Nov 2016 20:57:07 +0200
Subject: [PATCH 466/600] Added lazy switch in uwsgi configuration example

Also bumped the number of processes to 2. If anybody tries to bump that number will get frequent `sqlalchemy.exc.OperationalError: (OperationalError) SSL error: decryption failed or bad record mac` with the lazy settings. Better to have those switches explicitly there.
---
 docs/developing/basic/deployment.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/developing/basic/deployment.rst b/docs/developing/basic/deployment.rst
index 46f0c6bcf..574b7e37c 100644
--- a/docs/developing/basic/deployment.rst
+++ b/docs/developing/basic/deployment.rst
@@ -94,7 +94,9 @@ Create an ini file in ``/home/kotti/kotti.ini``::
     socket = /home/kotti/<your_domain>.sock
     master = true
     chmod-socket = 666
-    processes = 1
+    processes = 2
+    lazy = true      # needed if want processes > 1
+    lazy-apps = true
 
 Install Supervisor::
 

From 1b6c230de0324be7f9073f5a85f8c6c1698a5b6c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 21 Nov 2016 10:37:54 +0100
Subject: [PATCH 467/600] Upgrade requirements.

---
 .gitignore       |  2 ++
 Makefile         |  5 ++---
 requirements.txt | 40 ++++++++++++++++++++--------------------
 setup.py         | 45 ++++++++++++++++++++++-----------------------
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9d99779b1..8d2c7f73f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ __pycache__
 
 filestore
 share
+.eggs
+.python-version
diff --git a/Makefile b/Makefile
index ead25369b..9aeaeb859 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,10 @@ bin/py.test: .pip.log *.py *.cfg
 	bin/pip install -e ".[development]" --log .pip.log
 
 bin/python:
-	virtualenv-$(version) --no-site-packages --distribute .
+	virtualenv-$(version) .
 	@touch $@
 
 clean:
-	@rm -rfv bin/ include/ lib/ share/ .Python
+	@rm -rfv bin/ include/ lib/ share/ .Python .cache .eggs Kotti.db Kotti.egg-info tox
 
 .PHONY: test clean
-
diff --git a/requirements.txt b/requirements.txt
index 8d462cb25..87cc46126 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
 alembic==0.8.8
 appdirs==1.4.0
 Babel==2.3.4
-Beaker==1.8.0
-bleach==1.4.3
+Beaker==1.8.1
 bleach-whitelist==0.0.7
+bleach==1.5.0
 Chameleon==2.25
 colander==1.2
-deform==2.0a2
+deform==2.0.3
 docopt==0.6.2
-fanstatic==1.0a7
+fanstatic==0.16
 filedepot==0.4.0
 FormEncode==2.0.0a1
 funcsigs==1.0.2
@@ -17,59 +17,59 @@ html5lib==0.9999999
 iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
-js.deform==2.0a2.post3
+js.deform==2.0.3
 js.fineuploader==3.3.0
 js.html5shiv==3.7.3
-js.jquery==1.9.1
 js.jquery-form==3.9
 js.jquery-maskedinput==1.3.1
 js.jquery-maskmoney==1.4.1
 js.jquery-sortable==0.9.12
 js.jquery-tablednd==0.4
 js.jquery-timepicker-addon==1.5.3
-js.jqueryui==1.10.3
+js.jquery==1.9.1
 js.jqueryui-tagit==2.0.24.post2
+js.jqueryui==1.10.3
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.2.7
 kotti-image==0.1.4
-kotti-tinymce==0.5.4
 LEPL==5.1.3
-lingua==4.10
-Mako==1.0.4
+lingua==4.11
+Mako==1.0.6
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 peppercorn==0.5
+Pillow==3.4.2
+plone.scale==2.1
 polib==1.0.7
 py-bcrypt==0.4
-pyramid==1.7.3
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.14.1
-pyramid-tm==1.0
+pyramid-tm==1.1.0
 pyramid-zcml==1.0.0
+pyramid==1.7.3
 python-editor==1.0.1
 pytz==2016.7
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==1.0b1
-repoze.zcml==1.0b1
+repoze.zcml==0.4
 rfc6266==0.0.4
-shutilwhich==1.1.0
 six==1.10.0
-SQLAlchemy==1.1.1
-SQLAlchemy-Utils==0.32.9
-transaction==1.6.1
+SQLAlchemy-Utils==0.32.11
+SQLAlchemy==1.1.4
+transaction==2.0.3
 translationstring==1.3
 Unidecode==0.4.19
 usersettings==1.0.7
 venusian==1.0
-waitress==1.0.0
-WebOb==1.6.1
+waitress==1.0.1
+WebOb==1.6.3
 zope.component==4.3.0
 zope.configuration==4.0.3
-zope.deprecation==4.1.2
+zope.deprecation==4.2.0
 zope.event==4.2.0
 zope.i18nmessageid==4.0.3
 zope.interface==4.3.2
diff --git a/setup.py b/setup.py
index e58673375..93c8ccbf4 100644
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,7 @@
     'pytest-virtualenv',
     'pytest-warnings',
     'pytest-xdist',
+    'tox',
     'virtualenv',  # needed for scaffolding tests
     'zope.testbrowser>=5.0.0',
     ]
@@ -116,11 +117,8 @@ def read(*parts):
 setup(name='Kotti',
       version=version,
       description=description,
-      long_description='\n\n'.join([
-          read('README.rst'),
-          read('AUTHORS.txt'),
-          read('CHANGES.txt'),
-      ]),
+      long_description='\n\n'.join([read('README.rst'), read('AUTHORS.txt'),
+                                    read('CHANGES.txt'), ]),
       classifiers=[
           # 'Development Status :: 3 - Alpha',
           # 'Development Status :: 4 - Beta',
@@ -171,24 +169,25 @@ def read(*parts):
       setup_requires=setup_requires,
       tests_require=tests_require,
       dependency_links=[],
-      entry_points="""\
-      [paste.app_factory]
-      main = kotti:main
-
-      [fanstatic.libraries]
-      kotti = kotti.fanstatic:lib_kotti
-
-      [console_scripts]
-      kotti-migrate = kotti.migrate:kotti_migrate_command
-      kotti-reset-workflow = kotti.workflow:reset_workflow_command
-      kotti-migrate-storage = kotti.filedepot:migrate_storages_command
-
-      [pytest11]
-      kotti = kotti.tests
-
-      [pyramid.scaffold]
-      kotti=kotti.scaffolds:KottiPackageTemplate
-      """,
+      entry_points={
+          'paste.app_factory': [
+              'main = kotti:main',
+          ],
+          'fanstatic.libraries': [
+              'kotti = kotti.fanstatic:lib_kotti',
+          ],
+          'console_scripts': [
+              'kotti-migrate = kotti.migrate:kotti_migrate_command',
+              'kotti-reset-workflow = kotti.workflow:reset_workflow_command',
+              'kotti-migrate-storage = kotti.filedepot:migrate_storages_command',  # noqa
+          ],
+          'pytest11': [
+              'kotti = kotti.tests',
+          ],
+          'pyramid.scaffold': [
+              'kotti=kotti.scaffolds:KottiPackageTemplate',
+          ],
+      },
       extras_require={
           'testing': tests_require,
           'development': development_requires,

From 555c0d5a7e58518f5fc839644185f857a25f4e21 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 21 Nov 2016 17:35:25 +0100
Subject: [PATCH 468/600] Revert accidentally downgraded packages to recent
 versions.

---
 requirements.txt | 6 +++---
 setup.py         | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 87cc46126..688ef42b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ Chameleon==2.25
 colander==1.2
 deform==2.0.3
 docopt==0.6.2
-fanstatic==0.16
+fanstatic==1.0a7
 filedepot==0.4.0
 FormEncode==2.0.0a1
 funcsigs==1.0.2
@@ -50,12 +50,12 @@ pyramid-mailer==0.14.1
 pyramid-tm==1.1.0
 pyramid-zcml==1.0.0
 pyramid==1.7.3
-python-editor==1.0.1
+python-editor==1.0.2
 pytz==2016.7
 repoze.lru==0.6
 repoze.sendmail==4.2
 repoze.workflow==1.0b1
-repoze.zcml==0.4
+repoze.zcml==1.0b1
 rfc6266==0.0.4
 six==1.10.0
 SQLAlchemy-Utils==0.32.11
diff --git a/setup.py b/setup.py
index 93c8ccbf4..7a94808c0 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@
     'colander<1.3',  # until https://github.com/Pylons/colander/pull/272 is merged and released  # noqa
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
     'docopt',
+    'fanstatic>=1.0a7',
     'filedepot',
     'formencode',
     'html2text',
@@ -53,6 +54,7 @@
     'pyramid_zcml',
     'repoze.lru',
     'repoze.workflow>=1.0b1',
+    'repoze.zcml>=1.0b1',
     'rfc6266',
     'sqlalchemy>=1.0.0',
     'sqlalchemy-utils',

From 2918159aab46c7d032253563e064cc47beb6a145 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 21 Nov 2016 17:52:48 +0100
Subject: [PATCH 469/600] Fix ``python-editor`` version strangeness.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 688ef42b2..6752a9587 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -50,7 +50,7 @@ pyramid-mailer==0.14.1
 pyramid-tm==1.1.0
 pyramid-zcml==1.0.0
 pyramid==1.7.3
-python-editor==1.0.2
+python-editor==1.0.1
 pytz==2016.7
 repoze.lru==0.6
 repoze.sendmail==4.2

From 279c9b6031a7a3daf61fda3477ddd59f6c20f250 Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Mon, 28 Nov 2016 15:08:36 +0200
Subject: [PATCH 470/600] Avoid unnecessary file data overwrite when editing
 files (#513)

* Tweak file edit to avoid unnecessary file data saves

* Added tests for changes is FileUploadTempStore
---
 kotti/tests/test_file.py    | 38 +++++++++++++++++++++++++++----------
 kotti/views/edit/content.py |  9 ++++++---
 kotti/views/form.py         | 15 ++++++++++++---
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 79f574e15..e8154283c 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -6,6 +6,7 @@
 import pytest
 from colander import null
 from mock import MagicMock
+from mock import patch
 from pyramid.httpexceptions import HTTPMovedPermanently
 
 from kotti.filedepot import StoredFileResponse
@@ -81,16 +82,18 @@ def test_edit_without_file(self, filedepot):
         view.context.filename = u'myfile.png'
         view.context.mimetype = u'image/png'
         view.context.size = 777
-        view.edit(title=u'A title',
-                  description=u'A description',
-                  tags=[],
-                  file=null)
-        assert view.context.title == u'A title'
-        assert view.context.description == u'A description'
-        assert view.context.data.file.read() == 'filecontents'
-        assert view.context.filename == u'myfile.png'
-        assert view.context.mimetype == u'image/png'
-        assert view.context.size == 777
+        with patch("kotti.views.edit.content._to_fieldstorage") as tfs:
+            view.edit(title=u'A title',
+                      description=u'A description',
+                      tags=[],
+                      file=null)
+            assert tfs.call_count == 0
+            assert view.context.title == u'A title'
+            assert view.context.description == u'A description'
+            assert view.context.data.file.read() == 'filecontents'
+            assert view.context.filename == u'myfile.png'
+            assert view.context.mimetype == u'image/png'
+            assert view.context.size == 777
 
 
 class TestFileAddForm:
@@ -139,6 +142,21 @@ def test_delitem(self):
         del tmpstore['important']
         assert 'important' not in tmpstore.session
 
+    def test_setitem_with_stream(self):
+        ts = self.make_one()
+        ts['a'] = {'fp': StringIO('test'), 'marker': 'yes'}
+        assert ts.session['a'] == {'file_contents': 'test', 'marker': 'yes'}
+        v = ts['a']
+        assert 'fp' in v.keys()
+        assert v['marker'] == 'yes'
+        assert v['fp'].read() == 'test'
+
+    def test_setitem_with_empty(self):
+        ts = self.make_one()
+        ts['a'] = {'fp': None, 'marker': 'yes'}
+        assert ts.session['a'] == {'file_contents': '', 'marker': 'yes'}
+        assert ts['a'] == {'fp': None, 'marker': 'yes'}
+
 
 class TestDepotStore:
 
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 1d283fdad..6818cbcff 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -95,13 +95,16 @@ def before(self, form):
         form.appstruct = get_appstruct(self.context, self.schema)
         if self.context.data is not None:
             form.appstruct.update({'file': {
-                'fp': StringIO(self.context.data.file.read()),
-                'filename': self.context.name,
+                'fp': None,
+                'filename': self.context.data['filename'],  # self.context.name
                 'mimetype': self.context.mimetype,
                 'uid': str(random.randint(1000000000, 9999999999)),
             }})
 
     def schema_factory(self):
+        # File uploads are stored in the session so that you don't need
+        # to upload your file again if validation of another schema node
+        # fails.
         tmpstore = FileUploadTempStore(self.request)
         return FileSchema(tmpstore)
 
@@ -110,7 +113,7 @@ def edit(self, **appstruct):
         self.context.title = title
         self.context.description = appstruct['description']
         self.context.tags = appstruct['tags']
-        if appstruct['file']:
+        if appstruct['file'] and appstruct['file']['fp']:
             self.context.data = _to_fieldstorage(**appstruct['file'])
 
 
diff --git a/kotti/views/form.py b/kotti/views/form.py
index fad85e2f0..b24d4ca3d 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -244,13 +244,20 @@ def keys(self):
     def __setitem__(self, name, value):
         value = value.copy()
         fp = value.pop('fp')
-        value['file_contents'] = fp.read()
-        fp.seek(0)
+        if fp is not None:
+            value['file_contents'] = fp.read()
+            fp.seek(0)
+        else:
+            value['file_contents'] = ''
         self.session[name] = value
 
     def __getitem__(self, name):
         value = self.session[name].copy()
-        value['fp'] = StringIO(value.pop('file_contents'))
+        content = value.pop('file_contents')
+        if content:
+            value['fp'] = StringIO(content)
+        else:
+            value['fp'] = None
         return value
 
     def __delitem__(self, name):
@@ -268,6 +275,8 @@ def validate_file_size_limit(node, value):
     You can configure the maximum size by setting the kotti.max_file_size
     option to the maximum number of bytes that you want to allow.
     """
+    if not value['fp']:
+        return
 
     value['fp'].seek(0, 2)
     size = value['fp'].tell()

From fe52e5b5b60e4e9c4a55798dd7b0918f8009e645 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 29 Nov 2016 14:16:04 +0200
Subject: [PATCH 471/600] Fix nav slot used in notfound.pt

---
 CHANGES.txt                             | 3 ++-
 kotti/templates/http-errors/notfound.pt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c69408153..4b41e058e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,8 @@ Change History
   a defined add_view. This avoids a hard crash with, for example, a content
   type derived from Content that has no add_view defined.
 
-- Added "nav_bar" and "edit_bar" slots in view/master.pt and edit/master.pt
+- Added ``nav-bar`` slot to ``edit/master.pt``, ``edit-bar`` and ``nav-bar``
+  slots to ``view/master.pt``
 
 - Bugfix: Simplify 404 page, no longer crash when authenticated
 
diff --git a/kotti/templates/http-errors/notfound.pt b/kotti/templates/http-errors/notfound.pt
index e5a382b4e..8a4b6d06d 100644
--- a/kotti/templates/http-errors/notfound.pt
+++ b/kotti/templates/http-errors/notfound.pt
@@ -2,7 +2,7 @@
 <html i18n:domain="Kotti"
       metal:use-macro="api.macro('kotti:templates/view/master.pt')">
 
-    <div metal:fill-slot="top_nav">
+    <div metal:fill-slot="nav-bar">
       <nav xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
         xmlns:tal="http://xml.zope.org/namespaces/tal"
         class="navbar navbar-static-top navbar-inverse"

From a098d2f0f26ed251e45b4ee5ff5520a1d32bd5d4 Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Tue, 29 Nov 2016 14:30:26 +0200
Subject: [PATCH 472/600] Update CHANGES.txt

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 58b4b063f..202229bfa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Change History
 1.3.1.dev0 - unreleased
 -----------------------
 
+- Optimize the File edit form: don't load initial file data to session data 
+  and don't rewrite the file data after saving the form if that data has not
+  been changed through the edit form.
+
 - Bugfix: when showing addable content in the menu, check if the factory has
   a defined add_view. This avoids a hard crash with, for example, a content
   type derived from Content that has no add_view defined.

From 101283dea3630e7c3f0d83f183bfa88af2fab6f5 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 29 Nov 2016 14:34:09 +0200
Subject: [PATCH 473/600] Strip tal namespaces in middle of template

---
 kotti/templates/http-errors/notfound.pt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kotti/templates/http-errors/notfound.pt b/kotti/templates/http-errors/notfound.pt
index 8a4b6d06d..2e295be16 100644
--- a/kotti/templates/http-errors/notfound.pt
+++ b/kotti/templates/http-errors/notfound.pt
@@ -3,9 +3,7 @@
       metal:use-macro="api.macro('kotti:templates/view/master.pt')">
 
     <div metal:fill-slot="nav-bar">
-      <nav xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-        xmlns:tal="http://xml.zope.org/namespaces/tal"
-        class="navbar navbar-static-top navbar-inverse"
+      <nav class="navbar navbar-static-top navbar-inverse"
         role="navigation"
         id="navbar-view">
         <div class="container-fluid">

From b01953c99f8cce5e8752c56e1ab0a62040afa128 Mon Sep 17 00:00:00 2001
From: Lukas Zdych <lukas.zdych@gmail.com>
Date: Thu, 1 Dec 2016 17:00:40 +0100
Subject: [PATCH 474/600] Added initial Czech translation (#516)

* Added initial Czech translation

* Signed the Kotti's contributor agreement
---
 CONTRIBUTORS.txt                        |   1 +
 kotti/locale/Kotti.pot                  | 156 ++--
 kotti/locale/cs/LC_MESSAGES/Kotti.mo    | Bin 0 -> 18712 bytes
 kotti/locale/cs/LC_MESSAGES/Kotti.po    | 954 ++++++++++++++++++++++++
 kotti/locale/de/LC_MESSAGES/Kotti.mo    | Bin 18730 -> 18730 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/en/LC_MESSAGES/Kotti.mo    | Bin 157 -> 157 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 13169 -> 13169 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po | 148 ++--
 kotti/locale/it/LC_MESSAGES/Kotti.mo    | Bin 12305 -> 12305 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/ja/LC_MESSAGES/Kotti.mo    | Bin 11990 -> 11990 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/ko/LC_MESSAGES/Kotti.mo    | Bin 13002 -> 13002 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/nl/LC_MESSAGES/Kotti.mo    | Bin 10857 -> 10857 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/pl/LC_MESSAGES/Kotti.mo    | Bin 17934 -> 17934 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/pt/LC_MESSAGES/Kotti.mo    | Bin 7355 -> 7355 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po    | 148 ++--
 kotti/locale/sv/LC_MESSAGES/Kotti.mo    | Bin 14798 -> 14798 bytes
 kotti/locale/sv/LC_MESSAGES/Kotti.po    | 148 ++--
 24 files changed, 1773 insertions(+), 818 deletions(-)
 create mode 100644 kotti/locale/cs/LC_MESSAGES/Kotti.mo
 create mode 100644 kotti/locale/cs/LC_MESSAGES/Kotti.po

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index a150abaab..70b17c4f7 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -105,3 +105,4 @@ Contributors
 - Davide Moro, 2015/04/02
 - Matt Russell, 2015/09/27
 - Sebastian Braß, 2015/10/28
+- Lukas Zdych, 2016/12/01
diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 28dacec93..d0163a219 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\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"
@@ -14,17 +14,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
-"Generated-By: Lingua 4.9\n"
+"Generated-By: Lingua 4.10\n"
 
-#: ./kotti/populate.py:66
+#: ./kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: ./kotti/populate.py:67
+#: ./kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: ./kotti/populate.py:68
+#: ./kotti/populate.py:70
 #, c-format
 msgid ""
 "\n"
@@ -83,17 +83,17 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: ./kotti/populate.py:125
+#: ./kotti/populate.py:127
 msgid "About"
 msgstr ""
 
-#: ./kotti/populate.py:126
+#: ./kotti/populate.py:128
 msgid ""
 "Our company is the leading manufacturer of foo widgets used in a wide variety"
 " of aviation and and industrial products."
 msgstr ""
 
-#: ./kotti/populate.py:127
+#: ./kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -124,74 +124,74 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:520 ./kotti/views/edit/actions.py:457
+#: ./kotti/resources.py:524 ./kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr ""
 
-#: ./kotti/resources.py:521 ./kotti/views/edit/actions.py:458
+#: ./kotti/resources.py:525 ./kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr ""
 
-#: ./kotti/resources.py:522 ./kotti/views/edit/actions.py:454
+#: ./kotti/resources.py:526 ./kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr ""
 
-#: ./kotti/resources.py:523 ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/resources.py:527 ./kotti/templates/edit/rename-nodes.pt:8
 #: ./kotti/templates/edit/rename-nodes.pt:42
 #: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr ""
 
-#: ./kotti/resources.py:524 ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/resources.py:528 ./kotti/templates/edit/delete-nodes.pt:9
 #: ./kotti/templates/edit/delete-nodes.pt:49
 #: ./kotti/templates/edit/delete.pt:24
-#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:455
+#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:456
 #: ./kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr ""
 
-#: ./kotti/resources.py:535 ./kotti/templates/view/folder.pt:15
+#: ./kotti/resources.py:539 ./kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr ""
 
-#: ./kotti/resources.py:536 ./kotti/templates/edit/nav-tree.pt:10
+#: ./kotti/resources.py:540 ./kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: ./kotti/resources.py:537
+#: ./kotti/resources.py:541
 msgid "Share"
 msgstr ""
 
-#: ./kotti/resources.py:538 ./kotti/templates/actions-dropdown.pt:3
+#: ./kotti/resources.py:542 ./kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr ""
 
-#: ./kotti/resources.py:541
+#: ./kotti/resources.py:545
 msgid "Folder view"
 msgstr ""
 
-#: ./kotti/resources.py:650 ./kotti/views/edit/content.py:90
+#: ./kotti/resources.py:654 ./kotti/views/edit/content.py:90
 msgid "Document"
 msgstr ""
 
-#: ./kotti/resources.py:785 ./kotti/views/edit/content.py:70
-#: ./kotti/views/edit/content.py:118
+#: ./kotti/resources.py:789 ./kotti/views/edit/content.py:70
+#: ./kotti/views/edit/content.py:121
 msgid "File"
 msgstr ""
 
-#: ./kotti/security.py:194
+#: ./kotti/security.py:197
 msgid "Viewer"
 msgstr ""
 
-#: ./kotti/security.py:195
+#: ./kotti/security.py:198
 msgid "Editor"
 msgstr ""
 
-#: ./kotti/security.py:196
+#: ./kotti/security.py:199
 msgid "Owner"
 msgstr ""
 
-#: ./kotti/security.py:197
+#: ./kotti/security.py:200
 msgid "Admin"
 msgstr ""
 
@@ -264,8 +264,8 @@ msgstr ""
 msgid "Username or email"
 msgstr ""
 
-#: ./kotti/templates/login.pt:26 ./kotti/views/login.py:259
-#: ./kotti/views/users.py:221
+#: ./kotti/templates/login.pt:26 ./kotti/views/login.py:258
+#: ./kotti/views/users.py:222
 msgid "Password"
 msgstr ""
 
@@ -319,7 +319,7 @@ msgstr ""
 #: ./kotti/templates/edit/change-state.pt:18
 #: ./kotti/templates/edit/contents.pt:34
 #: ./kotti/templates/edit/delete-nodes.pt:21
-#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:205
+#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:206
 #: ./kotti/views/edit/content.py:35
 msgid "Title"
 msgstr ""
@@ -390,8 +390,8 @@ msgstr ""
 #: ./kotti/templates/edit/delete-nodes.pt:44
 #: ./kotti/templates/edit/delete.pt:19
 #: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:83
-#: ./kotti/views/users.py:325 ./kotti/views/users.py:360
-#: ./kotti/views/users.py:454
+#: ./kotti/views/users.py:326 ./kotti/views/users.py:361
+#: ./kotti/views/users.py:455
 msgid "Cancel"
 msgstr ""
 
@@ -474,19 +474,19 @@ msgid "Assign local roles"
 msgstr ""
 
 #: ./kotti/templates/edit/share.pt:50 ./kotti/templates/site-setup/users.pt:70
-#: ./kotti/views/users.py:216
+#: ./kotti/views/users.py:217
 msgid "Name"
 msgstr ""
 
 #: ./kotti/templates/edit/share.pt:61 ./kotti/templates/site-setup/users.pt:81
-#: ./kotti/views/users.py:322 ./kotti/views/users.py:516
-#: ./kotti/views/users.py:551
+#: ./kotti/views/users.py:323 ./kotti/views/users.py:517
+#: ./kotti/views/users.py:552
 msgid "User"
 msgstr ""
 
 #: ./kotti/templates/edit/share.pt:62 ./kotti/templates/site-setup/users.pt:82
-#: ./kotti/views/users.py:197 ./kotti/views/users.py:357
-#: ./kotti/views/users.py:516 ./kotti/views/users.py:551
+#: ./kotti/views/users.py:198 ./kotti/views/users.py:358
+#: ./kotti/views/users.py:517 ./kotti/views/users.py:552
 msgid "Group"
 msgstr ""
 
@@ -607,11 +607,11 @@ msgstr ""
 msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: ./kotti/views/form.py:82 ./kotti/views/users.py:453
+#: ./kotti/views/form.py:82 ./kotti/views/users.py:454
 msgid "Save"
 msgstr ""
 
-#: ./kotti/views/form.py:84 ./kotti/views/users.py:72
+#: ./kotti/views/form.py:84 ./kotti/views/users.py:73
 #: ./kotti/views/edit/actions.py:375 ./kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr ""
@@ -630,177 +630,177 @@ msgstr ""
 msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/views/form.py:277
+#: ./kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: ./kotti/views/login.py:67 ./kotti/views/users.py:279
+#: ./kotti/views/login.py:66 ./kotti/views/users.py:280
 msgid "Full name"
 msgstr ""
 
-#: ./kotti/views/login.py:70
+#: ./kotti/views/login.py:69
 msgid "Username"
 msgstr ""
 
-#: ./kotti/views/login.py:75 ./kotti/views/login.py:271
-#: ./kotti/views/users.py:208
+#: ./kotti/views/login.py:74 ./kotti/views/login.py:270
+#: ./kotti/views/users.py:209
 msgid "Email"
 msgstr ""
 
-#: ./kotti/views/login.py:84
+#: ./kotti/views/login.py:83
 msgid "Register"
 msgstr ""
 
-#: ./kotti/views/login.py:91
+#: ./kotti/views/login.py:90
 msgid "There was an error."
 msgstr ""
 
-#: ./kotti/views/login.py:110
+#: ./kotti/views/login.py:109
 msgid ""
 "Congratulations! You are successfully registered. You should be receiving an "
 "email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: ./kotti/views/login.py:125
+#: ./kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr ""
 
-#: ./kotti/views/login.py:156
+#: ./kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr ""
 
-#: ./kotti/views/login.py:181
+#: ./kotti/views/login.py:180
 msgid ""
 "You should be receiving an email with a link to reset your password. Doing so"
 " will activate your account."
 msgstr ""
 
-#: ./kotti/views/login.py:214
+#: ./kotti/views/login.py:213
 msgid "Login failed."
 msgstr ""
 
-#: ./kotti/views/login.py:224
+#: ./kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr ""
 
-#: ./kotti/views/login.py:246
+#: ./kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr ""
 
-#: ./kotti/views/login.py:284
+#: ./kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr ""
 
-#: ./kotti/views/login.py:303
+#: ./kotti/views/login.py:302
 msgid "Set password"
 msgstr ""
 
-#: ./kotti/views/login.py:331
+#: ./kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr ""
 
-#: ./kotti/views/login.py:338
+#: ./kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: ./kotti/views/site_setup.py:8 ./kotti/views/users.py:389
+#: ./kotti/views/site_setup.py:8 ./kotti/views/users.py:390
 msgid "User Management"
 msgstr ""
 
-#: ./kotti/views/users.py:74 ./kotti/views/users.py:478
+#: ./kotti/views/users.py:75 ./kotti/views/users.py:479
 #: ./kotti/views/edit/actions.py:313 ./kotti/views/edit/actions.py:379
 #: ./kotti/views/edit/actions.py:421 ./kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr ""
 
-#: ./kotti/views/users.py:107
+#: ./kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr ""
 
-#: ./kotti/views/users.py:154
+#: ./kotti/views/users.py:155
 msgid "Invalid value"
 msgstr ""
 
-#: ./kotti/views/users.py:160
+#: ./kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr ""
 
-#: ./kotti/views/users.py:167
+#: ./kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr ""
 
-#: ./kotti/views/users.py:190
+#: ./kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr ""
 
-#: ./kotti/views/users.py:228
+#: ./kotti/views/users.py:229
 msgid "Active"
 msgstr ""
 
-#: ./kotti/views/users.py:229
+#: ./kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: ./kotti/views/users.py:235
+#: ./kotti/views/users.py:236
 msgid "Global roles"
 msgstr ""
 
-#: ./kotti/views/users.py:239
+#: ./kotti/views/users.py:240
 msgid "Groups"
 msgstr ""
 
-#: ./kotti/views/users.py:276
+#: ./kotti/views/users.py:277
 msgid ""
 "Leave this empty and tick the 'Send password registration' box below to have "
 "the user set their own password."
 msgstr ""
 
-#: ./kotti/views/users.py:324
+#: ./kotti/views/users.py:325
 msgid "Add User"
 msgstr ""
 
-#: ./kotti/views/users.py:334
+#: ./kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr ""
 
-#: ./kotti/views/users.py:349
+#: ./kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr ""
 
-#: ./kotti/views/users.py:359
+#: ./kotti/views/users.py:360
 msgid "Add Group"
 msgstr ""
 
-#: ./kotti/views/users.py:520
+#: ./kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/users.py:548
+#: ./kotti/views/users.py:549
 msgid "User was not found."
 msgstr ""
 
-#: ./kotti/views/users.py:558
+#: ./kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/users.py:566
+#: ./kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/users.py:573
+#: ./kotti/views/users.py:574
 msgid "No name was given."
 msgstr ""
 
-#: ./kotti/views/users.py:602
+#: ./kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr ""
diff --git a/kotti/locale/cs/LC_MESSAGES/Kotti.mo b/kotti/locale/cs/LC_MESSAGES/Kotti.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d942ff632fa538bde96867b4423ca86247d2d689
GIT binary patch
literal 18712
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

literal 0
HcmV?d00001

diff --git a/kotti/locale/cs/LC_MESSAGES/Kotti.po b/kotti/locale/cs/LC_MESSAGES/Kotti.po
new file mode 100644
index 000000000..6a2a003c8
--- /dev/null
+++ b/kotti/locale/cs/LC_MESSAGES/Kotti.po
@@ -0,0 +1,954 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Kotti 1.3.1\n"
+"POT-Creation-Date: 2016-11-28 23:21+0100\n"
+"PO-Revision-Date: 2016-11-29 02:50+0100\n"
+"Last-Translator: Lukas Zdych <lukas.zdych@gmail.com>\n"
+"Language-Team: Czech\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Lingua 4.9\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#: kotti/populate.py:68
+msgid "Welcome to Kotti"
+msgstr "Vítejte v Kotti"
+
+#: kotti/populate.py:69
+msgid "Congratulations! You have successfully installed Kotti."
+msgstr "Gratulujeme! Úspěšně jste nainstalovali Kotti."
+
+#: kotti/populate.py:70
+#, c-format
+msgid ""
+"\n"
+"<h2>Log in</h2>\n"
+"<p>\n"
+"    You can <a class=\"btn btn-success\" href=\"login\">log in</a> to your site\n"
+"    and start changing its contents.  If you haven't chosen a password for\n"
+"    your admin account yet, it'll likely be <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Once you're logged in, you'll see the grey editor bar below the top\n"
+"    navigation bar.  It will allow you to switch between editing and viewing the\n"
+"    current page as it will appear to your visitors.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Configure</h2>\n"
+"        <p>\n"
+"            Find out how to configure your Kotti's title and many other\n"
+"            settings using a simple text file in your file system.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
+"               Configuration manual\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Add-ons</h2>\n"
+"        <p>\n"
+"            A number of add-ons allow you to extend the functionality of your\n"
+"            Kotti site.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+"                Kotti add-ons\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Documentation</h2>\n"
+"        <p>\n"
+"            Wonder what more you can do with Kotti?\n"
+"            What license it has?\n"
+"            Read the manual for more information.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
+"               Documentation\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+msgstr ""
+"\n"
+"<h2>Přihlášení</h2>\n"
+"<p>\n"
+"    Můžete se <a class=\"btn btn-success\" href=\"login\">přihlásit</a> do vašich stránek a začít upravovat jejich obsah. Pokud jste zatím nezměnili heslo pro váš účet správce, mělo by to být <em>qwerty</em>.\n"
+"</p>\n"
+"<p>\n"
+"    Jakmile se přihlásíte, uvidíte šedý editační pruh pod hlavní navigační lištou. Ten vám umožní přepínat mezi úpravami a zobrazením aktuální stránky, tak jak bude zobrazena vašim návštěvníkům.\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Nastavení</h2>\n"
+"        <p>\n"
+"            Zjistěte, jak nastavit název vašich Kotti stránek a mnoho dalších nastavení pomocí jednoduchého textového souboru v souborovém systému.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
+"               Návod k nastavení\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Doplňky</h2>\n"
+"        <p>\n"
+"            Řada doplňků vám umožní rozšířit funkčnost vašich Kotti stránek.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+"                Doplňky Kotti\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>Dokumentace</h2>\n"
+"        <p>\n"
+"            Zajímalo by vás, čeho všeho můžete dosáhnout s Kotti? Jakou má licenci? Získejte více informací přečtením manuálu.\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
+"               Dokumentace\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
+
+#: kotti/populate.py:127
+msgid "About"
+msgstr "Informace"
+
+#: kotti/populate.py:128
+msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+msgstr "Naše společnost je přední výrobce komponent využívaných v letectví a průmyslové výrobě."
+
+#: kotti/populate.py:129
+msgid ""
+"\n"
+"<p>\n"
+"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Our worldwide headquarters:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>Photo credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Originally published in the\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>\n"
+"article.\n"
+"</small></p>\n"
+msgstr ""
+"\n"
+"<p>\n"
+"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   Naše mezinárodní centrála:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>Foto credit:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"Copyright info</a>.\n"
+"Původně zveřejněno v článku \n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
+"</small></p>\n"
+
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
+msgid "Copy"
+msgstr "Kopírovat"
+
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
+msgid "Cut"
+msgstr "Vyjmout"
+
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
+msgid "Paste"
+msgstr "Vložit"
+
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
+#: kotti/views/edit/actions.py:459
+msgid "Rename"
+msgstr "Přejmenovat"
+
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
+#: kotti/views/edit/actions.py:461
+msgid "Delete"
+msgstr "Odstranit"
+
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Obsah"
+
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Úpravy"
+
+#: kotti/resources.py:541
+msgid "Share"
+msgstr "Sdílení"
+
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Akce"
+
+#: kotti/resources.py:545
+msgid "Folder view"
+msgstr "Zobrazení složky"
+
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
+msgid "File"
+msgstr "Soubor"
+
+#: kotti/security.py:197
+msgid "Viewer"
+msgstr "Může číst"
+
+#: kotti/security.py:198
+msgid "Editor"
+msgstr "Může upravit"
+
+#: kotti/security.py:199
+msgid "Owner"
+msgstr "Vlastník"
+
+#: kotti/security.py:200
+msgid "Admin"
+msgstr "Správce"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Přidat"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Nahrát Obsah"
+
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Nastavit výchozí zobrazení"
+
+#: kotti/templates/editor-bar.pt:21
+msgid "View"
+msgstr "Zobrazení"
+
+#: kotti/templates/editor-bar.pt:44
+msgid "Navigate"
+msgstr "Navigovat"
+
+#: kotti/templates/editor-bar.pt:55
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: kotti/templates/editor-bar.pt:60
+msgid "Site Setup"
+msgstr "Nastavení Stránek"
+
+#: kotti/templates/editor-bar.pt:71
+msgid "Logout"
+msgstr "Odhlasit se"
+
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Obnovení vašeho hesla pro ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Ahoj, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klikněte na tento odkaz pro obnovení vašeho hesla pro ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Vaše registrace pro ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Registrujete se k ${site_title}"
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klikněte zde pro nastavení vašeho hesla a přihlášení: ${url}"
+
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Přístup zamítnut"
+
+#: kotti/templates/login.pt:16
+msgid "Login"
+msgstr "Přihlášení"
+
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
+msgid "Username or email"
+msgstr "Uživatelské jméno nebo e-mail"
+
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
+msgid "Password"
+msgstr "Heslo"
+
+#: kotti/templates/login.pt:34
+msgid "Log in"
+msgstr "Přihlásit se"
+
+#: kotti/templates/login.pt:45
+msgid "Forgot your password?"
+msgstr "Zapoměli jste vaše heslo?"
+
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
+msgid "Reset password"
+msgstr "Obnovit heslo"
+
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:50
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+msgstr "Vyplňte vaše uživatelské jméno nebo e-mail a klikněte níže na ${reset_password} pro zaslání emailu s odkazem pro nastavení hesla."
+
+#: kotti/templates/login.pt:78
+msgid "Not registered yet?"
+msgstr "Ještě nemáte účet?"
+
+#: kotti/templates/login.pt:85
+msgid "Register for an account on this site."
+msgstr "Zaregistrujte si uživatelský účet na těchto stránkách."
+
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
+msgstr "Změnit na ${state}"
+
+#: kotti/templates/edit/breadcrumbs.pt:8
+msgid "You are here:"
+msgstr "Nacházite se zde:"
+
+#: kotti/templates/edit/change-state.pt:8
+msgid "Change workflow state"
+msgstr "Změnit stav"
+
+#: kotti/templates/edit/change-state.pt:12
+msgid "An item's workflow state determines who can see, edit and/or manage it."
+msgstr "Stav položky určuje kdo jí může vidět, upravit nebo spravovat."
+
+#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+msgid "Title"
+msgstr "Název"
+
+#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
+#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
+#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
+#: kotti/templates/edit/delete-nodes.pt:23
+msgid "State"
+msgstr "Stav"
+
+#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+msgid "Creation Date"
+msgstr "Datum vytvoření"
+
+#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+msgid "Modification Date"
+msgstr "Poslední změna"
+
+#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
+#: kotti/templates/edit/delete-nodes.pt:31
+msgid "Select item"
+msgstr "Vybrat položku"
+
+#: kotti/templates/edit/change-state.pt:40
+#: kotti/templates/edit/change-state.pt:48
+msgid "Include children"
+msgstr "Zahrnout pložky obsahu"
+
+#: kotti/templates/edit/change-state.pt:41
+msgid "If checked, this will attempt to modify the status of all children in any selected documents and their subdocuments."
+msgstr "Je-li tato volba zaškrtnuta, systém se pokusí změnit stav všech vybraných dokumentů a obsahu v nich."
+
+#: kotti/templates/edit/change-state.pt:54
+msgid "Change state to"
+msgstr "Změnit stav na"
+
+#: kotti/templates/edit/change-state.pt:55
+msgid "Select the new state where all chosen items should be set."
+msgstr "Vyberte stav, který má být nastaven pro všechny vybrané položky."
+
+#: kotti/templates/edit/change-state.pt:60
+msgid "No change"
+msgstr "Žádná změna"
+
+#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Uložit změny"
+
+#: kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Tato stránka neobsahuje žádné položky."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr "Vybrat vše / zrušit výběr všeho"
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Viditelnost"
+
+#: kotti/templates/edit/contents.pt:70
+msgid "Visible"
+msgstr "Viditelné"
+
+#: kotti/templates/edit/contents.pt:74
+msgid "Hidden"
+msgstr "Skryté"
+
+#: kotti/templates/edit/delete-nodes.pt:13
+msgid "Are you sure you want to delete the following items?"
+msgstr "Jste si jisti, že si přejete odstranit následující položky?"
+
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Odstranit ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Jste si jisti, že si přejete odstranit ${title}?"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Procházet Stránky"
+
+#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Každý obsah má jméno, které je použito k vytvoření URL a název. Pokud je potřebujete, přečtěte si manuál ohledně správného formátování jmen a názvů. Níže můžete obojí změnit."
+
+#: kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+msgid "New name"
+msgstr "Nový název"
+
+#: kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+msgid "New title"
+msgstr "Nový název"
+
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Přejmenovat ${title}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Sdílet ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Hledat uživatele a skupiny"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Hledat"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Přiřadit lokální role"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:217
+msgid "Name"
+msgstr "Jméno"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
+msgid "User"
+msgstr "Uživatel"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
+msgid "Group"
+msgstr "Skupina"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "Přiřadit roli"
+
+#: kotti/templates/edit/upload.pt:10
+msgid "Upload content from local file(s)"
+msgstr "Nahrát soubor(y) z pevného disku"
+
+#: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
+msgid "Filename"
+msgstr "Název souboru"
+
+#: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
+msgid "Size"
+msgstr "Velikost"
+
+#: kotti/templates/edit/upload.pt:20
+msgid "Status"
+msgstr "Stav"
+
+#: kotti/templates/edit/upload.pt:21
+msgid "Progress"
+msgstr "Průběh"
+
+#: kotti/templates/edit/upload.pt:84
+msgid "Select file(s) to upload..."
+msgstr "Vybrat soubor(y) k nahrání…"
+
+#: kotti/templates/edit/upload.pt:92
+msgid "Upload ${number} files."
+msgstr "Nahrát ${number} souborů."
+
+#: kotti/templates/edit/upload.pt:97
+msgid "Dismiss all errors"
+msgstr "Skrýt všechny chyby"
+
+#: kotti/templates/http-errors/notfound.pt:6
+msgid "Not Found"
+msgstr "Nenalezeno"
+
+#: kotti/templates/http-errors/notfound.pt:7
+msgid "The resource could not be found"
+msgstr "Stránka nebyla nalezena"
+
+#: kotti/templates/site-setup/delete-user.pt:15
+msgid "Are you sure you want to delete ${type} ${title}?"
+msgstr "Jste si jisti, že si přejete odstranit ${type} ${title}?"
+
+#: kotti/templates/site-setup/user.pt:12
+msgid "Back to User Management"
+msgstr "Zpět na Správu Uživatelů"
+
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#, python-format
+msgid "Edit ${title}"
+msgstr "Upravit ${title}"
+
+#: kotti/templates/site-setup/users.pt:12
+msgid "Search user(s) / group(s)"
+msgstr "Hledat uživatele / skupiny"
+
+#: kotti/templates/site-setup/users.pt:17
+msgid "Add user"
+msgstr "Přidat uživatele"
+
+#: kotti/templates/site-setup/users.pt:22
+msgid "Add group"
+msgstr "Přidat skupinu"
+
+#: kotti/templates/site-setup/users.pt:34
+msgid "Find users or groups"
+msgstr "Najít uživatele nebo skupiny"
+
+#: kotti/templates/site-setup/users.pt:40
+msgid "User- / groupname"
+msgstr "Uživatel- / název skupiny"
+
+#: kotti/templates/site-setup/users.pt:50
+msgid "Blank search text finds all."
+msgstr "Při zadání prázdného vyhledávacího výrazu bude nalezeno vše."
+
+#: kotti/templates/site-setup/users.pt:65
+msgid "Assign global roles"
+msgstr "Přiřadit globální role"
+
+#: kotti/templates/site-setup/users.pt:117
+msgid "Add new user"
+msgstr "Přidat nového uživatele"
+
+#: kotti/templates/site-setup/users.pt:123
+msgid "Add new group"
+msgstr "Přidat novou skupinu"
+
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Výsledky Vyhledávání"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Hledat…"
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Oštítkováno"
+
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Vítejte, ${user}! Jste přihlášeni."
+
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Vítejte, nejste přihlášeni."
+
+#: kotti/views/form.py:82 kotti/views/users.py:454
+msgid "Save"
+msgstr "Uložit"
+
+#: kotti/views/form.py:84 kotti/views/users.py:73
+#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
+msgid "Your changes have been saved."
+msgstr "Vaše změny byly uloženy."
+
+#: kotti/views/form.py:179
+msgid "Item was added."
+msgstr "Položka byla přidána."
+
+#: kotti/views/form.py:203
+#, python-format
+msgid "Add ${type} to ${title}."
+msgstr "Přidat ${type} do ${title}"
+
+#: kotti/views/form.py:207
+#, python-format
+msgid "Add ${type}."
+msgstr "Přidat ${type}."
+
+#: kotti/views/form.py:286
+#, python-format
+msgid "Maximum file size: ${size}MB"
+msgstr "Maximální velikost souboru: ${size}MB"
+
+#: kotti/views/login.py:66 kotti/views/users.py:280
+msgid "Full name"
+msgstr "Celé jméno"
+
+#: kotti/views/login.py:69
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
+msgid "Email"
+msgstr "E-mailová adresa"
+
+#: kotti/views/login.py:83
+msgid "Register"
+msgstr "Registrace"
+
+#: kotti/views/login.py:90
+msgid "There was an error."
+msgstr "Vyskytly se chyby."
+
+#: kotti/views/login.py:109
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+msgstr "Gratulujeme! Byli jste úspěšně zaregistrováni. Měli byste obdržet emailovou zprávu s odkazem pro nastavení vašeho hesla. Tímto vám bude aktivován váš účet."
+
+#: kotti/views/login.py:124
+#, python-format
+msgid "Register - ${title}"
+msgstr "Registrace - ${title}"
+
+#: kotti/views/login.py:155
+#, python-format
+msgid "Welcome, ${user}!"
+msgstr "Vítejte, ${user}!"
+
+#: kotti/views/login.py:180
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+msgstr "Právě byste měli obdržet emailovou zprávu s odkazem pro obnovení vašeho hesla. Tímto vám bude váš účet aktivován."
+
+#: kotti/views/login.py:213
+msgid "Login failed."
+msgstr "Přihlášení se nezdařilo"
+
+#: kotti/views/login.py:223
+msgid "That username or email is not known by this system."
+msgstr "Uživatelské jéno nebo e-mailová adresa v systému neexistuje."
+
+#: kotti/views/login.py:245
+msgid "You have been logged out."
+msgstr "Byli jste odhlášeni."
+
+#: kotti/views/login.py:283
+msgid "You have reset your password."
+msgstr "Vaše heslo bylo obnoveno."
+
+#: kotti/views/login.py:302
+msgid "Set password"
+msgstr "Nastavit heslo"
+
+#: kotti/views/login.py:330
+msgid "Your password reset token may have expired."
+msgstr "Vypadá to, že váš token pro obnovu hesla již vypršel."
+
+#: kotti/views/login.py:337
+#, python-format
+msgid "Reset your password - ${title}."
+msgstr "Obnova vašeho hesla - ${title}."
+
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
+msgid "User Management"
+msgstr "Správa Uživatelů"
+
+#: kotti/views/users.py:75 kotti/views/users.py:479
+#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
+#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
+msgid "No changes were made."
+msgstr "Nebyly provedeny žádné změny."
+
+#: kotti/views/users.py:108
+msgid "No users or groups were found."
+msgstr "Nebyli nalezeni žádní uživatelé ani skupiny."
+
+#: kotti/views/users.py:155
+msgid "Invalid value"
+msgstr "Neplatná hodnota"
+
+#: kotti/views/users.py:161
+msgid "A user with that name already exists."
+msgstr "Uživatel s tímto jménem již existuje."
+
+#: kotti/views/users.py:168
+msgid "A user with that email already exists."
+msgstr "Uživatel s touto e-mailovou adresou již existuje."
+
+#: kotti/views/users.py:191
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Skupina ${group} neexistuje"
+
+#: kotti/views/users.py:229
+msgid "Active"
+msgstr "Aktivní"
+
+#: kotti/views/users.py:230
+msgid "Untick this to deactivate the account."
+msgstr "Zde odškrtněte pro deaktivaci účtu."
+
+#: kotti/views/users.py:236
+msgid "Global roles"
+msgstr "Globální role"
+
+#: kotti/views/users.py:240
+msgid "Groups"
+msgstr "Skupiny"
+
+#: kotti/views/users.py:277
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Ponechte toto prázdné a níže zaškrtněte pole ‘Odeslat registrační heslo’, aby si uživatel nastavil vlastní heslo."
+
+#: kotti/views/users.py:325
+msgid "Add User"
+msgstr "Přidat Uživatele"
+
+#: kotti/views/users.py:335
+msgid "Send password registration link."
+msgstr "Odeslat odkaz pro obnovení hesla."
+
+#: kotti/views/users.py:350
+#, python-format
+msgid "${title} was added."
+msgstr "${title} bylo přidáno."
+
+#: kotti/views/users.py:360
+msgid "Add Group"
+msgstr "Přidat Skupinu"
+
+#: kotti/views/users.py:521
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Upravit ${principal_type} ${title}"
+
+#: kotti/views/users.py:549
+msgid "User was not found."
+msgstr "Uživatel nebyl nalezen."
+
+#: kotti/views/users.py:559
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} byl odstraněn."
+
+#: kotti/views/users.py:567
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Odstranit ${principal_type} ${title}"
+
+#: kotti/views/users.py:574
+msgid "No name was given."
+msgstr "Nebylo zadáno jméno."
+
+#: kotti/views/users.py:603
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mé předvolby - ${title}"
+
+#: kotti/views/edit/actions.py:107
+#, python-format
+msgid "${title} was copied."
+msgstr "${title} bylo zkopírováno."
+
+#: kotti/views/edit/actions.py:125
+#, python-format
+msgid "${title} was cut."
+msgstr "${title} bylo vyjmuto."
+
+#: kotti/views/edit/actions.py:160
+#, python-format
+msgid "${title} was pasted."
+msgstr "${title} bylo vloženo."
+
+#: kotti/views/edit/actions.py:163
+msgid "Could not paste node. It no longer exists."
+msgstr "Položku nebylo možné vložit. Položka již neexistuje."
+
+#: kotti/views/edit/actions.py:184
+#, python-format
+msgid "${title} was moved."
+msgstr "${title} bylo přesunuto."
+
+#: kotti/views/edit/actions.py:226
+#, python-format
+msgid "${title} is now visible in the navigation."
+msgstr "${title} je nyní zobrazeno v navigaci."
+
+#: kotti/views/edit/actions.py:229
+#, python-format
+msgid "${title} is no longer visible in the navigation."
+msgstr "${title} již není zobrazeno v navigaci."
+
+#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#, python-format
+msgid "${title} was deleted."
+msgstr "${title} bylo odstraněno."
+
+#: kotti/views/edit/actions.py:304
+msgid "Nothing was deleted."
+msgstr "Žádné položky nebyly odstraněny."
+
+#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+msgid "Name and title are required."
+msgstr "Jměno a název jsou povinné."
+
+#: kotti/views/edit/actions.py:344
+msgid "Item was renamed."
+msgstr "Položka byla přejmenována."
+
+#: kotti/views/edit/actions.py:465
+msgid "Change State"
+msgstr "Změnit Stav"
+
+#: kotti/views/edit/actions.py:466
+msgid "Move up"
+msgstr "Posonout nahoru"
+
+#: kotti/views/edit/actions.py:467
+msgid "Move down"
+msgstr "Posunout dolů"
+
+#: kotti/views/edit/actions.py:468
+msgid "Show"
+msgstr "Zobrazit"
+
+#: kotti/views/edit/actions.py:469
+msgid "Hide"
+msgstr "Skrýt"
+
+#: kotti/views/edit/actions.py:508
+msgid "You have to select items to perform an action."
+msgstr "Pro provedení akce je nutné vybrat položky."
+
+#: kotti/views/edit/content.py:41
+msgid "Description"
+msgstr "Popis"
+
+#: kotti/views/edit/content.py:47
+msgid "Tags"
+msgstr "Značky"
+
+#: kotti/views/edit/content.py:56
+msgid "Body"
+msgstr "Hlavní text"
+
+#: kotti/views/edit/default_views.py:89
+msgid "Default view"
+msgstr "Výchozí zobrazení"
+
+#: kotti/views/edit/default_views.py:110
+msgid "Default view has been reset to default."
+msgstr "Výchozí zobrazení bylo změněno na výchozí hodnotu."
+
+#: kotti/views/edit/default_views.py:117
+msgid "Default view has been set."
+msgstr "Výchozí zobrazení bylo nastaveno."
+
+#: kotti/views/edit/default_views.py:122
+msgid "Default view could not be set."
+msgstr "Nebylo možné nastavit výchozí zobrazení."
+
+msgid "Submit"
+msgstr "Předložit"
+
+msgid "Private"
+msgstr "Soukromé"
+
+msgid "Public"
+msgstr "Zveřejněno"
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index 94d95e38a092364e57ad6b3a76ec3d77eb10b4d9..b525a4e131af598d2fc2dc7552b5ad3db0a6f6a4 100644
GIT binary patch
delta 28
kcmZ2AiE-5=#tjLYyoS0)mI?+&RwfqO28Nq+HTTK`0D!>=V*mgE

delta 28
kcmZ2AiE-5=#tjLYyau|41`38IR;I?<21c86HTTK`0DvF}SO5S3

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index eee728bed..91ce75066 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: \n"
@@ -11,15 +11,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr "Willkommen bei Kotti"
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Herzlichen Glückwunsch! Sie haben Kotti erfolgreich installiert."
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, c-format
 msgid ""
 "\n"
@@ -124,15 +124,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr "Über"
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Unsere Firma is der führende Hersteller von Foo Produkten, welche gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen Industriesektoren eingesetzt werden."
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -190,73 +190,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Kopieren"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Einfügen"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Löschen"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhalt"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "Freigeben"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Aktionen"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "Ordneransicht"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "Datei"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "Betrachter"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "Bearbeiter"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "Besitzer"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "Administrator"
 
@@ -329,8 +329,8 @@ msgstr "Anmelden"
 msgid "Username or email"
 msgstr "Benutzername oder E-Mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "Passwort"
 
@@ -381,7 +381,7 @@ msgstr "Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten u
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titel"
 
@@ -441,7 +441,7 @@ msgstr "Änderungen übernehmen"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -517,18 +517,18 @@ msgid "Assign local roles"
 msgstr "Lokale Rollen zuweisen"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "Name"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "Benutzer"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "Gruppe"
 
@@ -649,11 +649,11 @@ msgstr "Willkommen, ${user}! Sie sind angemeldet."
 msgid "Welcome, you are not logged in."
 msgstr "Willkommen! Sie sind nicht angemeldet."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "Übernehmen"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Ihre Änderungen wurden übernommen."
@@ -672,170 +672,170 @@ msgstr "${type} in ${title} erstellen"
 msgid "Add ${type}."
 msgstr "${type} erstellen"
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximale Dateigröße: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "Benutzername"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "E-Mail"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "Registrieren"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "Ein Fehler ist aufgetreten."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrieren - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Willkommen, ${user}!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "Sie wurden abgemeldet."
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Passwort zurücksetzen - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "Benutzerverwaltung"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Keine Änderungen."
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "Keine Benutzer oder Gruppen gefunden."
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "Ungültige Eingabe"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "Ein Benutzer mit diesem Namen existiert bereits."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Unbekannte Gruppe: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "Aktiv"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "Abwählen um das Konto zu deaktivieren."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "Globale Rollen"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "Gruppen"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "Neuer Benutzer"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "Schicke Passwort-Registrierungs-Link"
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "${title} hinzugefügt."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "Neue Gruppe"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Bearbeite ${principal_type} ${title}"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "Keine Benutzer oder Gruppen gefunden."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} gelöscht."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Bearbeite ${principal_type} ${title}"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "Kein Name übergeben."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Meine Einstellungen - ${title}"
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index 1c220f2300688d376064c11946aa73ce3571bc02..dfa35cbb2b20b41b7f1d0359386a16d29066703f 100644
GIT binary patch
delta 23
ecmbQsIG1rk5U-)Gk)?uxk(G&swt?Zqcsl?`{RP(m

delta 23
ecmbQsIG1rk5U+u*p@D*-iIu6bwt>;acsl?`as|u)

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index f52f550c3..dbd7acce0 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr ""
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr ""
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr ""
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr ""
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr ""
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr ""
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr ""
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr ""
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr ""
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr ""
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr ""
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr ""
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr ""
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr ""
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr ""
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr ""
 
@@ -249,8 +249,8 @@ msgstr ""
 msgid "Username or email"
 msgstr ""
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr ""
 
@@ -301,7 +301,7 @@ msgstr ""
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr ""
 
@@ -361,7 +361,7 @@ msgstr ""
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr ""
 
@@ -437,18 +437,18 @@ msgid "Assign local roles"
 msgstr ""
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr ""
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr ""
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr ""
 
@@ -569,11 +569,11 @@ msgstr ""
 msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr ""
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr ""
@@ -592,170 +592,170 @@ msgstr ""
 msgid "Add ${type}."
 msgstr ""
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr ""
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr ""
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr ""
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr ""
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr ""
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr ""
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr ""
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr ""
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr ""
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr ""
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr ""
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 msgid "Set password"
 msgstr ""
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr ""
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr ""
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr ""
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr ""
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr ""
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr ""
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr ""
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr ""
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr ""
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr ""
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr ""
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr ""
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr ""
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr ""
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr ""
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr ""
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr ""
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr ""
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr ""
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr ""
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index 835b97c5bfadd58632901ebe2e0d181016db5ef8..61709a84b443e1b74a1530afd624b2b08fdbd126 100644
GIT binary patch
delta 26
hcmeyE_AzZkwj8gau92mJfsvJog|>m=<_fu=A^?K>2*>~c

delta 26
hcmeyE_AzZkwj8g4uAzZ~p^25Lv9^KH<_fu=A^?I~2)zIR

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 70ec1305f..040a55077 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr "Bienvenue dans Kotti"
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -123,15 +123,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr "A propos"
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Notre société est spécialisée dans la conception de pièces foo utilisées dans une grande variétée de produits."
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 #, fuzzy
 msgid ""
 "\n"
@@ -190,73 +190,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Copier"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Couper"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Coller"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Renommer"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Supprimer"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenus"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modifier"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "Permissions"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Actions"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "Contenus"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "Fichier"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "Lecteur"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "Editeur"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -329,8 +329,8 @@ msgstr "Identifiant"
 msgid "Username or email"
 msgstr "Identifiant ou e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -381,7 +381,7 @@ msgstr "Le statut de workflow d'un élément détermine qui peut le voir, l'édi
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titre"
 
@@ -441,7 +441,7 @@ msgstr "Appliquer les modifications"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -517,18 +517,18 @@ msgid "Assign local roles"
 msgstr "Assigner des rôles locaux"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "Nom"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "Utilisateur"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "Groupe"
 
@@ -650,11 +650,11 @@ msgstr "Bienvenue, ${user} ! Vous êtes connecté."
 msgid "Welcome, you are not logged in."
 msgstr "Bienvenue, vous n'êtes pas connecté."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "Enregistrer"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Vos modifications ont été enregistrées."
@@ -673,171 +673,171 @@ msgstr "Ajouter un(e) ${type} dans ${title}."
 msgid "Add ${type}."
 msgstr "Ajouter ${type}."
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Taille maximum d'un fichier : ${size} MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "Nom complet"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "Identifiant"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "E-mail"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "S'inscrire"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "Il y a une erreur."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez recevoir un e-mail contenant le lien permettant d'initialiser votre mot de passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "S'inscrire - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bienvenue, ${user} !"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "La connexion à échouée."
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "Vous avez été déconnecté."
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "Vous avez réinitialisé votre mot de passe."
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 #, fuzzy
 msgid "Set password"
 msgstr "Réinitialiser le mot de passe"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Réinitialiser votre mot de passe - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "Gestion des utilisateurs"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Aucune modification a été effectuée."
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "Aucun utilisateur ou groupe a été trouvé."
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "Valeur invalide"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "Un utilisateur avec ce nom existe déjà."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Aucun groupe : ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "Actif"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "Décocher cette option pour désactiver le compte."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "Rôle global"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "Groupes"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "Ajouter un Utilisateur"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "Envoyer un lien d'initialisation de mot de passe"
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "${title} a été ajouté."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Modifier ${principal_type} ${title}"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "Utilisateur non trouvé."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} a été supprimé."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Supprimer ${principal_type} ${title}"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "Aucun nom a été indiqué."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Mes préférences - ${title}"
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index 0ce38ef02b2dd6504c6c77a39a6f56ad24d96418..6487f18ec0199d30fedd940bbc1972fd1dff197e 100644
GIT binary patch
delta 26
hcmbQ3Ffn1n5m{bCT_Z~c10yRF3vC0#%@<`IgaCFy2k`&^

delta 26
hcmbQ3Ffn1n5m{aXT|)x}LlY}gV{HSY%@<`IgaCD*2j&0(

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index 85bf74f06..3cadf06f2 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr "Benvenuto in Kotti"
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Congratulazioni! Avete installato Kotti con successo."
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -117,15 +117,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr "Chi siamo"
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "La nostra azienda è il leader nella produzione di foo widget, usati in una grande varietà di prodotti per l'aviazione e industriali."
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -156,73 +156,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Copia"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Taglia"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Incolla"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Rinomina"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Elimina"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Contenuti"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Modificare"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "Condividi"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Azioni"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "Vista della cartella"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "File"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "Visualizzatore"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "Proprietario"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "Admin"
 
@@ -295,8 +295,8 @@ msgstr "Accedi"
 msgid "Username or email"
 msgstr "Username o email"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "Password"
 
@@ -347,7 +347,7 @@ msgstr "Lo stato del workflow di un item determina chi lo può vedere, editare e
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titolo"
 
@@ -407,7 +407,7 @@ msgstr "Applica le modifiche"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -483,18 +483,18 @@ msgid "Assign local roles"
 msgstr "Assegna ruoli locali"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "Nome"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "Utente"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "Gruppo"
 
@@ -617,11 +617,11 @@ msgstr "Benvenuto, ${user}! Sei loggato."
 msgid "Welcome, you are not logged in."
 msgstr "Benvenuto, non sei loggato."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "Salva"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Le tue modifiche sono state salvate."
@@ -640,171 +640,171 @@ msgstr "Aggiungere ${type} a ${title}."
 msgid "Add ${type}."
 msgstr "Aggiungere ${type}."
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Dimensione massima del file: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "Nome completo"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "Username"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "Email"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "Registrazione"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "C'è stato un errore."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per settare la tua password e attivare il tuo account."
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrazione - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Benvenuto, ${user}!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "Errore nell'accesso."
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "Questo username o email non è riconosciuto dal sistema."
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "Sei uscito."
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "Hai resettato la tua password."
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 #, fuzzy
 msgid "Set password"
 msgstr "Resetta password"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "Il token per resettare la tua password è scaduto."
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetta la tua password - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "Gestione utenti"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Non sono state fatte modifiche."
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "Utenti o gruppo non trovati"
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "Valore invalido"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "Un utente con questo nome già esiste."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "Un utente con questa email già esiste."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Gruppo non esistente: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "Attivo"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "Deseleziona questo per disattivare l'account."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "Ruoli globali"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "Gruppi"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "Aggiungi utente"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "Invia il link della password di registrazione."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "${title} è stato aggiunto."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Modificare ${principal_type} ${title}"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "Utente non trovato."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} è stato cancellato."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Elimina ${principal_type} ${title}"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "Non è stato dato un nome."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Le mie preferenze - ${title}"
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index ebdf2d0ce6c39ace0e16a5f13b6830f991c0fca6..38d4e7a7c289a34c1c2588f87ddb730bc39bc828 100644
GIT binary patch
delta 26
hcmcZ>do6ZDq!h2Au92mJfsvJog|>m=<}|4S5de7A2g?8e

delta 26
hcmcZ>do6ZDq!h1#uAzZ~p^25Lv9^KH<}|4S5de5J2fzRT

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 7c76d75df..4420927e9 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "コピー"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "切り取り"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "貼り付け"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "名称変更"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "削除"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "編集"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "共有"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "アクション"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "フォルダー表示"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "ドキュメント"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "ファイル"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "閲覧者"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "編集者"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "所有者"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "管理者"
 
@@ -249,8 +249,8 @@ msgstr "ログイン"
 msgid "Username or email"
 msgstr "ユーザー名またはメールアドレス"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "パスワード"
 
@@ -303,7 +303,7 @@ msgstr "アイテムを誰が閲覧できるか、編集できるか、管理で
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "タイトル"
 
@@ -363,7 +363,7 @@ msgstr "変更を適用"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -439,18 +439,18 @@ msgid "Assign local roles"
 msgstr "ローカルロールに割り当て"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "名称"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "ユーザー"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "グループ"
 
@@ -579,11 +579,11 @@ msgstr "ようこそ ${user}! ログインしています。"
 msgid "Welcome, you are not logged in."
 msgstr "ようこそ。ログインしていません。"
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "保存"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "変更内容を保存しました。"
@@ -602,171 +602,171 @@ msgstr "${title} に ${type} を追加する。"
 msgid "Add ${type}."
 msgstr "${type} を追加する。"
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "最大ファイルサイズ: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "フルネーム"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "ユーザー名"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "メールアドレス"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "登録"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "エラーが発生しました。"
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワードを設定して下さい。"
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "登録 - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "ようこそ ${user}!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "ログアウトしました。"
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "パスワードのリセットに成功しました。"
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 #, fuzzy
 msgid "Set password"
 msgstr "パスワードをリセット"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "パスワードのリセット - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "ユーザー管理"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "変更箇所がありませんでした。"
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "ユーザーもグループも見つかりませんでした。"
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "無効な値"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "同じ名称のユーザーがすでに存在します。"
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "そのメールアドレスをもつユーザーがすでに存在します。"
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "グループが見つかりません: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "有効"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "チェックを外すと、このアカウントは無効になります。"
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "グローバルロール"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "グループ"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "ユーザーを追加"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "パスワード登録を送信する。"
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "${title} を追加しました。"
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "グループ追加"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "${principal_type} ${title} を編集"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "ユーザーは見つかりませんでした。"
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} を削除しました。"
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "${principal_type} ${title} を削除"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "名前がありません。"
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "個人設定 - ${title}"
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index f74164d471ddc45fe93633245be0fe2cf416b732..a545bf068a46446eb14b63bd0b07ce9d33e50489 100644
GIT binary patch
delta 26
icmX?=dMb6pSy^5~T_Z~c10yRF3vC0#&9`JfhyVbDmI*Nc

delta 26
icmX?=dMb6pSy^5KT|)x}LlY}gV{HSY&9`JfhyVbC^$8{b

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index 076dbf72d..1baa18a8a 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr "Kotti에 오신 것을 환영합니다"
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "축하합니다! 성공적으로 Kotti를 설치했습니다."
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -117,15 +117,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr "이 사이트에 대하여"
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조업체입니다."
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 #, fuzzy
 msgid ""
 "\n"
@@ -184,73 +184,73 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "복사"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "잘라내기"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "삭제"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "컨텐츠 항목"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "편집"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "공유"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "동작"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "폴더로 보임"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "문서"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "파일"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "열람자"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "편집자"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "소유자"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "관리자"
 
@@ -323,8 +323,8 @@ msgstr "로그인"
 msgid "Username or email"
 msgstr "사용자 이름 혹은 전자메일"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "암호"
 
@@ -375,7 +375,7 @@ msgstr "항목의 작업 상태에 따라 항목을 누가 읽거나 고치고,
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "제목"
 
@@ -435,7 +435,7 @@ msgstr "바꾸기 적용"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "취소"
 
@@ -511,18 +511,18 @@ msgid "Assign local roles"
 msgstr "컨텐츠별 역할 부여"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "이름"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "사용자"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "그룹"
 
@@ -645,11 +645,11 @@ msgstr "${user}님, 환영합니다! 로그인되었습니다."
 msgid "Welcome, you are not logged in."
 msgstr "환영합니다, 로그인되지 않았습니다."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "저장"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "수정사항이 저장되었습니다."
@@ -668,171 +668,171 @@ msgstr "${type}을(를) \"${title}\"에 추가합니다."
 msgid "Add ${type}."
 msgstr "${type}을(를) 추가합니다."
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "최대 파일 크기: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "전체 이름"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "사용자 이름"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "전자메일"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "등록하기"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "오류가 있습니다."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "등록 - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "${user}님, 환영합니다!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "로그인이 실패했습니다."
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "로그아웃되었습니다."
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "암호를 재설정했습니다."
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 #, fuzzy
 msgid "Set password"
 msgstr "암호 재설정"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "암호를 재설정하세요 - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "사용자 관리"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "아무 것도 바뀌지 않았습니다."
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "사용자나 그룹이 발견되지 않았습니다."
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "잘못된 값입니다."
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "그런 그룹이 없습니다: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "활성"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "계정을 비활성화하려면 체크를 해제하십시오."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "전역 역할"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "그룹"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "사용자 추가"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "암호 등록 링크를 발송"
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "\"${title}\"이(가) 추가되었습니다."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "그룹 추가"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "${principal_type} \"${title}\" 편집"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "사용자가 없습니다."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} \"${title}\"이(가) 지워졌습니다."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "${principal_type} \"${title}\" 삭제"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "이름이 주어지지 않았습니다."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "나의 선호사항"
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index 2abc55e615b738c8c30aa2c3483714a4b638b602..f164f2a7c65a6e91df8ab1e8e3b525a49049f135 100644
GIT binary patch
delta 26
hcmaDE@-k#Yq!h2Au92mJfsvJog|>m=<}@j00RVaZ2W|iW

delta 26
hcmaDE@-k#Yq!h1#uAzZ~p^25Lv9^KH<}@j00RVYi2V(#L

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index 89e0f4a21..6ff3ebc32 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Knippen"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Plakken"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Inhoud"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Bewerken"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "Delen"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Acties"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "Map weergave"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Document"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "Bestand"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "Lezer"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -249,8 +249,8 @@ msgstr "Aanmelden"
 msgid "Username or email"
 msgstr "Gebuikersnaam of e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -303,7 +303,7 @@ msgstr "Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of b
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titel"
 
@@ -363,7 +363,7 @@ msgstr "Wijzigingen toepassen"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -439,18 +439,18 @@ msgid "Assign local roles"
 msgstr "Locale rollen toewijzen"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "Naam"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "gebruiker"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "Groep"
 
@@ -579,11 +579,11 @@ msgstr "Welkom, ${user}! U bent nu aangemeld."
 msgid "Welcome, you are not logged in."
 msgstr "Wilkom, je bent niet aangemeld."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "Opslaan"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Je wijzigingen werden opgeslagen."
@@ -602,171 +602,171 @@ msgstr "Voeg ${type} aan ${title} toe."
 msgid "Add ${type}."
 msgstr "Voeg ${type} toe."
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximale bestandsgrootte: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "E-mailadres"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "Registreer"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "Er trad een fout op."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om je wachtwoord in te stellen. Deze handeling zal je account activeren."
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "Refistreer - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Welkom, ${user}!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "Aanmelden mislukt."
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "Je bent afgemeld."
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "Je wachtwoord werd hersteld."
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 #, fuzzy
 msgid "Set password"
 msgstr "Wachtwoord herstellen"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Herstel je wachtwoord - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "Gebruikersbeheer"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Geen wijzigingen aangebracht."
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "Geen gebruikers of groepen werden gevonden."
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "Ongeldige waarde"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "Een gebruiker met deze naam bestaat reeds."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "Een gebruiker met deze naam bestaat reeds."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Onbekende groep: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "Actief"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "Uitvinken om je account te de-activeren."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "Globale rollen"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "Groepen"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "Gebruiker toevoegen"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "Verstuur wachtwoord registratie link."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "${title} werd toegevoegd."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Bewerk ${principal_type} ${title}"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "De gebruiker werd niet gevonden."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} werd verwijderd."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Verwijder ${principal_type} ${title}"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "Er werd geen naam ingevoerd."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Mijn instellingen - ${title}"
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
index f9e95268fae798d288efe93b4edce9b6bcb50677..e02efef85ac5d3a7c40aba12fded06d791d8af8c 100644
GIT binary patch
delta 28
jcmeC{VeIQ++~BRrYp82vsbFAaWn!UiV7NI#bDInRcclmG

delta 28
jcmeC{VeIQ++~BRrYoKdrpkQcXWooQ#V6-_xbDInRcLWFE

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index 2f9126ad9..3269a997c 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr "Witaj w Kotti"
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, c-format
 msgid ""
 "\n"
@@ -120,15 +120,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr "Informacje"
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim asortymencie produktów dla lotnictwa i przemysłu."
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -185,73 +185,73 @@ msgstr ""
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Wytnij"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Wklej"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Usuń"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Zawartość"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Edytuj"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "Udostępnij"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Akcje"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "Widok katalogów"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "Plik"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "Czytelnik"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "Edytor"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "Właściciel"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "Administrator"
 
@@ -324,8 +324,8 @@ msgstr "Logowanie"
 msgid "Username or email"
 msgstr "Nazwa użytkownika lub email"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "Hasło"
 
@@ -376,7 +376,7 @@ msgstr "Stan publikacji elementu określa kto może go zobaczyć, edytować i/lu
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Tytuł"
 
@@ -436,7 +436,7 @@ msgstr "Zapisz zmiany"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -512,18 +512,18 @@ msgid "Assign local roles"
 msgstr "Przypisz lokalne role"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "Nazwa"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "Użytkownik"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "Grupa"
 
@@ -644,11 +644,11 @@ msgstr "Witaj, ${user}! Jesteś zalogowany."
 msgid "Welcome, you are not logged in."
 msgstr "Witaj, nie jesteś zalogowany."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "Zapisz"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Twoje zmiany zostały zapisane."
@@ -667,170 +667,170 @@ msgstr "Dodaj ${type} do ${title}."
 msgid "Add ${type}."
 msgstr "Dodaj ${type}."
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maksymalny rozmiar pliku: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "Email"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "Wystąpił błąd."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "Zarejestruj - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Witaj, ${user}!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "Nie udało się zalogować."
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "Nieznana nazwa użytkownika lub email."
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "Zostałeś wylogowany."
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "Zresetowałeś swoje hasło."
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 msgid "Set password"
 msgstr "Ustaw hasło"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "Twój token do resetu hasła mógł stracić ważność."
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetowanie hasła - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "Zarządzanie użytkownikami"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Nie wykonano żadnych zmian."
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "Nie znaleziono użytkowników ani grup."
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "Niepoprawna wartość"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "Użytkownik z takim imieniem już istnieje."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "Użytkownik z takim adresem email już istnieje."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Nie ma takiej grupy: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "Aktywne"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "Odznacz, aby dezaktywować konto."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "Globalne role"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "Grupy"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "Dodaj użytkownika"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "Wyślij link do rejestracji na email."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "${title} został dodany."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "Dodaj grupę"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Edycja ${principal_type} ${title}"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "Użytkownik nie został odnaleziony."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} został usunięty."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Usuń ${principal_type} ${title}"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "Nie przekazano nazwy."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Moje ustawienia - ${title}"
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index 16e26cb2c811b7033062dfdd8f649fe5686f52a1..fbcfd63116efef4b4536c0890f301b4417563b2c 100644
GIT binary patch
delta 26
hcmdmOx!ZC>h!C%#u92mJfsvJog|>m==0u?=E&yv}2NM7Q

delta 26
hcmdmOx!ZC>h!C%VuAzZ~p^25Lv9^KH=0u?=E&yu72M7QF

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 39b95f370..4b8229510 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +71,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -110,73 +110,73 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Copiar"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Cortar"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Colar"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Renomear"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Apagar"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Editar"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "Partilha"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Ações"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "Vista de pasta"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Documento"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "Ficheiro"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "Leitor"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "Editor"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "Dono"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "Admin"
 
@@ -252,8 +252,8 @@ msgstr "Entrar"
 msgid "Username or email"
 msgstr "Utilizador ou e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "Palavra passe"
 
@@ -306,7 +306,7 @@ msgstr "O estado de workflow de um item define quem o pode ver, edit e/ou admini
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Título"
 
@@ -367,7 +367,7 @@ msgstr "Aplicar alterações"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -446,18 +446,18 @@ msgid "Assign local roles"
 msgstr "Atribuir papéis locais"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "Nome"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "Utilizador"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "Grupo"
 
@@ -588,11 +588,11 @@ msgstr "Bem-vindo, ${user}! Você está autenticado."
 msgid "Welcome, you are not logged in."
 msgstr "Bem-vindo, você não está autenticado."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "Guardar"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "As suas alterações foram guardadas."
@@ -612,181 +612,181 @@ msgstr "Adicionar ${type} em ${title}"
 msgid "Add ${type}."
 msgstr "Adicionar ${type}"
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Tamanho máximo do ficheiro: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 #, fuzzy
 msgid "Full name"
 msgstr "Nome completo"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "Nome utilizador"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "E-mail"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "Registar-se"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "Ocorreu um erro."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 #, fuzzy
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, fuzzy, python-format
 msgid "Register - ${title}"
 msgstr "Registar ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bem-vindo, ${user}!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 #, fuzzy
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "Erro de autenticação"
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 #, fuzzy
 msgid "That username or email is not known by this system."
 msgstr "Este utilizador ou e-mail não são reconhecidos."
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "Você desligou a sessão"
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 #, fuzzy
 msgid "You have reset your password."
 msgstr "Você reinicializou a palavra passe com sucesso"
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 #, fuzzy
 msgid "Set password"
 msgstr "Repor a palavra passe"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "A seu pedido para alterar a palavra passe expirou."
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, fuzzy, python-format
 msgid "Reset your password - ${title}."
 msgstr "Reiniciar a sua palavra passe - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "Gestão de Utilizadores"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 #, fuzzy
 msgid "No changes were made."
 msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 #, fuzzy
 msgid "No users or groups were found."
 msgstr "Utilizadores e grupos não encontrados."
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "Valor inválido"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "Esse utilizador com esse nome já existe."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "Esse utilizador com esse e-mail já existe."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Grupo não encontrado: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "Activo"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "Retirar para desactivar a conta."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "Papéis globais"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "Grupos"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "Adicionar Utilizador"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 #, fuzzy
 msgid "Send password registration link."
 msgstr "Enviar ligação para registo de palavra passe"
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, fuzzy, python-format
 msgid "${title} was added."
 msgstr "${title} adicionado."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "Adicionar Grupo"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, fuzzy, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Editar ${principal_type} - ${title}"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 #, fuzzy
 msgid "User was not found."
 msgstr "Utilizador não encontrado."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, fuzzy, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} apagado."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, fuzzy, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Apagar ${principal_type} - ${title}"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 #, fuzzy
 msgid "No name was given."
 msgstr "Nenhum nome foi indicado."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Minhas preferências - ${title}"
diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.mo b/kotti/locale/sv/LC_MESSAGES/Kotti.mo
index 260f9fe061830328fb5d4f903a25cce767103fbc..5b6fadbbc15ad15690c62febf3c185c95f9735d3 100644
GIT binary patch
delta 26
hcmX?Ce6D!Ib|qdzT_Z~c10yRF3vC0#%}12D!~ukY2v7h3

delta 26
hcmX?Ce6D!Ib|qc|T|)x}LlY}gV{HSY%}12D!~uih2t@z@

diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.po b/kotti/locale/sv/LC_MESSAGES/Kotti.po
index 4e42f79dc..e83156f99 100644
--- a/kotti/locale/sv/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/sv/LC_MESSAGES/Kotti.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2016-10-10 14:53+0200\n"
+"POT-Creation-Date: 2016-11-29 02:48+0100\n"
 "PO-Revision-Date: 2016-10-05 21:34+0300\n"
 "Last-Translator: Anders Nylund <stokkheim@gmail.com>\n"
 "Language-Team: Swedish\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Generated-By: Lingua 4.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: kotti/populate.py:66
+#: kotti/populate.py:68
 msgid "Welcome to Kotti"
 msgstr "Välkommen till Kotti"
 
-#: kotti/populate.py:67
+#: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulerar! Du har nu installerat Kotti."
 
-#: kotti/populate.py:68
+#: kotti/populate.py:70
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -137,15 +137,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:125
+#: kotti/populate.py:127
 msgid "About"
 msgstr "Om"
 
-#: kotti/populate.py:126
+#: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Vårt företag är den ledande tillverkaren av foo grunkor som används i en mängd olika tillämpningar inom flyg och industri."
 
-#: kotti/populate.py:127
+#: kotti/populate.py:129
 msgid ""
 "\n"
 "<p>\n"
@@ -203,73 +203,73 @@ msgstr ""
 "article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:520 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:457
 msgid "Copy"
 msgstr "Kopiera"
 
-#: kotti/resources.py:521 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:458
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: kotti/resources.py:522 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:454
 msgid "Paste"
 msgstr "Klistra in"
 
-#: kotti/resources.py:523 kotti/templates/edit/rename-nodes.pt:8
+#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
 #: kotti/views/edit/actions.py:459
 msgid "Rename"
 msgstr "Döp om"
 
-#: kotti/resources.py:524 kotti/templates/edit/delete-nodes.pt:9
+#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:455
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
 #: kotti/views/edit/actions.py:461
 msgid "Delete"
 msgstr "Radera"
 
-#: kotti/resources.py:535 kotti/templates/view/folder.pt:15
+#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
 msgid "Contents"
 msgstr "Innehåll"
 
-#: kotti/resources.py:536 kotti/templates/edit/nav-tree.pt:10
+#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
 msgid "Edit"
 msgstr "Redigera"
 
-#: kotti/resources.py:537
+#: kotti/resources.py:541
 msgid "Share"
 msgstr "Dela"
 
-#: kotti/resources.py:538 kotti/templates/actions-dropdown.pt:3
+#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
 msgid "Actions"
 msgstr "Handlingar"
 
-#: kotti/resources.py:541
+#: kotti/resources.py:545
 msgid "Folder view"
 msgstr "Mapp vy"
 
-#: kotti/resources.py:650 kotti/views/edit/content.py:90
+#: kotti/resources.py:654 kotti/views/edit/content.py:90
 msgid "Document"
 msgstr "Dokument"
 
-#: kotti/resources.py:785 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:118
+#: kotti/resources.py:789 kotti/views/edit/content.py:70
+#: kotti/views/edit/content.py:121
 msgid "File"
 msgstr "Fil"
 
-#: kotti/security.py:194
+#: kotti/security.py:197
 msgid "Viewer"
 msgstr "Läsare"
 
-#: kotti/security.py:195
+#: kotti/security.py:198
 msgid "Editor"
 msgstr "Redaktör"
 
-#: kotti/security.py:196
+#: kotti/security.py:199
 msgid "Owner"
 msgstr "Ägare"
 
-#: kotti/security.py:197
+#: kotti/security.py:200
 msgid "Admin"
 msgstr "Administratör"
 
@@ -342,8 +342,8 @@ msgstr "Inloggning"
 msgid "Username or email"
 msgstr "Användarnamn eller epost"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:259
-#: kotti/views/users.py:221
+#: kotti/templates/login.pt:26 kotti/views/login.py:258
+#: kotti/views/users.py:222
 msgid "Password"
 msgstr "Lösenord"
 
@@ -394,7 +394,7 @@ msgstr "Ett dokuments 'workflow' inställning bestämmer vem som kan se, rediger
 
 #: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
 #: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:205 kotti/views/edit/content.py:35
+#: kotti/views/users.py:206 kotti/views/edit/content.py:35
 msgid "Title"
 msgstr "Titel"
 
@@ -454,7 +454,7 @@ msgstr "Ta ändringarna i bruk"
 #: kotti/templates/edit/change-state.pt:74
 #: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
 #: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:325 kotti/views/users.py:360 kotti/views/users.py:454
+#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -530,18 +530,18 @@ msgid "Assign local roles"
 msgstr "Tilldela lokala roller"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:216
+#: kotti/views/users.py:217
 msgid "Name"
 msgstr "Namn"
 
 #: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:322 kotti/views/users.py:516 kotti/views/users.py:551
+#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
 msgid "User"
 msgstr "Användare"
 
 #: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:197 kotti/views/users.py:357 kotti/views/users.py:516
-#: kotti/views/users.py:551
+#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
+#: kotti/views/users.py:552
 msgid "Group"
 msgstr "Grupp"
 
@@ -662,11 +662,11 @@ msgstr "Välkommern, ${user}!. Du är inloggad."
 msgid "Welcome, you are not logged in."
 msgstr "Välkommen, du är inte inloggad."
 
-#: kotti/views/form.py:82 kotti/views/users.py:453
+#: kotti/views/form.py:82 kotti/views/users.py:454
 msgid "Save"
 msgstr "Spara"
 
-#: kotti/views/form.py:84 kotti/views/users.py:72
+#: kotti/views/form.py:84 kotti/views/users.py:73
 #: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
 msgid "Your changes have been saved."
 msgstr "Dina ändringar har blivit sparade."
@@ -685,170 +685,170 @@ msgstr "Lägg till ${type} till ${title}."
 msgid "Add ${type}."
 msgstr "Lägg till ${type}."
 
-#: kotti/views/form.py:277
+#: kotti/views/form.py:286
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximal filstorlek: ${size}MB"
 
-#: kotti/views/login.py:67 kotti/views/users.py:279
+#: kotti/views/login.py:66 kotti/views/users.py:280
 msgid "Full name"
 msgstr "Fullständigt namn"
 
-#: kotti/views/login.py:70
+#: kotti/views/login.py:69
 msgid "Username"
 msgstr "Användarnamn"
 
-#: kotti/views/login.py:75 kotti/views/login.py:271 kotti/views/users.py:208
+#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
 msgid "Email"
 msgstr "Epost"
 
-#: kotti/views/login.py:84
+#: kotti/views/login.py:83
 msgid "Register"
 msgstr "Registrera"
 
-#: kotti/views/login.py:91
+#: kotti/views/login.py:90
 msgid "There was an error."
 msgstr "Ett fel uppstod."
 
-#: kotti/views/login.py:110
+#: kotti/views/login.py:109
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Gratulerar! Du har registrerat dig. Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
 
-#: kotti/views/login.py:125
+#: kotti/views/login.py:124
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrara - ${title}"
 
-#: kotti/views/login.py:156
+#: kotti/views/login.py:155
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Välkommen, ${user}!"
 
-#: kotti/views/login.py:181
+#: kotti/views/login.py:180
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
 
-#: kotti/views/login.py:214
+#: kotti/views/login.py:213
 msgid "Login failed."
 msgstr "Inloggningen misslyckades."
 
-#: kotti/views/login.py:224
+#: kotti/views/login.py:223
 msgid "That username or email is not known by this system."
 msgstr "Användarnamnet eller epostadressen är inte bekanta för systemet."
 
-#: kotti/views/login.py:246
+#: kotti/views/login.py:245
 msgid "You have been logged out."
 msgstr "Du har loggats ut."
 
-#: kotti/views/login.py:284
+#: kotti/views/login.py:283
 msgid "You have reset your password."
 msgstr "Du har återställt ditt lösenord."
 
-#: kotti/views/login.py:303
+#: kotti/views/login.py:302
 msgid "Set password"
 msgstr "Ställ in lösenord"
 
-#: kotti/views/login.py:331
+#: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
 msgstr "Lösenordsåterställningen kan vara föråldrad."
 
-#: kotti/views/login.py:338
+#: kotti/views/login.py:337
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Återställ ditt lösenord - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:389
+#: kotti/views/site_setup.py:8 kotti/views/users.py:390
 msgid "User Management"
 msgstr "Hantera användare"
 
-#: kotti/views/users.py:74 kotti/views/users.py:478
+#: kotti/views/users.py:75 kotti/views/users.py:479
 #: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
 #: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
 msgid "No changes were made."
 msgstr "Inga ändringar har gjorts."
 
-#: kotti/views/users.py:107
+#: kotti/views/users.py:108
 msgid "No users or groups were found."
 msgstr "Inga användare eller grupper hittades."
 
-#: kotti/views/users.py:154
+#: kotti/views/users.py:155
 msgid "Invalid value"
 msgstr "Felaktigt värde"
 
-#: kotti/views/users.py:160
+#: kotti/views/users.py:161
 msgid "A user with that name already exists."
 msgstr "En användare med det namnet finns redan."
 
-#: kotti/views/users.py:167
+#: kotti/views/users.py:168
 msgid "A user with that email already exists."
 msgstr "En användare med den epostadressen finns redan."
 
-#: kotti/views/users.py:190
+#: kotti/views/users.py:191
 #, python-format
 msgid "No such group: ${group}"
 msgstr "Ingen sådan grupp: ${group}"
 
-#: kotti/views/users.py:228
+#: kotti/views/users.py:229
 msgid "Active"
 msgstr "Aktiv"
 
-#: kotti/views/users.py:229
+#: kotti/views/users.py:230
 msgid "Untick this to deactivate the account."
 msgstr "Ta bort det här valet för att inaktivera kontot."
 
-#: kotti/views/users.py:235
+#: kotti/views/users.py:236
 msgid "Global roles"
 msgstr "Globala roller"
 
-#: kotti/views/users.py:239
+#: kotti/views/users.py:240
 msgid "Groups"
 msgstr "Grupper"
 
-#: kotti/views/users.py:276
+#: kotti/views/users.py:277
 msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr "Lämna det här tomt och välj 'Sänd länk för lösenordsregistrering' nedan för att låta användaren själv välja lösenord."
 
-#: kotti/views/users.py:324
+#: kotti/views/users.py:325
 msgid "Add User"
 msgstr "Lägg till användare"
 
-#: kotti/views/users.py:334
+#: kotti/views/users.py:335
 msgid "Send password registration link."
 msgstr "Sänd länk för lösenordsregistrering."
 
-#: kotti/views/users.py:349
+#: kotti/views/users.py:350
 #, python-format
 msgid "${title} was added."
 msgstr "${title} lades till."
 
-#: kotti/views/users.py:359
+#: kotti/views/users.py:360
 msgid "Add Group"
 msgstr "Lägg till grupp"
 
-#: kotti/views/users.py:520
+#: kotti/views/users.py:521
 #, python-format
 msgid "Edit ${principal_type} ${title}"
 msgstr "Redigera ${principal_type} ${title}"
 
-#: kotti/views/users.py:548
+#: kotti/views/users.py:549
 msgid "User was not found."
 msgstr "Användaren kunde inte hittas."
 
-#: kotti/views/users.py:558
+#: kotti/views/users.py:559
 #, python-format
 msgid "${principal_type} ${title} was deleted."
 msgstr "${principal_type} ${title} raderades."
 
-#: kotti/views/users.py:566
+#: kotti/views/users.py:567
 #, python-format
 msgid "Delete ${principal_type} ${title}"
 msgstr "Radera ${principal_type} ${title}"
 
-#: kotti/views/users.py:573
+#: kotti/views/users.py:574
 msgid "No name was given."
 msgstr "Inget namn angavs."
 
-#: kotti/views/users.py:602
+#: kotti/views/users.py:603
 #, python-format
 msgid "My preferences - ${title}"
 msgstr "Mina preferenser - ${title}"

From c922c57ae42f5d609ce449c55e1616df96f54d27 Mon Sep 17 00:00:00 2001
From: tiberiuichim <tiberiuichim@users.noreply.github.com>
Date: Wed, 14 Dec 2016 11:25:10 +0200
Subject: [PATCH 475/600] Show the workflow state for all authenticated users
 (#517)

---
 CHANGES.txt                   | 5 ++++-
 kotti/templates/editor-bar.pt | 4 +---
 kotti/views/edit/actions.py   | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 93de2160c..be41baede 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,10 @@ Change History
 1.3.1.dev0 - unreleased
 -----------------------
 
-- Optimize the File edit form: don't load initial file data to session data 
+- When authenticated, show workflow state in the edit bar. Before it was
+  shown only if the 'edit' permission was available.
+
+- Optimize the File edit form: don't load initial file data to session data
   and don't rewrite the file data after saving the form if that data has not
   been changed through the edit form.
 
diff --git a/kotti/templates/editor-bar.pt b/kotti/templates/editor-bar.pt
index e302b92af..4584e8793 100644
--- a/kotti/templates/editor-bar.pt
+++ b/kotti/templates/editor-bar.pt
@@ -13,9 +13,7 @@
     </div>
     <div class="collapse navbar-collapse" id="navbar-edit">
       <ul class="nav navbar-nav navbar-left">
-        <tal:condition tal:condition="api.has_permission('edit')">
-          <li tal:replace="api.render_view('workflow-dropdown')" />
-        </tal:condition>
+        <li tal:replace="api.render_view('workflow-dropdown')" />
 
         <li class="${api.url() == (request.url.endswith('/') and request.url or request.url + '/') and 'active' or None}">
           <a href="${api.url()}" i18n:translate="">View</a>
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 91b62348d..ffa51c641 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -162,6 +162,7 @@ def paste_nodes(self):
             else:
                 self.flash(_(u'Could not paste node. It no longer exists.'),
                            'error')
+        DBSession.flush()
         if not self.request.is_xhr:
             return self.back()
 

From 0a71600bfcdad81f53b93f33002de2e60fbe6886 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Fri, 16 Dec 2016 14:22:59 +0200
Subject: [PATCH 476/600] Added DummyRequest.blank method. Fix bug in slots.

---
 kotti/testing.py     | 22 ++++++++++++++++++++++
 kotti/views/slots.py | 10 +++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/kotti/testing.py b/kotti/testing.py
index 17fc05524..b0bd6142f 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -52,6 +52,28 @@ def is_response(ob):
         return (hasattr(ob, 'app_iter') and hasattr(ob, 'headerlist') and
                 hasattr(ob, 'status'))
 
+    @classmethod
+    def blank(cls,
+              path, environ=None, base_url=None, headers=None, POST=None,
+              **kw):
+        """
+        ``request.blank`` is used in Kotti only when assigning slots, where
+        the POST parameters are faked as a querystring.
+        """
+        import urlparse
+
+        def _decode(body):
+            if not body:
+                return {}
+            return dict([(x, y.decode('utf-8'))
+                         for x, y in urlparse.parse_qsl(body)])
+
+        if POST and isinstance(POST, basestring):
+            POST = _decode(POST)
+        req = testing.DummyRequest(path=path, environ=environ, headers=headers,
+                                   cookies=None, post=POST, **kw)
+        return req
+
 
 def asset(name):
     import kotti
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index ae0841bdb..5746ae316 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -65,14 +65,14 @@ def _render_view_on_slot_event(view_name, event, params):
     context = event.object
     request = event.request
 
-    view_request = Request.blank(
+    view_request = request.__class__.blank(
         "{0}/{1}".format(request.path.rstrip('/'), view_name),
         base_url=request.application_url,
-        POST=_encode(params))
+        POST=_encode(params)
+    )
 
-    post_items = request.POST.items()
-    if post_items:
-        view_request.POST.extend(post_items)
+    if request.POST:
+        view_request.POST.update(request.POST)
 
     # This is quite brittle:
     for name in REQUEST_ATTRS_TO_COPY:

From 6ece85987128c505cf67e51fd111213eef843715 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Tue, 20 Dec 2016 16:56:28 +0200
Subject: [PATCH 477/600] Added changelog entry about request.blank()

---
 CHANGES.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 93de2160c..aca90229b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,12 @@ Change History
 1.3.1.dev0 - unreleased
 -----------------------
 
-- Optimize the File edit form: don't load initial file data to session data 
+- When rendering slot views, use ``request.blank()`` to create the request.
+  This is the proper behaviour, in tune with customizing
+  ``kotti.request_factory``. Also added ``blank()`` method to
+  ``kotti.testing.DummyRequest``.
+
+- Optimize the File edit form: don't load initial file data to session data
   and don't rewrite the file data after saving the form if that data has not
   been changed through the edit form.
 

From 2b444a26bdd68f5639f0c39252990b2c72fbab74 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 22 Dec 2016 16:53:19 +0200
Subject: [PATCH 478/600] Remove some unused imports; pep8 long line

---
 kotti/util.py               | 18 +++++++++---------
 kotti/views/edit/actions.py | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kotti/util.py b/kotti/util.py
index 608d9c337..7bc840c31 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -12,15 +12,15 @@
 import cgi
 import re
 
-try:
-    # PY2
-    from urllib import unquote
-    from urlparse import urlparse
-    from urlparse import urlunparse
-except ImportError:
-    from urllib.parse import unquote
-    from urllib.parse import urlparse
-    from urllib.parse import urlunparse
+# try:
+#     # PY2
+#     from urllib import unquote
+#     from urlparse import urlparse
+#     from urlparse import urlunparse
+# except ImportError:
+#     from urllib.parse import unquote
+#     from urllib.parse import urlparse
+#     from urllib.parse import urlunparse
 
 
 from docopt import docopt
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index ffa51c641..1616043e1 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -224,12 +224,12 @@ def set_visibility(self, show):
                 child.in_navigation = show
                 mapping = dict(title=child.title)
                 if show:
-                    msg = _(u'${title} is now visible in the navigation.',
-                            mapping=mapping)
+                    mg = _(u'${title} is now visible in the navigation.',
+                           mapping=mapping)
                 else:
-                    msg = _(u'${title} is no longer visible in the navigation.',
-                            mapping=mapping)
-                self.flash(msg, 'success')
+                    mg = _(u'${title} is no longer visible in the navigation.',
+                           mapping=mapping)
+                self.flash(mg, 'success')
         if not self.request.is_xhr:
             return self.back()
 

From ad9df51604b2b98fc6430ee5e7abff5e5addbfeb Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Thu, 22 Dec 2016 16:55:09 +0200
Subject: [PATCH 479/600] Remove unused imports in util.py

---
 kotti/util.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/kotti/util.py b/kotti/util.py
index 7bc840c31..63545449a 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -12,17 +12,6 @@
 import cgi
 import re
 
-# try:
-#     # PY2
-#     from urllib import unquote
-#     from urlparse import urlparse
-#     from urlparse import urlunparse
-# except ImportError:
-#     from urllib.parse import unquote
-#     from urllib.parse import urlparse
-#     from urllib.parse import urlunparse
-
-
 from docopt import docopt
 from pyramid.i18n import get_localizer
 from pyramid.i18n import get_locale_name

From 725c5ac32f981362076be4a7a3329c94988d835b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 24 Dec 2016 13:32:26 +0100
Subject: [PATCH 480/600] Add changelog entry for Czech translation.

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index e0ae6b2cf..aa3938a15 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,6 +29,8 @@ Change History
   instead of deriving the view name from request.url. Also, consider the View
   editor bar entry as selected even when the url doesn't end with a slash '/'
 
+- Feature: add Czech translation.
+
 1.3.0 - 2016-10-10
 ------------------
 

From 7a801d49fd36300dc3c5d46c702d9a8a71a00438 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Sat, 24 Dec 2016 21:06:21 +0100
Subject: [PATCH 481/600] Update requirements.

---
 requirements.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 6752a9587..7062c2142 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
-alembic==0.8.8
+alembic==0.8.9
 appdirs==1.4.0
 Babel==2.3.4
 Beaker==1.8.1
 bleach-whitelist==0.0.7
 bleach==1.5.0
-Chameleon==2.25
+Chameleon==3.0
 colander==1.2
 deform==2.0.3
 docopt==0.6.2
@@ -41,24 +41,24 @@ PasteDeploy==1.5.2
 peppercorn==0.5
 Pillow==3.4.2
 plone.scale==2.1
-polib==1.0.7
+polib==1.0.8
 py-bcrypt==0.4
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
-pyramid-mailer==0.14.1
-pyramid-tm==1.1.0
+pyramid-mailer==0.15.1
+pyramid-tm==1.1.1
 pyramid-zcml==1.0.0
 pyramid==1.7.3
 python-editor==1.0.1
-pytz==2016.7
+pytz==2016.10
 repoze.lru==0.6
-repoze.sendmail==4.2
+repoze.sendmail==4.3
 repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 rfc6266==0.0.4
 six==1.10.0
-SQLAlchemy-Utils==0.32.11
+SQLAlchemy-Utils==0.32.12
 SQLAlchemy==1.1.4
 transaction==2.0.3
 translationstring==1.3
@@ -66,12 +66,12 @@ Unidecode==0.4.19
 usersettings==1.0.7
 venusian==1.0
 waitress==1.0.1
-WebOb==1.6.3
+WebOb==1.7.0
 zope.component==4.3.0
 zope.configuration==4.0.3
 zope.deprecation==4.2.0
 zope.event==4.2.0
 zope.i18nmessageid==4.0.3
-zope.interface==4.3.2
+zope.interface==4.3.3
 zope.schema==4.4.2
 zope.sqlalchemy==0.7.7

From 66258108d59af8c0b1d418b3bbfc7fa39ef85e12 Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tibi@pixelblaster.ro>
Date: Sun, 25 Dec 2016 10:04:24 +0200
Subject: [PATCH 482/600] pep8 test_util_views.py

---
 kotti/tests/test_util_views.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 988d206e0..5dfcfdbd4 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -157,11 +157,10 @@ def test_contenttypefactories_add_links(self, config):
         assert res['factories'] == [Document, File]
 
     def test_contenttypefactories_with_invalid_add_link(self, config):
-        from kotti.resources import Content, Document, File
+        from kotti.resources import Document, File
         from kotti.resources import default_type_info
         from kotti.views.edit import content
         from kotti.views.edit.actions import content_type_factories
-        from sqlalchemy import Column, Integer, ForeignKey
 
         class TestContent(object):
             type_info = default_type_info.copy(
@@ -408,7 +407,7 @@ def foo(context, request):
     #     register(RenderAboveContent, None, render_something)
 
     #     api = self.make()
-    #     assert (api.slots.abovecontent == [u'Hello, %s!' % api.context.title])
+    #     assert (api.slots.abovecontent == [u'Hello, %s!' %api.context.title])
 
     #     # Slot renderers may also return lists:
     #     def render_a_list(context, request):
@@ -448,8 +447,8 @@ def test_format_currency(self, db_session):
         api = self.make()
         assert u'€13.99' == api.format_currency(13.99, 'EUR')
         assert u'$15,499.12' == api.format_currency(15499.12, 'USD')
-        assert u'€1.00' == api.format_currency(1, fmt=u'€#,##0',
-                                               currency='EUR')
+        assert u'€1.00' == api.format_currency(
+            1, fmt=u'€#,##0', currency='EUR')
         assert u'CHF3.14' == api.format_currency(
             decimal.Decimal((0, (3, 1, 4), -2)), 'CHF')
 
@@ -611,10 +610,12 @@ def test_no_permission(self, config, root):
         from kotti.views.navigation import local_navigation
         a, aa, ab, ac, aca, acb = create_contents(root)
 
-        with patch('kotti.testing.DummyRequest.has_permission', return_value=True):
+        with patch('kotti.testing.DummyRequest.has_permission',
+                   return_value=True):
             assert local_navigation(ac, DummyRequest())['parent'] is not None
 
-        with patch('kotti.testing.DummyRequest.has_permission', return_value=False):
+        with patch('kotti.testing.DummyRequest.has_permission',
+                   return_value=False):
             assert local_navigation(ac, DummyRequest())['parent'] is None
 
     def test_in_navigation(self, config, root):

From 4827440d4073459b6793f1b8eb0e39b95d085358 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 7 Feb 2017 11:10:39 +0100
Subject: [PATCH 483/600] Fix #523

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 7a94808c0..92cfd4b3a 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@
 development_requires = [
     'check-manifest',
     'pipdeptree',
-    'pyramid_debugtoolbar',
+    'pyramid_debugtoolbar<2.5',
 ]
 
 docs_require = [

From 878d8d1d0c2cc7e8a9adb534dfba5fed98e9543e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 20 Feb 2017 20:18:33 +0100
Subject: [PATCH 484/600] Upgrade requirements.

---
 requirements.txt | 33 +++++++++++++++++----------------
 setup.py         |  6 ++++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7062c2142..e1e33f6cc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,14 @@
-alembic==0.8.9
+alembic==0.8.10
 appdirs==1.4.0
 Babel==2.3.4
 Beaker==1.8.1
-bleach-whitelist==0.0.7
 bleach==1.5.0
 Chameleon==3.0
-colander==1.2
-deform==2.0.3
+colander==1.3.2
+deform==2.0.4
 docopt==0.6.2
 fanstatic==1.0a7
-filedepot==0.4.0
+filedepot==0.4.1
 FormEncode==2.0.0a1
 funcsigs==1.0.2
 html2text==2016.9.19
@@ -20,37 +19,38 @@ js.bootstrap==3.3.4
 js.deform==2.0.3
 js.fineuploader==3.3.0
 js.html5shiv==3.7.3
+js.jquery==1.9.1
 js.jquery-form==3.9
 js.jquery-maskedinput==1.3.1
 js.jquery-maskmoney==1.4.1
 js.jquery-sortable==0.9.12
 js.jquery-tablednd==0.4
 js.jquery-timepicker-addon==1.5.3
-js.jquery==1.9.1
-js.jqueryui-tagit==2.0.24.post2
 js.jqueryui==1.10.3
+js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.2.7
 kotti-image==0.1.4
 LEPL==5.1.3
-lingua==4.11
+lingua==4.13
+lxml==3.7.2
 Mako==1.0.6
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 peppercorn==0.5
-Pillow==3.4.2
+Pillow==4.0.0
 plone.scale==2.1
 polib==1.0.8
 py-bcrypt==0.4
+pyramid==1.7.4
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.15.1
 pyramid-tm==1.1.1
 pyramid-zcml==1.0.0
-pyramid==1.7.3
-python-editor==1.0.1
+python-editor==1.0.3
 pytz==2016.10
 repoze.lru==0.6
 repoze.sendmail==4.3
@@ -58,15 +58,16 @@ repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 rfc6266==0.0.4
 six==1.10.0
+SQLAlchemy==1.1.5
 SQLAlchemy-Utils==0.32.12
-SQLAlchemy==1.1.4
-transaction==2.0.3
+transaction==2.1.0
 translationstring==1.3
-Unidecode==0.4.19
+Unidecode==0.4.20
 usersettings==1.0.7
 venusian==1.0
-waitress==1.0.1
-WebOb==1.7.0
+waitress==1.0.2
+WebOb==1.7.1
+zope.cachedescriptors==4.2.0
 zope.component==4.3.0
 zope.configuration==4.0.3
 zope.deprecation==4.2.0
diff --git a/setup.py b/setup.py
index 92cfd4b3a..e994e3b2a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
     'alembic>=0.8.0',
     'bleach',
     'bleach-whitelist',
-    'colander<1.3',  # until https://github.com/Pylons/colander/pull/272 is merged and released  # noqa
+    'colander>=1.3.2',
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
     'docopt',
     'fanstatic>=1.0a7',
@@ -45,7 +45,9 @@
     'kotti_image',
     'lingua>=1.3',
     'py_bcrypt',
-    'pyramid>=1.5',  # needed for ``request.has_permission``
+    'pyramid>=1.5<1.8',  # needed for ``request.has_permission``,
+    # pyramid_zcml isn't compatible with pyramid 1.8 yet.
+    # see https://github.com/Pylons/pyramid_zcml/pull/23
     'pyramid_beaker',
     'pyramid_chameleon',
     'pyramid_deform>=0.2a3',  # language and template path config includeme

From a54513ff1cb51a6e0e4c6fb2c8574cf3378e5427 Mon Sep 17 00:00:00 2001
From: Tetsuya Morimoto <tetsuya.morimoto@gmail.com>
Date: Sat, 15 Apr 2017 15:20:37 +0900
Subject: [PATCH 485/600] update the Japanese translation for Kotti

---
 kotti/locale/Kotti.pot               |  64 ++++-----
 kotti/locale/ja/LC_MESSAGES/Kotti.mo | Bin 11990 -> 19748 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po | 198 ++++++++++++++++++---------
 3 files changed, 163 insertions(+), 99 deletions(-)

diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index d0163a219..55abc0885 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -1,20 +1,20 @@
 #
 # SOME DESCRIPTIVE TITLE
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2017-04-15 15:19+0900\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: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Generated-By: Lingua 4.10\n"
+"Generated-By: Lingua 4.13\n"
 
 #: ./kotti/populate.py:68
 msgid "Welcome to Kotti"
@@ -124,21 +124,21 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:524 ./kotti/views/edit/actions.py:457
+#: ./kotti/resources.py:524 ./kotti/views/edit/actions.py:458
 msgid "Copy"
 msgstr ""
 
-#: ./kotti/resources.py:525 ./kotti/views/edit/actions.py:458
+#: ./kotti/resources.py:525 ./kotti/views/edit/actions.py:459
 msgid "Cut"
 msgstr ""
 
-#: ./kotti/resources.py:526 ./kotti/views/edit/actions.py:454
+#: ./kotti/resources.py:526 ./kotti/views/edit/actions.py:455
 msgid "Paste"
 msgstr ""
 
 #: ./kotti/resources.py:527 ./kotti/templates/edit/rename-nodes.pt:8
 #: ./kotti/templates/edit/rename-nodes.pt:42
-#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:459
+#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:460
 msgid "Rename"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 #: ./kotti/templates/edit/delete-nodes.pt:49
 #: ./kotti/templates/edit/delete.pt:24
 #: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:456
-#: ./kotti/views/edit/actions.py:461
+#: ./kotti/views/edit/actions.py:462
 msgid "Delete"
 msgstr ""
 
@@ -207,23 +207,23 @@ msgstr ""
 msgid "Set default view"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:21
+#: ./kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:44
+#: ./kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:55
+#: ./kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:60
+#: ./kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:71
+#: ./kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr ""
 
@@ -530,11 +530,11 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
-#: ./kotti/templates/http-errors/notfound.pt:6
+#: ./kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
 
-#: ./kotti/templates/http-errors/notfound.pt:7
+#: ./kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr ""
 
@@ -612,7 +612,7 @@ msgid "Save"
 msgstr ""
 
 #: ./kotti/views/form.py:84 ./kotti/views/users.py:73
-#: ./kotti/views/edit/actions.py:375 ./kotti/views/edit/actions.py:419
+#: ./kotti/views/edit/actions.py:376 ./kotti/views/edit/actions.py:420
 msgid "Your changes have been saved."
 msgstr ""
 
@@ -712,8 +712,8 @@ msgid "User Management"
 msgstr ""
 
 #: ./kotti/views/users.py:75 ./kotti/views/users.py:479
-#: ./kotti/views/edit/actions.py:313 ./kotti/views/edit/actions.py:379
-#: ./kotti/views/edit/actions.py:421 ./kotti/views/edit/actions.py:425
+#: ./kotti/views/edit/actions.py:314 ./kotti/views/edit/actions.py:380
+#: ./kotti/views/edit/actions.py:422 ./kotti/views/edit/actions.py:426
 msgid "No changes were made."
 msgstr ""
 
@@ -824,59 +824,59 @@ msgstr ""
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:184
+#: ./kotti/views/edit/actions.py:185
 #, python-format
 msgid "${title} was moved."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:226
+#: ./kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:229
+#: ./kotti/views/edit/actions.py:230
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:278 ./kotti/views/edit/actions.py:307
+#: ./kotti/views/edit/actions.py:279 ./kotti/views/edit/actions.py:308
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:304
+#: ./kotti/views/edit/actions.py:305
 msgid "Nothing was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:340 ./kotti/views/edit/actions.py:367
+#: ./kotti/views/edit/actions.py:341 ./kotti/views/edit/actions.py:368
 msgid "Name and title are required."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:344
+#: ./kotti/views/edit/actions.py:345
 msgid "Item was renamed."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:465
+#: ./kotti/views/edit/actions.py:466
 msgid "Change State"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:466
+#: ./kotti/views/edit/actions.py:467
 msgid "Move up"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:467
+#: ./kotti/views/edit/actions.py:468
 msgid "Move down"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:468
+#: ./kotti/views/edit/actions.py:469
 msgid "Show"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:469
+#: ./kotti/views/edit/actions.py:470
 msgid "Hide"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:508
+#: ./kotti/views/edit/actions.py:509
 msgid "You have to select items to perform an action."
 msgstr ""
 
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index 38d4e7a7c289a34c1c2588f87ddb730bc39bc828..abafddf7d6e781b37c73c5f6c3e7feae4b51721d 100644
GIT binary patch
literal 19748
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

delta 3662
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
BrP2TZ

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 4420927e9..2d350ce3f 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -1,16 +1,16 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2017-04-15 15:19+0900\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
 #: kotti/populate.py:68
 msgid "Welcome to Kotti"
-msgstr ""
+msgstr "Kotti へようこそ"
 
 #: kotti/populate.py:69
 msgid "Congratulations! You have successfully installed Kotti."
-msgstr ""
+msgstr "おめでとうございます！Kotti のインストールに成功しました！"
 
 #: kotti/populate.py:70
 #, c-format
@@ -70,14 +70,64 @@ msgid ""
 "    </div>\n"
 "</div>\n"
 msgstr ""
+"\n"
+"<h2>ログイン</h2>\n"
+"<p>\n"
+"    サイトに <a class=\"btn btn-success\" href=\"login\">ログイン</a> してコンテンツを変更しながら始めます。\n"
+"    admin ユーザーのパスワードを変更していないなら、パスワードは <em>qwerty</em> でログインできるでしょう。\n"
+"</p>\n"
+"<p>\n"
+"    ログインすると、上部のナビゲーションバーの下に灰色のエディターバーがあります。\n"
+"    エディターバーを使って現在のページの編集モードと訪問者に表示される閲覧モードを切り替えます。\n"
+"</p>\n"
+"<div class=\"row\">\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>設定</h2>\n"
+"        <p>\n"
+"            ファイルシステム上のテキストファイルを使って Kotti のタイトルやその他多くの項目の設定方法を調べます。\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/developing/basic/configuration.html\">\n"
+"               設定マニュアル\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>アドオン</h2>\n"
+"        <p>\n"
+"            Kotti の機能を拡張する数多くのアドオンがあります。\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"http://pypi.python.org/pypi?%3Aaction=search&amp;term=kotti\">\n"
+"                Kotti アドオン\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"    <div class=\"col-md-4\">\n"
+"        <h2>ドキュメント</h2>\n"
+"        <p>\n"
+"            Kotti で何ができるか知りたくないですか？\n"
+"            どんなラインセンスなんだろう？\n"
+"            詳細はマニュアルを読んでください。\n"
+"        </p>\n"
+"        <p>\n"
+"            <a class=\"btn btn-info\"\n"
+"               href=\"https://kotti.readthedocs.io/en/latest/\">\n"
+"               ドキュメント\n"
+"            </a>\n"
+"        </p>\n"
+"    </div>\n"
+"</div>\n"
 
 #: kotti/populate.py:127
 msgid "About"
-msgstr ""
+msgstr "概要"
 
 #: kotti/populate.py:128
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
-msgstr ""
+msgstr "当社は航空および工業製品に幅広く利用されている foo ウィジェットの大手製造業者です。"
 
 #: kotti/populate.py:129
 msgid ""
@@ -109,29 +159,54 @@ msgid ""
 "article.\n"
 "</small></p>\n"
 msgstr ""
+"\n"
+"<p>\n"
+"  <img alt=\"five colorful Extra EA300 airplanes flying in formation\"\n"
+"   src=\"http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg\"\n"
+"   width=\"640\" height=\"376\" />\n"
+"</p>\n"
+"\n"
+"<p>\n"
+"   本社所在地:\n"
+"</p>\n"
+"\n"
+"<address>\n"
+"  Foo World<br />\n"
+"  123 Nowhere Street, Suite 777<br />\n"
+"  Omak, WA   98841   USA<br />\n"
+"  +1-509-555-0100<br />\n"
+"  widgets@foowrld.example.com\n"
+"</address>\n"
+"\n"
+"<p><small style=\"font-size: smaller\">\n"
+"<em>写真の著作権:</em> FlugKerl2 氏の \"Northern Lights Formation\"\n"
+"<a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
+"著作権に関する情報</a> は\n"
+"<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a> 記事で公開されています。\n"
+"</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
+#: kotti/resources.py:524 kotti/views/edit/actions.py:458
 msgid "Copy"
 msgstr "コピー"
 
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
+#: kotti/resources.py:525 kotti/views/edit/actions.py:459
 msgid "Cut"
 msgstr "切り取り"
 
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
+#: kotti/resources.py:526 kotti/views/edit/actions.py:455
 msgid "Paste"
 msgstr "貼り付け"
 
 #: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
 #: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
+#: kotti/views/edit/actions.py:460
 msgid "Rename"
 msgstr "名称変更"
 
 #: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
 #: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
 #: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
+#: kotti/views/edit/actions.py:462
 msgid "Delete"
 msgstr "削除"
 
@@ -192,23 +267,23 @@ msgstr "アップロード"
 msgid "Set default view"
 msgstr "表示方法の設定"
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "表示"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "ナビゲート"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "設定"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "サイト設定"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "ログアウト"
 
@@ -272,18 +347,16 @@ msgstr "パスワードをリセット"
 
 #. Canonical text for ${reset_password} is: "Reset password"
 #: kotti/templates/login.pt:50
-#, fuzzy
 msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
-msgstr "上の入力欄のユーザー名かメールアドレスを埋めて、下にある ${reset_password} をクリックしてください。パスワードをリセットするためのリンクが書かれたメールが送信されます。"
+msgstr "ユーザー名かメールアドレスを入力して、下にある ${reset_password} をクリックしてください。パスワードをリセットするためのリンクが書かれたメールが届きます。"
 
 #: kotti/templates/login.pt:78
 msgid "Not registered yet?"
-msgstr ""
+msgstr "まだ登録していませんか?"
 
 #: kotti/templates/login.pt:85
-#, fuzzy
 msgid "Register for an account on this site."
-msgstr "まだ登録していませんか? このサイトにアカウントを ${register} しましょう。"
+msgstr "このサイトにアカウントを登録しましょう。"
 
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
@@ -332,7 +405,7 @@ msgstr "変更日"
 #: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
 #: kotti/templates/edit/delete-nodes.pt:31
 msgid "Select item"
-msgstr ""
+msgstr "アイテムを選択する"
 
 #: kotti/templates/edit/change-state.pt:40
 #: kotti/templates/edit/change-state.pt:48
@@ -373,7 +446,7 @@ msgstr "ここにはコンテンツアイテムが含まれていません。"
 
 #: kotti/templates/edit/contents.pt:33
 msgid "Select / deselect all"
-msgstr ""
+msgstr "全選択 / 全解除"
 
 #: kotti/templates/edit/contents.pt:37
 msgid "Visibility"
@@ -436,7 +509,7 @@ msgstr "検索"
 
 #: kotti/templates/edit/share.pt:44
 msgid "Assign local roles"
-msgstr "ローカルロールに割り当て"
+msgstr "ローカルロールを指定する"
 
 #: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
 #: kotti/views/users.py:217
@@ -459,50 +532,48 @@ msgid "Gravatar"
 msgstr "Gravatar"
 
 #: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-#, fuzzy
 msgid "Assign role"
-msgstr "ローカルロールに割り当て"
+msgstr "ロールを指定する"
 
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
-msgstr ""
+msgstr "ローカルファイルからコンテンツをアップロードする"
 
 #: kotti/templates/edit/upload.pt:17 kotti/templates/edit/upload.pt:107
-#, fuzzy
 msgid "Filename"
-msgstr "名称変更"
+msgstr "ファイル名"
 
 #: kotti/templates/edit/upload.pt:19 kotti/templates/edit/upload.pt:109
 msgid "Size"
-msgstr ""
+msgstr "サイズ"
 
 #: kotti/templates/edit/upload.pt:20
 msgid "Status"
-msgstr ""
+msgstr "ステータス"
 
 #: kotti/templates/edit/upload.pt:21
 msgid "Progress"
-msgstr ""
+msgstr "進捗"
 
 #: kotti/templates/edit/upload.pt:84
 msgid "Select file(s) to upload..."
-msgstr ""
+msgstr "アップロードするファイルを選択する ..."
 
 #: kotti/templates/edit/upload.pt:92
 msgid "Upload ${number} files."
-msgstr ""
+msgstr "${number} 個のファイルをアップロードする。"
 
 #: kotti/templates/edit/upload.pt:97
 msgid "Dismiss all errors"
-msgstr ""
+msgstr "全てのエラーを非表示にする"
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
-msgstr ""
+msgstr "存在しません"
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
-msgstr ""
+msgstr "リソースが見つかりません"
 
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
@@ -518,7 +589,6 @@ msgid "Edit ${title}"
 msgstr "${title} を編集"
 
 #: kotti/templates/site-setup/users.pt:12
-#, fuzzy
 msgid "Search user(s) / group(s)"
 msgstr "ユーザーとグループを検索"
 
@@ -531,31 +601,26 @@ msgid "Add group"
 msgstr "グループを追加"
 
 #: kotti/templates/site-setup/users.pt:34
-#, fuzzy
 msgid "Find users or groups"
-msgstr "ユーザーとグループを検索"
+msgstr "ユーザーとグループを探す"
 
 #: kotti/templates/site-setup/users.pt:40
 msgid "User- / groupname"
-msgstr ""
+msgstr "ユーザー名 / グループ名"
 
 #: kotti/templates/site-setup/users.pt:50
-#, fuzzy
 msgid "Blank search text finds all."
-msgstr "ユーザーを検索して変更する (空文字列での検索で全部表示) 。"
+msgstr "空白で検索するとすべて表示します。"
 
 #: kotti/templates/site-setup/users.pt:65
-#, fuzzy
 msgid "Assign global roles"
-msgstr "ローカルロールに割り当て"
+msgstr "グローバルロールを指定する"
 
 #: kotti/templates/site-setup/users.pt:117
-#, fuzzy
 msgid "Add new user"
 msgstr "ユーザーを追加"
 
 #: kotti/templates/site-setup/users.pt:123
-#, fuzzy
 msgid "Add new group"
 msgstr "グループを追加"
 
@@ -584,13 +649,13 @@ msgid "Save"
 msgstr "保存"
 
 #: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
+#: kotti/views/edit/actions.py:376 kotti/views/edit/actions.py:420
 msgid "Your changes have been saved."
 msgstr "変更内容を保存しました。"
 
 #: kotti/views/form.py:179
 msgid "Item was added."
-msgstr "${title} を追加しました。"
+msgstr "アイテムを追加しました。"
 
 #: kotti/views/form.py:203
 #, python-format
@@ -662,9 +727,8 @@ msgid "You have reset your password."
 msgstr "パスワードのリセットに成功しました。"
 
 #: kotti/views/login.py:302
-#, fuzzy
 msgid "Set password"
-msgstr "パスワードをリセット"
+msgstr "パスワードを設定"
 
 #: kotti/views/login.py:330
 msgid "Your password reset token may have expired."
@@ -680,8 +744,8 @@ msgid "User Management"
 msgstr "ユーザー管理"
 
 #: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
+#: kotti/views/edit/actions.py:314 kotti/views/edit/actions.py:380
+#: kotti/views/edit/actions.py:422 kotti/views/edit/actions.py:426
 msgid "No changes were made."
 msgstr "変更箇所がありませんでした。"
 
@@ -790,59 +854,59 @@ msgstr "${title} を貼り付けました。"
 msgid "Could not paste node. It no longer exists."
 msgstr "ノードを張り付けできません。何も存在していません。"
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:185
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} を移動しました。"
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:227
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} がナビゲーションに表示されるようになりました。"
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:230
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} がナビゲーションでは非表示になりました。"
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:279 kotti/views/edit/actions.py:308
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} を削除しました。"
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:305
 msgid "Nothing was deleted."
 msgstr "削除対象がありません。"
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:341 kotti/views/edit/actions.py:368
 msgid "Name and title are required."
 msgstr "名称とタイトルは必須です。"
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:345
 msgid "Item was renamed."
 msgstr "名称変更しました"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:466
 msgid "Change State"
 msgstr "状態を変更"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:467
 msgid "Move up"
 msgstr "上に移動する"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:468
 msgid "Move down"
 msgstr "下に移動する"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:469
 msgid "Show"
 msgstr "表示中にする"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:470
 msgid "Hide"
 msgstr "非表示にする"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:509
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 

From 1c19793aee04d91121c663c100c9ea6f490e6981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u=20=28Johnny=20B=2E=29?=
 <bizauionica@gmail.com>
Date: Tue, 6 Jun 2017 10:41:53 +0300
Subject: [PATCH 486/600] Updated the copyright year (#527)

* Updated the copyright year

* Change the year in the footer

* Make the footer copyright year dynamic
---
 COPYRIGHT.txt                  | 2 +-
 kotti/templates/view/footer.pt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index e2ac24ddb..b5f93e763 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
-Copyright (c) 2010-2016 Daniel Nouri and Contributors.
+Copyright (c) 2010-2017 Daniel Nouri and Contributors.
 All Rights Reserved
diff --git a/kotti/templates/view/footer.pt b/kotti/templates/view/footer.pt
index 8404a1422..1ac96ef81 100644
--- a/kotti/templates/view/footer.pt
+++ b/kotti/templates/view/footer.pt
@@ -1,4 +1,5 @@
 <hr />
 <footer>
-  <p class="pull-right">&copy; Aliens 2016</p>
+  <p class="pull-right">&copy; Aliens <tal:current-year define="date import:datetime.date">${date.today().year}</tal:current-year>
+</p>
 </footer>

From 3da025313f3c192262f722af4b5e3355a2b15e36 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 2 Aug 2017 22:04:41 +0200
Subject: [PATCH 487/600] Fix link to Chameleon docs.

---
 docs/first_steps/overview.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index f447ac221..acf5d3d99 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -85,7 +85,7 @@ Support
 
 
 .. _repoze.workflow: http://docs.repoze.org/workflow/
-.. _Chameleon: http://chameleon.repoze.org/
+.. _Chameleon: https://chameleon.readthedocs.io/
 .. _Colander: http://docs.pylonsproject.org/projects/colander/en/latest/
 .. _continuous testing: http://travis-ci.org/Kotti/Kotti
 .. _Deform: http://docs.pylonsproject.org/projects/deform/en/latest/

From 462d847879ab9f363d96fd976e21bce9dfd6ed64 Mon Sep 17 00:00:00 2001
From: Davide Moro <davide.moro@gmail.com>
Date: Fri, 5 Jan 2018 10:05:19 +0100
Subject: [PATCH 488/600] remove pytest-warnings from test dependencies (#548)

* remove pytest-warnings from test dependencies (already shipped with modern pytest versions)

* add pep8 marker in order to fix tests (or remove strict option)

* unicode warning
---
 CHANGES.txt                   | 3 +++
 kotti/tests/test_filedepot.py | 6 +++---
 pytest.ini                    | 1 +
 setup.py                      | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa3938a15..dc8aba5d5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,9 @@ Change History
 
 - Feature: add Czech translation.
 
+- remove pytest-warnings from test dependencies (already integrated in
+  modern pytest versions)
+
 1.3.0 - 2016-10-10
 ------------------
 
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index e1025e2cb..8ced6056a 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -279,13 +279,13 @@ def test_tween(self, webtest, filedepot, root, image_asset, db_session):
 
         # the attachments (created by the filters) are served by the
         # FiledepotServeApp
-        resp = webtest.app.get(img.data['thumb_128x128_url'])
+        resp = webtest.app.get(img.data[u'thumb_128x128_url'])
 
         assert resp.etag is not None
         assert resp.cache_control.max_age == 604800
         assert resp.body.startswith('\x89PNG')
 
-        resp = webtest.app.get(img.data['thumb_256x256_url'])
+        resp = webtest.app.get(img.data[u'thumb_256x256_url'])
         assert resp.etag is not None
         assert resp.cache_control.max_age == 604800
         assert resp.body.startswith('\x89PNG')
@@ -294,6 +294,6 @@ def test_tween(self, webtest, filedepot, root, image_asset, db_session):
         resp = webtest.app.get('/depot/non_existing/fileid', status=404)
         assert resp.status_code == 404
 
-        resp = webtest.app.get(img.data['thumb_256x256_url'] + 'not',
+        resp = webtest.app.get(img.data[u'thumb_256x256_url'] + 'not',
                                status=404)
         assert resp.status_code == 404
diff --git a/pytest.ini b/pytest.ini
index c3b47b392..f137d6db9 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -17,3 +17,4 @@ pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
 markers =
     user: mark test to be run as the given user
     slow: mark test to be run only with --runslow option
+    pep8: pep8 marker
diff --git a/setup.py b/setup.py
index e994e3b2a..03b915a27 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,6 @@
     'pytest-pep8!=1.0.3',
     'pytest-travis-fold',
     'pytest-virtualenv',
-    'pytest-warnings',
     'pytest-xdist',
     'tox',
     'virtualenv',  # needed for scaffolding tests

From 9d02f9f932df4c8852bd8ca1501b10c07ac2ccf4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jan 2018 17:27:08 +0100
Subject: [PATCH 489/600] Fix test ``TestCommand.test_it`` (caused by plaster
 in recent Pyramid).

---
 kotti/tests/test_util.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index fedf4db56..9ee326018 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -116,12 +116,12 @@ def test_it(self):
         closer = Mock()
         with patch('kotti.util.docopt') as docopt:
             with patch('kotti.util.bootstrap') as bootstrap:
-                docopt.return_value = {'<config_uri>': 'uri'}
+                docopt.return_value = {'<config_uri>': 'app.ini'}
                 bootstrap.return_value = {'closer': closer}
                 assert command(func, 'doc') == 0
-                func.assert_called_with({'<config_uri>': 'uri'})
+                func.assert_called_with({'<config_uri>': 'app.ini'})
                 docopt.assert_called_with('doc')
-                bootstrap.assert_called_with('uri')
+                bootstrap.assert_called_with('app.ini')
                 assert closer.call_count == 1
 
 

From 8611cc1cc5e1b3155dca74b4c1a91a65b3b98c56 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jan 2018 17:27:46 +0100
Subject: [PATCH 490/600] Update requirements.txt to most recent versions of
 all packages.

---
 requirements.txt | 102 +++++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e1e33f6cc..a99fbb45a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,78 +1,84 @@
-alembic==0.8.10
-appdirs==1.4.0
-Babel==2.3.4
-Beaker==1.8.1
-bleach==1.5.0
-Chameleon==3.0
-colander==1.3.2
+alembic==0.9.7
+appdirs==1.4.3
+Babel==2.5.3
+Beaker==1.9.0
+bleach==2.1.2
+bleach-whitelist==0.0.8
+Chameleon==3.2
+colander==1.4
 deform==2.0.4
 docopt==0.6.2
-fanstatic==1.0a7
-filedepot==0.4.1
-FormEncode==2.0.0a1
+fanstatic==1.0.0
+filedepot==0.5.0
+FormEncode==1.3.1
 funcsigs==1.0.2
-html2text==2016.9.19
-html5lib==0.9999999
-iso8601==0.1.11
+html2text==2018.1.9
+html5lib==1.0.1
+hupper==1.0
+iso8601==0.1.12
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.3
-js.fineuploader==3.3.0
+js.fineuploader==5.14.0
 js.html5shiv==3.7.3
 js.jquery==1.9.1
 js.jquery-form==3.9
-js.jquery-maskedinput==1.3.1
-js.jquery-maskmoney==1.4.1
-js.jquery-sortable==0.9.12
+js.jquery-maskedinput==1.4.1
+js.jquery-maskmoney==3.0.2
+js.jquery-sortable==0.9.13
 js.jquery-tablednd==0.4
 js.jquery-timepicker-addon==1.5.3
 js.jqueryui==1.10.3
 js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
-js.select2==3.4.1
-js.tinymce==4.2.7
-kotti-image==0.1.4
+js.select2==4.0.4.post1
+js.tinymce==4.5.4
+kotti-image==1.0.0
 LEPL==5.1.3
 lingua==4.13
-lxml==3.7.2
-Mako==1.0.6
-MarkupSafe==0.23
+Mako==1.0.7
+MarkupSafe==1.0
 PasteDeploy==1.5.2
 peppercorn==0.5
-Pillow==4.0.0
-plone.scale==2.1
-polib==1.0.8
+Pillow==5.0.0
+plaster==1.0
+plaster-pastedeploy==0.4.2
+plone.scale==3.0
+polib==1.1.0
 py-bcrypt==0.4
-pyramid==1.7.4
+pyramid==1.9.1
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.15.1
-pyramid-tm==1.1.1
-pyramid-zcml==1.0.0
+pyramid-tm==2.2
+pyramid-zcml==1.1.0
+python-dateutil==2.6.1
 python-editor==1.0.3
-pytz==2016.10
-repoze.lru==0.6
-repoze.sendmail==4.3
+pytz==2017.3
+repoze.lru==0.7
+repoze.sendmail==4.4.1
 repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 rfc6266==0.0.4
-six==1.10.0
-SQLAlchemy==1.1.5
-SQLAlchemy-Utils==0.32.12
-transaction==2.1.0
+rfc6266-parser==0.0.5.post2
+shutilwhich==1.1.0
+six==1.11.0
+SQLAlchemy==1.2.1
+SQLAlchemy-Utils==0.32.21
+transaction==2.1.2
 translationstring==1.3
-Unidecode==0.4.20
+Unidecode==1.0.22
 usersettings==1.0.7
-venusian==1.0
-waitress==1.0.2
-WebOb==1.7.1
-zope.cachedescriptors==4.2.0
-zope.component==4.3.0
-zope.configuration==4.0.3
-zope.deprecation==4.2.0
-zope.event==4.2.0
-zope.i18nmessageid==4.0.3
-zope.interface==4.3.3
-zope.schema==4.4.2
+venusian==1.1.0
+waitress==1.1.0
+webencodings==0.5.1
+WebOb==1.7.4
+zope.component==4.4.1
+zope.configuration==4.1.0
+zope.deprecation==4.3.0
+zope.event==4.3.0
+zope.i18nmessageid==4.1.0
+zope.interface==4.4.3
+zope.schema==4.5.0
 zope.sqlalchemy==0.7.7

From 396552ba43b31285e7ac19692204263f835cd02a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jan 2018 17:45:01 +0100
Subject: [PATCH 491/600] Add pep8 marker to scaffold.

---
 kotti/scaffolds/package/pytest.ini_tmpl | 1 +
 kotti/scaffolds/package/setup.py_tmpl   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kotti/scaffolds/package/pytest.ini_tmpl b/kotti/scaffolds/package/pytest.ini_tmpl
index 9b766a428..530a1b32b 100644
--- a/kotti/scaffolds/package/pytest.ini_tmpl
+++ b/kotti/scaffolds/package/pytest.ini_tmpl
@@ -13,4 +13,5 @@ addopts =
 python_files = test*py
 markers =
     user: mark test to be run as the given user
+    pep8: pep8 marker
 pep8ignore = E501 E122 E123 E125 E128 E711 E402
diff --git a/kotti/scaffolds/package/setup.py_tmpl b/kotti/scaffolds/package/setup.py_tmpl
index 2d7aea7ab..fea7ec0cd 100644
--- a/kotti/scaffolds/package/setup.py_tmpl
+++ b/kotti/scaffolds/package/setup.py_tmpl
@@ -17,7 +17,7 @@ except IOError:
 version = '0.1dev'
 
 install_requires = [
-    'Kotti>=1.3.0-dev',
+    'Kotti>=1.3.0',
     'kotti_tinymce',
 ]
 

From 1757b65f8d300bb9f0dc2d857ff518471fb1386a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jan 2018 17:59:02 +0100
Subject: [PATCH 492/600] Enforce even newer versions.

---
 setup.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 03b915a27..2f24ed0f2 100644
--- a/setup.py
+++ b/setup.py
@@ -25,9 +25,9 @@
     'bleach',
     'bleach-whitelist',
     'colander>=1.3.2',
-    'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
+    'deform>=2.0.3',  # >=2.0a1 to support Bootstrap 2
     'docopt',
-    'fanstatic>=1.0a7',
+    'fanstatic>=1.0.0',
     'filedepot',
     'formencode',
     'html2text',
@@ -45,15 +45,13 @@
     'kotti_image',
     'lingua>=1.3',
     'py_bcrypt',
-    'pyramid>=1.5<1.8',  # needed for ``request.has_permission``,
-    # pyramid_zcml isn't compatible with pyramid 1.8 yet.
-    # see https://github.com/Pylons/pyramid_zcml/pull/23
+    'pyramid>=1.8',  # needed for ``request.has_permission``,
     'pyramid_beaker',
     'pyramid_chameleon',
     'pyramid_deform>=0.2a3',  # language and template path config includeme
     'pyramid_mailer',
     'pyramid_tm',
-    'pyramid_zcml',
+    'pyramid_zcml>=1.1.0',
     'repoze.lru',
     'repoze.workflow>=1.0b1',
     'repoze.zcml>=1.0b1',
@@ -88,7 +86,7 @@
 development_requires = [
     'check-manifest',
     'pipdeptree',
-    'pyramid_debugtoolbar<2.5',
+    'pyramid_debugtoolbar',
 ]
 
 docs_require = [

From cbff4e56eda01c25cb100c1aa8c7f9b187831199 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jan 2018 20:41:55 +0100
Subject: [PATCH 493/600] Bump version.

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index dc8aba5d5..5964709c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-1.3.1.dev0 - unreleased
------------------------
+1.3.1 - 2018-01-17
+------------------
 
 - When rendering slot views, use ``request.blank()`` to create the request.
   This is the proper behaviour, in tune with customizing
diff --git a/setup.py b/setup.py
index 2f24ed0f2..d6440e9eb 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 
-version = '1.3.1.dev0'
+version = '1.3.1'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 6005d83a56e8ed028feb9cb52e9036a2078ab0fe Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 17 Jan 2018 20:43:58 +0100
Subject: [PATCH 494/600] Bump version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index d6440e9eb..612ec4755 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 
-version = '1.3.1'
+version = '1.3.2.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From b3164348cb7a69b12b05254686d8874068308c69 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 22 Feb 2018 11:39:23 +0100
Subject: [PATCH 495/600] PYTHON 3 SUPPORT (#550)

* Migrate to Python >= 3.5.

* Switch to mysqlclient in Travis config.

* Add missing dependency.

* "Merge" changes from https://github.com/Kotti/Kotti/pull/548.

* remove deprecation warning (pyramid.security.has_permission)

* Remove Python 2 unicode literals.

* Fix ``validate_file_size_limit``

* Improve readability, add note for debugging tests with PyCharm.  (ci-skip)

* Update Makefile and tox.ini.

* Fix test_upload_authenticated_text on Python 3.5.

* Fix bug in ``share_node``.

* Fix test that assumed query params in a particular order.

* Replace empty tags that are invalid in templates to supress warnings in linters.

* Fix trove classifiers in setup.py.

* Remove scaffolding support.

* Add CircleCI.

* Add scrutinzier.

* Simplify tox.ini.

* Completely get rid of kotti_image.

* Add some type annotations.

* Require deform 2.0.5 / remove pre release testing hacks.

* Re-add ``iso8601`` to requirements as it isn't picked up automatically for some reason.

* Update docs [ci skip].

* Pin js.jquery to < 2.0.0.dev.

* Update installation instructios for Python 3 virtualenv.
---
 .circleci/config.yml                          | 106 +++
 .scrutinizer.yml                              |  25 +
 .travis.yml                                   |  16 +-
 CHANGES.txt                                   |  29 +
 COPYRIGHT.txt                                 |   2 +-
 Dockerfile                                    |  17 -
 Makefile                                      |  13 +-
 app.ini                                       |   6 +-
 development.ini                               |   7 +-
 docs/developing/basic/developer-manual.rst    |  97 +-
 docs/developing/basic/security.rst            |  16 +-
 docs/developing/basic/testing.rst             |  25 +-
 docs/first_steps/installation.rst             |  21 +-
 docs/first_steps/overview.rst                 |  19 +-
 kotti/__init__.py                             |  10 +-
 kotti/alembic/env.py                          |  18 +-
 kotti/alembic/script.py.mako                  |   8 +-
 .../1063d7178fa_add_node_path_column.py       |   5 +-
 .../37a05f6246af_enlarge_name_title_path.py   |   7 +-
 .../versions/413fa5fcc581_add_filedepot.py    |  10 +-
 .../4a3de0d0804a_add_foreignkey_indices.py    |   1 -
 .../559ce6eb0949_update_node_path_column.py   |  12 +-
 .../57fecf5dbd62_initialize_workflow.py       |   1 -
 ...ec72f1_add_file_columns_to_images_table.py |  14 +-
 .../9398ccf41c2_add_content_state_fo.py       |   7 +-
 kotti/events.py                               |  95 +-
 kotti/fanstatic.py                            |  47 +-
 kotti/filedepot.py                            | 134 ++-
 kotti/interfaces.py                           |  13 -
 kotti/locale/Kotti.pot                        | 731 ++++++++-------
 kotti/locale/cs/LC_MESSAGES/Kotti.mo          | Bin 18712 -> 18567 bytes
 kotti/locale/cs/LC_MESSAGES/Kotti.po          | 836 ++++++++---------
 kotti/locale/de/LC_MESSAGES/Kotti.mo          | Bin 18730 -> 18730 bytes
 kotti/locale/de/LC_MESSAGES/Kotti.po          | 824 +++++++++--------
 kotti/locale/en/LC_MESSAGES/Kotti.mo          | Bin 157 -> 157 bytes
 kotti/locale/en/LC_MESSAGES/Kotti.po          | 718 +++++++-------
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo       | Bin 13169 -> 13169 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po       | 826 ++++++++---------
 kotti/locale/it/LC_MESSAGES/Kotti.mo          | Bin 12305 -> 12305 bytes
 kotti/locale/it/LC_MESSAGES/Kotti.po          | 826 ++++++++---------
 kotti/locale/ja/LC_MESSAGES/Kotti.mo          | Bin 19748 -> 19748 bytes
 kotti/locale/ja/LC_MESSAGES/Kotti.po          | 810 ++++++++--------
 kotti/locale/ko/LC_MESSAGES/Kotti.mo          | Bin 13002 -> 13002 bytes
 kotti/locale/ko/LC_MESSAGES/Kotti.po          | 826 ++++++++---------
 kotti/locale/nl/LC_MESSAGES/Kotti.mo          | Bin 10857 -> 10857 bytes
 kotti/locale/nl/LC_MESSAGES/Kotti.po          | 856 ++++++++---------
 kotti/locale/pl/LC_MESSAGES/Kotti.mo          | Bin 17934 -> 17934 bytes
 kotti/locale/pl/LC_MESSAGES/Kotti.po          | 824 +++++++++--------
 kotti/locale/pt/LC_MESSAGES/Kotti.mo          | Bin 7355 -> 7355 bytes
 kotti/locale/pt/LC_MESSAGES/Kotti.po          | 872 +++++++++---------
 kotti/locale/sv/LC_MESSAGES/Kotti.mo          | Bin 14798 -> 14798 bytes
 kotti/locale/sv/LC_MESSAGES/Kotti.po          | 824 +++++++++--------
 kotti/message.py                              |  41 +-
 kotti/migrate.py                              |  45 +-
 kotti/populate.py                             |  31 +-
 kotti/request.py                              |  13 +-
 kotti/resources.py                            | 245 +++--
 kotti/sanitizers.py                           |  45 +-
 kotti/scaffolds/__init__.py                   | 102 --
 kotti/scaffolds/package/+dot+coveragerc_tmpl  |   2 -
 kotti/scaffolds/package/+dot+gitignore        |  31 -
 kotti/scaffolds/package/+dot+travis.yml_tmpl  |  22 -
 .../package/+package+/__init__.py_tmpl        |  44 -
 .../package/+package+/alembic/script.py.mako  |  22 -
 .../+package+/alembic/versions/+dot+gitkeep   |   2 -
 .../package/+package+/alembic/versions/.keep  |   2 -
 .../package/+package+/fanstatic.py_tmpl       |  26 -
 .../package/+package+/locale/+dot+gitkeep     |   2 -
 .../overrides/kotti/static/icons/.gitkeep     |   0
 .../package/+package+/resources.py_tmpl       |  49 -
 .../package/+package+/static/scripts.js       |   1 -
 .../package/+package+/static/scripts.min.js   |   1 -
 .../package/+package+/static/styles.css       |   1 -
 .../package/+package+/static/styles.min.css   |   1 -
 .../custom-content-alternative.pt_tmpl        |  26 -
 .../templates/custom-content-default.pt_tmpl  |  20 -
 .../package/+package+/tests/conftest.py_tmpl  |  19 -
 .../+package+/tests/test_functional.py_tmpl   |  50 -
 .../+package+/tests/test_resources.py_tmpl    |  24 -
 .../package/+package+/tests/test_view.py_tmpl |  35 -
 .../package/+package+/views/__init__.py_tmpl  |  25 -
 .../package/+package+/views/edit.py_tmpl      |  42 -
 .../package/+package+/views/view.py_tmpl      |  49 -
 kotti/scaffolds/package/CHANGES.rst_tmpl      |   7 -
 kotti/scaffolds/package/LICENSE.txt_tmpl      |  40 -
 kotti/scaffolds/package/README.rst_tmpl       |  63 --
 kotti/scaffolds/package/development.ini_tmpl  |  75 --
 kotti/scaffolds/package/i18n.sh_tmpl          |  47 -
 kotti/scaffolds/package/pytest.ini_tmpl       |  17 -
 kotti/scaffolds/package/requirements.txt      |  12 -
 kotti/scaffolds/package/rtd.txt               |   6 -
 kotti/scaffolds/package/setup.cfg_tmpl        |   7 -
 kotti/scaffolds/package/setup.py_tmpl         |  71 --
 kotti/security.py                             | 208 +++--
 kotti/sqla.py                                 |   4 -
 kotti/templates/actions-dropdown.pt           |   2 +-
 kotti/templates/edit/contents.pt              |   3 +-
 kotti/templates/edit/master.pt                |   8 +-
 kotti/templates/edit/nav-tree.pt              |   4 +-
 kotti/templates/edit/node.pt                  |   2 +-
 kotti/templates/edit/simpleform.pt            |   2 +-
 kotti/templates/editor-bar.pt                 |   6 +-
 kotti/templates/email-reset-password.pt       |   6 +-
 kotti/templates/email-set-password.pt         |   8 +-
 kotti/templates/master-bare.pt                |   6 +-
 kotti/templates/site-setup/master.pt          |   2 +-
 kotti/templates/site-setup/user.pt            |   2 +-
 kotti/templates/site-setup/users.pt           |   4 +-
 kotti/templates/view/document.pt              |   2 +-
 kotti/templates/view/file.pt                  |   2 +-
 kotti/templates/view/folder.pt                |   2 +-
 kotti/templates/view/master.pt                |  12 +-
 kotti/templates/view/nav.pt                   |   2 +-
 kotti/testing.py                              |  44 +-
 kotti/tests/__init__.py                       | 128 +--
 kotti/tests/conftest.py                       |  23 +-
 kotti/tests/nodes.txt                         |  20 +-
 kotti/tests/test_app.py                       |  17 +-
 kotti/tests/test_cache.py                     |  14 +-
 kotti/tests/test_default_view_selection.py    |   3 -
 kotti/tests/test_deprecated.py                |  46 +-
 kotti/tests/test_events.py                    |  29 +-
 kotti/tests/test_file.py                      | 210 +++--
 kotti/tests/test_filedepot.py                 | 102 +-
 kotti/tests/test_functional.py                | 312 ++++---
 kotti/tests/test_httpexceptions.py            |   3 -
 kotti/tests/test_message.py                   |  27 +-
 kotti/tests/test_migrate.py                   |   5 +-
 kotti/tests/test_node.py                      | 144 +--
 kotti/tests/test_node_views.py                | 161 ++--
 kotti/tests/test_principals.py                |   4 -
 kotti/tests/test_register.py                  |  76 +-
 kotti/tests/test_request.py                   |   4 -
 kotti/tests/test_sanitizers.py                |  63 +-
 kotti/tests/test_search.py                    |  87 +-
 kotti/tests/test_security.py                  | 196 ++--
 kotti/tests/test_security_views.py            | 123 ++-
 kotti/tests/test_sqla.py                      |   3 -
 kotti/tests/test_static.py                    |   3 -
 kotti/tests/test_tags.py                      | 205 ++--
 kotti/tests/test_upload.py                    |  24 +-
 kotti/tests/test_url_normalizer.py            |  71 +-
 kotti/tests/test_util.py                      |  37 +-
 kotti/tests/test_util_views.py                | 105 +--
 kotti/tests/test_views_form.py                |   9 +-
 kotti/tests/test_workflow.py                  |  31 +-
 kotti/tests/test_zzz_scaffolds.py             |  60 --
 kotti/traversal.py                            |   3 -
 kotti/url_normalizer.py                       |  15 +-
 kotti/util.py                                 |  47 +-
 kotti/views/__init__.py                       |  20 +-
 kotti/views/cache.py                          |   3 -
 kotti/views/edit/__init__.py                  |   7 +-
 kotti/views/edit/actions.py                   | 186 ++--
 kotti/views/edit/content.py                   |  91 +-
 kotti/views/edit/default_views.py             |   5 +-
 kotti/views/edit/upload.py                    |   3 -
 kotti/views/file.py                           |  26 -
 kotti/views/form.py                           |  99 +-
 kotti/views/image.py                          |  18 -
 kotti/views/login.py                          |  76 +-
 kotti/views/navigation.py                     |  10 +-
 kotti/views/site_setup.py                     |   5 +-
 kotti/views/slots.py                          |  24 +-
 kotti/views/users.py                          | 140 ++-
 kotti/views/util.py                           |  75 +-
 kotti/views/view.py                           |  13 +-
 kotti/workflow.py                             |   3 -
 kotti/workflow.zcml                           |   2 +-
 pytest.ini                                    |  13 +-
 requirements.txt                              |  13 +-
 rtd.txt                                       |   1 +
 setup.py                                      |  49 +-
 tox.ini                                       |  48 +-
 174 files changed, 7236 insertions(+), 8352 deletions(-)
 create mode 100644 .circleci/config.yml
 create mode 100644 .scrutinizer.yml
 delete mode 100644 Dockerfile
 delete mode 100644 kotti/scaffolds/__init__.py
 delete mode 100644 kotti/scaffolds/package/+dot+coveragerc_tmpl
 delete mode 100644 kotti/scaffolds/package/+dot+gitignore
 delete mode 100644 kotti/scaffolds/package/+dot+travis.yml_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/__init__.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/alembic/script.py.mako
 delete mode 100644 kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep
 delete mode 100644 kotti/scaffolds/package/+package+/alembic/versions/.keep
 delete mode 100644 kotti/scaffolds/package/+package+/fanstatic.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/locale/+dot+gitkeep
 delete mode 100644 kotti/scaffolds/package/+package+/overrides/kotti/static/icons/.gitkeep
 delete mode 100644 kotti/scaffolds/package/+package+/resources.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/static/scripts.js
 delete mode 100644 kotti/scaffolds/package/+package+/static/scripts.min.js
 delete mode 100644 kotti/scaffolds/package/+package+/static/styles.css
 delete mode 100644 kotti/scaffolds/package/+package+/static/styles.min.css
 delete mode 100644 kotti/scaffolds/package/+package+/templates/custom-content-alternative.pt_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/templates/custom-content-default.pt_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/tests/conftest.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/tests/test_functional.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/tests/test_resources.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/tests/test_view.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/views/__init__.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/views/edit.py_tmpl
 delete mode 100644 kotti/scaffolds/package/+package+/views/view.py_tmpl
 delete mode 100644 kotti/scaffolds/package/CHANGES.rst_tmpl
 delete mode 100644 kotti/scaffolds/package/LICENSE.txt_tmpl
 delete mode 100644 kotti/scaffolds/package/README.rst_tmpl
 delete mode 100644 kotti/scaffolds/package/development.ini_tmpl
 delete mode 100755 kotti/scaffolds/package/i18n.sh_tmpl
 delete mode 100644 kotti/scaffolds/package/pytest.ini_tmpl
 delete mode 100644 kotti/scaffolds/package/requirements.txt
 delete mode 100644 kotti/scaffolds/package/rtd.txt
 delete mode 100644 kotti/scaffolds/package/setup.cfg_tmpl
 delete mode 100644 kotti/scaffolds/package/setup.py_tmpl
 delete mode 100644 kotti/tests/test_zzz_scaffolds.py
 delete mode 100644 kotti/views/image.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..e780dcf4b
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,106 @@
+# Python CircleCI 2.0 configuration file
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+
+version: 2
+
+dependencies:
+  override:
+    - pip install tox tox-pyenv
+    - pyenv local 3.6.4 3.5.4
+
+jobs:
+  python3.6-sqlite: &py36sqlite
+    docker:
+      # specify the version you desire here. use `-browsers` prefix for selenium tests, e.g. `3.6.4-browsers`
+      - image: circleci/python:3.6.4
+
+    working_directory: ~/kotti
+
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            # Download and cache dependencies
+            - v2-dependencies-{{ checksum "setup.py" }}
+      - run:
+          name: install dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -U pip wheel setuptools setuptools-git
+            pip install psycopg2 mysqlclient python-coveralls codecov
+            pip install -e .[testing]
+      - save_cache:
+          paths:
+            - ./venv
+          key: v2-dependencies-{{ checksum "setup.py" }}
+      - run:
+          name: run tests
+          command: |
+            . venv/bin/activate
+            py.test --junitxml=test-reports/junit
+      - store_test_results:
+          path: test-reports
+      - store_artifacts:
+          path: test-reports
+
+  python3.6-postgresql10.1:
+    <<: *py36sqlite
+    docker:
+      - image: circleci/python:3.6.4
+        environment: &pgenv
+          KOTTI_TEST_DB_STRING: postgresql://kotti@localhost/kotti?sslmode=disable
+          POSTGRES_USER: kotti
+          POSTGRES_DB: kotti
+          POSTGRES_PASSWORD: ""
+      - image: circleci/postgres:10.1
+        environment:
+          <<: *pgenv
+
+  python3.6-mysql5.6:
+    <<: *py36sqlite
+    docker:
+      - image: circleci/python:3.6.4
+        environment: &mysqlenv
+          KOTTI_TEST_DB_STRING: mysql+mysqldb://root@127.0.0.1:3306/kotti
+          MYSQL_USER: kotti
+          MYSQL_DATABASE: kotti
+      - image: circleci/mysql:5.6-ram
+        environment:
+          <<: *mysqlenv
+
+  python3.5-sqlite:
+    <<: *py36sqlite
+    docker:
+      - image: circleci/python:3.5.4
+
+  python3.5-postgresql10.1:
+    <<: *py36sqlite
+    docker:
+      - image: circleci/python:3.5.4
+        environment:
+          <<: *pgenv
+      - image: circleci/postgres:10.1
+        environment:
+          <<: *pgenv
+
+  python3.5-mysql5.6:
+    <<: *py36sqlite
+    docker:
+      - image: circleci/python:3.5.4
+        environment:
+          <<: *mysqlenv
+      - image: circleci/mysql:5.6-ram
+        environment:
+          <<: *mysqlenv
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - python3.6-sqlite
+      - python3.6-postgresql10.1
+      - python3.6-mysql5.6
+      - python3.5-sqlite
+      - python3.5-postgresql10.1
+      - python3.5-mysql5.6
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 000000000..cdde86116
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,25 @@
+build:
+  environment:
+    python: 3.6.3
+  dependencies:
+    before:
+      - pip install -U pip wheel setuptools
+      - pip install psycopg2 mysqlclient python-coveralls codecov
+      - pip install -e .[testing]
+  tests:
+    override:
+      - command: pytest
+        coverage:
+          file: '.coverage'
+          config_file: '.coveragerc'
+          format: 'py-cc'
+
+checks:
+  python:
+    code_rating: true
+    duplicate_code: true
+
+filter:
+  excluded_paths:
+    - kotti/tests/
+    - kotti/alembic/
diff --git a/.travis.yml b/.travis.yml
index 083253146..8afde245a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,24 +6,22 @@ cache:
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 python:
-  - "2.7"
-#  - "2.6"
+  - "3.6"
+  - "3.5"
+#  - "2.7"
 env:
   - KOTTI_TEST_DB_STRING=postgresql://postgres@localhost:5432/kotti_testing
-  - KOTTI_TEST_DB_STRING=mysql+oursql://root@localhost:3306/kotti_testing
+  - KOTTI_TEST_DB_STRING=mysql+mysqldb://root@localhost:3306/kotti_testing
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
   - travis_retry pip install -U pip wheel setuptools
-  - travis_retry pip install psycopg2 oursql python-coveralls codecov
-  - travis_retry pip install -e . -r requirements.txt
-  - pip uninstall -y Kotti
-  - python setup.py develop
-  - python setup.py dev
+  - travis_retry pip install psycopg2 mysqlclient python-coveralls codecov
+  - travis_retry pip install -e ".[testing]"
 before_script:
   - psql -c 'create database kotti_testing;' -U postgres
   - mysql -e 'create database kotti_testing;'
 script:
-  - py.test -rw --runslow --tb=native --cov=kotti --cov-report=term-missing
+  - py.test -rw --tb=native --cov=kotti --cov-report=term-missing
 after_success:
   - coveralls
   - codecov
diff --git a/CHANGES.txt b/CHANGES.txt
index 5964709c9..a6d587b13 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,35 @@
 Change History
 ==============
 
+2.0.0.dev0 - unreleased
+-----------------------
+
+Backward Incompatibilities
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- **Python 3 compatibility**
+
+  Kotti now runs on Python >= 3.5.
+
+  Python 2.x support was dropped entirely and won't come back until somebody implements it or is willing to pay for it.
+
+- Everything marked as deprecated in Kotti 1.x was removed.
+
+- Scaffolding support via ``pcreate`` was dropped as it's deprecated by Pyramid now.
+  An alternate solution (cookiecutter template) might become available again in the future.
+
+New Features
+~~~~~~~~~~~~
+
+- **Python 3 compatibility**
+
+- Extensive testing and code analysis on Circle CI, Travis CI and Scrutinizer.
+
+Fixes
+~~~~~
+
+- Avoid deprecation warning ``pyramid.security.has_permission``
+
 1.3.1 - 2018-01-17
 ------------------
 
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index b5f93e763..592b39c9f 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
-Copyright (c) 2010-2017 Daniel Nouri and Contributors.
+Copyright (c) 2010-2018 Daniel Nouri, Andreas Kaiser and Contributors.
 All Rights Reserved
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 3f1145c6d..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# --------------------------------------------------------------------------
-# This is a Dockerfile to build an Ubuntu 14.04 Docker image with
-# Kotti
-#
-# Use a command like:
-#     docker build -t <user>/kotti .
-# --------------------------------------------------------------------------
-
-FROM  orchardup/python:2.7
-MAINTAINER  Marc Abramowitz <marc@marc-abramowitz.com> (@msabramo)
-
-RUN pip install -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
-ADD app.ini .
-
-EXPOSE 5000
-
-CMD ["pserve", "app.ini", "host=0.0.0.0"]
diff --git a/Makefile b/Makefile
index 9aeaeb859..834382ebb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,8 @@
 
-version = 2.7
-python = python$(version)
+test: bin/pytest
+	bin/pytest -q -n4
 
-test: bin/py.test
-	bin/py.test -q -n4
-
-bin/py.test: .pip.log *.py *.cfg
+bin/pytest: .pip.log *.py *.cfg
 	bin/pip install -e ".[testing]"
 	@touch $@
 
@@ -13,10 +10,10 @@ bin/py.test: .pip.log *.py *.cfg
 	bin/pip install -e ".[development]" --log .pip.log
 
 bin/python:
-	virtualenv-$(version) .
+	virtualenv --clear .
 	@touch $@
 
 clean:
-	@rm -rfv bin/ include/ lib/ share/ .Python .cache .eggs Kotti.db Kotti.egg-info tox
+	@rm -rfv bin/ include/ lib/ share/ .Python .cache .eggs Kotti.db Kotti.egg-info .tox
 
 .PHONY: test clean
diff --git a/app.ini b/app.ini
index 5cda4ca61..0198c4065 100644
--- a/app.ini
+++ b/app.ini
@@ -19,7 +19,11 @@ mail.default_sender = yourname@yourhost
 
 # kotti.configurators: another hook for add-ons
 # kotti_tinymce should always be present (unless you don't want WYSIWYG editing)
-kotti.configurators = kotti_tinymce.kotti_configure
+kotti.configurators =
+  kotti_tinymce.kotti_configure
+# kotti_image was part of kotti in 1.x.
+# install with pip and add it to kotti.configurators:
+#  kotti_image.kotti_configure
 
 # kotti.asset_overrides: override Kotti's templates and resources; an example:
 # kotti.asset_overrides = mypackage:kotti-overrides/
diff --git a/development.ini b/development.ini
index b8a440565..61cba39eb 100644
--- a/development.ini
+++ b/development.ini
@@ -14,7 +14,12 @@ pyramid.default_locale_name = en
 sqlalchemy.url = sqlite:///%(here)s/Kotti.db
 #mail.default_sender = yourname@yourhost
 
-kotti.configurators = kotti_tinymce.kotti_configure
+kotti.configurators =
+    kotti_tinymce.kotti_configure
+# kotti_image was part of kotti in 1.x.
+# install with pip and add it to kotti.configurators:
+#    kotti_image.kotti_configure
+
 kotti.site_title = My Kotti site
 kotti.secret = qwerty
 
diff --git a/docs/developing/basic/developer-manual.rst b/docs/developing/basic/developer-manual.rst
index 2b8fd30b3..bc9f79c3c 100644
--- a/docs/developing/basic/developer-manual.rst
+++ b/docs/developing/basic/developer-manual.rst
@@ -3,16 +3,14 @@
 Developer manual
 ================
 
-Read the :ref:`Configuration` section first to understand which hooks
-both integrators and developers can use to customize and extend Kotti.
+Read the :ref:`Configuration` section first to understand which hooks both integrators and developers can use to customize and extend Kotti.
 
 .. contents::
 
 Screencast tutorial
 -------------------
 
-Here's a screencast that guides you through the process of creating a
-simple Kotti add-on for visitor comments:
+Here's a screencast that guides you through the process of creating a simple Kotti add-on for visitor comments:
 
 .. raw:: html
 
@@ -23,8 +21,8 @@ simple Kotti add-on for visitor comments:
 Content types
 -------------
 
-Defining your own content types is easy.  The implementation of the
-Document content type serves as an example here:
+Defining your own content types is easy.
+The implementation of the Document content type serves as an example here:
 
 .. code-block:: python
 
@@ -47,18 +45,14 @@ Document content type serves as an example here:
           self.body = body
           self.mime_type = mime_type
 
-The ``add_view`` parameter of the ``type_info`` attribute is the name of a view
-that can be used to construct a ``Document`` instance. This view has to be
-available for all content types specified in ``addable_to`` parameter. See the
-section below and the :ref:`adding-forms-and-a-view` section in the tutorial on
-how to define a view restricted to a specific context.
+The ``add_view`` parameter of the ``type_info`` attribute is the name of a view that can be used to construct a ``Document`` instance.
+This view has to be available for all content types specified in ``addable_to`` parameter.
+See the section below and the :ref:`adding-forms-and-a-view` section in the tutorial on how to define a view restricted to a specific context.
 
-You can configure the list of active content types in Kotti by
-modifying the :ref:`kotti.available_types` setting.
+You can configure the list of active content types in Kotti by modifying the :ref:`kotti.available_types` setting.
 
-Note that when adding a relationship from your content type to another
-Node, you will need to add a ``primaryjoin`` parameter to your
-relationship.  An example:
+Note that when adding a relationship from your content type to another Node, you will need to add a ``primaryjoin`` parameter to your relationship.
+An example:
 
 .. code-block:: python
 
@@ -73,10 +67,8 @@ relationship.  An example:
 Add views, subscribers and more
 -------------------------------
 
-:ref:`pyramid.includes` allows you to hook ``includeme`` functions
-that you can use to add views, subscribers, and more aspects of Kotti.
-An ``includeme`` function takes the *Pyramid Configurator API* object
-as its sole argument.
+:ref:`pyramid.includes` allows you to hook ``includeme`` functions that you can use to add views, subscribers, and more aspects of Kotti.
+An ``includeme`` function takes the *Pyramid Configurator API* object as its sole argument.
 
 Here's an example that'll override the default view for Files:
 
@@ -93,12 +85,10 @@ Here's an example that'll override the default view for Files:
           context=File,
           )
 
-To find out more about views and view registrations, please refer to
-the `Pyramid documentation`_.
+To find out more about views and view registrations, please refer to the `Pyramid documentation`_.
 
-By adding the *dotted name string* of your ``includeme`` function to
-the :ref:`pyramid.includes` setting, you ask Kotti to call it on
-application start-up.  An example:
+By adding the *dotted name string* of your ``includeme`` function to the :ref:`pyramid.includes` setting, you ask Kotti to call it on application start-up.
+An example:
 
 .. code-block:: ini
 
@@ -121,13 +111,9 @@ Also see:
 ``kotti.configurators``
 -----------------------
 
-Requiring users of your package to set all the configuration settings
-by hand in the Paste Deploy INI file is not ideal.  That's why Kotti
-includes a configuration variable through which extending packages can
-set all other INI settings through Python.  Here's an example of a
-function that programmatically modified ``kotti.base_includes`` and
-``kotti.principals_factory`` which would otherwise be configured by
-hand in the INI file:
+Requiring users of your package to set all the configuration settings by hand in the Paste Deploy INI file is not ideal.
+That's why Kotti includes a configuration variable through which extending packages can set all other INI settings through Python.
+Here's an example of a function that programmatically modified ``kotti.base_includes`` and ``kotti.principals_factory`` which would otherwise be configured by hand in the INI file:
 
 .. code-block:: python
 
@@ -147,14 +133,10 @@ And this is how your users would hook it up in their INI file:
 Security
 --------
 
-Kotti uses `Pyramid's security API`_, most notably its support
-`inherited access control lists`_ support.  On top of that, Kotti
-defines *roles* and *groups* support: Users may be collected in
-groups, and groups may be given roles, which in turn define
-permissions.
+Kotti uses `Pyramid's security API`_, most notably its support `inherited access control lists`_ support.
+On top of that, Kotti defines *roles* and *groups* support: Users may be collected in groups, and groups may be given roles, which in turn define permissions.
 
-The site root's ACL defines the default mapping of roles to their
-permissions:
+The site root's ACL defines the default mapping of roles to their permissions:
 
 .. code-block:: python
 
@@ -165,37 +147,26 @@ permissions:
       ['Allow', 'role:owner', ['view', 'add', 'edit', 'manage']],
       ]
 
-Every Node object has an ``__acl__`` attribute, allowing the
-definition of localized row-level security.
+Every Node object has an ``__acl__`` attribute, allowing the definition of localized row-level security.
 
-The :func:`kotti.security.set_groups` function allows assigning roles
-and groups to users in a given context.
-:func:`kotti.security.list_groups` allows one to list the groups of a
-given user.  You may also set the list of groups globally on principal
-objects, which are of type :class:`kotti.security.Principal`.
+The :func:`kotti.security.set_groups` function allows assigning roles and groups to users in a given context.
+:func:`kotti.security.list_groups` allows one to list the groups of a given user.
+You may also set the list of groups globally on principal objects, which are of type :class:`kotti.security.Principal`.
 
-Kotti delegates adding, deleting and search of user objects to an
-interface it calls :class:`kotti.security.AbstractPrincipals`.  You
-can configure Kotti to use a different ``Principals`` implementation
-by pointing the ``kotti.principals_factory`` configuration setting to
-a different factory.  The default setting here is:
+Kotti delegates adding, deleting and search of user objects to an interface it calls :class:`kotti.security.AbstractPrincipals`.
+You can configure Kotti to use a different ``Principals`` implementation by pointing the ``kotti.principals_factory`` configuration setting to a different factory.
+The default setting here is:
 
 .. code-block:: ini
 
   kotti.principals_factory = kotti.security.principals_factory
 
-There are views that you might want to override when you override the
-principal factory. That is, if you use different columns in the
-database, then you will probably want to make changes to the deform
-schema as well.
-
-These views are :class:`kotti.views.users.UsersManage`,
-:class:`kotti.views.users.UserManage` and
-:class:`kotti.views.users.Preferences`. Notice that you should
-override them using the standard way, that is, by overriding
-``setup-users``, ``setup-user`` or ``prefs`` views. Then you can
-override any sub-view used inside them as well as include any logic
-for your usecase when it is called, if needed.
+There are views that you might want to override when you override the principal factory.
+That is, if you use different columns in the database, then you will probably want to make changes to the deform schema as well.
+
+These views are :class:`kotti.views.users.UsersManage`, :class:`kotti.views.users.UserManage` and :class:`kotti.views.users.Preferences`.
+Notice that you should override them using the standard way, that is, by overriding ``setup-users``, ``setup-user`` or ``prefs`` views.
+Then you can override any sub-view used inside them as well as include any logic for your usecase when it is called, if needed.
 
 .. _Pyramid's security API: http://docs.pylonsproject.org/projects/pyramid/dev/api/security.html
 .. _inherited access control lists: http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/security.html#acl-inheritance-and-location-awareness
diff --git a/docs/developing/basic/security.rst b/docs/developing/basic/security.rst
index 7a08b0b0c..fa0eb6efd 100644
--- a/docs/developing/basic/security.rst
+++ b/docs/developing/basic/security.rst
@@ -16,8 +16,7 @@ Group
 Permission
     A permission describes what is allowed on an object.
 
-    Permissions are never directly assigned to users or groups but always
-    aggregated in roles.
+    Permissions are never directly assigned to users or groups but always aggregated in roles.
 
 Role
     A Role is a collection of permissions.
@@ -25,15 +24,14 @@ Role
     Users or groups can have global or local roles.
 
     Global Roles
-        Global roles are assigned to a user or group via Kotti's user management
-        screens.  They apply to every object in a site.  You should use them
-        very rarely, maybe only assign the "Adminsitrator" role to the
-        "Administrator" group.  This assignment is present by default in a fresh
-        Kotti site.
+        Global roles are assigned to a user or group via Kotti's user management screens.
+        They apply to every object in a site.
+        You should use them very rarely, maybe only assign the "Adminsitrator" role to the "Administrator" group.
+        This assignment is present by default in a fresh Kotti site.
 
     Local Roles
-        Local roles are assigned to a user or group via the "Sharing" screen
-        of a content object.  They apply only to this object and its children.
+        Local roles are assigned to a user or group via the "Sharing" screen of a content object.
+        They apply only to this object and its children.
 
 Workflow
     The workflow keeps track of the current state of each object lifecycle to manage content security.
diff --git a/docs/developing/basic/testing.rst b/docs/developing/basic/testing.rst
index 443b850b9..69e2fdfef 100644
--- a/docs/developing/basic/testing.rst
+++ b/docs/developing/basic/testing.rst
@@ -3,15 +3,14 @@
 Automated tests
 ===============
 
-Kotti uses `pytest`_, `zope.testbrowser`_ and WebTest_ for automated
-testing.
+Kotti uses `pytest`_, `zope.testbrowser`_ and WebTest_ for automated testing.
 
-Before you can run the tests, you must install Kotti's 'testing'
-extras.  Inside your Kotti checkout directory, do:
+Before you can run the tests, you must install Kotti's 'testing' extras.
+Inside your Kotti checkout directory, do:
 
 .. code-block:: bash
 
-  bin/python setup.py dev
+  bin/pip install -e .[testing]
 
 To then run Kotti's test suite, do:
 
@@ -26,9 +25,7 @@ To then run Kotti's test suite, do:
 Using Kotti's test fixtures/funcargs in third party add-ons' tests
 ------------------------------------------------------------------
 
-To be able to use all of Kotti's fixtures and funcargs in your own package's
-tests, you only need to "include" them with a line like this in your
-``conftest.py`` file::
+To be able to use all of Kotti's fixtures and funcargs in your own package's tests, you only need to "include" them with a line like this in your ``conftest.py`` file::
 
   pytest_plugins = "kotti"
 
@@ -42,19 +39,11 @@ Available fixtures
 Continuous Integration
 ----------------------
 
-Kotti itself is tested against Python versions 2.6 and 2.7 as well as SQLite,
-mySQL and PostgreSQL (in every possible combination of those) on every commit
-(and pull request) via the excellent `GitHub`_ / `Travis CI`_ hook.
+Kotti itself is tested against Python versions 3.5 and 3.6 as well as SQLite, mySQL and PostgreSQL (in every possible combination of those) on every commit (and pull request) via the excellent `GitHub`_ / `Travis CI`_ hook.
 
-If you want your add-on packages' to be tested the same way with additional
-testing against multiple versions of Kotti (including the current master), you
-can add a ``.travis.yml`` file to your repo that looks similar to this:
+If you want your add-on packages' to be tested the same way with additional testing against multiple versions of Kotti (including the current master), you can add a ``.travis.yml`` file to your repo that looks similar to this:
 https://raw.github.com/Kotti/kotti_media/master/.travis.yml.
 
-The packages under http://kottipackages.xo7.de/ include all Kotti versions
-released on `PyPI` (synced every night at 00:15 CET) and a package built from
-the current master on GitHub (created every 15 minutes).
-
 .. _GitHub: https://github.com/
 .. _Travis CI: https://travis-ci.org/
 .. _PyPI: http://pypi.python.org/pypi
diff --git a/docs/first_steps/installation.rst b/docs/first_steps/installation.rst
index 5d2cef7fd..cdbab702a 100644
--- a/docs/first_steps/installation.rst
+++ b/docs/first_steps/installation.rst
@@ -6,8 +6,7 @@ Installation
 Requirements
 ------------
 
-- Python 2.7 (Python 3 will be supported soon)
-- virtualenv_
+- Python >= 3.5
 - ``build_essential`` and ``python-dev`` (on Debian or Ubuntu) or
 - ``Xcode`` (on OS X) or
 - equivalent build toolchain for your OS.
@@ -19,9 +18,8 @@ It is recommended to install Kotti inside a virtualenv:
 
 .. parsed-literal::
 
-  virtualenv mysite
+  python3 -m venv mysite
   cd mysite
-  bin/pip install -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
   bin/pip install Kotti
 
 This will install the latest released version of Kotti and all its requirements into your virtualenv.
@@ -55,23 +53,10 @@ See the Pyramid documentation for a variety of server and server configuration o
 
 The pserve command above uses SQLite as the default database.
 On first run, Kotti will create a SQLite database called Kotti.db in your mysite directory.
-Kotti includes support for PostgreSQL, MySQL and SQLite (tested regularly), and
-`other SQL databases`_.
+Kotti includes support for PostgreSQL, MySQL and SQLite (tested regularly), and `other SQL databases`_.
 The default use of SQLite makes initial development easy.
 Although SQLite may prove to be adequate for some deployments, Kotti is flexible for installation of your choice of database during development or at deployment.
 
-Installation using Docker (experimental)
-----------------------------------------
-
-This assumes that you already have Docker_ installed:
-
-.. parsed-literal::
-
-  docker pull kotti/kotti
-  docker run -i -t -p 5000:5000 kotti/kotti
-
-This should get you a running Kotti instance on port 5000.
-
 .. _other SQL databases: http://www.sqlalchemy.org/docs/core/engines.html#supported-databases
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _Paste Deploy: http://pythonpaste.org/deploy/#the-config-file
diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index acf5d3d99..1f86f3764 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -22,26 +22,19 @@ You can **try out the default installation** on `Kotti's demo page`_.
 The Kotti CMS is a content management system that's heavily inspired by Plone_.
 Its **main features** are:
 
-- **User-friendliness**: editors can edit content where it appears;
-  thus the edit interface is contextual and intuitive
+- **User-friendliness**: editors can edit content where it appears; thus the edit interface is contextual and intuitive
 
 - **WYSIWYG editor**: includes a rich text editor
 
-- **Responsive design**: Kotti builds on `Twitter Bootstrap`_, which
-  looks good both on desktop and mobile
+- **Responsive design**: Kotti builds on `Twitter Bootstrap`_, which looks good both on desktop and mobile
 
-- **Templating**: easily extend the CMS with your own look & feel with
-  little programming required (see :ref:`static-resource-management`)
+- **Templating**: easily extend the CMS with your own look & feel with little programming required (see :ref:`static-resource-management`)
 
-- **Add-ons**: install a variety of add-ons and customize them as well
-  as many aspects of the built-in CMS by use of an INI configuration
-  file (see :ref:`configuration`)
+- **Add-ons**: install a variety of add-ons and customize them as well as many aspects of the built-in CMS by use of an INI configuration file (see :ref:`configuration`)
 
-- **Security**: the advanced user and permissions management is
-  intuitive and scales to fit the requirements of large organizations
+- **Security**: the advanced user and permissions management is intuitive and scales to fit the requirements of large organizations
 
-- **Internationalized**: the user interface is fully translatable,
-  Unicode is used everywhere to store data (see :ref:`translations`)
+- **Internationalized**: the user interface is fully translatable, Unicode is used everywhere to store data (see :ref:`translations`)
 
 .. _Kotti's demo page: http://kottidemo.danielnouri.org/
 .. _Plone: http://plone.org/
diff --git a/kotti/__init__.py b/kotti/__init__.py
index 78906231a..2a3890272 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import pkg_resources
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
@@ -55,6 +52,7 @@ def beaker_session_factory(**settings):
 def none_factory(**kwargs):  # pragma: no cover
     return None
 
+
 # All of these can be set by passing them in the Paste Deploy settings:
 conf_defaults = {
     'kotti.alembic_dirs': 'kotti:alembic',
@@ -203,11 +201,7 @@ def base_configure(global_config, **settings):
 
     for key, value in settings.items():
         if key.startswith('kotti') and isinstance(value, binary_type):
-            settings[key] = unicode(value, 'utf8')
-
-    # will be removed in 2.0
-    import kotti_image
-    kotti_image.kotti_configure(settings)
+            settings[key] = value.decode('utf8')
 
     # Allow extending packages to change 'settings' w/ Python:
     k = 'kotti.configurators'
diff --git a/kotti/alembic/env.py b/kotti/alembic/env.py
index 1c855bf45..47868c411 100755
--- a/kotti/alembic/env.py
+++ b/kotti/alembic/env.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import traceback
 
 import transaction
@@ -13,10 +10,9 @@
 
 def run_migrations_online():
     if DBSession.bind is None:
-        raise ValueError(
-            "\nYou must run Kotti's migration using the 'kotti-migrate' script"
-            "\nand not through 'alembic' directly."
-            )
+        raise ValueError("You must run Kotti's migration using the "
+                         "'kotti-migrate' script and not through 'alembic' "
+                         "directly.")
 
     transaction.begin()
     connection = DBSession.connection()
@@ -45,9 +41,7 @@ def run_migrations_online():
     pass
 else:
     if offline_mode:  # pragma: no cover
-        raise ValueError(
-            "\nNo support for Alembic's offline mode at this point."
-            "\nYou may want to write your own env.py script to use "
-            "\n'offline mode'."
-            )
+        raise ValueError("No support for Alembic's offline mode at this point. "
+                         "You may want to write your own env.py script to use "
+                         "'offline mode'.")
     run_migrations_online()
diff --git a/kotti/alembic/script.py.mako b/kotti/alembic/script.py.mako
index 928c41843..a14b08c34 100644
--- a/kotti/alembic/script.py.mako
+++ b/kotti/alembic/script.py.mako
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """${message}
 
 Revision ID: ${up_revision}
@@ -7,13 +6,14 @@ Create Date: ${create_date}
 
 """
 
+import sqlalchemy as sa
+from alembic import op
+${imports if imports else ""}
+
 # 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"}
diff --git a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
index f1afbe323..ff4979f56 100644
--- a/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
+++ b/kotti/alembic/versions/1063d7178fa_add_node_path_column.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Add Node.path column
 
 Revision ID: 1063d7178fa
@@ -31,8 +30,8 @@ def upgrade():
 
     for node in DBSession.query(Node).with_polymorphic([Node]):
         reversed_lineage = reversed(tuple(lineage(node)))
-        node.path = u'/'.join(
-            node.__name__ for node in reversed_lineage) or u'/'
+        node.path = '/'.join(
+            node.__name__ for node in reversed_lineage) or '/'
 
 
 def downgrade():
diff --git a/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py b/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py
index 348c7ab95..53df38c28 100644
--- a/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py
+++ b/kotti/alembic/versions/37a05f6246af_enlarge_name_title_path.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Enlarged name title
 
 Revision ID: 37a05f6246af
@@ -7,13 +6,13 @@
 
 """
 
+import sqlalchemy as sa
+from alembic import op
+
 # revision identifiers, used by Alembic.
 revision = '37a05f6246af'
 down_revision = '413fa5fcc581'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.alter_column('nodes',
diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index d1714520a..346865296 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Migrate binary file storage to filedepot
 
 Revision ID: 413fa5fcc581
@@ -7,10 +6,6 @@
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '413fa5fcc581'
-down_revision = '559ce6eb0949'
-
 import logging
 import sys
 import time
@@ -18,6 +13,10 @@
 import sqlalchemy as sa
 from alembic import op
 
+# revision identifiers, used by Alembic.
+revision = '413fa5fcc581'
+down_revision = '559ce6eb0949'
+
 log = logging.getLogger('kotti')
 log.addHandler(logging.StreamHandler(sys.stdout))
 log.setLevel(logging.INFO)
@@ -39,6 +38,7 @@ def upgrade():
     def process(thing):
         id, data, filename, mimetype = thing
         uploaded_file = UploadedFile({'depot_name': dn, 'files': []})
+        # noinspection PyProtectedMember
         uploaded_file._thaw()
         uploaded_file.process_content(
             data, filename=filename, content_type=mimetype)
diff --git a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
index 570b08d3e..f58fad046 100644
--- a/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
+++ b/kotti/alembic/versions/4a3de0d0804a_add_foreignkey_indices.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Add ForeignKey indices
 
 Revision ID: 4a3de0d0804a
diff --git a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
index adbcc8f9e..b82154f4e 100644
--- a/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
+++ b/kotti/alembic/versions/559ce6eb0949_update_node_path_column.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Update Node.path column
 
 Revision ID: 559ce6eb0949
@@ -21,10 +20,13 @@ def upgrade():
     conn = get_bind()
 
     if conn.engine.dialect.name == 'mysql':
-        update = "update nodes set path = concat(path, '/') where path not \
-like '%/'"
+        update = "UPDATE nodes " \
+                 "SET path = concat(path, '/') " \
+                 "WHERE path NOT LIKE '%/'"
     else:
-        update = "update nodes set path = path || '/' where path not like '%/'"
+        update = "UPDATE nodes " \
+                 "SET path = path || '/' " \
+                 "WHERE path NOT LIKE '%/'"
     DBSession.execute(update)
 
 
@@ -34,5 +36,5 @@ def downgrade():
 
     for node in DBSession.query(Node).with_polymorphic([Node]):
         # remove trailing '/' from all nodes but root
-        if node.path != u'/':
+        if node.path != '/':
             node.path = node.path[:-1]
diff --git a/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py b/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py
index d0deae1a7..eed49c6d1 100644
--- a/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py
+++ b/kotti/alembic/versions/57fecf5dbd62_initialize_workflow.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Initialize workflow and publish all items.
 
 Revision ID: 57fecf5dbd62
diff --git a/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py b/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
index 36a0d7a39..7fa9184e3 100644
--- a/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
+++ b/kotti/alembic/versions/814c4ec72f1_add_file_columns_to_images_table.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Add file columns  to images table.
 
 Revision ID: 814c4ec72f1
@@ -7,16 +6,16 @@
 
 """
 
-# revision identifiers, used by Alembic.
+import sqlalchemy as sa
+from alembic import op
 from depot.fields.sqlalchemy import UploadedFileField
 
-revision = '814c4ec72f1'
-down_revision = '4a3de0d0804a'
+from kotti import DBSession
 
-from alembic import op
-import sqlalchemy as sa
+# revision identifiers, used by Alembic.
 
-from kotti import DBSession
+revision = '814c4ec72f1'
+down_revision = '4a3de0d0804a'
 
 
 def upgrade():
@@ -43,7 +42,6 @@ def upgrade():
 
 
 def downgrade():
-    from kotti.resources import Image
     DBSession.execute("""
         INSERT INTO files (id, filename, mimetype, size, data)
         SELECT id, filename, mimetype, size, data
diff --git a/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py b/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py
index 21f1b9755..ec96b1ec9 100644
--- a/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py
+++ b/kotti/alembic/versions/9398ccf41c2_add_content_state_fo.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Add 'Content.state' for workflow
 
 Revision ID: 9398ccf41c2
@@ -7,13 +6,13 @@
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = '9398ccf41c2'
 down_revision = None
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
     op.add_column('contents', sa.Column('state', sa.String(50)))
diff --git a/kotti/events.py b/kotti/events.py
index 2ecaba640..1b8577e7f 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-# -*- coding: utf-8 -*-
 """This module includes a simple events system that allows users to
 subscribe to specific events, and more particularly to *object events*
 of specific object types.
@@ -13,24 +11,17 @@
 
 """
 
-from __future__ import absolute_import, division, print_function
-
-from collections import defaultdict
+from collections import OrderedDict
 from datetime import datetime
 
-try:  # pragma: no cover
-    from collections import OrderedDict
-except ImportError:  # pragma: no cover
-    from ordereddict import OrderedDict
-
 import sqlalchemy.event
 import venusian
+from pyramid.location import lineage
+from pyramid.threadlocal import get_current_request
 from sqlalchemy.orm import load_only
 from sqlalchemy.orm import mapper
 from sqlalchemy_utils.functions import has_changes
-from pyramid.location import lineage
-from pyramid.threadlocal import get_current_request
-from zope.deprecation.deprecation import deprecated
+from zope.deprecation import deprecated
 
 from kotti import DBSession
 from kotti import get_settings
@@ -39,10 +30,10 @@
 from kotti.resources import Node
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
+from kotti.security import Principal
 from kotti.security import get_principals
 from kotti.security import list_groups
 from kotti.security import list_groups_raw
-from kotti.security import Principal
 from kotti.security import set_groups
 from kotti.sqla import no_autoflush
 
@@ -84,6 +75,8 @@ class ObjectAfterDelete(ObjectEvent):
 
     .. deprecated:: 0.9
     """
+
+
 deprecated('ObjectAfterDelete',
            "The ObjectAfterDelete event is deprecated and will be no longer "
            "available starting with Kotti 0.10.")
@@ -93,12 +86,45 @@ class UserDeleted(ObjectEvent):
     """This event is emitted when an user object is deleted from the DB."""
 
 
-class DispatcherDict(defaultdict, OrderedDict):
-    """Base class for dispatchers"""
+class DispatcherDict(OrderedDict):
+    # Source: http://stackoverflow.com/a/6190500/562769
+    def __init__(self, *a, **kw):
+        OrderedDict.__init__(self, *a, **kw)
+        self.default_factory = list
+
+    def __getitem__(self, key):
+        try:
+            return OrderedDict.__getitem__(self, key)
+        except KeyError:
+            return self.__missing__(key)
+
+    def __missing__(self, key):
+        if self.default_factory is None:
+            raise KeyError(key)
+        self[key] = value = self.default_factory()
+        return value
+
+    def __reduce__(self):
+        if self.default_factory is None:
+            args = tuple()
+        else:
+            args = self.default_factory,
+        return type(self), args, None, None, self.items()
 
-    def __init__(self, *args, **kwargs):
-        defaultdict.__init__(self, list)
-        OrderedDict.__init__(self, *args, **kwargs)
+    def copy(self):
+        return self.__copy__()
+
+    def __copy__(self):
+        return type(self)(self.default_factory, self)
+
+    def __deepcopy__(self, memo):
+        import copy
+        return type(self)(self.default_factory,
+                          copy.deepcopy(self.items()))
+
+    def __repr__(self):
+        return 'OrderedDefaultDict(%s, %s)' % (self.default_factory,
+                                               OrderedDict.__repr__(self))
 
 
 class Dispatcher(DispatcherDict):
@@ -181,6 +207,7 @@ def clear():
     objectevent_listeners.clear()
     listeners[ObjectEvent].append(objectevent_listeners)
 
+
 listeners = Dispatcher()
 notify = listeners.__call__
 objectevent_listeners = ObjectEventDispatcher()
@@ -233,13 +260,12 @@ def set_owner(event):
     if request is not None and isinstance(obj, Node):
         userid = request.authenticated_userid
         if userid is not None:
-            userid = unicode(userid)
             # Set owner metadata:
             if obj.owner is None:
                 obj.owner = userid
             # Add owner role for userid if it's not inherited already:
-            if u'role:owner' not in list_groups(userid, obj):
-                groups = list_groups_raw(userid, obj) | {u'role:owner'}
+            if 'role:owner' not in list_groups(userid, obj):
+                groups = list_groups_raw(userid, obj) | {'role:owner'}
                 set_groups(userid, obj, groups)
 
 
@@ -342,19 +368,19 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
         # Our name is about to be set to 'None', so skip.
         return
 
-    if target.__parent__ is None and value != u'':
+    if target.__parent__ is None and value != '':
         # Our parent hasn't been set yet.  Skip, unless we're the root
         # object (which always has an empty string as name).
         return
 
     old_path = target.path
     line = tuple(reversed(tuple(lineage(target))))
-    target_path = u'/'.join(node.__name__ for node in line[:-1])
-    if target.__parent__ is None and value == u'':
+    target_path = '/'.join(node.__name__ for node in line[:-1])
+    if target.__parent__ is None and value == '':
         # We're a new root object
-        target_path = u'/'
+        target_path = '/'
     else:
-        target_path += u'/{0}/'.format(value)
+        target_path += '/{0}/'.format(value)
     target.path = target_path
     # We need to set the name to value here so that the subsequent
     # UPDATE in _update_children_paths will include the new 'name'
@@ -371,8 +397,8 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
         _update_children_paths(old_path, target_path)
     else:
         for child in _all_children(target):
-            child.path = u'{0}{1}/'.format(child.__parent__.path,
-                                           child.__name__)
+            child.path = '{0}{1}/'.format(child.__parent__.path,
+                                          child.__name__)
 
 
 def _all_children(item, _all=None):
@@ -398,7 +424,7 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # The object's name is still 'None', so skip.
         return
 
-    if value.__parent__ is None and value.__name__ != u'':
+    if value.__parent__ is None and value.__name__ != '':
         # Our parent doesn't have a parent, and it's not root either.
         return
 
@@ -409,8 +435,8 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # If any of our parents don't have a name yet, skip
         return
 
-    target_path = u'/'.join(node.__name__ for node in line)
-    target_path += u'/{0}/'.format(target.__name__)
+    target_path = '/'.join(node.__name__ for node in line)
+    target_path += '/{0}/'.format(target.__name__)
     target.path = target_path
 
     if old_path and target.id is not None:
@@ -420,10 +446,11 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # children.  This is the case when we create an object with
         # children before we assign the object itself to a parent.
         for child in _all_children(target):
-            child.path = u'{0}{1}/'.format(child.__parent__.path,
-                                           child.__name__)
+            child.path = '{0}{1}/'.format(child.__parent__.path,
+                                          child.__name__)
 
 
+# noinspection PyPep8Naming
 class subscribe(object):
     """Function decorator to attach the decorated function as a handler for a
     Kotti event.  Example::
diff --git a/kotti/fanstatic.py b/kotti/fanstatic.py
index f4b103902..ca6ce942a 100644
--- a/kotti/fanstatic.py
+++ b/kotti/fanstatic.py
@@ -1,6 +1,6 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, division, print_function
+from typing import List
+from typing import Optional
+from typing import Union
 
 from fanstatic import Group
 from fanstatic import Library
@@ -16,7 +16,6 @@
 from js.jqueryui import bootstrap as jqueryui_bootstrap_theme
 from js.jqueryui_tagit import tagit as ui_tagit
 
-
 # This is needed until ``kotti.views.form.deferred_tag_it_widget`` is converted
 # to a class with a ``requirements`` attribute (that would be auto_needed by
 # ``js.deform[_bootstrap]``).
@@ -66,7 +65,8 @@ class NeededGroup(object):
     """A collection of fanstatic resources that supports
        dynamic appending of resources after initialization"""
 
-    def __init__(self, resources=None):
+    def __init__(self,
+                 resources: Optional[List[Union[Resource, 'NeededGroup']]]=None):  # noqa
 
         if resources is None:
             resources = []
@@ -81,7 +81,7 @@ def __init__(self, resources=None):
         for resource in resources:
             self.add(resource)
 
-    def add(self, resource):
+    def add(self, resource: Union['NeededGroup', Resource]):
         """resource may be a:
 
             - :class:`fanstatic.Resource` object or
@@ -101,30 +101,11 @@ def need(self):  # pragma: no cover
         # for `view_needed` and `edit_needed` (see below)
         Group(self.resources).need()
 
-view_needed_css = NeededGroup([
-    view_css,
-    ])
-view_needed_js = NeededGroup([
-    jquery,
-    bootstrap_js,
-    html5shiv,
-    ])
-view_needed = NeededGroup([
-    view_needed_css,
-    view_needed_js,
-    ])
-
-edit_needed_css = NeededGroup([
-    edit_css,
-    jqueryui_bootstrap_theme,
-    ])
-edit_needed_js = NeededGroup([
-    jquery,
-    bootstrap_js,
-    html5shiv,
-    jquery_form,
-    ])
-edit_needed = NeededGroup([
-    edit_needed_css,
-    edit_needed_js,
-    ])
+
+view_needed_css = NeededGroup([view_css, ])
+view_needed_js = NeededGroup([jquery, bootstrap_js, html5shiv, ])
+view_needed = NeededGroup([view_needed_css, view_needed_js, ])
+
+edit_needed_css = NeededGroup([edit_css, jqueryui_bootstrap_theme, ])
+edit_needed_js = NeededGroup([jquery, bootstrap_js, html5shiv, jquery_form, ])
+edit_needed = NeededGroup([edit_needed_css, edit_needed_js, ])
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 8955ecde4..804e100cf 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -1,18 +1,26 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import logging
 import mimetypes
 import uuid
+from cgi import FieldStorage
 from datetime import datetime
-
-import rfc6266
+from typing import Callable
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Tuple
+from typing import Union
+
+import rfc6266_parser
 from depot.fields.sqlalchemy import _SQLAMutationTracker
+from depot.fields.upload import UploadedFile
 from depot.io.interfaces import FileStorage
+from depot.io.memory import MemoryStoredFile
 from depot.manager import DepotManager
 from pyramid import tweens
+from pyramid.config import Configurator
 from pyramid.httpexceptions import HTTPMovedPermanently
 from pyramid.httpexceptions import HTTPNotFound
+from pyramid.registry import Registry
 from pyramid.response import FileIter
 from pyramid.response import Response
 from pyramid.response import _BLOCK_SIZE
@@ -23,12 +31,19 @@
 from sqlalchemy import String
 from sqlalchemy import Unicode
 from sqlalchemy import event
+from sqlalchemy.engine.base import Connection
 from sqlalchemy.orm import deferred
+from sqlalchemy.orm.attributes import Event
+from sqlalchemy.util.langhelpers import _symbol
 from unidecode import unidecode
 
 from kotti import Base
-from kotti import get_settings
 from kotti import DBSession
+from kotti import get_settings
+from kotti.events import ObjectInsert
+from kotti.events import ObjectUpdate
+from kotti.request import Request
+from kotti.testing import DummyRequest
 from kotti.util import _to_fieldstorage
 from kotti.util import camel_case_to_name
 from kotti.util import command
@@ -85,7 +100,8 @@ def __init__(self, file_id, filename=None, content_type=None,
         for k, v in kwds.items():
             setattr(self, k, v)
 
-    def read(self, n=-1):
+    def read(self,
+             n: int = -1) -> bytes:
         """Reads ``n`` bytes from the file.
 
         If ``n`` is not specified or is ``-1`` the whole
@@ -106,31 +122,31 @@ def read(self, n=-1):
         return result
 
     @staticmethod
-    def close(*args, **kwargs):
+    def close(*args, **kwargs) -> None:
         """Implement :meth:`StoredFile.close`.
         :class:`DBStoredFile` never closes.
         """
         return
 
     @staticmethod
-    def closed():
+    def closed() -> bool:
         """Implement :meth:`StoredFile.closed`.
         """
         return False
 
     @staticmethod
-    def writable():
+    def writable() -> bool:
         """Implement :meth:`StoredFile.writable`.
         """
         return False
 
     @staticmethod
-    def seekable():
+    def seekable() -> bool:
         """Implement :meth:`StoredFile.seekable`.
         """
         return True
 
-    def seek(self, offset, whence=0):
+    def seek(self, offset: int, whence: int = 0) -> None:
         """ Change stream position.
 
         Change the stream position to the given byte offset. The offset is
@@ -152,7 +168,7 @@ def seek(self, offset, whence=0):
         else:
             raise ValueError('whence must be 0, 1 or 2')
 
-    def tell(self):
+    def tell(self) -> int:
         """ Returns current position of file cursor
 
         :result: Current file cursor position.
@@ -161,7 +177,7 @@ def tell(self):
         return self._cursor
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Implement :meth:`StoredFile.name`.
 
         :result: the filename of the saved file
@@ -170,7 +186,7 @@ def name(self):
         return self.filename
 
     @classmethod
-    def __declare_last__(cls):
+    def __declare_last__(cls) -> None:
         """ Executed by SQLAlchemy as part of mapper configuration
 
         When the data changes, we want to reset the cursor position of target
@@ -179,12 +195,15 @@ def __declare_last__(cls):
         event.listen(DBStoredFile.data, 'set', handle_change_data)
 
 
-def handle_change_data(target, value, oldvalue, initiator):
+def handle_change_data(target: DBStoredFile,
+                       value: Optional[bytes],
+                       oldvalue: Union[bytes, _symbol],
+                       initiator: Event) -> None:
     target._cursor = 0
     target._data = _marker
 
 
-def set_metadata(event):
+def set_metadata(event: Union[ObjectUpdate, ObjectInsert]) -> None:
     """Set DBStoredFile metadata based on data
 
     :param event: event that trigerred this handler.
@@ -203,7 +222,7 @@ class DBFileStorage(FileStorage):
 
     # noinspection PyMethodOverriding
     @staticmethod
-    def get(file_id):
+    def get(file_id: str) -> DBStoredFile:
         """Returns the file given by the file_id
 
         :param file_id: the unique id associated to the file
@@ -217,7 +236,10 @@ def get(file_id):
             raise IOError
         return f
 
-    def create(self, content, filename=None, content_type=None):
+    def create(self,
+               content: Union[bytes, FieldStorage],
+               filename: Optional[str] = None,
+               content_type: Optional[str] = None) -> str:
         """Saves a new file and returns the file id
 
         :param content: can either be ``bytes``, another ``file object``
@@ -248,7 +270,11 @@ def create(self, content, filename=None, content_type=None):
         DBSession.add(fstore)
         return new_file_id
 
-    def replace(self, file_or_id, content, filename=None, content_type=None):
+    def replace(self,
+                file_or_id: Union[DBStoredFile, str],
+                content: bytes,
+                filename: Optional[str] = None,
+                content_type: Optional[str] = None) -> None:
         """Replaces an existing file, an ``IOError`` is raised if the file
         didn't already exist.
 
@@ -289,7 +315,8 @@ def replace(self, file_or_id, content, filename=None, content_type=None):
 
         fstore.data = content
 
-    def delete(self, file_or_id):
+    def delete(self,
+               file_or_id: str) -> None:
         """Deletes a file. If the file didn't exist it will just do nothing.
 
         :param file_or_id: can be either ``DBStoredFile`` or a ``file_id``
@@ -299,7 +326,8 @@ def delete(self, file_or_id):
 
         DBSession.query(DBStoredFile).filter_by(file_id=file_id).delete()
 
-    def exists(self, file_or_id):
+    def exists(self,
+               file_or_id: str) -> bool:
         """Returns if a file or its ID still exist.
 
         :return: Returns if a file or its ID still exist.
@@ -312,17 +340,18 @@ def exists(self, file_or_id):
             DBSession.query(DBStoredFile).filter_by(file_id=file_id).count())
 
     @staticmethod
-    def list(*args):
+    def list(*args) -> None:
         raise NotImplementedError("list() method is unimplemented.")
 
     @staticmethod
-    def _get_file_id(file_or_id):
+    def _get_file_id(file_or_id: Union[DBStoredFile, str]) -> str:
         if hasattr(file_or_id, 'file_id'):
             return file_or_id.file_id
         return file_or_id
 
 
-def migrate_storage(from_storage, to_storage):
+def migrate_storage(from_storage: str,
+                    to_storage: str) -> None:
 
     log = logging.getLogger(__name__)
 
@@ -360,7 +389,9 @@ def migrate_storages_command():  # pragma: no cover
     __doc__ = """ Migrate blobs between two configured filedepot storages
 
     Usage:
-      kotti-migrate-storage <config_uri> --from-storage <name> --to-storage <name>
+      kotti-migrate-storage <config_uri> \
+          --from-storage <name> \
+          --to-storage <name>
 
     Options:
       -h --help                 Show this screen.
@@ -382,9 +413,13 @@ class StoredFileResponse(Response):
     Code adapted from :class:`pyramid.response.FileResponse`.
     """
 
-    def __init__(self, f, request, disposition='attachment',
-                 cache_max_age=604800, content_type=None,
-                 content_encoding=None):
+    def __init__(self,
+                 f: MemoryStoredFile,
+                 request: Union[DummyRequest, Request],
+                 disposition: str = 'attachment',
+                 cache_max_age: int = 604800,
+                 content_type: None = None,
+                 content_encoding: None = None) -> None:
         """
         :param f: the ``UploadedFile`` file field value.
         :type f: :class:`depot.io.interfaces.StoredFile`
@@ -437,12 +472,18 @@ def __init__(self, f, request, disposition='attachment',
             self.cache_control.public = True
 
         self.etag = self.generate_etag(f)
-        self.content_disposition = rfc6266.build_header(
+
+        disposition = rfc6266_parser.build_header(
             f.filename, disposition=disposition,
             filename_compat=unidecode(f.filename))
+        if isinstance(disposition, bytes):
+            disposition = disposition.decode('iso-8859-1')
+        self.content_disposition = disposition
 
     @staticmethod
-    def _get_type_and_encoding(content_encoding, content_type, f):
+    def _get_type_and_encoding(content_encoding: None,
+                               content_type: None,
+                               f: MemoryStoredFile) -> Tuple['NoneType', str]:
         content_type = content_type or getattr(f, 'content_type', None)
         if content_type is None:
             content_type, content_encoding = \
@@ -456,13 +497,17 @@ def _get_type_and_encoding(content_encoding, content_type, f):
         return content_encoding, content_type
 
     @staticmethod
-    def generate_etag(f):
+    def generate_etag(f: MemoryStoredFile) -> str:
         return '"{0}-{1}"'.format(f.last_modified, f.content_length)
 
 
-def uploaded_file_response(self, uploaded_file, disposition='inline'):
+def uploaded_file_response(self: Union[DummyRequest, Request],
+                           uploaded_file: UploadedFile,
+                           disposition: str = 'inline',
+                           cache_max_age: int = 604800) -> StoredFileResponse:
     return StoredFileResponse(uploaded_file.file, self,
-                              disposition=disposition)
+                              disposition=disposition,
+                              cache_max_age=cache_max_age)
 
 
 def uploaded_file_url(self, uploaded_file, disposition='inline'):
@@ -487,7 +532,9 @@ class TweenFactory(object):
     object instead of the WSGI environment.
     """
 
-    def __init__(self, handler, registry):
+    def __init__(self,
+                 handler: Optional[Callable],
+                 registry: Registry) -> None:
         """
         :param handler: Downstream tween or main Pyramid request handler (Kotti)
         :type handler: function
@@ -503,9 +550,10 @@ def __init__(self, handler, registry):
         DepotManager.set_middleware(self)
 
     def url_for(self, path):
-        return u'/'.join((self.mountpoint, path))
+        return '/'.join((self.mountpoint, path))
 
-    def __call__(self, request):
+    def __call__(self,
+                 request: Request) -> Response:
         """
         :param request: Current request
         :type request: :class:`kotti.request.Request`
@@ -558,7 +606,8 @@ def __call__(self, request):
         return response
 
 
-def adjust_for_engine(conn, branch):
+def adjust_for_engine(conn: Connection,
+                      branch: bool) -> None:
     # adjust for engine type
 
     if conn.engine.dialect.name == 'mysql':  # pragma: no cover
@@ -573,14 +622,15 @@ def adjust_for_engine(conn, branch):
     def patched_processed_result_value(self, value, dialect):
         if not value:
             return None
-        return self._upload_type.decode(unicode(value))
+        return self._upload_type.decode(value)
 
     if conn.engine.dialect.name == 'sqlite':  # pragma: no cover
         from depot.fields.sqlalchemy import UploadedFileField
         UploadedFileField.process_result_value = patched_processed_result_value
 
 
-def extract_depot_settings(prefix="kotti.depot.", settings=None):
+def extract_depot_settings(prefix: Optional[str]="kotti.depot.",
+                           settings: Optional[Dict[str, str]]=None) -> List[Dict[str, str]]:  # noqa
     """ Merges items from a dictionary that have keys that start with `prefix`
     to a list of dictionaries.
 
@@ -620,7 +670,7 @@ def extract_depot_settings(prefix="kotti.depot.", settings=None):
     return result
 
 
-def configure_filedepot(settings):
+def configure_filedepot(settings: Dict[str, str]) -> None:
 
     config = extract_depot_settings('kotti.depot.', settings)
     for conf in config:
@@ -629,7 +679,7 @@ def configure_filedepot(settings):
             DepotManager.configure(name, conf, prefix='')
 
 
-def includeme(config):
+def includeme(config: Configurator) -> None:
     """ Pyramid includeme hook.
 
     :param config: app config
diff --git a/kotti/interfaces.py b/kotti/interfaces.py
index f4b70efba..ceb29d3c1 100644
--- a/kotti/interfaces.py
+++ b/kotti/interfaces.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from pyramid.interfaces import ILocation
 from zope.interface import Interface
 
@@ -46,13 +43,3 @@ class INavigationRoot(Interface):
         The root item for the navigation will be ``/a/b`` for everey context in
         or below ``/a/b`` and ``/a`` for every other item.
         """
-
-
-# DEPRECATED
-
-from kotti_image.interfaces import IImage
-from zope.deprecation.deprecation import deprecated
-__ = IImage  # pyflakes
-deprecated('IImage',
-           'Image was outfactored to the kotti_image package.  '
-           'Please import from there.')
diff --git a/kotti/locale/Kotti.pot b/kotti/locale/Kotti.pot
index 55abc0885..9b56f6039 100644
--- a/kotti/locale/Kotti.pot
+++ b/kotti/locale/Kotti.pot
@@ -1,12 +1,12 @@
 #
 # SOME DESCRIPTIVE TITLE
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2017-04-15 15:19+0900\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\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"
@@ -16,15 +16,86 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Lingua 4.13\n"
 
-#: ./kotti/populate.py:68
+#: ./kotti/security.py:173
+msgid "Viewer"
+msgstr ""
+
+#: ./kotti/security.py:174
+msgid "Editor"
+msgstr ""
+
+#: ./kotti/security.py:175
+msgid "Owner"
+msgstr ""
+
+#: ./kotti/security.py:176
+msgid "Admin"
+msgstr ""
+
+#: ./kotti/resources.py:541 ./kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr ""
+
+#: ./kotti/resources.py:542 ./kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr ""
+
+#: ./kotti/resources.py:543 ./kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr ""
+
+#: ./kotti/resources.py:544 ./kotti/templates/edit/rename.pt:31
+#: ./kotti/templates/edit/rename-nodes.pt:8
+#: ./kotti/templates/edit/rename-nodes.pt:42 ./kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr ""
+
+#: ./kotti/resources.py:545 ./kotti/templates/edit/delete.pt:24
+#: ./kotti/templates/edit/delete-nodes.pt:9
+#: ./kotti/templates/edit/delete-nodes.pt:49
+#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:454
+#: ./kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr ""
+
+#: ./kotti/resources.py:556 ./kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr ""
+
+#: ./kotti/resources.py:557 ./kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr ""
+
+#: ./kotti/resources.py:558
+msgid "Share"
+msgstr ""
+
+#: ./kotti/resources.py:559 ./kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr ""
+
+#: ./kotti/resources.py:562
+msgid "Folder view"
+msgstr ""
+
+#: ./kotti/resources.py:671 ./kotti/views/edit/content.py:61
+msgid "Document"
+msgstr ""
+
+#: ./kotti/resources.py:808 ./kotti/views/edit/content.py:73
+#: ./kotti/views/edit/content.py:87
+msgid "File"
+msgstr ""
+
+#: ./kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: ./kotti/populate.py:69
+#: ./kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: ./kotti/populate.py:70
+#: ./kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -83,17 +154,17 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: ./kotti/populate.py:127
+#: ./kotti/populate.py:126
 msgid "About"
 msgstr ""
 
-#: ./kotti/populate.py:128
+#: ./kotti/populate.py:127
 msgid ""
 "Our company is the leading manufacturer of foo widgets used in a wide variety"
 " of aviation and and industrial products."
 msgstr ""
 
-#: ./kotti/populate.py:129
+#: ./kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -124,107 +195,96 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: ./kotti/resources.py:524 ./kotti/views/edit/actions.py:458
-msgid "Copy"
-msgstr ""
-
-#: ./kotti/resources.py:525 ./kotti/views/edit/actions.py:459
-msgid "Cut"
-msgstr ""
-
-#: ./kotti/resources.py:526 ./kotti/views/edit/actions.py:455
-msgid "Paste"
-msgstr ""
-
-#: ./kotti/resources.py:527 ./kotti/templates/edit/rename-nodes.pt:8
-#: ./kotti/templates/edit/rename-nodes.pt:42
-#: ./kotti/templates/edit/rename.pt:31 ./kotti/views/edit/actions.py:460
-msgid "Rename"
+#: ./kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-#: ./kotti/resources.py:528 ./kotti/templates/edit/delete-nodes.pt:9
-#: ./kotti/templates/edit/delete-nodes.pt:49
-#: ./kotti/templates/edit/delete.pt:24
-#: ./kotti/templates/site-setup/delete-user.pt:24 ./kotti/views/users.py:456
-#: ./kotti/views/edit/actions.py:462
-msgid "Delete"
+#: ./kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: ./kotti/resources.py:539 ./kotti/templates/view/folder.pt:15
-msgid "Contents"
+#: ./kotti/templates/editor-bar.pt:19
+msgid "View"
 msgstr ""
 
-#: ./kotti/resources.py:540 ./kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: ./kotti/templates/editor-bar.pt:42
+msgid "Navigate"
 msgstr ""
 
-#: ./kotti/resources.py:541
-msgid "Share"
+#: ./kotti/templates/editor-bar.pt:53
+msgid "Preferences"
 msgstr ""
 
-#: ./kotti/resources.py:542 ./kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
+#: ./kotti/templates/editor-bar.pt:58
+msgid "Site Setup"
 msgstr ""
 
-#: ./kotti/resources.py:545
-msgid "Folder view"
+#: ./kotti/templates/editor-bar.pt:69
+msgid "Logout"
 msgstr ""
 
-#: ./kotti/resources.py:654 ./kotti/views/edit/content.py:90
-msgid "Document"
+#: ./kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
 msgstr ""
 
-#: ./kotti/resources.py:789 ./kotti/views/edit/content.py:70
-#: ./kotti/views/edit/content.py:121
-msgid "File"
+#: ./kotti/templates/login.pt:16
+msgid "Login"
 msgstr ""
 
-#: ./kotti/security.py:197
-msgid "Viewer"
+#: ./kotti/templates/login.pt:21 ./kotti/templates/login.pt:59
+msgid "Username or email"
 msgstr ""
 
-#: ./kotti/security.py:198
-msgid "Editor"
+#: ./kotti/templates/login.pt:26 ./kotti/views/users.py:220
+#: ./kotti/views/login.py:255
+msgid "Password"
 msgstr ""
 
-#: ./kotti/security.py:199
-msgid "Owner"
+#: ./kotti/templates/login.pt:34
+msgid "Log in"
 msgstr ""
 
-#: ./kotti/security.py:200
-msgid "Admin"
+#: ./kotti/templates/login.pt:45
+msgid "Forgot your password?"
 msgstr ""
 
-#: ./kotti/templates/add-dropdown.pt:3
-msgid "Add"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#. 
+#: ./kotti/templates/login.pt:52 ./kotti/templates/login.pt:67
+msgid "Reset password"
 msgstr ""
 
-#: ./kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: ./kotti/templates/login.pt:50
+msgid ""
+"Fill out your username or email and click ${reset_password} below to receive "
+"an email with a link to reset your password."
 msgstr ""
 
-#: ./kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
+#: ./kotti/templates/login.pt:78
+msgid "Not registered yet?"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:19
-msgid "View"
+#: ./kotti/templates/login.pt:85
+msgid "Register for an account on this site."
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:42
-msgid "Navigate"
+#: ./kotti/templates/forbidden.pt:10
+msgid "Forbidden"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:53
-msgid "Preferences"
+#: ./kotti/templates/add-dropdown.pt:3
+msgid "Add"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:58
-msgid "Site Setup"
+#: ./kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
 msgstr ""
 
-#: ./kotti/templates/editor-bar.pt:69
-msgid "Logout"
+#: ./kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
 msgstr ""
 
 #: ./kotti/templates/email-reset-password.pt:2
@@ -252,62 +312,87 @@ msgstr ""
 msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-#: ./kotti/templates/forbidden.pt:10
-msgid "Forbidden"
+#: ./kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
 msgstr ""
 
-#: ./kotti/templates/login.pt:16
-msgid "Login"
+#: ./kotti/templates/edit/share.pt:14 ./kotti/templates/edit/share.pt:20
+#: ./kotti/templates/edit/share.pt:27 ./kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
 msgstr ""
 
-#: ./kotti/templates/login.pt:21 ./kotti/templates/login.pt:59
-msgid "Username or email"
+#: ./kotti/templates/edit/share.pt:34 ./kotti/templates/site-setup/users.pt:56
+msgid "Search"
 msgstr ""
 
-#: ./kotti/templates/login.pt:26 ./kotti/views/login.py:258
-#: ./kotti/views/users.py:222
-msgid "Password"
+#: ./kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
 msgstr ""
 
-#: ./kotti/templates/login.pt:34
-msgid "Log in"
+#: ./kotti/templates/edit/share.pt:49 ./kotti/templates/edit/change-state.pt:19
+#: ./kotti/templates/edit/delete-nodes.pt:22
+#: ./kotti/templates/edit/upload.pt:18 ./kotti/templates/edit/upload.pt:108
+#: ./kotti/templates/edit/contents.pt:35 ./kotti/templates/view/folder.pt:21
+#: ./kotti/templates/site-setup/users.pt:69
+msgid "Type"
 msgstr ""
 
-#: ./kotti/templates/login.pt:45
-msgid "Forgot your password?"
+#: ./kotti/templates/edit/share.pt:50 ./kotti/templates/site-setup/users.pt:70
+#: ./kotti/views/users.py:215
+msgid "Name"
 msgstr ""
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#. 
-#: ./kotti/templates/login.pt:52 ./kotti/templates/login.pt:67
-msgid "Reset password"
+#: ./kotti/templates/edit/share.pt:61 ./kotti/templates/site-setup/users.pt:81
+#: ./kotti/views/users.py:321 ./kotti/views/users.py:515
+#: ./kotti/views/users.py:550
+msgid "User"
 msgstr ""
 
-#. Canonical text for ${reset_password} is: "Reset password"
-#: ./kotti/templates/login.pt:50
-msgid ""
-"Fill out your username or email and click ${reset_password} below to receive "
-"an email with a link to reset your password."
+#: ./kotti/templates/edit/share.pt:62 ./kotti/templates/site-setup/users.pt:82
+#: ./kotti/views/users.py:196 ./kotti/views/users.py:356
+#: ./kotti/views/users.py:515 ./kotti/views/users.py:550
+msgid "Group"
 msgstr ""
 
-#: ./kotti/templates/login.pt:78
-msgid "Not registered yet?"
+#: ./kotti/templates/edit/share.pt:65 ./kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
 msgstr ""
 
-#: ./kotti/templates/login.pt:85
-msgid "Register for an account on this site."
+#: ./kotti/templates/edit/share.pt:70 ./kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
 msgstr ""
 
-#: ./kotti/templates/workflow-dropdown.pt:14
-msgid "Make ${state}"
+#: ./kotti/templates/edit/share.pt:85 ./kotti/templates/edit/change-state.pt:72
+#: ./kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr ""
+
+#: ./kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
 msgstr ""
 
 #: ./kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr ""
 
+#: ./kotti/templates/edit/delete.pt:9
+#: ./kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr ""
+
+#: ./kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr ""
+
+#: ./kotti/templates/edit/delete.pt:19
+#: ./kotti/templates/edit/change-state.pt:74
+#: ./kotti/templates/edit/delete-nodes.pt:44
+#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/users.py:324
+#: ./kotti/views/users.py:359 ./kotti/views/users.py:453
+#: ./kotti/views/form.py:81
+msgid "Cancel"
+msgstr ""
+
 #: ./kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr ""
@@ -317,44 +402,33 @@ msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:18
-#: ./kotti/templates/edit/contents.pt:34
 #: ./kotti/templates/edit/delete-nodes.pt:21
-#: ./kotti/templates/view/folder.pt:20 ./kotti/views/users.py:206
-#: ./kotti/views/edit/content.py:35
+#: ./kotti/templates/edit/contents.pt:34 ./kotti/templates/view/folder.pt:20
+#: ./kotti/views/users.py:204 ./kotti/views/edit/content.py:28
 msgid "Title"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:19
-#: ./kotti/templates/edit/contents.pt:35
-#: ./kotti/templates/edit/delete-nodes.pt:22 ./kotti/templates/edit/share.pt:49
-#: ./kotti/templates/edit/upload.pt:18 ./kotti/templates/edit/upload.pt:108
-#: ./kotti/templates/site-setup/users.pt:69 ./kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr ""
-
 #: ./kotti/templates/edit/change-state.pt:20
-#: ./kotti/templates/edit/contents.pt:36
 #: ./kotti/templates/edit/delete-nodes.pt:23
+#: ./kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:21
-#: ./kotti/templates/edit/contents.pt:38
 #: ./kotti/templates/edit/delete-nodes.pt:24
-#: ./kotti/templates/view/folder.pt:22
+#: ./kotti/templates/edit/contents.pt:38 ./kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:22
-#: ./kotti/templates/edit/contents.pt:39
 #: ./kotti/templates/edit/delete-nodes.pt:25
-#: ./kotti/templates/view/folder.pt:23
+#: ./kotti/templates/edit/contents.pt:39 ./kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr ""
 
 #: ./kotti/templates/edit/change-state.pt:28
-#: ./kotti/templates/edit/contents.pt:45
 #: ./kotti/templates/edit/delete-nodes.pt:31
+#: ./kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr ""
 
@@ -381,123 +455,34 @@ msgstr ""
 msgid "No change"
 msgstr ""
 
-#: ./kotti/templates/edit/change-state.pt:72 ./kotti/templates/edit/share.pt:85
-#: ./kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr ""
-
-#: ./kotti/templates/edit/change-state.pt:74
-#: ./kotti/templates/edit/delete-nodes.pt:44
-#: ./kotti/templates/edit/delete.pt:19
-#: ./kotti/templates/edit/rename-nodes.pt:44 ./kotti/views/form.py:83
-#: ./kotti/views/users.py:326 ./kotti/views/users.py:361
-#: ./kotti/views/users.py:455
-msgid "Cancel"
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr ""
-
-#: ./kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr ""
-
 #: ./kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: ./kotti/templates/edit/delete.pt:9
-#: ./kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr ""
-
-#: ./kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
+#: ./kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
 msgstr ""
 
-#: ./kotti/templates/edit/rename-nodes.pt:13
 #: ./kotti/templates/edit/rename.pt:11
+#: ./kotti/templates/edit/rename-nodes.pt:13
 msgid ""
 "Each content item has a name, which is used to create the url, and a title. "
 "Read the user manual about proper formatting of name and title if needed. You"
 " can change both below."
 msgstr ""
 
+#: ./kotti/templates/edit/rename.pt:19
 #: ./kotti/templates/edit/rename-nodes.pt:26
 #: ./kotti/templates/edit/rename-nodes.pt:28
-#: ./kotti/templates/edit/rename.pt:19
 msgid "New name"
 msgstr ""
 
+#: ./kotti/templates/edit/rename.pt:25
 #: ./kotti/templates/edit/rename-nodes.pt:34
 #: ./kotti/templates/edit/rename-nodes.pt:36
-#: ./kotti/templates/edit/rename.pt:25
 msgid "New title"
 msgstr ""
 
-#: ./kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:14 ./kotti/templates/edit/share.pt:20
-#: ./kotti/templates/edit/share.pt:27 ./kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:34 ./kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:50 ./kotti/templates/site-setup/users.pt:70
-#: ./kotti/views/users.py:217
-msgid "Name"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:61 ./kotti/templates/site-setup/users.pt:81
-#: ./kotti/views/users.py:323 ./kotti/views/users.py:517
-#: ./kotti/views/users.py:552
-msgid "User"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:62 ./kotti/templates/site-setup/users.pt:82
-#: ./kotti/views/users.py:198 ./kotti/views/users.py:358
-#: ./kotti/views/users.py:517 ./kotti/views/users.py:552
-msgid "Group"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:65 ./kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr ""
-
-#: ./kotti/templates/edit/share.pt:70 ./kotti/templates/site-setup/users.pt:91
-msgid "Assign role"
-msgstr ""
-
 #: ./kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr ""
@@ -530,6 +515,26 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
+#: ./kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr ""
+
+#: ./kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr ""
+
+#: ./kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr ""
+
+#: ./kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr ""
+
+#: ./kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr ""
+
 #: ./kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
@@ -538,6 +543,18 @@ msgstr ""
 msgid "The resource could not be found"
 msgstr ""
 
+#: ./kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr ""
+
+#: ./kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr ""
+
+#: ./kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr ""
+
 #: ./kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
@@ -546,7 +563,7 @@ msgstr ""
 msgid "Back to User Management"
 msgstr ""
 
-#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:161
+#: ./kotti/templates/site-setup/user.pt:21 ./kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
@@ -587,323 +604,303 @@ msgstr ""
 msgid "Add new group"
 msgstr ""
 
-#: ./kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr ""
-
-#: ./kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr ""
-
-#: ./kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
+#: ./kotti/views/users.py:70 ./kotti/views/form.py:82
+#: ./kotti/views/edit/actions.py:371 ./kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
 msgstr ""
 
-#: ./kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
+#: ./kotti/views/users.py:72 ./kotti/views/users.py:477
+#: ./kotti/views/edit/actions.py:309 ./kotti/views/edit/actions.py:375
+#: ./kotti/views/edit/actions.py:417 ./kotti/views/edit/actions.py:421
+msgid "No changes were made."
 msgstr ""
 
-#: ./kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
+#: ./kotti/views/users.py:105
+msgid "No users or groups were found."
 msgstr ""
 
-#: ./kotti/views/form.py:82 ./kotti/views/users.py:454
-msgid "Save"
+#: ./kotti/views/users.py:153
+msgid "Invalid value"
 msgstr ""
 
-#: ./kotti/views/form.py:84 ./kotti/views/users.py:73
-#: ./kotti/views/edit/actions.py:376 ./kotti/views/edit/actions.py:420
-msgid "Your changes have been saved."
+#: ./kotti/views/users.py:159
+msgid "A user with that name already exists."
 msgstr ""
 
-#: ./kotti/views/form.py:179
-msgid "Item was added."
+#: ./kotti/views/users.py:166
+msgid "A user with that email already exists."
 msgstr ""
 
-#: ./kotti/views/form.py:203
+#: ./kotti/views/users.py:189
 #, python-format
-msgid "Add ${type} to ${title}."
+msgid "No such group: ${group}"
 msgstr ""
 
-#: ./kotti/views/form.py:207
-#, python-format
-msgid "Add ${type}."
+#: ./kotti/views/users.py:207 ./kotti/views/login.py:71
+#: ./kotti/views/login.py:267
+msgid "Email"
 msgstr ""
 
-#: ./kotti/views/form.py:286
-#, python-format
-msgid "Maximum file size: ${size}MB"
+#: ./kotti/views/users.py:227
+msgid "Active"
 msgstr ""
 
-#: ./kotti/views/login.py:66 ./kotti/views/users.py:280
-msgid "Full name"
+#: ./kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: ./kotti/views/login.py:69
-msgid "Username"
+#: ./kotti/views/users.py:234
+msgid "Global roles"
 msgstr ""
 
-#: ./kotti/views/login.py:74 ./kotti/views/login.py:270
-#: ./kotti/views/users.py:209
-msgid "Email"
+#: ./kotti/views/users.py:238
+msgid "Groups"
 msgstr ""
 
-#: ./kotti/views/login.py:83
-msgid "Register"
+#: ./kotti/views/users.py:275
+msgid ""
+"Leave this empty and tick the 'Send password registration' box below to have "
+"the user set their own password."
 msgstr ""
 
-#: ./kotti/views/login.py:90
-msgid "There was an error."
+#: ./kotti/views/users.py:278 ./kotti/views/login.py:63
+msgid "Full name"
 msgstr ""
 
-#: ./kotti/views/login.py:109
-msgid ""
-"Congratulations! You are successfully registered. You should be receiving an "
-"email with a link to set your password. Doing so will activate your account."
+#: ./kotti/views/users.py:323
+msgid "Add User"
 msgstr ""
 
-#: ./kotti/views/login.py:124
-#, python-format
-msgid "Register - ${title}"
+#: ./kotti/views/users.py:333
+msgid "Send password registration link."
 msgstr ""
 
-#: ./kotti/views/login.py:155
+#: ./kotti/views/users.py:348
 #, python-format
-msgid "Welcome, ${user}!"
+msgid "${title} was added."
 msgstr ""
 
-#: ./kotti/views/login.py:180
-msgid ""
-"You should be receiving an email with a link to reset your password. Doing so"
-" will activate your account."
+#: ./kotti/views/users.py:358
+msgid "Add Group"
 msgstr ""
 
-#: ./kotti/views/login.py:213
-msgid "Login failed."
+#: ./kotti/views/users.py:388 ./kotti/views/site_setup.py:5
+msgid "User Management"
 msgstr ""
 
-#: ./kotti/views/login.py:223
-msgid "That username or email is not known by this system."
+#: ./kotti/views/users.py:452 ./kotti/views/form.py:80
+msgid "Save"
 msgstr ""
 
-#: ./kotti/views/login.py:245
-msgid "You have been logged out."
+#: ./kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/login.py:283
-msgid "You have reset your password."
+#: ./kotti/views/users.py:547
+msgid "User was not found."
 msgstr ""
 
-#: ./kotti/views/login.py:302
-msgid "Set password"
+#: ./kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/login.py:330
-msgid "Your password reset token may have expired."
+#: ./kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: ./kotti/views/login.py:337
-#, python-format
-msgid "Reset your password - ${title}."
+#: ./kotti/views/users.py:572
+msgid "No name was given."
 msgstr ""
 
-#: ./kotti/views/site_setup.py:8 ./kotti/views/users.py:390
-msgid "User Management"
+#: ./kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
 msgstr ""
 
-#: ./kotti/views/users.py:75 ./kotti/views/users.py:479
-#: ./kotti/views/edit/actions.py:314 ./kotti/views/edit/actions.py:380
-#: ./kotti/views/edit/actions.py:422 ./kotti/views/edit/actions.py:426
-msgid "No changes were made."
+#: ./kotti/views/form.py:177
+msgid "Item was added."
 msgstr ""
 
-#: ./kotti/views/users.py:108
-msgid "No users or groups were found."
+#: ./kotti/views/form.py:201
+#, python-format
+msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: ./kotti/views/users.py:155
-msgid "Invalid value"
+#: ./kotti/views/form.py:205
+#, python-format
+msgid "Add ${type}."
 msgstr ""
 
-#: ./kotti/views/users.py:161
-msgid "A user with that name already exists."
+#: ./kotti/views/form.py:295
+#, python-format
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: ./kotti/views/users.py:168
-msgid "A user with that email already exists."
+#: ./kotti/views/login.py:66
+msgid "Username"
 msgstr ""
 
-#: ./kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
+#: ./kotti/views/login.py:80
+msgid "Register"
 msgstr ""
 
-#: ./kotti/views/users.py:229
-msgid "Active"
+#: ./kotti/views/login.py:87
+msgid "There was an error."
 msgstr ""
 
-#: ./kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
+#: ./kotti/views/login.py:106
+msgid ""
+"Congratulations! You are successfully registered. You should be receiving an "
+"email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: ./kotti/views/users.py:236
-msgid "Global roles"
+#: ./kotti/views/login.py:121
+#, python-format
+msgid "Register - ${title}"
 msgstr ""
 
-#: ./kotti/views/users.py:240
-msgid "Groups"
+#: ./kotti/views/login.py:152
+#, python-format
+msgid "Welcome, ${user}!"
 msgstr ""
 
-#: ./kotti/views/users.py:277
+#: ./kotti/views/login.py:177
 msgid ""
-"Leave this empty and tick the 'Send password registration' box below to have "
-"the user set their own password."
+"You should be receiving an email with a link to reset your password. Doing so"
+" will activate your account."
 msgstr ""
 
-#: ./kotti/views/users.py:325
-msgid "Add User"
+#: ./kotti/views/login.py:210
+msgid "Login failed."
 msgstr ""
 
-#: ./kotti/views/users.py:335
-msgid "Send password registration link."
+#: ./kotti/views/login.py:220
+msgid "That username or email is not known by this system."
 msgstr ""
 
-#: ./kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
+#: ./kotti/views/login.py:242
+msgid "You have been logged out."
 msgstr ""
 
-#: ./kotti/views/users.py:360
-msgid "Add Group"
+#: ./kotti/views/login.py:280
+msgid "You have reset your password."
 msgstr ""
 
-#: ./kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
+#: ./kotti/views/login.py:299
+msgid "Set password"
 msgstr ""
 
-#: ./kotti/views/users.py:549
-msgid "User was not found."
+#: ./kotti/views/login.py:327
+msgid "Your password reset token may have expired."
 msgstr ""
 
-#: ./kotti/views/users.py:559
+#: ./kotti/views/login.py:334
 #, python-format
-msgid "${principal_type} ${title} was deleted."
+msgid "Reset your password - ${title}."
 msgstr ""
 
-#: ./kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
+#: ./kotti/views/edit/default_views.py:86
+msgid "Default view"
 msgstr ""
 
-#: ./kotti/views/users.py:574
-msgid "No name was given."
+#: ./kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
 msgstr ""
 
-#: ./kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
+#: ./kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr ""
+
+#: ./kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:107
+#: ./kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:125
+#: ./kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:160
+#: ./kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:163
+#: ./kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:185
+#: ./kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:227
+#: ./kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:230
+#: ./kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:279 ./kotti/views/edit/actions.py:308
+#: ./kotti/views/edit/actions.py:274 ./kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:305
+#: ./kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:341 ./kotti/views/edit/actions.py:368
+#: ./kotti/views/edit/actions.py:336 ./kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:345
+#: ./kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:466
+#: ./kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:467
+#: ./kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:468
+#: ./kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:469
+#: ./kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:470
+#: ./kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr ""
 
-#: ./kotti/views/edit/actions.py:509
+#: ./kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: ./kotti/views/edit/content.py:41
+#: ./kotti/views/edit/content.py:34
 msgid "Description"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:47
+#: ./kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr ""
 
-#: ./kotti/views/edit/content.py:56
+#: ./kotti/views/edit/content.py:49
 msgid "Body"
 msgstr ""
-
-#: ./kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr ""
-
-#: ./kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr ""
-
-#: ./kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr ""
-
-#: ./kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr ""
diff --git a/kotti/locale/cs/LC_MESSAGES/Kotti.mo b/kotti/locale/cs/LC_MESSAGES/Kotti.mo
index d942ff632fa538bde96867b4423ca86247d2d689..b01bdb4876fef17f0fae0537fd5f41914faa56bd 100644
GIT binary patch
delta 3981
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
WeDUbe3wa|0H(O^H2@Gj_I{1GlLW&*$

delta 4127
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
A;Q#;t

diff --git a/kotti/locale/cs/LC_MESSAGES/Kotti.po b/kotti/locale/cs/LC_MESSAGES/Kotti.po
index 6a2a003c8..191c15d92 100644
--- a/kotti/locale/cs/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/cs/LC_MESSAGES/Kotti.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Kotti 1.3.1\n"
-"POT-Creation-Date: 2016-11-28 23:21+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "PO-Revision-Date: 2016-11-29 02:50+0100\n"
 "Last-Translator: Lukas Zdych <lukas.zdych@gmail.com>\n"
 "Language-Team: Czech\n"
@@ -13,15 +13,86 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Může číst"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Může upravit"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Vlastník"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Správce"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Kopírovat"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Vyjmout"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Vložit"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Přejmenovat"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Odstranit"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Obsah"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Úpravy"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Sdílení"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Akce"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Zobrazení složky"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "Soubor"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Vítejte v Kotti"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulujeme! Úspěšně jste nainstalovali Kotti."
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -126,15 +197,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "Informace"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Naše společnost je přední výrobce komponent využívaných v letectví a průmyslové výrobě."
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -191,136 +262,37 @@ msgstr ""
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Kopírovat"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Vyjmout"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Vložit"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Přejmenovat"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Odstranit"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Obsah"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Úpravy"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Sdílení"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Akce"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Zobrazení složky"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Dokument"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "Soubor"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Může číst"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Může upravit"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Vlastník"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Správce"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Přidat"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Nahrát Obsah"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Vítejte, ${user}! Jste přihlášeni."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Nastavit výchozí zobrazení"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Vítejte, nejste přihlášeni."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Zobrazení"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Navigovat"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Nastavení Stránek"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Odhlasit se"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Obnovení vašeho hesla pro ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Ahoj, ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Klikněte na tento odkaz pro obnovení vašeho hesla pro ${site_title}: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Vaše registrace pro ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Registrujete se k ${site_title}"
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Klikněte zde pro nastavení vašeho hesla a přihlášení: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Přístup zamítnut"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Nastavit výchozí zobrazení"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -330,8 +302,8 @@ msgstr "Přihlášení"
 msgid "Username or email"
 msgstr "Uživatelské jméno nebo e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Heslo"
 
@@ -364,14 +336,123 @@ msgstr "Ještě nemáte účet?"
 msgid "Register for an account on this site."
 msgstr "Zaregistrujte si uživatelský účet na těchto stránkách."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Přístup zamítnut"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Přidat"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Nahrát Obsah"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Změnit na ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Obnovení vašeho hesla pro ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Ahoj, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klikněte na tento odkaz pro obnovení vašeho hesla pro ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Vaše registrace pro ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Registrujete se k ${site_title}"
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klikněte zde pro nastavení vašeho hesla a přihlášení: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Sdílet ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Hledat uživatele a skupiny"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Hledat"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Přiřadit lokální role"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Jméno"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "Uživatel"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Skupina"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "Přiřadit roli"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Uložit změny"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Procházet Stránky"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Nacházite se zde:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Odstranit ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Jste si jisti, že si přejete odstranit ${title}?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Zrušit"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Změnit stav"
@@ -380,36 +461,32 @@ msgstr "Změnit stav"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Stav položky určuje kdo jí může vidět, upravit nebo spravovat."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Název"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Typ"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Stav"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Datum vytvoření"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Poslední změna"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr "Vybrat položku"
 
@@ -434,113 +511,28 @@ msgstr "Vyberte stav, který má být nastaven pro všechny vybrané položky."
 msgid "No change"
 msgstr "Žádná změna"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Uložit změny"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Tato stránka neobsahuje žádné položky."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr "Vybrat vše / zrušit výběr všeho"
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Viditelnost"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Viditelné"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "Skryté"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Jste si jisti, že si přejete odstranit následující položky?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Odstranit ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Jste si jisti, že si přejete odstranit ${title}?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Procházet Stránky"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Přejmenovat ${title}"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "Každý obsah má jméno, které je použito k vytvoření URL a název. Pokud je potřebujete, přečtěte si manuál ohledně správného formátování jmen a názvů. Níže můžete obojí změnit."
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "Nový název"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "Nový název"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Přejmenovat ${title}"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Sdílet ${title}"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Hledat uživatele a skupiny"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Hledat"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Přiřadit lokální role"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Jméno"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "Uživatel"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Skupina"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-msgid "Assign role"
-msgstr "Přiřadit roli"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Nahrát soubor(y) z pevného disku"
@@ -573,14 +565,46 @@ msgstr "Nahrát ${number} souborů."
 msgid "Dismiss all errors"
 msgstr "Skrýt všechny chyby"
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Tato stránka neobsahuje žádné položky."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr "Vybrat vše / zrušit výběr všeho"
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Viditelnost"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Viditelné"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "Skryté"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr "Nenalezeno"
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr "Stránka nebyla nalezena"
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Výsledky Vyhledávání"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Hledat…"
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Oštítkováno"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Jste si jisti, že si přejete odstranit ${type} ${title}?"
@@ -589,7 +613,7 @@ msgstr "Jste si jisti, že si přejete odstranit ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Zpět na Správu Uživatelů"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Upravit ${title}"
@@ -630,325 +654,305 @@ msgstr "Přidat nového uživatele"
 msgid "Add new group"
 msgstr "Přidat novou skupinu"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Výsledky Vyhledávání"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "Vaše změny byly uloženy."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Hledat…"
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "Nebyly provedeny žádné změny."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Oštítkováno"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "Nebyli nalezeni žádní uživatelé ani skupiny."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Vítejte, ${user}! Jste přihlášeni."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Neplatná hodnota"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Vítejte, nejste přihlášeni."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "Uživatel s tímto jménem již existuje."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "Uživatel s touto e-mailovou adresou již existuje."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Skupina ${group} neexistuje"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "E-mailová adresa"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Aktivní"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Zde odškrtněte pro deaktivaci účtu."
+
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Globální role"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Skupiny"
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Ponechte toto prázdné a níže zaškrtněte pole ‘Odeslat registrační heslo’, aby si uživatel nastavil vlastní heslo."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "Celé jméno"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Přidat Uživatele"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "Odeslat odkaz pro obnovení hesla."
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} bylo přidáno."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Přidat Skupinu"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Správa Uživatelů"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Uložit"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "Vaše změny byly uloženy."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Upravit ${principal_type} ${title}"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "Uživatel nebyl nalezen."
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} byl odstraněn."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Odstranit ${principal_type} ${title}"
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "Nebylo zadáno jméno."
+
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mé předvolby - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Položka byla přidána."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Přidat ${type} do ${title}"
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Přidat ${type}."
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximální velikost souboru: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "Celé jméno"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "E-mailová adresa"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "Registrace"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "Vyskytly se chyby."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Gratulujeme! Byli jste úspěšně zaregistrováni. Měli byste obdržet emailovou zprávu s odkazem pro nastavení vašeho hesla. Tímto vám bude aktivován váš účet."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrace - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Vítejte, ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Právě byste měli obdržet emailovou zprávu s odkazem pro obnovení vašeho hesla. Tímto vám bude váš účet aktivován."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "Přihlášení se nezdařilo"
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "Uživatelské jéno nebo e-mailová adresa v systému neexistuje."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Byli jste odhlášeni."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "Vaše heslo bylo obnoveno."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 msgid "Set password"
 msgstr "Nastavit heslo"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "Vypadá to, že váš token pro obnovu hesla již vypršel."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Obnova vašeho hesla - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Správa Uživatelů"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "Nebyly provedeny žádné změny."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "Nebyli nalezeni žádní uživatelé ani skupiny."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Neplatná hodnota"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "Uživatel s tímto jménem již existuje."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "Uživatel s touto e-mailovou adresou již existuje."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Skupina ${group} neexistuje"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Aktivní"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Zde odškrtněte pro deaktivaci účtu."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Globální role"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Skupiny"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Ponechte toto prázdné a níže zaškrtněte pole ‘Odeslat registrační heslo’, aby si uživatel nastavil vlastní heslo."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Přidat Uživatele"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "Odeslat odkaz pro obnovení hesla."
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} bylo přidáno."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Přidat Skupinu"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Upravit ${principal_type} ${title}"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "Uživatel nebyl nalezen."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} byl odstraněn."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Výchozí zobrazení"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Odstranit ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "Výchozí zobrazení bylo změněno na výchozí hodnotu."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "Nebylo zadáno jméno."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "Výchozí zobrazení bylo nastaveno."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mé předvolby - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "Nebylo možné nastavit výchozí zobrazení."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} bylo zkopírováno."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} bylo vyjmuto."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} bylo vloženo."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "Položku nebylo možné vložit. Položka již neexistuje."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} bylo přesunuto."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} je nyní zobrazeno v navigaci."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} již není zobrazeno v navigaci."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} bylo odstraněno."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "Žádné položky nebyly odstraněny."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Jměno a název jsou povinné."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "Položka byla přejmenována."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Změnit Stav"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "Posonout nahoru"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "Posunout dolů"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Zobrazit"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Skrýt"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "Pro provedení akce je nutné vybrat položky."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Popis"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Značky"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Hlavní text"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Výchozí zobrazení"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "Výchozí zobrazení bylo změněno na výchozí hodnotu."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "Výchozí zobrazení bylo nastaveno."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "Nebylo možné nastavit výchozí zobrazení."
-
-msgid "Submit"
-msgstr "Předložit"
+#~ msgid "Submit"
+#~ msgstr "Předložit"
 
-msgid "Private"
-msgstr "Soukromé"
+#~ msgid "Private"
+#~ msgstr "Soukromé"
 
-msgid "Public"
-msgstr "Zveřejněno"
+#~ msgid "Public"
+#~ msgstr "Zveřejněno"
diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.mo b/kotti/locale/de/LC_MESSAGES/Kotti.mo
index b525a4e131af598d2fc2dc7552b5ad3db0a6f6a4..00ae9b3f8d42fb8644ab5408a8aa80717ed17d9b 100644
GIT binary patch
delta 28
kcmZ2AiE-5=#tpHWycW6!hPsC43Wmm3riPodG!MuF0DzMSVgLXD

delta 28
kcmZ2AiE-5=#tpHWyk@$FhPp<U3I;}2CKj8sG!MuF0D!azXaE2J

diff --git a/kotti/locale/de/LC_MESSAGES/Kotti.po b/kotti/locale/de/LC_MESSAGES/Kotti.po
index 91ce75066..97233484a 100644
--- a/kotti/locale/de/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/de/LC_MESSAGES/Kotti.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andreas Kaiser <kaiser@xo7.de>\n"
 "Language-Team: \n"
@@ -11,15 +11,86 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Betrachter"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Bearbeiter"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Besitzer"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Administrator"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Kopieren"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Einfügen"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Löschen"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Inhalt"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Freigeben"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Aktionen"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Ordneransicht"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "Datei"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Willkommen bei Kotti"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Herzlichen Glückwunsch! Sie haben Kotti erfolgreich installiert."
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -124,15 +195,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "Über"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Unsere Firma is der führende Hersteller von Foo Produkten, welche gleichermaßen in in der Luft- und Raumfahrt, als auch in anderen Industriesektoren eingesetzt werden."
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -190,136 +261,37 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Kopieren"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Einfügen"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Löschen"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Inhalt"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Freigeben"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Aktionen"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Ordneransicht"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Dokument"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "Datei"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Betrachter"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Bearbeiter"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Besitzer"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Administrator"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Dateien hochladen"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Willkommen, ${user}! Sie sind angemeldet."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Standardansicht setzen"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Willkommen! Sie sind nicht angemeldet."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Anzeigen"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Navigieren"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Seiten-Einstellungen"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Abmelden"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Passwort zurücksetzen bei ${site_title}"
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Hallo ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} zurückzusetzen: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Ihre Anmeldung bei ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Ihre Anmeldung bei ${site_title}"
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich anzumelden: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Zugriff verweigert"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Standardansicht setzen"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -329,8 +301,8 @@ msgstr "Anmelden"
 msgid "Username or email"
 msgstr "Benutzername oder E-Mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Passwort"
 
@@ -363,14 +335,123 @@ msgstr "Noch nicht registriert?"
 msgid "Register for an account on this site."
 msgstr "Einen Benutzer für den Zugang zu dieser Seite erstellen."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Zugriff verweigert"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Dateien hochladen"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Setze ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Passwort zurücksetzen bei ${site_title}"
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Hallo ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort bei ${site_title} zurückzusetzen: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Ihre Anmeldung bei ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Ihre Anmeldung bei ${site_title}"
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Besuchen Sie bitte folgende Seite, um Ihr Passwort zu setzen und sich anzumelden: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "${title} freigeben"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Suche Benutzer und Gruppen"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Suche"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Lokale Rollen zuweisen"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Name"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "Benutzer"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Gruppe"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "Rolle zuweisen"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Änderungen übernehmen"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigieren"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Sie sind hier:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Lösche ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Sind Sie sicher, dass Sie ${title} löschen möchten?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Workflowstatus ändern"
@@ -379,36 +460,32 @@ msgstr "Workflowstatus ändern"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Der Workflowstatus eines Dokumentes bestimmt, wer es sehen, bearbeiten und/oder verwalten kann."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Titel"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Typ"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Status"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Erstellungsdatum"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Bearbeitungsdatum"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr "Element wählen"
 
@@ -433,113 +510,28 @@ msgstr "Wählen Sie den neuen Status, der für alle ausgwählten Dokumente geset
 msgid "No change"
 msgstr "Keine Änderungen."
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Änderungen übernehmen"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Kein sichtbarer Inhalt."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr "Alles auswählen/abwählen"
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Sichtbarkeit"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Sichtbar"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "Unsichtbar"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sind Sie sicher, dass Sie die folgenden Dokumente löschen möchten?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Lösche ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Sind Sie sicher, dass Sie ${title} löschen möchten?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Navigieren"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "${title} umbenennen"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "Jeder Inhalt hat einen Namen, der auch Bestandteil der URL ist, und einen Titel. Sie können beides ändern, indem Sie unten einen neuen Namen und/oder Titel angeben."
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "Neuer Name"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "Neuer Titel"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "${title} umbenennen"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "${title} freigeben"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Suche Benutzer und Gruppen"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Suche"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Lokale Rollen zuweisen"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Name"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "Benutzer"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Gruppe"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-msgid "Assign role"
-msgstr "Rolle zuweisen"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Inhalte aus lokalen Dateien hochladen"
@@ -572,14 +564,46 @@ msgstr "${number} Dateien hochladen"
 msgid "Dismiss all errors"
 msgstr "Alle Fehlermeldungen ausblenden"
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Kein sichtbarer Inhalt."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr "Alles auswählen/abwählen"
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Sichtbarkeit"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Sichtbar"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "Unsichtbar"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr "Die Ressource konnte nicht gefunden werden"
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Suche..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Verschlagwortet mit:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
@@ -588,7 +612,7 @@ msgstr "Sind Sie sicher, dass Sie ${title} (${type}) löschen möchten?"
 msgid "Back to User Management"
 msgstr "Zurück zur Benutzerverwaltung"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bearbeite ${title}"
@@ -629,320 +653,300 @@ msgstr "Neuen Benutzer hinzufügen"
 msgid "Add new group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Suchergebnisse"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "Ihre Änderungen wurden übernommen."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Suche..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "Keine Änderungen."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Verschlagwortet mit:"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "Keine Benutzer oder Gruppen gefunden."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Willkommen, ${user}! Sie sind angemeldet."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Ungültige Eingabe"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Willkommen! Sie sind nicht angemeldet."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "Ein Benutzer mit diesem Namen existiert bereits."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Unbekannte Gruppe: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "E-Mail"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Aktiv"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Abwählen um das Konto zu deaktivieren."
+
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Globale Rollen"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Gruppen"
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "Vollständiger Name"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Neuer Benutzer"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "Schicke Passwort-Registrierungs-Link"
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} hinzugefügt."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Neue Gruppe"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Benutzerverwaltung"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Übernehmen"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "Ihre Änderungen wurden übernommen."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Bearbeite ${principal_type} ${title}"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "Keine Benutzer oder Gruppen gefunden."
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} gelöscht."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Bearbeite ${principal_type} ${title}"
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "Kein Name übergeben."
+
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Meine Einstellungen - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Dokument hinzugefügt."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${type} in ${title} erstellen"
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "${type} erstellen"
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximale Dateigröße: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "Vollständiger Name"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Benutzername"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "E-Mail"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "Registrieren"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "Ein Fehler ist aufgetreten."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrieren - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Willkommen, ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Ihre Registrierung war erfolgreich. Sie sollten in Kürze eine E-Mail mit einem Link zur Aktivierung und zum Setzen Ihres Passwortes erhalten."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "Anmeldung fehlgeschlagen."
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "Der angegebene Benutzername oder die E-Mail-Adresse ist nicht bekannt."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Sie wurden abgemeldet."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "Der Link zum Zurücksetzen Ihres Passwortes ist abgelaufen!"
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Passwort zurücksetzen - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Benutzerverwaltung"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "Keine Änderungen."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "Keine Benutzer oder Gruppen gefunden."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Ungültige Eingabe"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "Ein Benutzer mit diesem Namen existiert bereits."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "Ein Benutzer mit dieser E-Mail Adresse existiert bereits."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Unbekannte Gruppe: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Aktiv"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Abwählen um das Konto zu deaktivieren."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Globale Rollen"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Gruppen"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Lassen Sie die Passwort-Felder leer und aktivieren sie unten \"Schicke Passwort-Registrierung\" um den Benutzer das Passwort selbst auswählen zu lassen."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Neuer Benutzer"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "Schicke Passwort-Registrierungs-Link"
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} hinzugefügt."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Neue Gruppe"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Bearbeite ${principal_type} ${title}"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "Keine Benutzer oder Gruppen gefunden."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} gelöscht."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Standardansicht"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Bearbeite ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "Standardansicht wurde zurückgesetzt."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "Kein Name übergeben."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "Standardansicht wurde gesetzt."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Meine Einstellungen - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "Standardansicht konnte nicht geändert werden."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} kopiert."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} ausgeschnitten."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} eingefügt."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "Inhalt konnte nicht eingefügt werden, da er nicht mehr existiert."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} verschoben."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} wird nun in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} wird nun nicht mehr in der Navigation angezeigt."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} gelöscht."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "Nichts wurde gelöscht."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Name und Titel werden benötigt."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "Objekt umbenannt."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Status ändern"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "Nach oben verschieben"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "Nach unten verschieben"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Anzeigen"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Verstecken"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "Sie müssen Dokumente auswählen, um eine Aktion auszuführen."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Beschreibung"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Schlagworte:"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Inhalt"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Standardansicht"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "Standardansicht wurde zurückgesetzt."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "Standardansicht wurde gesetzt."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "Standardansicht konnte nicht geändert werden."
-
 #~ msgid "Image"
 #~ msgstr "Bild"
 
diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.mo b/kotti/locale/en/LC_MESSAGES/Kotti.mo
index dfa35cbb2b20b41b7f1d0359386a16d29066703f..3f6810c793cf53b7c79f8526d6b799cd979aed61 100644
GIT binary patch
delta 23
ecmbQsIG1sPKd*(ZfuXLUxq_jwm8s#x7)Jm{*9F!9

delta 23
ecmbQsIG1sPKd+gtp`oskrGkNxm5If~7)Jm{>;>Ea

diff --git a/kotti/locale/en/LC_MESSAGES/Kotti.po b/kotti/locale/en/LC_MESSAGES/Kotti.po
index dbd7acce0..10f0c98bc 100644
--- a/kotti/locale/en/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/en/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr ""
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr ""
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr ""
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr ""
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr ""
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr ""
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr ""
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr ""
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr ""
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr ""
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr ""
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr ""
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr ""
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr ""
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr ""
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr ""
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +142,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -110,106 +181,94 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr ""
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr ""
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr ""
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
 msgstr ""
 
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
 msgstr ""
 
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
+#: kotti/templates/editor-bar.pt:19
+msgid "View"
 msgstr ""
 
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
+#: kotti/templates/editor-bar.pt:42
+msgid "Navigate"
 msgstr ""
 
-#: kotti/resources.py:541
-msgid "Share"
+#: kotti/templates/editor-bar.pt:53
+msgid "Preferences"
 msgstr ""
 
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
+#: kotti/templates/editor-bar.pt:58
+msgid "Site Setup"
 msgstr ""
 
-#: kotti/resources.py:545
-msgid "Folder view"
+#: kotti/templates/editor-bar.pt:69
+msgid "Logout"
 msgstr ""
 
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
 msgstr ""
 
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
+#: kotti/templates/login.pt:16
+msgid "Login"
 msgstr ""
 
-#: kotti/security.py:197
-msgid "Viewer"
+#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
+msgid "Username or email"
 msgstr ""
 
-#: kotti/security.py:198
-msgid "Editor"
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
+msgid "Password"
 msgstr ""
 
-#: kotti/security.py:199
-msgid "Owner"
+#: kotti/templates/login.pt:34
+msgid "Log in"
 msgstr ""
 
-#: kotti/security.py:200
-msgid "Admin"
+#: kotti/templates/login.pt:45
+msgid "Forgot your password?"
 msgstr ""
 
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
+#. Used in sentence: "Fill out your username or email and click
+#. ${reset_password} below to receive an email with a link to reset your
+#. password."
+#.
+#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
+msgid "Reset password"
 msgstr ""
 
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
+#. Canonical text for ${reset_password} is: "Reset password"
+#: kotti/templates/login.pt:50
+msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
 msgstr ""
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
+#: kotti/templates/login.pt:78
+msgid "Not registered yet?"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:21
-msgid "View"
+#: kotti/templates/login.pt:85
+msgid "Register for an account on this site."
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:44
-msgid "Navigate"
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:55
-msgid "Preferences"
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:60
-msgid "Site Setup"
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
 msgstr ""
 
-#: kotti/templates/editor-bar.pt:71
-msgid "Logout"
+#: kotti/templates/workflow-dropdown.pt:14
+msgid "Make ${state}"
 msgstr ""
 
 #: kotti/templates/email-reset-password.pt:2
@@ -237,60 +296,82 @@ msgstr ""
 msgid "Click here to set your password and log in: ${url}"
 msgstr ""
 
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
 msgstr ""
 
-#: kotti/templates/login.pt:16
-msgid "Login"
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
 msgstr ""
 
-#: kotti/templates/login.pt:21 kotti/templates/login.pt:59
-msgid "Username or email"
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
 msgstr ""
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
-msgid "Password"
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
 msgstr ""
 
-#: kotti/templates/login.pt:34
-msgid "Log in"
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
 msgstr ""
 
-#: kotti/templates/login.pt:45
-msgid "Forgot your password?"
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
 msgstr ""
 
-#. Used in sentence: "Fill out your username or email and click
-#. ${reset_password} below to receive an email with a link to reset your
-#. password."
-#.
-#: kotti/templates/login.pt:52 kotti/templates/login.pt:67
-msgid "Reset password"
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
 msgstr ""
 
-#. Canonical text for ${reset_password} is: "Reset password"
-#: kotti/templates/login.pt:50
-msgid "Fill out your username or email and click ${reset_password} below to receive an email with a link to reset your password."
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
 msgstr ""
 
-#: kotti/templates/login.pt:78
-msgid "Not registered yet?"
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
 msgstr ""
 
-#: kotti/templates/login.pt:85
-msgid "Register for an account on this site."
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
 msgstr ""
 
-#: kotti/templates/workflow-dropdown.pt:14
-msgid "Make ${state}"
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr ""
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
 msgstr ""
 
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr ""
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr ""
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr ""
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr ""
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr ""
@@ -299,36 +380,32 @@ msgstr ""
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr ""
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr ""
 
@@ -353,113 +430,28 @@ msgstr ""
 msgid "No change"
 msgstr ""
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr ""
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr ""
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr ""
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr ""
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr ""
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr ""
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr ""
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-msgid "Assign role"
-msgstr ""
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr ""
@@ -492,14 +484,46 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr ""
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr ""
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr ""
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr ""
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr ""
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr ""
@@ -508,7 +532,7 @@ msgstr ""
 msgid "Back to User Management"
 msgstr ""
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr ""
@@ -549,316 +573,296 @@ msgstr ""
 msgid "Add new group"
 msgstr ""
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr ""
-
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
 msgstr ""
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
 msgstr ""
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
 msgstr ""
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
+#: kotti/views/users.py:153
+msgid "Invalid value"
 msgstr ""
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
-msgid "Save"
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
 msgstr ""
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
 msgstr ""
 
-#: kotti/views/form.py:179
-msgid "Item was added."
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
 msgstr ""
 
-#: kotti/views/form.py:203
-#, python-format
-msgid "Add ${type} to ${title}."
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
 msgstr ""
 
-#: kotti/views/form.py:207
-#, python-format
-msgid "Add ${type}."
+#: kotti/views/users.py:227
+msgid "Active"
 msgstr ""
 
-#: kotti/views/form.py:286
-#, python-format
-msgid "Maximum file size: ${size}MB"
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
 msgstr ""
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
+#: kotti/views/users.py:234
+msgid "Global roles"
 msgstr ""
 
-#: kotti/views/login.py:69
-msgid "Username"
+#: kotti/views/users.py:238
+msgid "Groups"
 msgstr ""
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
 msgstr ""
 
-#: kotti/views/login.py:83
-msgid "Register"
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
 msgstr ""
 
-#: kotti/views/login.py:90
-msgid "There was an error."
+#: kotti/views/users.py:323
+msgid "Add User"
 msgstr ""
 
-#: kotti/views/login.py:109
-msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
+#: kotti/views/users.py:333
+msgid "Send password registration link."
 msgstr ""
 
-#: kotti/views/login.py:124
+#: kotti/views/users.py:348
 #, python-format
-msgid "Register - ${title}"
+msgid "${title} was added."
 msgstr ""
 
-#: kotti/views/login.py:155
-#, python-format
-msgid "Welcome, ${user}!"
+#: kotti/views/users.py:358
+msgid "Add Group"
 msgstr ""
 
-#: kotti/views/login.py:180
-msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
 msgstr ""
 
-#: kotti/views/login.py:213
-msgid "Login failed."
+#: kotti/views/users.py:452 kotti/views/form.py:80
+msgid "Save"
 msgstr ""
 
-#: kotti/views/login.py:223
-msgid "That username or email is not known by this system."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/login.py:245
-msgid "You have been logged out."
+#: kotti/views/users.py:547
+msgid "User was not found."
 msgstr ""
 
-#: kotti/views/login.py:283
-msgid "You have reset your password."
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
 msgstr ""
 
-#: kotti/views/login.py:302
-msgid "Set password"
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
 msgstr ""
 
-#: kotti/views/login.py:330
-msgid "Your password reset token may have expired."
+#: kotti/views/users.py:572
+msgid "No name was given."
 msgstr ""
 
-#: kotti/views/login.py:337
+#: kotti/views/users.py:601
 #, python-format
-msgid "Reset your password - ${title}."
+msgid "My preferences - ${title}"
 msgstr ""
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
+#: kotti/views/form.py:177
+msgid "Item was added."
 msgstr ""
 
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
+#: kotti/views/form.py:201
+#, python-format
+msgid "Add ${type} to ${title}."
 msgstr ""
 
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
+#: kotti/views/form.py:205
+#, python-format
+msgid "Add ${type}."
 msgstr ""
 
-#: kotti/views/users.py:155
-msgid "Invalid value"
+#: kotti/views/form.py:295
+#, python-format
+msgid "Maximum file size: ${size}MB"
 msgstr ""
 
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
+#: kotti/views/login.py:66
+msgid "Username"
 msgstr ""
 
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
+#: kotti/views/login.py:80
+msgid "Register"
 msgstr ""
 
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
+#: kotti/views/login.py:87
+msgid "There was an error."
 msgstr ""
 
-#: kotti/views/users.py:229
-msgid "Active"
+#: kotti/views/login.py:106
+msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
+#: kotti/views/login.py:121
+#, python-format
+msgid "Register - ${title}"
 msgstr ""
 
-#: kotti/views/users.py:236
-msgid "Global roles"
+#: kotti/views/login.py:152
+#, python-format
+msgid "Welcome, ${user}!"
 msgstr ""
 
-#: kotti/views/users.py:240
-msgid "Groups"
+#: kotti/views/login.py:177
+msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr ""
 
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+#: kotti/views/login.py:210
+msgid "Login failed."
 msgstr ""
 
-#: kotti/views/users.py:325
-msgid "Add User"
+#: kotti/views/login.py:220
+msgid "That username or email is not known by this system."
 msgstr ""
 
-#: kotti/views/users.py:335
-msgid "Send password registration link."
+#: kotti/views/login.py:242
+msgid "You have been logged out."
 msgstr ""
 
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
+#: kotti/views/login.py:280
+msgid "You have reset your password."
 msgstr ""
 
-#: kotti/views/users.py:360
-msgid "Add Group"
+#: kotti/views/login.py:299
+msgid "Set password"
 msgstr ""
 
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
+#: kotti/views/login.py:327
+msgid "Your password reset token may have expired."
 msgstr ""
 
-#: kotti/views/users.py:549
-msgid "User was not found."
+#: kotti/views/login.py:334
+#, python-format
+msgid "Reset your password - ${title}."
 msgstr ""
 
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
 msgstr ""
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
 msgstr ""
 
-#: kotti/views/users.py:574
-msgid "No name was given."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
 msgstr ""
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
 msgstr ""
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr ""
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr ""
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr ""
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr ""
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr ""
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr ""
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr ""
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr ""
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr ""
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr ""
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr ""
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr ""
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr ""
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr ""
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr ""
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr ""
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr ""
-
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr ""
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr ""
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr ""
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr ""
diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index 61709a84b443e1b74a1530afd624b2b08fdbd126..914633a70fa632870e7786bbf17f0a0e0b6f3d7a 100644
GIT binary patch
delta 26
hcmeyE_AzZkh8(Yju7RPhp}B&gv6ZRe=2E#oA^?KT2*&^b

delta 26
hcmeyE_AzZkh8(Y%uA!l>k)?uxk(G(X=2E#oA^?K!2+aTh

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 040a55077..50584d1de 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Lecteur"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Editeur"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Propriétaire"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Administrateur"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Copier"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Couper"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Coller"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Renommer"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Supprimer"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Contenus"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Modifier"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Permissions"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Actions"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Contenus"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Document"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "Fichier"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Bienvenue dans Kotti"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -123,15 +194,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "A propos"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Notre société est spécialisée dans la conception de pièces foo utilisées dans une grande variétée de produits."
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 #, fuzzy
 msgid ""
 "\n"
@@ -190,136 +261,37 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Copier"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Couper"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Coller"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Renommer"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Supprimer"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Contenus"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Modifier"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Permissions"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Actions"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Contenus"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Document"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "Fichier"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Lecteur"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Editeur"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Propriétaire"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Administrateur"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Ajouter"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Téléverser des contenus"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Bienvenue, ${user} ! Vous êtes connecté."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Définir la vue par défaut"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Bienvenue, vous n'êtes pas connecté."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Voir"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Parcourir"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Préférences"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Paramètres du Site"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Réinitialiser votre mot de passe pour ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Bonjour, ${user_title} !"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Votre inscription sur ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Vous vous joignez à ${site_title}."
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Interdit"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Définir la vue par défaut"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -329,8 +301,8 @@ msgstr "Identifiant"
 msgid "Username or email"
 msgstr "Identifiant ou e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -363,14 +335,124 @@ msgstr ""
 msgid "Register for an account on this site."
 msgstr "Enregistrez-vous sur ce site."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Interdit"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Ajouter"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Téléverser des contenus"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Rendre ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Réinitialiser votre mot de passe pour ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Bonjour, ${user_title} !"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Votre inscription sur ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Vous vous joignez à ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Cliquez ici afin de définir votre mot de passe et vous connecter : ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Permissions pour ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Rechercher des utilisateurs ou des groupes"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Rechercher"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Assigner des rôles locaux"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Type"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Nom"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "Utilisateur"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Groupe"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+#, fuzzy
+msgid "Assign role"
+msgstr "Assigner des rôles locaux"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Appliquer les modifications"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Parcourir le Site"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Vous êtes ici :"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Supprimer ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Etes-vous sûr de vouloir supprimer ${title} ?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Annuler"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Modifier le statut de workflow"
@@ -379,36 +461,32 @@ msgstr "Modifier le statut de workflow"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Le statut de workflow d'un élément détermine qui peut le voir, l'éditer et/ou le gérer."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Titre"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Type"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Statut"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Date de création"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Date de modification"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr ""
 
@@ -433,114 +511,28 @@ msgstr "Sélectionner le nouveau statut à appliquer aux éléments choisis."
 msgid "No change"
 msgstr "Aucune modification"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Appliquer les modifications"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Annuler"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Aucun contenu ici."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Visibilité"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Visible"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "Caché"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Etes-vous sûr de vouloir supprimer les éléments suivants ?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Supprimer ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Etes-vous sûr de vouloir supprimer ${title} ?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Parcourir le Site"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Renommer ${title}"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "Chaque contenu a un nom, qui est utilisé pour créer une url, et un titre. Consultez, si besoin, le manuel à propos du format des nom et titre. Vous pouvez modifier les deux."
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "Nouveau nom"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "Nouveau titre"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Renommer ${title}"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Permissions pour ${title}"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Rechercher des utilisateurs ou des groupes"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Rechercher"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Assigner des rôles locaux"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Nom"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "Utilisateur"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Groupe"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-#, fuzzy
-msgid "Assign role"
-msgstr "Assigner des rôles locaux"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Téléverser des contenus à partir de fichiers locaux"
@@ -573,14 +565,46 @@ msgstr "Téléverser ${number} fichiers."
 msgid "Dismiss all errors"
 msgstr "Ignorer toutes les erreurs"
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Aucun contenu ici."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Visibilité"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Visible"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "Caché"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr ""
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Résultats de la recherche"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Rechercher..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Mots-clés associés :"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
@@ -589,7 +613,7 @@ msgstr "Etes-vous sûr de vouloir supprimer ${type} ${title} ?"
 msgid "Back to User Management"
 msgstr "Retour à la gestion des Utilisateurs"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Modifier ${title}"
@@ -630,321 +654,301 @@ msgstr "Ajouter un utilisateur"
 msgid "Add new group"
 msgstr "Ajouter un groupe"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Résultats de la recherche"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "Vos modifications ont été enregistrées."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Rechercher..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "Aucune modification a été effectuée."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Mots-clés associés :"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "Aucun utilisateur ou groupe a été trouvé."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Bienvenue, ${user} ! Vous êtes connecté."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Valeur invalide"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Bienvenue, vous n'êtes pas connecté."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "Un utilisateur avec ce nom existe déjà."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Aucun groupe : ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "E-mail"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Actif"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Décocher cette option pour désactiver le compte."
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Rôle global"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Groupes"
+
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "Nom complet"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Ajouter un Utilisateur"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "Envoyer un lien d'initialisation de mot de passe"
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} a été ajouté."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Ajouter un Groupe"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Gestion des utilisateurs"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Enregistrer"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "Vos modifications ont été enregistrées."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Modifier ${principal_type} ${title}"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "Utilisateur non trouvé."
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} a été supprimé."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Supprimer ${principal_type} ${title}"
+
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "Aucun nom a été indiqué."
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mes préférences - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "L'élément a été ajouté."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Ajouter un(e) ${type} dans ${title}."
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Ajouter ${type}."
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Taille maximum d'un fichier : ${size} MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "Nom complet"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Identifiant"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "E-mail"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "S'inscrire"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "Il y a une erreur."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Félicitations ! Vous venez de vous enregistrer avec succès. Vous devriez recevoir un e-mail contenant le lien permettant d'initialiser votre mot de passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "S'inscrire - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bienvenue, ${user} !"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Vous devriez recevoir un e-mail contenant un lien d'initialisation de votre mot de passe, afin d'activer votre compte."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "La connexion à échouée."
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "Cet identifiant ou cette adresse e-mail n'est pas connue du système"
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Vous avez été déconnecté."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "Vous avez réinitialisé votre mot de passe."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 #, fuzzy
 msgid "Set password"
 msgstr "Réinitialiser le mot de passe"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "Votre jeton de réinitialisation de votre mot de passe est expiré."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Réinitialiser votre mot de passe - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Gestion des utilisateurs"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "Aucune modification a été effectuée."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "Aucun utilisateur ou groupe a été trouvé."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Valeur invalide"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "Un utilisateur avec ce nom existe déjà."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "Un utilisateur avec cette adresse e-mail existe déjà."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Aucun groupe : ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Actif"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Décocher cette option pour désactiver le compte."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Rôle global"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Groupes"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Laisser vide et cochez \"Envoyer un mot de passe d'inscription\" ci-dessous pour que l'utilisateur définisse son propre mot de passe."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Ajouter un Utilisateur"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "Envoyer un lien d'initialisation de mot de passe"
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} a été ajouté."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Ajouter un Groupe"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Modifier ${principal_type} ${title}"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "Utilisateur non trouvé."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} a été supprimé."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Vue par défaut"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Supprimer ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "La vue par défaut a été réinitialisée."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "Aucun nom a été indiqué."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "La vue par défaut a été définie."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mes préférences - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "La vue par défaut ne peut pas être définie."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} a été copié."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} a été coupé."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} a été collé."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "Ne peut pas coller ce contenu. Il n'existe plus."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} a été déplacé."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} est désormais visible dans la navigation."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nest plus visible dans la navigation."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} a été supprimé."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "Rien n'a été supprimé."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Le nom et le titre sont obligatoires."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "L'élément a été renommé."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Modifier le statut"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "Décaler vers le haut"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "Décaler vers le bas"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Rendre visible"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Cacher"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "Vous avez sélectionné des éléments afin de les traiter."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Description"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Mots-clés"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Contenu"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Vue par défaut"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "La vue par défaut a été réinitialisée."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "La vue par défaut a été définie."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "La vue par défaut ne peut pas être définie."
-
 #~ msgid "Image"
 #~ msgstr "Image"
 
diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.mo b/kotti/locale/it/LC_MESSAGES/Kotti.mo
index 6487f18ec0199d30fedd940bbc1972fd1dff197e..cde449ffabf5b93c2dfcd441a6f2dd2d37ba044d 100644
GIT binary patch
delta 26
hcmbQ3Ffn1nL0Mi4T?0d1LvsZ~V=Gg`&F5sDg#dOF2k-y@

delta 26
hcmbQ3Ffn1nL0MiiT|+}%BTEGXBP$b&&F5sDg#dOm2lfB}

diff --git a/kotti/locale/it/LC_MESSAGES/Kotti.po b/kotti/locale/it/LC_MESSAGES/Kotti.po
index 3cadf06f2..724a2ef67 100644
--- a/kotti/locale/it/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/it/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Visualizzatore"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Proprietario"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Admin"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Copia"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Taglia"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Incolla"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Rinomina"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Elimina"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Contenuti"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Modificare"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Condividi"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Azioni"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Vista della cartella"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Documento"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "File"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Benvenuto in Kotti"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Congratulazioni! Avete installato Kotti con successo."
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -117,15 +188,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "Chi siamo"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "La nostra azienda è il leader nella produzione di foo widget, usati in una grande varietà di prodotti per l'aviazione e industriali."
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -156,136 +227,37 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Copia"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Taglia"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Incolla"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Rinomina"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Elimina"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Contenuti"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Modificare"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Condividi"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Azioni"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Vista della cartella"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Documento"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "File"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Visualizzatore"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Editor"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Proprietario"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Admin"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Aggiungere"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Carica contenuto"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Benvenuto, ${user}! Sei loggato."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Seleziona la vista predefinita"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Benvenuto, non sei loggato."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Vista"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Navigazione"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Configurazione del sito"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Esci"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Resetta la tua password per ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Ciao, ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Segui il link per resettare la tua password a ${site_title}: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "La tua registrazione per ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Stai entrando in ${site_title}."
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Premi qui per impostare la tua password e accedere: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Vietato"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Seleziona la vista predefinita"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -295,8 +267,8 @@ msgstr "Accedi"
 msgid "Username or email"
 msgstr "Username o email"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Password"
 
@@ -329,14 +301,124 @@ msgstr "Non sei ancora registrato?"
 msgid "Register for an account on this site."
 msgstr "Registrati per avere un account su questo sito."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Vietato"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Aggiungere"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Carica contenuto"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Rendi ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Resetta la tua password per ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Ciao, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Segui il link per resettare la tua password a ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "La tua registrazione per ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Stai entrando in ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Premi qui per impostare la tua password e accedere: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Condividi ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Cerca utenti e gruppi"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Cerca"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Assegna ruoli locali"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Tipo"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Nome"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "Utente"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Gruppo"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+#, fuzzy
+msgid "Assign role"
+msgstr "Assegna ruoli locali"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Applica le modifiche"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigazione del Sito"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Sei qua:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Elimina ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Sei sicuro di voler eliminare ${title}?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Cancella"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Cambia lo stato del workflow"
@@ -345,36 +427,32 @@ msgstr "Cambia lo stato del workflow"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Lo stato del workflow di un item determina chi lo può vedere, editare e/o modificare."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Titolo"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Tipo"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Stato"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data di creazione"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data di modifica"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr ""
 
@@ -399,114 +477,28 @@ msgstr "Seleziona il nuovo stato per tutti gli elementi selezionati."
 msgid "No change"
 msgstr "Nessuna modifica"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Applica le modifiche"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Cancella"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Non è presente nessun elemento di contenuto."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Visibilità"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Visibile"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "Nascosto"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Sei sicuro di voler eliminare i seguenti elementi?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Elimina ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Sei sicuro di voler eliminare ${title}?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Navigazione del Sito"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Rinomina ${title}"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "Ogni contenuto ha un nome, che è usato per creare la url, e un titolo. Leggi il manuale utente per saperne di più sul formato del nome e del titolo. Si possono cambiare entrambi qui sotto."
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "Nuovo nome"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "Nuovo titolo"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Rinomina ${title}"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Condividi ${title}"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Cerca utenti e gruppi"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Cerca"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Assegna ruoli locali"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Nome"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "Utente"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Gruppo"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-#, fuzzy
-msgid "Assign role"
-msgstr "Assegna ruoli locali"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Carica un contenuto da uno o più file locali"
@@ -539,14 +531,46 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Non è presente nessun elemento di contenuto."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Visibilità"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Visibile"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "Nascosto"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr ""
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Risultati di ricerca"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Cerca..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Taggati con:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
@@ -555,7 +579,7 @@ msgstr "Sei sicuro di voler eliminare ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Torna alla gestione degli utenti"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr " Modificare ${title}"
@@ -597,321 +621,301 @@ msgstr "Aggiungi un nuovo utente"
 msgid "Add new group"
 msgstr "Aggiungi un nuovo gruppo"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Risultati di ricerca"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "Le tue modifiche sono state salvate."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Cerca..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "Non sono state fatte modifiche."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Taggati con:"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "Utenti o gruppo non trovati"
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Benvenuto, ${user}! Sei loggato."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Valore invalido"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Benvenuto, non sei loggato."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "Un utente con questo nome già esiste."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "Un utente con questa email già esiste."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Gruppo non esistente: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "Email"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Attivo"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Deseleziona questo per disattivare l'account."
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Ruoli globali"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Gruppi"
+
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "Nome completo"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Aggiungi utente"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "Invia il link della password di registrazione."
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} è stato aggiunto."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Aggiungi gruppo"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Gestione utenti"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Salva"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "Le tue modifiche sono state salvate."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Modificare ${principal_type} ${title}"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "Utente non trovato."
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} è stato cancellato."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Elimina ${principal_type} ${title}"
+
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "Non è stato dato un nome."
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Le mie preferenze - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "L'elemento è stato aggiunto."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Aggiungere ${type} a ${title}."
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Aggiungere ${type}."
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Dimensione massima del file: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "Nome completo"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Username"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "Email"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "Registrazione"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "C'è stato un errore."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Complimenti! Sei registrato. Dovrebbe arrivarti una email con il link per settare la tua password e attivare il tuo account."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrazione - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Benvenuto, ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Dovresti ricevere una email con un link per resettare la tua password. Clikkandolo si attiverà il tuo account."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "Errore nell'accesso."
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "Questo username o email non è riconosciuto dal sistema."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Sei uscito."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "Hai resettato la tua password."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 #, fuzzy
 msgid "Set password"
 msgstr "Resetta password"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "Il token per resettare la tua password è scaduto."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetta la tua password - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Gestione utenti"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "Non sono state fatte modifiche."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "Utenti o gruppo non trovati"
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Valore invalido"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "Un utente con questo nome già esiste."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "Un utente con questa email già esiste."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Gruppo non esistente: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Attivo"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Deseleziona questo per disattivare l'account."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Ruoli globali"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Gruppi"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Lascia questo vuoto e seleziona il box 'Invia la password di registrazione' per mandare all'utente la sua password."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Aggiungi utente"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "Invia il link della password di registrazione."
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} è stato aggiunto."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Aggiungi gruppo"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Modificare ${principal_type} ${title}"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "Utente non trovato."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} è stato cancellato."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Vista predefinita"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Elimina ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "La vista predefinita è stata modificata a predefinita."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "Non è stato dato un nome."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "E' stata selezionata la vista predefinita."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Le mie preferenze - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "La vista predefinita non può essere selezionata."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} è stato copiato."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} è stato tagliato."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} è stato incollato."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "Non si può incollare l'elemento. L'elemento non è più esistente."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} è stato spostato."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} è ora visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} non è più visibile nella navigazione."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} è stato cancellato."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "Non è stato cancellato niente."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Nome e titolo sono obbligatori."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "L'elemento è stato rinominato"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Cambia stato"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "Muovere su"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "Muovi giù"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Mostra"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Nascondi"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "Devi selezionare degli elementi per fare quest'azione."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Descrizione"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Contenuto"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Vista predefinita"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "La vista predefinita è stata modificata a predefinita."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "E' stata selezionata la vista predefinita."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "La vista predefinita non può essere selezionata."
-
 #~ msgid "Image"
 #~ msgstr "Immagine"
 
diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.mo b/kotti/locale/ja/LC_MESSAGES/Kotti.mo
index abafddf7d6e781b37c73c5f6c3e7feae4b51721d..f0035d143c684eac24d8bc0e70c8ce7bcbf0dba2 100644
GIT binary patch
delta 31
ncmZ27i*d;;#tj~t0v5UkhPsC43Wmm3riR)EhMOZa&nN=`m7ECP

delta 31
ncmZ27i*d;;#tj~t0_M5~Cc1{E3WlauhL+j}mYX9q&nN=`mInyz

diff --git a/kotti/locale/ja/LC_MESSAGES/Kotti.po b/kotti/locale/ja/LC_MESSAGES/Kotti.po
index 2d350ce3f..9f85dd09a 100644
--- a/kotti/locale/ja/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ja/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2017-04-15 15:19+0900\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "閲覧者"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "編集者"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "所有者"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "管理者"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "コピー"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "切り取り"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "貼り付け"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "名称変更"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "削除"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "コンテンツ"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "編集"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "共有"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "アクション"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "フォルダー表示"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "ドキュメント"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "ファイル"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Kotti へようこそ"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "おめでとうございます！Kotti のインストールに成功しました！"
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -121,15 +192,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "概要"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "当社は航空および工業製品に幅広く利用されている foo ウィジェットの大手製造業者です。"
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -185,87 +256,13 @@ msgstr ""
 "<a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a> 記事で公開されています。\n"
 "</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:458
-msgid "Copy"
-msgstr "コピー"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:459
-msgid "Cut"
-msgstr "切り取り"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:455
-msgid "Paste"
-msgstr "貼り付け"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:460
-msgid "Rename"
-msgstr "名称変更"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:462
-msgid "Delete"
-msgstr "削除"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "コンテンツ"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "編集"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "共有"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "アクション"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "フォルダー表示"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "ドキュメント"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "ファイル"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "閲覧者"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "編集者"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "所有者"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "管理者"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "追加"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "アップロード"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "ようこそ ${user}! ログインしています。"
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "表示方法の設定"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "ようこそ。ログインしていません。"
 
 #: kotti/templates/editor-bar.pt:19
 msgid "View"
@@ -287,34 +284,9 @@ msgstr "サイト設定"
 msgid "Logout"
 msgstr "ログアウト"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "${site_title} のパスワードをリセット"
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "こんにちは ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "${site_title} のパスワードをリセットするにはこのリンクをクリックしてください: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "${site_title} へのアカウント登録"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "あなたは ${site_title} に参加しようとしています。"
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "パスワードをセットしてログインするにはこのリンクをクリックしてください: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "表示権限がありません"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "表示方法の設定"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -324,8 +296,8 @@ msgstr "ログイン"
 msgid "Username or email"
 msgstr "ユーザー名またはメールアドレス"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "パスワード"
 
@@ -358,14 +330,123 @@ msgstr "まだ登録していませんか?"
 msgid "Register for an account on this site."
 msgstr "このサイトにアカウントを登録しましょう。"
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "表示権限がありません"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "追加"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "アップロード"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "${state} にする"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "${site_title} のパスワードをリセット"
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "こんにちは ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "${site_title} のパスワードをリセットするにはこのリンクをクリックしてください: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "${site_title} へのアカウント登録"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "あなたは ${site_title} に参加しようとしています。"
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "パスワードをセットしてログインするにはこのリンクをクリックしてください: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "${title} を共有"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "ユーザーとグループを検索"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "検索"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "ローカルロールを指定する"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "種類"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "名称"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "ユーザー"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "グループ"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "ロールを指定する"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "変更を適用"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "ナビゲート"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "今の場所:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "${title} を削除する"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "本当に ${title} を削除しますか?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "キャンセル"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "ワークフローの状態を変更"
@@ -374,36 +455,32 @@ msgstr "ワークフローの状態を変更"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "アイテムを誰が閲覧できるか、編集できるか、管理できるかといった、ワークフローの状態を変更します。"
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "タイトル"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "種類"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "状態"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "作成日"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "変更日"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr "アイテムを選択する"
 
@@ -428,113 +505,28 @@ msgstr "新しく設定する状態を選択して下さい。"
 msgid "No change"
 msgstr "変更しない"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "変更を適用"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "ここにはコンテンツアイテムが含まれていません。"
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr "全選択 / 全解除"
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "表示状態"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "表示中"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "非表示"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "本当に以下のアイテムを削除しますか?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "${title} を削除する"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "本当に ${title} を削除しますか?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "ナビゲート"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "${title} の名称変更"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "それぞれのコンテンツには名称とタイトルがあり、名称は URL を生成するのに使用します。下のフォームでは、その両方を変更することができます。"
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "新しい名称"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "新しいタイトル"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "${title} の名称変更"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "${title} を共有"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "ユーザーとグループを検索"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "検索"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "ローカルロールを指定する"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "名称"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "ユーザー"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "グループ"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-msgid "Assign role"
-msgstr "ロールを指定する"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "ローカルファイルからコンテンツをアップロードする"
@@ -567,6 +559,26 @@ msgstr "${number} 個のファイルをアップロードする。"
 msgid "Dismiss all errors"
 msgstr "全てのエラーを非表示にする"
 
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "ここにはコンテンツアイテムが含まれていません。"
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr "全選択 / 全解除"
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "表示状態"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "表示中"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "非表示"
+
 #: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr "存在しません"
@@ -575,6 +587,18 @@ msgstr "存在しません"
 msgid "The resource could not be found"
 msgstr "リソースが見つかりません"
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "検索結果"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "検索..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "付与されたタグ:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "本当に ${type} ${title} を削除しますか?"
@@ -583,7 +607,7 @@ msgstr "本当に ${type} ${title} を削除しますか?"
 msgid "Back to User Management"
 msgstr "ユーザー管理に戻る"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "${title} を編集"
@@ -624,320 +648,300 @@ msgstr "ユーザーを追加"
 msgid "Add new group"
 msgstr "グループを追加"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "検索結果"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "変更内容を保存しました。"
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "検索..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "変更箇所がありませんでした。"
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "付与されたタグ:"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "ユーザーもグループも見つかりませんでした。"
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "ようこそ ${user}! ログインしています。"
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "無効な値"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "ようこそ。ログインしていません。"
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "同じ名称のユーザーがすでに存在します。"
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "そのメールアドレスをもつユーザーがすでに存在します。"
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "グループが見つかりません: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "メールアドレス"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "有効"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "チェックを外すと、このアカウントは無効になります。"
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "グローバルロール"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "グループ"
+
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "フルネーム"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "ユーザーを追加"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "パスワード登録を送信する。"
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} を追加しました。"
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "グループ追加"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "ユーザー管理"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "保存"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:376 kotti/views/edit/actions.py:420
-msgid "Your changes have been saved."
-msgstr "変更内容を保存しました。"
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "${principal_type} ${title} を編集"
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "ユーザーは見つかりませんでした。"
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} を削除しました。"
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "${principal_type} ${title} を削除"
+
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "名前がありません。"
+
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "個人設定 - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "アイテムを追加しました。"
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${title} に ${type} を追加する。"
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "${type} を追加する。"
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "最大ファイルサイズ: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "フルネーム"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "ユーザー名"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "メールアドレス"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "登録"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "エラーが発生しました。"
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "おめでとうございます! 登録が完了しました。Eメールのリンクから、すぐにパスワードを設定して下さい。"
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "登録 - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "ようこそ ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "まもなくパスワードをリセットするためのリンクが記載されたメールが送信されます。"
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "ログインに失敗しました。"
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "ユーザー名もメールアドレスも見つかりませんでした。"
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "ログアウトしました。"
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "パスワードのリセットに成功しました。"
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 msgid "Set password"
 msgstr "パスワードを設定"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "パスワードをリセットするためのトークンが期限切れです。"
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "パスワードのリセット - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "ユーザー管理"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:314 kotti/views/edit/actions.py:380
-#: kotti/views/edit/actions.py:422 kotti/views/edit/actions.py:426
-msgid "No changes were made."
-msgstr "変更箇所がありませんでした。"
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "ユーザーもグループも見つかりませんでした。"
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "無効な値"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "同じ名称のユーザーがすでに存在します。"
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "そのメールアドレスをもつユーザーがすでに存在します。"
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "グループが見つかりません: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "有効"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "チェックを外すと、このアカウントは無効になります。"
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "グローバルロール"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "グループ"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "この項目を空にして下の 'パスワード登録を送信する' をチェックすると、ユーザー自身にパスワードを設定させられます。"
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "ユーザーを追加"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "パスワード登録を送信する。"
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} を追加しました。"
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "グループ追加"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "${principal_type} ${title} を編集"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "ユーザーは見つかりませんでした。"
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} を削除しました。"
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "デフォルト表示"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "${principal_type} ${title} を削除"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "デフォルト表示は既定値にリセットされました。"
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "名前がありません。"
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "デフォルト表示が設定されました。"
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "個人設定 - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "デフォルト表示は設定できませんでした。"
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} をコピーしました。"
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} を切り取りました。"
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} を貼り付けました。"
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "ノードを張り付けできません。何も存在していません。"
 
-#: kotti/views/edit/actions.py:185
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} を移動しました。"
 
-#: kotti/views/edit/actions.py:227
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} がナビゲーションに表示されるようになりました。"
 
-#: kotti/views/edit/actions.py:230
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} がナビゲーションでは非表示になりました。"
 
-#: kotti/views/edit/actions.py:279 kotti/views/edit/actions.py:308
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} を削除しました。"
 
-#: kotti/views/edit/actions.py:305
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "削除対象がありません。"
 
-#: kotti/views/edit/actions.py:341 kotti/views/edit/actions.py:368
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "名称とタイトルは必須です。"
 
-#: kotti/views/edit/actions.py:345
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "名称変更しました"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "状態を変更"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "上に移動する"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "下に移動する"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "表示中にする"
 
-#: kotti/views/edit/actions.py:470
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "非表示にする"
 
-#: kotti/views/edit/actions.py:509
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "アクションを適用するアイテムを選択してください。"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "説明"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "タグ"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "本文"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "デフォルト表示"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "デフォルト表示は既定値にリセットされました。"
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "デフォルト表示が設定されました。"
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "デフォルト表示は設定できませんでした。"
-
 #~ msgid "Image"
 #~ msgstr "画像"
 
diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.mo b/kotti/locale/ko/LC_MESSAGES/Kotti.mo
index a545bf068a46446eb14b63bd0b07ce9d33e50489..530eaeff67fa4f169fa8c9cabdef4eb54f89eb2f 100644
GIT binary patch
delta 26
icmX?=dMb6pDOp|%T?0d1LvsZ~V=Gg`&DUi=ivR$GXbCU?

delta 26
icmX?=dMb6pDOp}KT|+}%BTEGXBP$b&&DUi=ivR$Gi3v6U

diff --git a/kotti/locale/ko/LC_MESSAGES/Kotti.po b/kotti/locale/ko/LC_MESSAGES/Kotti.po
index 1baa18a8a..eda4adcf7 100644
--- a/kotti/locale/ko/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/ko/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "열람자"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "편집자"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "소유자"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "관리자"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "복사"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "잘라내기"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "붙여넣기"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "이름 바꾸기"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "삭제"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "컨텐츠 항목"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "편집"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "공유"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "동작"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "폴더로 보임"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "문서"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "파일"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Kotti에 오신 것을 환영합니다"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "축하합니다! 성공적으로 Kotti를 설치했습니다."
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -117,15 +188,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "이 사이트에 대하여"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "우리 회사는 다양한 범위의 항공 및 산업 제품들에 사용되는 foo 위젯의 선두 제조업체입니다."
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 #, fuzzy
 msgid ""
 "\n"
@@ -184,136 +255,37 @@ msgstr ""
 "  article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "복사"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "잘라내기"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "붙여넣기"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "이름 바꾸기"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "삭제"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "컨텐츠 항목"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "편집"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "공유"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "동작"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "폴더로 보임"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "문서"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "파일"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "열람자"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "편집자"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "소유자"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "관리자"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "추가"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "컨텐트 올리기"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "${user}님, 환영합니다! 로그인되었습니다."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "보이는 방식 설정"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "환영합니다, 로그인되지 않았습니다."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "보기"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "둘러보기"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "사이트 설정"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "로그아웃"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "${site_title}의 암호를 재설정하십시오."
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "${user_title}님, 안녕하세요!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "이 링크를 눌러 ${site_title}에서의 암호를 설정하십시오: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "${site_title} 가입"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "${site_title}에 가입 중입니다."
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "금지됨"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "보이는 방식 설정"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -323,8 +295,8 @@ msgstr "로그인"
 msgid "Username or email"
 msgstr "사용자 이름 혹은 전자메일"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "암호"
 
@@ -357,14 +329,124 @@ msgstr "아직 등록하지 않으셨습니까?"
 msgid "Register for an account on this site."
 msgstr "이 사이트에 계정을 등록하십시오."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "금지됨"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "추가"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "컨텐트 올리기"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "\"${state}\"로(으로) 바꿈"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "${site_title}의 암호를 재설정하십시오."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "${user_title}님, 안녕하세요!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "이 링크를 눌러 ${site_title}에서의 암호를 설정하십시오: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "${site_title} 가입"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "${site_title}에 가입 중입니다."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "여기를 눌러 암호를 설정 후 로그인하십시오: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "\"${title}\" 공유하기"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "사용자와 그룹 검색"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "검색"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "컨텐츠별 역할 부여"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "유형"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "이름"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "사용자"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "그룹"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr ""
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+#, fuzzy
+msgid "Assign role"
+msgstr "컨텐츠별 역할 부여"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "바꾸기 적용"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "사이트 둘러보기"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "현재 위치:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "\"${title}\" 삭제"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "\"${title}\"을(를) 정말 지우겠습니까?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "취소"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "작업 상태 바꾸기"
@@ -373,36 +455,32 @@ msgstr "작업 상태 바꾸기"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "항목의 작업 상태에 따라 항목을 누가 읽거나 고치고, 관리할 수 있는지 달라집니다."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "제목"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "유형"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "작업 상태"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "만든 날"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "바꾼 날"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr ""
 
@@ -427,114 +505,28 @@ msgstr "고른 항목 모두가 갖게 될 상태를 선택하십시오."
 msgid "No change"
 msgstr "바꾸지 않음"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "바꾸기 적용"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "취소"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "여기엔 하위 항목이 없습니다."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "가시성"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "보임"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "숨김"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "다음 항목을 정말 지우겠습니까?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "\"${title}\" 삭제"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "\"${title}\"을(를) 정말 지우겠습니까?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "사이트 둘러보기"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "\"${title}\" 이름 바꾸기"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "각 컨텐트 항목은 이름을 가지며, 이는 URL과 제목을 만드는데 사용됩니다. 이름과 제목의 올바른 형식에 대해 알려면 사용자 매뉴얼을 읽으십시오. 둘 다 아래에서 바꿀 수 있습니다."
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "새 이름"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "새 제목"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "\"${title}\" 이름 바꾸기"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "\"${title}\" 공유하기"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "사용자와 그룹 검색"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "검색"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "컨텐츠별 역할 부여"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "이름"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "사용자"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "그룹"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr ""
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-#, fuzzy
-msgid "Assign role"
-msgstr "컨텐츠별 역할 부여"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "내 컴퓨터에서 컨텐트 올리기"
@@ -567,14 +559,46 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "여기엔 하위 항목이 없습니다."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "가시성"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "보임"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "숨김"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr ""
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "검색결과"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "검색..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "태그:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
@@ -583,7 +607,7 @@ msgstr "${type} \"${title}\"을 정말 지우겠습니까?"
 msgid "Back to User Management"
 msgstr "사용자 관리로 되돌아가기"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "\"${title}\" 편집"
@@ -625,321 +649,301 @@ msgstr "새 사용자 추가"
 msgid "Add new group"
 msgstr "새 그룹 추가"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "검색결과"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "수정사항이 저장되었습니다."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "검색..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "아무 것도 바뀌지 않았습니다."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "태그:"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "사용자나 그룹이 발견되지 않았습니다."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "${user}님, 환영합니다! 로그인되었습니다."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "잘못된 값입니다."
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "환영합니다, 로그인되지 않았습니다."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "그런 그룹이 없습니다: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "전자메일"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "활성"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "계정을 비활성화하려면 체크를 해제하십시오."
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "전역 역할"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "그룹"
+
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "전체 이름"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "사용자 추가"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "암호 등록 링크를 발송"
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "\"${title}\"이(가) 추가되었습니다."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "그룹 추가"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "사용자 관리"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "저장"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "수정사항이 저장되었습니다."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "${principal_type} \"${title}\" 편집"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "사용자가 없습니다."
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} \"${title}\"이(가) 지워졌습니다."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "${principal_type} \"${title}\" 삭제"
+
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "이름이 주어지지 않았습니다."
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "나의 선호사항"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "항목이 추가되었습니다."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "${type}을(를) \"${title}\"에 추가합니다."
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "${type}을(를) 추가합니다."
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "최대 파일 크기: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "전체 이름"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "사용자 이름"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "전자메일"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "등록하기"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "오류가 있습니다."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "축하합니다! 성공적으로 등록되었습니다. 전자메일로 암호를 설정하는 전자메일을 받게 됩니다. 암호 설정 후 계정이 활성화됩니다."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "등록 - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "${user}님, 환영합니다!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "암호를 재설정할 링크를 전자메일로 받게 됩니다. 설정하면 계정이 활성화됩니다."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "로그인이 실패했습니다."
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "이 시스템에 없는 사용자 이름이나 전자메일입니다."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "로그아웃되었습니다."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "암호를 재설정했습니다."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 #, fuzzy
 msgid "Set password"
 msgstr "암호 재설정"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "암호 재설정 토큰이 만료된 것 같습니다."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "암호를 재설정하세요 - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "사용자 관리"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "아무 것도 바뀌지 않았습니다."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "사용자나 그룹이 발견되지 않았습니다."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "잘못된 값입니다."
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "그 이름을 쓰는 사용자가 이미 있습니다."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "그 전자메일을 쓰는 사용자가 이미 있습니다."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "그런 그룹이 없습니다: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "활성"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "계정을 비활성화하려면 체크를 해제하십시오."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "전역 역할"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "그룹"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "여길 비워두고 아래 '암호 등록 링크 발송'을 체크하면 사용자가 직접 암호를 설정합니다."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "사용자 추가"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "암호 등록 링크를 발송"
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "\"${title}\"이(가) 추가되었습니다."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "그룹 추가"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "${principal_type} \"${title}\" 편집"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "사용자가 없습니다."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} \"${title}\"이(가) 지워졌습니다."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "기본형으로 보임"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "${principal_type} \"${title}\" 삭제"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "기본형 보기로 재설정되었습니다."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "이름이 주어지지 않았습니다."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "보이는 방식이 설정되었습니다."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "나의 선호사항"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "보이는 방식을 설정할 수 없었습니다."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "\"${title}\"이(가) 복사되었습니다."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "\"${title}\"이(가) 잘라내어졌습니다."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "\"${title}\"이(가) 붙여넣어졌습니다."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "노드를 붙여넣을 수 없습니다. 그 노드가 존재하지 않습니다."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "\"${title}\"이(가) 옮겨졌습니다."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "\"${title}\"이(가) 이제 둘러보기에 나타납니다."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "\"${title}\"이(가) 이젠 둘러보기에 나타나지 않습니다."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "\"${title}\"이(가) 지워졌습니다."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "아무것도 지워지지 않았습니다."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "이름과 제목이 필요합니다."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "항목이 재명명되었습니다."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "작업 상태 바꾸기"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "위로 옮김"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "아래로 옮김"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "보이기"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "숨기기"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "적용할 항목을 선택해야합니다."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "설명"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "태그"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "본문"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "기본형으로 보임"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "기본형 보기로 재설정되었습니다."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "보이는 방식이 설정되었습니다."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "보이는 방식을 설정할 수 없었습니다."
-
 #~ msgid "Image"
 #~ msgstr "화상"
 
diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.mo b/kotti/locale/nl/LC_MESSAGES/Kotti.mo
index f164f2a7c65a6e91df8ab1e8e3b525a49049f135..3c2a8e718f15fedf8977a7b611ce95fbfc0301bd 100644
GIT binary patch
delta 26
hcmaDE@-k#Ym=v#tu7RPhp}B&gv6ZRe=42^00RVZ=2W<cV

delta 26
hcmaDE@-k#Ym=v#>uA!l>k)?uxk(G(X=42^00RVaM2Xg=b

diff --git a/kotti/locale/nl/LC_MESSAGES/Kotti.po b/kotti/locale/nl/LC_MESSAGES/Kotti.po
index 6ff3ebc32..36879dcb5 100644
--- a/kotti/locale/nl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/nl/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Lezer"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Eigenaar"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Beheerder"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Kopiëren"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Knippen"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Plakken"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Hernoemen"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Inhoud"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Bewerken"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Delen"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Acties"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Map weergave"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Document"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "Bestand"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +142,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -110,136 +181,37 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Knippen"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Plakken"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Hernoemen"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Inhoud"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Bewerken"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Delen"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Acties"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Map weergave"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Document"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "Bestand"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Lezer"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Editor"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Eigenaar"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Beheerder"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Toevoegen"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Inhoud Opladen"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Welkom, ${user}! U bent nu aangemeld."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Zet standaard weergave"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Wilkom, je bent niet aangemeld."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Weergeven"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Navigeren"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Site Instellingen"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Afmelden"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Herstel je wachtwoord voor ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Welkom, ${user}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Je registratie voor ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Je treedt toe tot ${site_title}."
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Verboden"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Zet standaard weergave"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -249,8 +221,8 @@ msgstr "Aanmelden"
 msgid "Username or email"
 msgstr "Gebuikersnaam of e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -285,14 +257,124 @@ msgstr ""
 msgid "Register for an account on this site."
 msgstr "Nog niet geregistreerd? ${register} voor een account op deze site."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Verboden"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Toevoegen"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Inhoud Opladen"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Maak ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Herstel je wachtwoord voor ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Welkom, ${user}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klik deze link om je wachtwoord opnieuw in te stellen voor ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Je registratie voor ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Je treedt toe tot ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klik hier om je wachtwoord opnieuw in te stellen en aan te melden: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Delen ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Zoeken naar gebruikers en groepen"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Zoeken"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Locale rollen toewijzen"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Type"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Naam"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "gebruiker"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Groep"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+#, fuzzy
+msgid "Assign role"
+msgstr "Locale rollen toewijzen"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Wijzigingen toepassen"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Site Navigeren"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "U bent hier:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Verwijder ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Ben je zeker dat je ${title} wil verwijderen?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Annuleren"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Wijzig de workflow status"
@@ -301,36 +383,32 @@ msgstr "Wijzig de workflow status"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Een item zijn workflow status bepaalt wie het kan zien, bewerken en/of beheren."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Titel"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Type"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Status"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Aanmaak datum"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Wijzigingsdatum"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr ""
 
@@ -347,121 +425,35 @@ msgstr "Indien aangevinkt zal een poging ondernomen worden om de status van alle
 msgid "Change state to"
 msgstr "Wij status naar"
 
-#: kotti/templates/edit/change-state.pt:55
-msgid "Select the new state where all chosen items should be set."
-msgstr "Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te worden."
-
-#: kotti/templates/edit/change-state.pt:60
-msgid "No change"
-msgstr "Geen wijzigingen"
-
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Wijzigingen toepassen"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Bevat geen content items."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Zichtbaarheid"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Zichtbaar"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "Verborgen"
-
-#: kotti/templates/edit/delete-nodes.pt:13
-msgid "Are you sure you want to delete the following items?"
-msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
-
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Verwijder ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Ben je zeker dat je ${title} wil verwijderen?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Site Navigeren"
-
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
-msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
-msgstr "Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel en naam. Je kan beiden hieronder aanpassen."
-
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
-msgid "New name"
-msgstr "Nieuwe naam"
-
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
-msgid "New title"
-msgstr "Nieuwe titel"
-
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Hernoemen ${title}"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Delen ${title}"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Zoeken naar gebruikers en groepen"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Zoeken"
+#: kotti/templates/edit/change-state.pt:55
+msgid "Select the new state where all chosen items should be set."
+msgstr "Selecteer de nieuwe status waarin alle geselecteerde items dienen gezet te worden."
 
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Locale rollen toewijzen"
+#: kotti/templates/edit/change-state.pt:60
+msgid "No change"
+msgstr "Geen wijzigingen"
 
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Naam"
+#: kotti/templates/edit/delete-nodes.pt:13
+msgid "Are you sure you want to delete the following items?"
+msgstr "Ben je zeker dat je de volgende items wil verwijderen?"
 
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "gebruiker"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Hernoemen ${title}"
 
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Groep"
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Elk inhoudsitem heeft een naam die gebruikt wordt om een url en titel aan te maken. Lees de gebruikershandleiding inzake correcte naamgeving voor titel en naam. Je kan beiden hieronder aanpassen."
 
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
+msgid "New name"
+msgstr "Nieuwe naam"
 
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-#, fuzzy
-msgid "Assign role"
-msgstr "Locale rollen toewijzen"
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
+msgid "New title"
+msgstr "Nieuwe titel"
 
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
@@ -496,14 +488,46 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Bevat geen content items."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Zichtbaarheid"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Zichtbaar"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "Verborgen"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr ""
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Zoek Resultaten"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Zoeken..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Getagd met:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
@@ -512,7 +536,7 @@ msgstr "Ben je zeker dat je ${type} ${title} wil verwijderen?"
 msgid "Back to User Management"
 msgstr "Terug naar gebruiksersbeheer"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Bewerken ${title}"
@@ -559,321 +583,301 @@ msgstr "Gebruiker toevoegen"
 msgid "Add new group"
 msgstr "Groep toevoegen"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Zoek Resultaten"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "Je wijzigingen werden opgeslagen."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Zoeken..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "Geen wijzigingen aangebracht."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Getagd met:"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "Geen gebruikers of groepen werden gevonden."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Welkom, ${user}! U bent nu aangemeld."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Ongeldige waarde"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Wilkom, je bent niet aangemeld."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "Een gebruiker met deze naam bestaat reeds."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "Een gebruiker met deze naam bestaat reeds."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Onbekende groep: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "E-mailadres"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Actief"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Uitvinken om je account te de-activeren."
+
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Globale rollen"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Groepen"
+
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "Volledige naam"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Gebruiker toevoegen"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "Verstuur wachtwoord registratie link."
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} werd toegevoegd."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Groep toevoegen"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Gebruikersbeheer"
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Opslaan"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "Je wijzigingen werden opgeslagen."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Bewerk ${principal_type} ${title}"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "De gebruiker werd niet gevonden."
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} werd verwijderd."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Verwijder ${principal_type} ${title}"
+
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "Er werd geen naam ingevoerd."
+
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mijn instellingen - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Item werd toegevoegd."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Voeg ${type} aan ${title} toe."
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Voeg ${type} toe."
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximale bestandsgrootte: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "Volledige naam"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "E-mailadres"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "Registreer"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "Er trad een fout op."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Proficiat! Je bent geregistreerd. Je zal een e-mail ontvangen met een link om je wachtwoord in te stellen. Deze handeling zal je account activeren."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "Refistreer - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Welkom, ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Je zal een e-mail ontvangen met een link om je wachtwoord te herstellen. Via deze link activeer je je account."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "Aanmelden mislukt."
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "Deze gebruikersnaam of e-mailadres is ons onbekend."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Je bent afgemeld."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "Je wachtwoord werd hersteld."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 #, fuzzy
 msgid "Set password"
 msgstr "Wachtwoord herstellen"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "Je wachtwoord herstellen link is mogelijks vervallen."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Herstel je wachtwoord - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Gebruikersbeheer"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "Geen wijzigingen aangebracht."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "Geen gebruikers of groepen werden gevonden."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Ongeldige waarde"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "Een gebruiker met deze naam bestaat reeds."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "Een gebruiker met deze naam bestaat reeds."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Onbekende groep: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Actief"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Uitvinken om je account te de-activeren."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Globale rollen"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Groepen"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Laat dit veld leeg en vink de optie 'Verstuur wachtwoord registratie' hieronder aan zodat de gebruiker zelf een wachtwoord kan instellen."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Gebruiker toevoegen"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "Verstuur wachtwoord registratie link."
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} werd toegevoegd."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Groep toevoegen"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Bewerk ${principal_type} ${title}"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "De gebruiker werd niet gevonden."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} werd verwijderd."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Standaard weergave"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Verwijder ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "Standaard weergave werd hersteld naar standaard."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "Er werd geen naam ingevoerd."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "Standaard weergave is ingesteld."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mijn instellingen - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "Standaar weergave kon niet ingesteld worden."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} werd gekopieerd."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} werd geknipt."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} werd geplakt."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "De node kon niet geplakt worden. Hij bestaat niet meer."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} werd verplaatst."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} is nu zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} is niet langer zichtbaar in de navigatie."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} werd verwijderd."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "Er werd niks verwijderd."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Naam en titel zijn vereist."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "Item werd hernoemd."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Wijzig Status."
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "Naar boven"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Weergeven"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Verbergen"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "Je dient items te selecteren om acties uit te voeren."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Beschrijving"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Tags"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Inhoud"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Standaard weergave"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "Standaard weergave werd hersteld naar standaard."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "Standaard weergave is ingesteld."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "Standaar weergave kon niet ingesteld worden."
-
 #~ msgid "Image"
 #~ msgstr "Afbeelding"
 
diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.mo b/kotti/locale/pl/LC_MESSAGES/Kotti.mo
index e02efef85ac5d3a7c40aba12fded06d791d8af8c..9f0b00c97a93619659f1384da6070bb72ce1684a 100644
GIT binary patch
delta 28
jcmeC{VeIQ++~A?fYoTjksB37hU}$V*YPdO6bEgadcXtQs

delta 28
jcmeC{VeIQ++~A?fYo=>xsB2`YU|?irVzD_?bEgadcbEt8

diff --git a/kotti/locale/pl/LC_MESSAGES/Kotti.po b/kotti/locale/pl/LC_MESSAGES/Kotti.po
index 3269a997c..c0f712f78 100644
--- a/kotti/locale/pl/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pl/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Czytelnik"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Edytor"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Właściciel"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Administrator"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Wytnij"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Wklej"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Zmień nazwę"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Usuń"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Zawartość"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Edytuj"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Udostępnij"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Akcje"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Widok katalogów"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "Plik"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Witaj w Kotti"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulacje! Właśnie zainstalowałeś Kotti."
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -120,15 +191,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "Informacje"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Nasza firma jest wiodącym producentem urządzeń foo używanych w szerokim asortymencie produktów dla lotnictwa i przemysłu."
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -185,136 +256,37 @@ msgstr ""
 "  <a href=\"http://en.wikipedia.org/wiki/Extra_EA-300\"> Extra EA-300</a>.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Kopiuj"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Wytnij"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Wklej"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Zmień nazwę"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Usuń"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Zawartość"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Edytuj"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Udostępnij"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Akcje"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Widok katalogów"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Dokument"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "Plik"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Czytelnik"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Edytor"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Właściciel"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Administrator"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Dodaj"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Dołącz treści"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Witaj, ${user}! Jesteś zalogowany."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Ustaw domyślny widok"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Witaj, nie jesteś zalogowany."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Widok"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Nawigacja"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Ustawienia strony"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Zresetuj swoje hasło do ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Witaj, ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Kliknij na link, aby zresetować hasło do ${site_title}: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Rejestracja na ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Rejestrujesz się na ${site_title}."
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Brak dostępu"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Ustaw domyślny widok"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -324,8 +296,8 @@ msgstr "Logowanie"
 msgid "Username or email"
 msgstr "Nazwa użytkownika lub email"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Hasło"
 
@@ -358,14 +330,123 @@ msgstr "Nie jesteś jeszcze zarejestrowany?"
 msgid "Register for an account on this site."
 msgstr "Zarejestruj się na stronie."
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Brak dostępu"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Dodaj"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Dołącz treści"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Zrób ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Zresetuj swoje hasło do ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Witaj, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Kliknij na link, aby zresetować hasło do ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Rejestracja na ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Rejestrujesz się na ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Kliknij tutuaj, aby ustawić hasło i zalogować się do: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Udostępnij ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Szukaj użytkowników i grup"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Szukaj"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Przypisz lokalne role"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Nazwa"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "Użytkownik"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Grupa"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "Przypisz rolę"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Zapisz zmiany"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Nawigacja strony"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Jesteś tutaj:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Usuń ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Anuluj"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Zmień stan publikacji"
@@ -374,36 +455,32 @@ msgstr "Zmień stan publikacji"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Stan publikacji elementu określa kto może go zobaczyć, edytować i/lub zarządzać nim."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Tytuł"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Typ"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Stan"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data modyfikacji"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr "Wybierz obiekt"
 
@@ -428,113 +505,28 @@ msgstr "Zaznacz nowy stan, gdzie wszystkie wybrane elementy zostaną zmienione."
 msgid "No change"
 msgstr "Bez zmian"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Zapisz zmiany"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Brak elementów potomnych."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr "Zaznacz / odznacz wszystko"
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Widoczność"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Widoczny"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "Ukryty"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Czy jesteś pewien, że chcesz usunąć wybrane elementy?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Usuń ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Czy jesteś pewien, że chcesz usunąć ${title}?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Nawigacja strony"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Zmień nazwę ${title}"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "Każda element ma swoje imię, które używane jest do tworzenia url'a i tytułu. W razie potrzeby przeczytaj poradnik użytkownika o poprawnym formatowaniu nazwy i tytułu. Możesz zmienić obie rzeczy niżej."
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "Nowa nazwa"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "Nowy tytuł"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Zmień nazwę ${title}"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Udostępnij ${title}"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Szukaj użytkowników i grup"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Szukaj"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Przypisz lokalne role"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Nazwa"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "Użytkownik"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Grupa"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-msgid "Assign role"
-msgstr "Przypisz rolę"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Załącz zawartość z lokalnego pliku(ów)"
@@ -567,14 +559,46 @@ msgstr "Prześlij ${number} plików."
 msgid "Dismiss all errors"
 msgstr "Zignoruj wszystkie błędy"
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Brak elementów potomnych."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr "Zaznacz / odznacz wszystko"
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Widoczność"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Widoczny"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "Ukryty"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr "Nie znaleziono"
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr "Zasób nie został znaleziony"
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Wyniki wyszukania"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Szukaj..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Otagowane z:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
@@ -583,7 +607,7 @@ msgstr "Czy jesteś pewien, że chesz usunąć ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Powrót do zarządzania użytkownikami"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Edycja ${title}"
@@ -624,320 +648,300 @@ msgstr "Dodaj nowego użytkownika"
 msgid "Add new group"
 msgstr "Dodaj nową grupę"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Wyniki wyszukania"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "Twoje zmiany zostały zapisane."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Szukaj..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "Nie wykonano żadnych zmian."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Otagowane z:"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "Nie znaleziono użytkowników ani grup."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Witaj, ${user}! Jesteś zalogowany."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Niepoprawna wartość"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Witaj, nie jesteś zalogowany."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "Użytkownik z takim imieniem już istnieje."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "Użytkownik z takim adresem email już istnieje."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Nie ma takiej grupy: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "Email"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Aktywne"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Odznacz, aby dezaktywować konto."
+
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Globalne role"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Grupy"
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "Imię i nazwisko"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Dodaj użytkownika"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "Wyślij link do rejestracji na email."
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} został dodany."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Dodaj grupę"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Zarządzanie użytkownikami"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Zapisz"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "Twoje zmiany zostały zapisane."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Edycja ${principal_type} ${title}"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "Użytkownik nie został odnaleziony."
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} został usunięty."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Usuń ${principal_type} ${title}"
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "Nie przekazano nazwy."
+
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Moje ustawienia - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Element został dodany."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Dodaj ${type} do ${title}."
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Dodaj ${type}."
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maksymalny rozmiar pliku: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "Imię i nazwisko"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "Email"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "Wystąpił błąd."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Gratulacje! Zarejestrowałeś się. Powinieneś otrzymać email z linkiem do ustawienia swego hasła. Robiąc to aktywujesz konto."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "Zarejestruj - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Witaj, ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Powinieneś otrzymać email z linkiem do resetu hasła. Resetując hasło aktywujesz swoje konto."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "Nie udało się zalogować."
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "Nieznana nazwa użytkownika lub email."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Zostałeś wylogowany."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "Zresetowałeś swoje hasło."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 msgid "Set password"
 msgstr "Ustaw hasło"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "Twój token do resetu hasła mógł stracić ważność."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Resetowanie hasła - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Zarządzanie użytkownikami"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "Nie wykonano żadnych zmian."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "Nie znaleziono użytkowników ani grup."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Niepoprawna wartość"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "Użytkownik z takim imieniem już istnieje."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "Użytkownik z takim adresem email już istnieje."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Nie ma takiej grupy: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Aktywne"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Odznacz, aby dezaktywować konto."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Globalne role"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Grupy"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Zostaw to puste i zaznacz 'Wyślij link do rejestracji' poniżej, aby użytkownik sam ustawił sobie hasło."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Dodaj użytkownika"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "Wyślij link do rejestracji na email."
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} został dodany."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Dodaj grupę"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Edycja ${principal_type} ${title}"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "Użytkownik nie został odnaleziony."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} został usunięty."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Domyślny widok"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Usuń ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "Zresetowano widok na domyślny."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "Nie przekazano nazwy."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "Ustawiono domyślny widok."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Moje ustawienia - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "Domyślny widok nie mógł zostać ustawiony."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} został skopiowany."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} został wycięty."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} został wklejony."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "Nie można wkleić. Element już nie istnieje."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} został przeniesiony."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} jest teraz widoczny w nawigacji."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} nie jest już widoczny w nawigacji."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} został usunięty."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "Nic nie zostało usunięte"
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Nazwa i tytuł są obowiązkowe."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "Zmieniono nazwę elementu."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Zmień stan"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "W górę"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "W dół"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Pokaż"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Ukryj"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "Musisz zaznaczyć elementy, aby wykonać akcję."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Opis"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Tagi"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Treść"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Domyślny widok"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "Zresetowano widok na domyślny."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "Ustawiono domyślny widok."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "Domyślny widok nie mógł zostać ustawiony."
-
 #~ msgid "Image"
 #~ msgstr "Obraz"
 
diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.mo b/kotti/locale/pt/LC_MESSAGES/Kotti.mo
index fbcfd63116efef4b4536c0890f301b4417563b2c..dde197a9e56ae7be518ff9a7b98d325ebf252141 100644
GIT binary patch
delta 26
hcmdmOx!ZC>pb)Qxu7RPhp}B&gv6ZRe<~X5PE&yvb2ND1P

delta 26
hcmdmOx!ZC>pb)Q_uA!l>k)?uxk(G(X<~X5PE&yv+2N(bV

diff --git a/kotti/locale/pt/LC_MESSAGES/Kotti.po b/kotti/locale/pt/LC_MESSAGES/Kotti.po
index 4b8229510..df084a2af 100644
--- a/kotti/locale/pt/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/pt/LC_MESSAGES/Kotti.po
@@ -1,18 +1,89 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Leitor"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Editor"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Dono"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Admin"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Copiar"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Cortar"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Colar"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Renomear"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Apagar"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Conteúdo"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Editar"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Partilha"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Ações"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Vista de pasta"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Documento"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "Ficheiro"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr ""
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr ""
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, c-format
 msgid ""
 "\n"
@@ -71,15 +142,15 @@ msgid ""
 "</div>\n"
 msgstr ""
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr ""
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr ""
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -110,139 +181,37 @@ msgid ""
 "</small></p>\n"
 msgstr ""
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Copiar"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Cortar"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Colar"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Renomear"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Apagar"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Conteúdo"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Editar"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Partilha"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Ações"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Vista de pasta"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Documento"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "Ficheiro"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Leitor"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Editor"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Dono"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Admin"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Adicionar"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Colocar Conteúdo"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Bem-vindo, ${user}! Você está autenticado."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Definir vista por defeito"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Bem-vindo, você não está autenticado."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Ver"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Navegar"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Preferências"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Configurar Sítio"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Sair"
 
-#: kotti/templates/email-reset-password.pt:2
-#, fuzzy
-msgid "Reset your password for ${site_title}."
-msgstr "Reiniciar a sua palavra passe em ${site_title}"
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Bem-vindo, ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "O seu registo em ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-#, fuzzy
-msgid "You are joining ${site_title}."
-msgstr "O seu registo em ${site_title}"
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-#, fuzzy
-msgid "Forbidden"
-msgstr "Escondido"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Definir vista por defeito"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -252,8 +221,8 @@ msgstr "Entrar"
 msgid "Username or email"
 msgstr "Utilizador ou e-mail"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Palavra passe"
 
@@ -288,14 +257,128 @@ msgstr ""
 msgid "Register for an account on this site."
 msgstr "Não se encontra registado? ${register} para criar uma conta."
 
+#: kotti/templates/forbidden.pt:10
+#, fuzzy
+msgid "Forbidden"
+msgstr "Escondido"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Adicionar"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Colocar Conteúdo"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Tornar ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+#, fuzzy
+msgid "Reset your password for ${site_title}."
+msgstr "Reiniciar a sua palavra passe em ${site_title}"
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Bem-vindo, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Clique aqui para reiniciar a sua palavra passe em ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "O seu registo em ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+#, fuzzy
+msgid "You are joining ${site_title}."
+msgstr "O seu registo em ${site_title}"
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Clique aqui para definir a sua palavra passe e para entrar: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Partilhar ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Procurar utilizadores e grupos"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Procurar"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Atribuir papéis locais"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Tipo"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Nome"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "Utilizador"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Grupo"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+#, fuzzy
+msgid "Assign role"
+msgstr "Atribuir papéis locais"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Aplicar alterações"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+#, fuzzy
+msgid "Navigate Site"
+msgstr "Navegar"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Você está aqui:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Apagar ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Deseja realmente eliminar ${title}?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Modificar estado de workflow"
@@ -304,36 +387,32 @@ msgstr "Modificar estado de workflow"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "O estado de workflow de um item define quem o pode ver, edit e/ou administrar."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Título"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Tipo"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Estado"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Data de Modificação"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr ""
 
@@ -357,118 +436,30 @@ msgstr "Selecione o novo estado para os items selecionados."
 
 #: kotti/templates/edit/change-state.pt:60
 msgid "No change"
-msgstr "Não foram efectuadas nenhumas alterações"
-
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Aplicar alterações"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Não existem items nesta pasta."
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr ""
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Visibilidade"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Visível"
-
-#: kotti/templates/edit/contents.pt:74
-#, fuzzy
-msgid "Hidden"
-msgstr "Escondido"
-
-#: kotti/templates/edit/delete-nodes.pt:13
-msgid "Are you sure you want to delete the following items?"
-msgstr "Deseja realmente eliminar os items seguintes?"
-
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Apagar ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Deseja realmente eliminar ${title}?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-#, fuzzy
-msgid "Navigate Site"
-msgstr "Navegar"
-
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
-#, fuzzy
-msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
-msgstr "Cada item tem um nome que será usado para criar o url e o título.  Poderá alterá-los colocando os novos detalhes abaixo."
-
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
-msgid "New name"
-msgstr "Novo nome"
-
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
-msgid "New title"
-msgstr "Novo título"
-
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Renomear ${title}"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Partilhar ${title}"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Procurar utilizadores e grupos"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Procurar"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Atribuir papéis locais"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Nome"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "Utilizador"
+msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Grupo"
+#: kotti/templates/edit/delete-nodes.pt:13
+msgid "Are you sure you want to delete the following items?"
+msgstr "Deseja realmente eliminar os items seguintes?"
 
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Renomear ${title}"
 
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 #, fuzzy
-msgid "Assign role"
-msgstr "Atribuir papéis locais"
+msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
+msgstr "Cada item tem um nome que será usado para criar o url e o título.  Poderá alterá-los colocando os novos detalhes abaixo."
+
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
+msgid "New name"
+msgstr "Novo nome"
+
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
+msgid "New title"
+msgstr "Novo título"
 
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
@@ -503,14 +494,47 @@ msgstr ""
 msgid "Dismiss all errors"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Não existem items nesta pasta."
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr ""
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Visível"
+
+#: kotti/templates/edit/contents.pt:73
+#, fuzzy
+msgid "Hidden"
+msgstr "Escondido"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr ""
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr ""
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Resultados da pesquisa"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Procurar..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Marcado como:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Deseja realmente eliminar ${type} ${title}?"
@@ -519,7 +543,7 @@ msgstr "Deseja realmente eliminar ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Voltar à gestão de utilizadores"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Editar ${title}"
@@ -568,336 +592,316 @@ msgstr "Adicionar utilizador"
 msgid "Add new group"
 msgstr "Adicionar grupo"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Resultados da pesquisa"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "As suas alterações foram guardadas."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Procurar..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+#, fuzzy
+msgid "No changes were made."
+msgstr "Não foram efectuadas nenhumas alterações"
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Marcado como:"
+#: kotti/views/users.py:105
+#, fuzzy
+msgid "No users or groups were found."
+msgstr "Utilizadores e grupos não encontrados."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Bem-vindo, ${user}! Você está autenticado."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Valor inválido"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Bem-vindo, você não está autenticado."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "Esse utilizador com esse nome já existe."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "Esse utilizador com esse e-mail já existe."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Grupo não encontrado: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "E-mail"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Activo"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Retirar para desactivar a conta."
+
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Papéis globais"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Grupos"
+
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+#, fuzzy
+msgid "Full name"
+msgstr "Nome completo"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Adicionar Utilizador"
+
+#: kotti/views/users.py:333
+#, fuzzy
+msgid "Send password registration link."
+msgstr "Enviar ligação para registo de palavra passe"
+
+#: kotti/views/users.py:348
+#, fuzzy, python-format
+msgid "${title} was added."
+msgstr "${title} adicionado."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Adicionar Grupo"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Gestão de Utilizadores"
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Guardar"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "As suas alterações foram guardadas."
+#: kotti/views/users.py:519
+#, fuzzy, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Editar ${principal_type} - ${title}"
+
+#: kotti/views/users.py:547
+#, fuzzy
+msgid "User was not found."
+msgstr "Utilizador não encontrado."
+
+#: kotti/views/users.py:557
+#, fuzzy, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} apagado."
+
+#: kotti/views/users.py:565
+#, fuzzy, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Apagar ${principal_type} - ${title}"
+
+#: kotti/views/users.py:572
+#, fuzzy
+msgid "No name was given."
+msgstr "Nenhum nome foi indicado."
+
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Minhas preferências - ${title}"
 
-#: kotti/views/form.py:179
+#: kotti/views/form.py:177
 #, fuzzy
 msgid "Item was added."
 msgstr "${title} adicionado."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, fuzzy, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Adicionar ${type} em ${title}"
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, fuzzy, python-format
 msgid "Add ${type}."
 msgstr "Adicionar ${type}"
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Tamanho máximo do ficheiro: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-#, fuzzy
-msgid "Full name"
-msgstr "Nome completo"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Nome utilizador"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "E-mail"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "Registar-se"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "Ocorreu um erro."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 #, fuzzy
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Parabéns! Você está registado com sucesso. Irá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, fuzzy, python-format
 msgid "Register - ${title}"
 msgstr "Registar ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Bem-vindo, ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 #, fuzzy
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Você deverá receber um e-mail com uma ligação temporária para reiniciar a sua palavra passe."
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "Erro de autenticação"
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 #, fuzzy
 msgid "That username or email is not known by this system."
 msgstr "Este utilizador ou e-mail não são reconhecidos."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Você desligou a sessão"
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 #, fuzzy
 msgid "You have reset your password."
 msgstr "Você reinicializou a palavra passe com sucesso"
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 #, fuzzy
 msgid "Set password"
 msgstr "Repor a palavra passe"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "A seu pedido para alterar a palavra passe expirou."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, fuzzy, python-format
 msgid "Reset your password - ${title}."
 msgstr "Reiniciar a sua palavra passe - ${title}"
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Gestão de Utilizadores"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-#, fuzzy
-msgid "No changes were made."
-msgstr "Não foram efectuadas nenhumas alterações"
-
-#: kotti/views/users.py:108
-#, fuzzy
-msgid "No users or groups were found."
-msgstr "Utilizadores e grupos não encontrados."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Valor inválido"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "Esse utilizador com esse nome já existe."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "Esse utilizador com esse e-mail já existe."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Grupo não encontrado: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Activo"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Retirar para desactivar a conta."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Papéis globais"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Grupos"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Deixe este campo por preencher e escolha a opção 'Enviar ligação para registo' abaixo para permitir ao utilizador escolher a sua palavra passe."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Adicionar Utilizador"
-
-#: kotti/views/users.py:335
-#, fuzzy
-msgid "Send password registration link."
-msgstr "Enviar ligação para registo de palavra passe"
-
-#: kotti/views/users.py:350
-#, fuzzy, python-format
-msgid "${title} was added."
-msgstr "${title} adicionado."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Adicionar Grupo"
-
-#: kotti/views/users.py:521
-#, fuzzy, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Editar ${principal_type} - ${title}"
-
-#: kotti/views/users.py:549
-#, fuzzy
-msgid "User was not found."
-msgstr "Utilizador não encontrado."
-
-#: kotti/views/users.py:559
-#, fuzzy, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} apagado."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Vista por defeito"
 
-#: kotti/views/users.py:567
-#, fuzzy, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Apagar ${principal_type} - ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "A vista original foi indicada como a vista por defeito."
 
-#: kotti/views/users.py:574
-#, fuzzy
-msgid "No name was given."
-msgstr "Nenhum nome foi indicado."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "Vista por defeito foi alterada."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Minhas preferências - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "Vista por defeito não pode ser alterada."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, fuzzy, python-format
 msgid "${title} was copied."
 msgstr "${title} copiado."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, fuzzy, python-format
 msgid "${title} was cut."
 msgstr "${title} cortado."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, fuzzy, python-format
 msgid "${title} was pasted."
 msgstr "${title} colado."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 #, fuzzy
 msgid "Could not paste node. It no longer exists."
 msgstr "Nãp é possivel copiar. A cópia já não está disponivel."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, fuzzy, python-format
 msgid "${title} was moved."
 msgstr "${title} movido."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} encontra-se visivel na navegação."
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} já não está visivel na navegação."
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, fuzzy, python-format
 msgid "${title} was deleted."
 msgstr "${title} apagado."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 #, fuzzy
 msgid "Nothing was deleted."
 msgstr "Nada foi apagado."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Nome e título são obrigatórios."
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 #, fuzzy
 msgid "Item was renamed."
 msgstr "Item renomeado"
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Alterar Estado"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Mostrar"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Esconder"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 #, fuzzy
 msgid "You have to select items to perform an action."
 msgstr "Terá de escolher items para executar a ação."
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Descrição"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Corpo"
 
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Vista por defeito"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "A vista original foi indicada como a vista por defeito."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "Vista por defeito foi alterada."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "Vista por defeito não pode ser alterada."
-
 #~ msgid "Image"
 #~ msgstr "Imagem"
 
diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.mo b/kotti/locale/sv/LC_MESSAGES/Kotti.mo
index 5b6fadbbc15ad15690c62febf3c185c95f9735d3..5bdfaff84ab36cedb9214e82d762e6609df20d0c 100644
GIT binary patch
delta 26
hcmX?Ce6D!I7A0N_T?0d1LvsZ~V=Gg`%?Fiu#Q}s=2u}b2

delta 26
hcmX?Ce6D!I7A0OYT|+}%BTEGXBP$b&%?Fiu#Q}tM2vq<8

diff --git a/kotti/locale/sv/LC_MESSAGES/Kotti.po b/kotti/locale/sv/LC_MESSAGES/Kotti.po
index e83156f99..0e9cca42b 100644
--- a/kotti/locale/sv/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/sv/LC_MESSAGES/Kotti.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2016-11-29 02:48+0100\n"
+"POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "PO-Revision-Date: 2016-10-05 21:34+0300\n"
 "Last-Translator: Anders Nylund <stokkheim@gmail.com>\n"
 "Language-Team: Swedish\n"
@@ -16,15 +16,86 @@ msgstr ""
 "Generated-By: Lingua 4.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: kotti/populate.py:68
+#: kotti/security.py:173
+msgid "Viewer"
+msgstr "Läsare"
+
+#: kotti/security.py:174
+msgid "Editor"
+msgstr "Redaktör"
+
+#: kotti/security.py:175
+msgid "Owner"
+msgstr "Ägare"
+
+#: kotti/security.py:176
+msgid "Admin"
+msgstr "Administratör"
+
+#: kotti/resources.py:541 kotti/views/edit/actions.py:453
+msgid "Copy"
+msgstr "Kopiera"
+
+#: kotti/resources.py:542 kotti/views/edit/actions.py:454
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: kotti/resources.py:543 kotti/views/edit/actions.py:450
+msgid "Paste"
+msgstr "Klistra in"
+
+#: kotti/resources.py:544 kotti/templates/edit/rename.pt:31
+#: kotti/templates/edit/rename-nodes.pt:8
+#: kotti/templates/edit/rename-nodes.pt:42 kotti/views/edit/actions.py:455
+msgid "Rename"
+msgstr "Döp om"
+
+#: kotti/resources.py:545 kotti/templates/edit/delete.pt:24
+#: kotti/templates/edit/delete-nodes.pt:9
+#: kotti/templates/edit/delete-nodes.pt:49
+#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:454
+#: kotti/views/edit/actions.py:457
+msgid "Delete"
+msgstr "Radera"
+
+#: kotti/resources.py:556 kotti/templates/view/folder.pt:15
+msgid "Contents"
+msgstr "Innehåll"
+
+#: kotti/resources.py:557 kotti/templates/edit/nav-tree.pt:10
+msgid "Edit"
+msgstr "Redigera"
+
+#: kotti/resources.py:558
+msgid "Share"
+msgstr "Dela"
+
+#: kotti/resources.py:559 kotti/templates/actions-dropdown.pt:3
+msgid "Actions"
+msgstr "Handlingar"
+
+#: kotti/resources.py:562
+msgid "Folder view"
+msgstr "Mapp vy"
+
+#: kotti/resources.py:671 kotti/views/edit/content.py:61
+msgid "Document"
+msgstr "Dokument"
+
+#: kotti/resources.py:808 kotti/views/edit/content.py:73
+#: kotti/views/edit/content.py:87
+msgid "File"
+msgstr "Fil"
+
+#: kotti/populate.py:67
 msgid "Welcome to Kotti"
 msgstr "Välkommen till Kotti"
 
-#: kotti/populate.py:69
+#: kotti/populate.py:68
 msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Gratulerar! Du har nu installerat Kotti."
 
-#: kotti/populate.py:70
+#: kotti/populate.py:69
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -137,15 +208,15 @@ msgstr ""
 "    </div>\n"
 "</div>\n"
 
-#: kotti/populate.py:127
+#: kotti/populate.py:126
 msgid "About"
 msgstr "Om"
 
-#: kotti/populate.py:128
+#: kotti/populate.py:127
 msgid "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
 msgstr "Vårt företag är den ledande tillverkaren av foo grunkor som används i en mängd olika tillämpningar inom flyg och industri."
 
-#: kotti/populate.py:129
+#: kotti/populate.py:128
 msgid ""
 "\n"
 "<p>\n"
@@ -203,136 +274,37 @@ msgstr ""
 "article.\n"
 "</small></p>\n"
 
-#: kotti/resources.py:524 kotti/views/edit/actions.py:457
-msgid "Copy"
-msgstr "Kopiera"
-
-#: kotti/resources.py:525 kotti/views/edit/actions.py:458
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: kotti/resources.py:526 kotti/views/edit/actions.py:454
-msgid "Paste"
-msgstr "Klistra in"
-
-#: kotti/resources.py:527 kotti/templates/edit/rename-nodes.pt:8
-#: kotti/templates/edit/rename-nodes.pt:42 kotti/templates/edit/rename.pt:31
-#: kotti/views/edit/actions.py:459
-msgid "Rename"
-msgstr "Döp om"
-
-#: kotti/resources.py:528 kotti/templates/edit/delete-nodes.pt:9
-#: kotti/templates/edit/delete-nodes.pt:49 kotti/templates/edit/delete.pt:24
-#: kotti/templates/site-setup/delete-user.pt:24 kotti/views/users.py:456
-#: kotti/views/edit/actions.py:461
-msgid "Delete"
-msgstr "Radera"
-
-#: kotti/resources.py:539 kotti/templates/view/folder.pt:15
-msgid "Contents"
-msgstr "Innehåll"
-
-#: kotti/resources.py:540 kotti/templates/edit/nav-tree.pt:10
-msgid "Edit"
-msgstr "Redigera"
-
-#: kotti/resources.py:541
-msgid "Share"
-msgstr "Dela"
-
-#: kotti/resources.py:542 kotti/templates/actions-dropdown.pt:3
-msgid "Actions"
-msgstr "Handlingar"
-
-#: kotti/resources.py:545
-msgid "Folder view"
-msgstr "Mapp vy"
-
-#: kotti/resources.py:654 kotti/views/edit/content.py:90
-msgid "Document"
-msgstr "Dokument"
-
-#: kotti/resources.py:789 kotti/views/edit/content.py:70
-#: kotti/views/edit/content.py:121
-msgid "File"
-msgstr "Fil"
-
-#: kotti/security.py:197
-msgid "Viewer"
-msgstr "Läsare"
-
-#: kotti/security.py:198
-msgid "Editor"
-msgstr "Redaktör"
-
-#: kotti/security.py:199
-msgid "Owner"
-msgstr "Ägare"
-
-#: kotti/security.py:200
-msgid "Admin"
-msgstr "Administratör"
-
-#: kotti/templates/add-dropdown.pt:3
-msgid "Add"
-msgstr "Lägg till"
-
-#: kotti/templates/add-dropdown.pt:13
-msgid "Upload Content"
-msgstr "Ladda upp innehåll"
+#: kotti/tests/testing_view.pt:11
+msgid "Welcome, ${user}! You are logged in."
+msgstr "Välkommern, ${user}!. Du är inloggad."
 
-#: kotti/templates/default-view-selector.pt:3
-msgid "Set default view"
-msgstr "Sätt standardvy"
+#: kotti/tests/testing_view.pt:15
+msgid "Welcome, you are not logged in."
+msgstr "Välkommen, du är inte inloggad."
 
-#: kotti/templates/editor-bar.pt:21
+#: kotti/templates/editor-bar.pt:19
 msgid "View"
 msgstr "Visa"
 
-#: kotti/templates/editor-bar.pt:44
+#: kotti/templates/editor-bar.pt:42
 msgid "Navigate"
 msgstr "Navigera"
 
-#: kotti/templates/editor-bar.pt:55
+#: kotti/templates/editor-bar.pt:53
 msgid "Preferences"
 msgstr "Preferenser"
 
-#: kotti/templates/editor-bar.pt:60
+#: kotti/templates/editor-bar.pt:58
 msgid "Site Setup"
 msgstr "Site inställningar"
 
-#: kotti/templates/editor-bar.pt:71
+#: kotti/templates/editor-bar.pt:69
 msgid "Logout"
 msgstr "Logga ut"
 
-#: kotti/templates/email-reset-password.pt:2
-msgid "Reset your password for ${site_title}."
-msgstr "Återställ ditt lösenord för ${site_title}."
-
-#: kotti/templates/email-reset-password.pt:4
-#: kotti/templates/email-set-password.pt:4
-msgid "Hello, ${user_title}!"
-msgstr "Hej, ${user_title}!"
-
-#: kotti/templates/email-reset-password.pt:5
-msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Klicka den här länken för att återställa ditt lösenord för ${site_title}: ${url}"
-
-#: kotti/templates/email-set-password.pt:2
-msgid "Your registration for ${site_title}"
-msgstr "Din registrering för ${site_title}"
-
-#: kotti/templates/email-set-password.pt:5
-msgid "You are joining ${site_title}."
-msgstr "Du ansluter dig till ${site_title}."
-
-#: kotti/templates/email-set-password.pt:6
-msgid "Click here to set your password and log in: ${url}"
-msgstr "Klicka här för att ställa in ditt lösenord och logga in: ${url}"
-
-#: kotti/templates/forbidden.pt:10
-msgid "Forbidden"
-msgstr "Förbjudet"
+#: kotti/templates/default-view-selector.pt:3
+msgid "Set default view"
+msgstr "Sätt standardvy"
 
 #: kotti/templates/login.pt:16
 msgid "Login"
@@ -342,8 +314,8 @@ msgstr "Inloggning"
 msgid "Username or email"
 msgstr "Användarnamn eller epost"
 
-#: kotti/templates/login.pt:26 kotti/views/login.py:258
-#: kotti/views/users.py:222
+#: kotti/templates/login.pt:26 kotti/views/users.py:220
+#: kotti/views/login.py:255
 msgid "Password"
 msgstr "Lösenord"
 
@@ -376,14 +348,123 @@ msgstr "Inte ännu registrerad?"
 msgid "Register for an account on this site."
 msgstr "Registrera ett konto på den här siten"
 
+#: kotti/templates/forbidden.pt:10
+msgid "Forbidden"
+msgstr "Förbjudet"
+
+#: kotti/templates/add-dropdown.pt:3
+msgid "Add"
+msgstr "Lägg till"
+
+#: kotti/templates/add-dropdown.pt:13
+msgid "Upload Content"
+msgstr "Ladda upp innehåll"
+
 #: kotti/templates/workflow-dropdown.pt:14
 msgid "Make ${state}"
 msgstr "Gör ${state}"
 
+#: kotti/templates/email-reset-password.pt:2
+msgid "Reset your password for ${site_title}."
+msgstr "Återställ ditt lösenord för ${site_title}."
+
+#: kotti/templates/email-reset-password.pt:4
+#: kotti/templates/email-set-password.pt:4
+msgid "Hello, ${user_title}!"
+msgstr "Hej, ${user_title}!"
+
+#: kotti/templates/email-reset-password.pt:5
+msgid "Click this link to reset your password at ${site_title}: ${url}"
+msgstr "Klicka den här länken för att återställa ditt lösenord för ${site_title}: ${url}"
+
+#: kotti/templates/email-set-password.pt:2
+msgid "Your registration for ${site_title}"
+msgstr "Din registrering för ${site_title}"
+
+#: kotti/templates/email-set-password.pt:5
+msgid "You are joining ${site_title}."
+msgstr "Du ansluter dig till ${site_title}."
+
+#: kotti/templates/email-set-password.pt:6
+msgid "Click here to set your password and log in: ${url}"
+msgstr "Klicka här för att ställa in ditt lösenord och logga in: ${url}"
+
+#: kotti/templates/edit/share.pt:8
+msgid "Share ${title}"
+msgstr "Dela ${title}"
+
+#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
+#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
+msgid "Search users and groups"
+msgstr "Sök efter användare och grupper"
+
+#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
+msgid "Search"
+msgstr "Sök"
+
+#: kotti/templates/edit/share.pt:44
+msgid "Assign local roles"
+msgstr "Tilldela lokala roller"
+
+#: kotti/templates/edit/share.pt:49 kotti/templates/edit/change-state.pt:19
+#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/upload.pt:18
+#: kotti/templates/edit/upload.pt:108 kotti/templates/edit/contents.pt:35
+#: kotti/templates/view/folder.pt:21 kotti/templates/site-setup/users.pt:69
+msgid "Type"
+msgstr "Typ"
+
+#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
+#: kotti/views/users.py:215
+msgid "Name"
+msgstr "Namn"
+
+#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
+#: kotti/views/users.py:321 kotti/views/users.py:515 kotti/views/users.py:550
+msgid "User"
+msgstr "Användare"
+
+#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
+#: kotti/views/users.py:196 kotti/views/users.py:356 kotti/views/users.py:515
+#: kotti/views/users.py:550
+msgid "Group"
+msgstr "Grupp"
+
+#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
+msgid "Gravatar"
+msgstr "Gravatar"
+
+#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
+msgid "Assign role"
+msgstr "Tilldela roll"
+
+#: kotti/templates/edit/share.pt:85 kotti/templates/edit/change-state.pt:72
+#: kotti/templates/site-setup/users.pt:107
+msgid "Apply changes"
+msgstr "Ta ändringarna i bruk"
+
+#: kotti/templates/edit/nav-tree-view.pt:8
+msgid "Navigate Site"
+msgstr "Navigera siten"
+
 #: kotti/templates/edit/breadcrumbs.pt:8
 msgid "You are here:"
 msgstr "Du är här:"
 
+#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
+msgid "Delete ${title}"
+msgstr "Radera ${title}"
+
+#: kotti/templates/edit/delete.pt:13
+msgid "Are you sure you want to delete ${title}?"
+msgstr "Är du säker på att du vill radera ${title}?"
+
+#: kotti/templates/edit/delete.pt:19 kotti/templates/edit/change-state.pt:74
+#: kotti/templates/edit/delete-nodes.pt:44
+#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/users.py:324
+#: kotti/views/users.py:359 kotti/views/users.py:453 kotti/views/form.py:81
+msgid "Cancel"
+msgstr "Avbryt"
+
 #: kotti/templates/edit/change-state.pt:8
 msgid "Change workflow state"
 msgstr "Ändra 'workflow' inställning"
@@ -392,36 +473,32 @@ msgstr "Ändra 'workflow' inställning"
 msgid "An item's workflow state determines who can see, edit and/or manage it."
 msgstr "Ett dokuments 'workflow' inställning bestämmer vem som kan se, redigera och/eller hantera det."
 
-#: kotti/templates/edit/change-state.pt:18 kotti/templates/edit/contents.pt:34
-#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/view/folder.pt:20
-#: kotti/views/users.py:206 kotti/views/edit/content.py:35
+#: kotti/templates/edit/change-state.pt:18
+#: kotti/templates/edit/delete-nodes.pt:21 kotti/templates/edit/contents.pt:34
+#: kotti/templates/view/folder.pt:20 kotti/views/users.py:204
+#: kotti/views/edit/content.py:28
 msgid "Title"
 msgstr "Titel"
 
-#: kotti/templates/edit/change-state.pt:19 kotti/templates/edit/contents.pt:35
-#: kotti/templates/edit/delete-nodes.pt:22 kotti/templates/edit/share.pt:49
-#: kotti/templates/edit/upload.pt:18 kotti/templates/edit/upload.pt:108
-#: kotti/templates/site-setup/users.pt:69 kotti/templates/view/folder.pt:21
-msgid "Type"
-msgstr "Typ"
-
-#: kotti/templates/edit/change-state.pt:20 kotti/templates/edit/contents.pt:36
-#: kotti/templates/edit/delete-nodes.pt:23
+#: kotti/templates/edit/change-state.pt:20
+#: kotti/templates/edit/delete-nodes.pt:23 kotti/templates/edit/contents.pt:36
 msgid "State"
 msgstr "Läge"
 
-#: kotti/templates/edit/change-state.pt:21 kotti/templates/edit/contents.pt:38
-#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/view/folder.pt:22
+#: kotti/templates/edit/change-state.pt:21
+#: kotti/templates/edit/delete-nodes.pt:24 kotti/templates/edit/contents.pt:38
+#: kotti/templates/view/folder.pt:22
 msgid "Creation Date"
 msgstr "Skapat"
 
-#: kotti/templates/edit/change-state.pt:22 kotti/templates/edit/contents.pt:39
-#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/view/folder.pt:23
+#: kotti/templates/edit/change-state.pt:22
+#: kotti/templates/edit/delete-nodes.pt:25 kotti/templates/edit/contents.pt:39
+#: kotti/templates/view/folder.pt:23
 msgid "Modification Date"
 msgstr "Ändrat"
 
-#: kotti/templates/edit/change-state.pt:28 kotti/templates/edit/contents.pt:45
-#: kotti/templates/edit/delete-nodes.pt:31
+#: kotti/templates/edit/change-state.pt:28
+#: kotti/templates/edit/delete-nodes.pt:31 kotti/templates/edit/contents.pt:45
 msgid "Select item"
 msgstr "Välj dokument"
 
@@ -446,113 +523,28 @@ msgstr "Välj nytt läge för alla valda dokument"
 msgid "No change"
 msgstr "Ingen ändring"
 
-#: kotti/templates/edit/change-state.pt:72 kotti/templates/edit/share.pt:85
-#: kotti/templates/site-setup/users.pt:107
-msgid "Apply changes"
-msgstr "Ta ändringarna i bruk"
-
-#: kotti/templates/edit/change-state.pt:74
-#: kotti/templates/edit/delete-nodes.pt:44 kotti/templates/edit/delete.pt:19
-#: kotti/templates/edit/rename-nodes.pt:44 kotti/views/form.py:83
-#: kotti/views/users.py:326 kotti/views/users.py:361 kotti/views/users.py:455
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: kotti/templates/edit/contents.pt:26
-msgid "No content items are contained here."
-msgstr "Här finns inga dokument"
-
-#: kotti/templates/edit/contents.pt:33
-msgid "Select / deselect all"
-msgstr "Välj / väl bort alla"
-
-#: kotti/templates/edit/contents.pt:37
-msgid "Visibility"
-msgstr "Synlighet"
-
-#: kotti/templates/edit/contents.pt:70
-msgid "Visible"
-msgstr "Synliga"
-
-#: kotti/templates/edit/contents.pt:74
-msgid "Hidden"
-msgstr "Dolda"
-
 #: kotti/templates/edit/delete-nodes.pt:13
 msgid "Are you sure you want to delete the following items?"
 msgstr "Är du säker på att du vill radera följande dokument?"
 
-#: kotti/templates/edit/delete.pt:9 kotti/templates/site-setup/delete-user.pt:9
-msgid "Delete ${title}"
-msgstr "Radera ${title}"
-
-#: kotti/templates/edit/delete.pt:13
-msgid "Are you sure you want to delete ${title}?"
-msgstr "Är du säker på att du vill radera ${title}?"
-
-#: kotti/templates/edit/nav-tree-view.pt:8
-msgid "Navigate Site"
-msgstr "Navigera siten"
+#: kotti/templates/edit/rename.pt:8
+msgid "Rename ${title}"
+msgstr "Döp om ${title}"
 
-#: kotti/templates/edit/rename-nodes.pt:13 kotti/templates/edit/rename.pt:11
+#: kotti/templates/edit/rename.pt:11 kotti/templates/edit/rename-nodes.pt:13
 msgid "Each content item has a name, which is used to create the url, and a title. Read the user manual about proper formatting of name and title if needed. You can change both below."
 msgstr "Varje dokument har ett namn som används för att skapa ett url och en titel. Läs vid behov om korrekt formattering av namn och titel i användarmanualen. Nedan kan du ändra bägge."
 
-#: kotti/templates/edit/rename-nodes.pt:26
-#: kotti/templates/edit/rename-nodes.pt:28 kotti/templates/edit/rename.pt:19
+#: kotti/templates/edit/rename.pt:19 kotti/templates/edit/rename-nodes.pt:26
+#: kotti/templates/edit/rename-nodes.pt:28
 msgid "New name"
 msgstr "Nytt namn"
 
-#: kotti/templates/edit/rename-nodes.pt:34
-#: kotti/templates/edit/rename-nodes.pt:36 kotti/templates/edit/rename.pt:25
+#: kotti/templates/edit/rename.pt:25 kotti/templates/edit/rename-nodes.pt:34
+#: kotti/templates/edit/rename-nodes.pt:36
 msgid "New title"
 msgstr "Ny rubrik"
 
-#: kotti/templates/edit/rename.pt:8
-msgid "Rename ${title}"
-msgstr "Döp om ${title}"
-
-#: kotti/templates/edit/share.pt:8
-msgid "Share ${title}"
-msgstr "Dela ${title}"
-
-#: kotti/templates/edit/share.pt:14 kotti/templates/edit/share.pt:20
-#: kotti/templates/edit/share.pt:27 kotti/templates/site-setup/users.pt:48
-msgid "Search users and groups"
-msgstr "Sök efter användare och grupper"
-
-#: kotti/templates/edit/share.pt:34 kotti/templates/site-setup/users.pt:56
-msgid "Search"
-msgstr "Sök"
-
-#: kotti/templates/edit/share.pt:44
-msgid "Assign local roles"
-msgstr "Tilldela lokala roller"
-
-#: kotti/templates/edit/share.pt:50 kotti/templates/site-setup/users.pt:70
-#: kotti/views/users.py:217
-msgid "Name"
-msgstr "Namn"
-
-#: kotti/templates/edit/share.pt:61 kotti/templates/site-setup/users.pt:81
-#: kotti/views/users.py:323 kotti/views/users.py:517 kotti/views/users.py:552
-msgid "User"
-msgstr "Användare"
-
-#: kotti/templates/edit/share.pt:62 kotti/templates/site-setup/users.pt:82
-#: kotti/views/users.py:198 kotti/views/users.py:358 kotti/views/users.py:517
-#: kotti/views/users.py:552
-msgid "Group"
-msgstr "Grupp"
-
-#: kotti/templates/edit/share.pt:65 kotti/templates/site-setup/users.pt:85
-msgid "Gravatar"
-msgstr "Gravatar"
-
-#: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-msgid "Assign role"
-msgstr "Tilldela roll"
-
 #: kotti/templates/edit/upload.pt:10
 msgid "Upload content from local file(s)"
 msgstr "Ladda upp innehåll från lokal fil/filer"
@@ -585,14 +577,46 @@ msgstr "Ladda upp ${number} filer."
 msgid "Dismiss all errors"
 msgstr "Avfärda alla fel"
 
-#: kotti/templates/http-errors/notfound.pt:6
+#: kotti/templates/edit/contents.pt:26
+msgid "No content items are contained here."
+msgstr "Här finns inga dokument"
+
+#: kotti/templates/edit/contents.pt:33
+msgid "Select / deselect all"
+msgstr "Välj / väl bort alla"
+
+#: kotti/templates/edit/contents.pt:37
+msgid "Visibility"
+msgstr "Synlighet"
+
+#: kotti/templates/edit/contents.pt:69
+msgid "Visible"
+msgstr "Synliga"
+
+#: kotti/templates/edit/contents.pt:73
+msgid "Hidden"
+msgstr "Dolda"
+
+#: kotti/templates/http-errors/notfound.pt:26
 msgid "Not Found"
 msgstr "Hittas ej"
 
-#: kotti/templates/http-errors/notfound.pt:7
+#: kotti/templates/http-errors/notfound.pt:27
 msgid "The resource could not be found"
 msgstr "Resursen kan ej hittas"
 
+#: kotti/templates/view/search-results.pt:9
+msgid "Search Results"
+msgstr "Sökresultat"
+
+#: kotti/templates/view/search.pt:12
+msgid "Search..."
+msgstr "Sök..."
+
+#: kotti/templates/view/tags.pt:7
+msgid "Tagged with:"
+msgstr "Taggad med:"
+
 #: kotti/templates/site-setup/delete-user.pt:15
 msgid "Are you sure you want to delete ${type} ${title}?"
 msgstr "Är du säker på att du vill radera ${type} ${title}?"
@@ -601,7 +625,7 @@ msgstr "Är du säker på att du vill radera ${type} ${title}?"
 msgid "Back to User Management"
 msgstr "Tillbaka till hantering av användare"
 
-#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:161
+#: kotti/templates/site-setup/user.pt:21 kotti/views/form.py:159
 #, python-format
 msgid "Edit ${title}"
 msgstr "Redigera ${title}"
@@ -642,316 +666,296 @@ msgstr "Lägg till ny användare"
 msgid "Add new group"
 msgstr "Lägg till ny grupp"
 
-#: kotti/templates/view/search-results.pt:9
-msgid "Search Results"
-msgstr "Sökresultat"
+#: kotti/views/users.py:70 kotti/views/form.py:82
+#: kotti/views/edit/actions.py:371 kotti/views/edit/actions.py:415
+msgid "Your changes have been saved."
+msgstr "Dina ändringar har blivit sparade."
 
-#: kotti/templates/view/search.pt:12
-msgid "Search..."
-msgstr "Sök..."
+#: kotti/views/users.py:72 kotti/views/users.py:477
+#: kotti/views/edit/actions.py:309 kotti/views/edit/actions.py:375
+#: kotti/views/edit/actions.py:417 kotti/views/edit/actions.py:421
+msgid "No changes were made."
+msgstr "Inga ändringar har gjorts."
 
-#: kotti/templates/view/tags.pt:7
-msgid "Tagged with:"
-msgstr "Taggad med:"
+#: kotti/views/users.py:105
+msgid "No users or groups were found."
+msgstr "Inga användare eller grupper hittades."
 
-#: kotti/tests/testing_view.pt:11
-msgid "Welcome, ${user}! You are logged in."
-msgstr "Välkommern, ${user}!. Du är inloggad."
+#: kotti/views/users.py:153
+msgid "Invalid value"
+msgstr "Felaktigt värde"
 
-#: kotti/tests/testing_view.pt:15
-msgid "Welcome, you are not logged in."
-msgstr "Välkommen, du är inte inloggad."
+#: kotti/views/users.py:159
+msgid "A user with that name already exists."
+msgstr "En användare med det namnet finns redan."
+
+#: kotti/views/users.py:166
+msgid "A user with that email already exists."
+msgstr "En användare med den epostadressen finns redan."
+
+#: kotti/views/users.py:189
+#, python-format
+msgid "No such group: ${group}"
+msgstr "Ingen sådan grupp: ${group}"
+
+#: kotti/views/users.py:207 kotti/views/login.py:71 kotti/views/login.py:267
+msgid "Email"
+msgstr "Epost"
+
+#: kotti/views/users.py:227
+msgid "Active"
+msgstr "Aktiv"
+
+#: kotti/views/users.py:228
+msgid "Untick this to deactivate the account."
+msgstr "Ta bort det här valet för att inaktivera kontot."
+
+#: kotti/views/users.py:234
+msgid "Global roles"
+msgstr "Globala roller"
+
+#: kotti/views/users.py:238
+msgid "Groups"
+msgstr "Grupper"
 
-#: kotti/views/form.py:82 kotti/views/users.py:454
+#: kotti/views/users.py:275
+msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
+msgstr "Lämna det här tomt och välj 'Sänd länk för lösenordsregistrering' nedan för att låta användaren själv välja lösenord."
+
+#: kotti/views/users.py:278 kotti/views/login.py:63
+msgid "Full name"
+msgstr "Fullständigt namn"
+
+#: kotti/views/users.py:323
+msgid "Add User"
+msgstr "Lägg till användare"
+
+#: kotti/views/users.py:333
+msgid "Send password registration link."
+msgstr "Sänd länk för lösenordsregistrering."
+
+#: kotti/views/users.py:348
+#, python-format
+msgid "${title} was added."
+msgstr "${title} lades till."
+
+#: kotti/views/users.py:358
+msgid "Add Group"
+msgstr "Lägg till grupp"
+
+#: kotti/views/users.py:388 kotti/views/site_setup.py:5
+msgid "User Management"
+msgstr "Hantera användare"
+
+#: kotti/views/users.py:452 kotti/views/form.py:80
 msgid "Save"
 msgstr "Spara"
 
-#: kotti/views/form.py:84 kotti/views/users.py:73
-#: kotti/views/edit/actions.py:375 kotti/views/edit/actions.py:419
-msgid "Your changes have been saved."
-msgstr "Dina ändringar har blivit sparade."
+#: kotti/views/users.py:519
+#, python-format
+msgid "Edit ${principal_type} ${title}"
+msgstr "Redigera ${principal_type} ${title}"
+
+#: kotti/views/users.py:547
+msgid "User was not found."
+msgstr "Användaren kunde inte hittas."
+
+#: kotti/views/users.py:557
+#, python-format
+msgid "${principal_type} ${title} was deleted."
+msgstr "${principal_type} ${title} raderades."
+
+#: kotti/views/users.py:565
+#, python-format
+msgid "Delete ${principal_type} ${title}"
+msgstr "Radera ${principal_type} ${title}"
 
-#: kotti/views/form.py:179
+#: kotti/views/users.py:572
+msgid "No name was given."
+msgstr "Inget namn angavs."
+
+#: kotti/views/users.py:601
+#, python-format
+msgid "My preferences - ${title}"
+msgstr "Mina preferenser - ${title}"
+
+#: kotti/views/form.py:177
 msgid "Item was added."
 msgstr "Dokumentet har lagts till."
 
-#: kotti/views/form.py:203
+#: kotti/views/form.py:201
 #, python-format
 msgid "Add ${type} to ${title}."
 msgstr "Lägg till ${type} till ${title}."
 
-#: kotti/views/form.py:207
+#: kotti/views/form.py:205
 #, python-format
 msgid "Add ${type}."
 msgstr "Lägg till ${type}."
 
-#: kotti/views/form.py:286
+#: kotti/views/form.py:295
 #, python-format
 msgid "Maximum file size: ${size}MB"
 msgstr "Maximal filstorlek: ${size}MB"
 
-#: kotti/views/login.py:66 kotti/views/users.py:280
-msgid "Full name"
-msgstr "Fullständigt namn"
-
-#: kotti/views/login.py:69
+#: kotti/views/login.py:66
 msgid "Username"
 msgstr "Användarnamn"
 
-#: kotti/views/login.py:74 kotti/views/login.py:270 kotti/views/users.py:209
-msgid "Email"
-msgstr "Epost"
-
-#: kotti/views/login.py:83
+#: kotti/views/login.py:80
 msgid "Register"
 msgstr "Registrera"
 
-#: kotti/views/login.py:90
+#: kotti/views/login.py:87
 msgid "There was an error."
 msgstr "Ett fel uppstod."
 
-#: kotti/views/login.py:109
+#: kotti/views/login.py:106
 msgid "Congratulations! You are successfully registered. You should be receiving an email with a link to set your password. Doing so will activate your account."
 msgstr "Gratulerar! Du har registrerat dig. Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
 
-#: kotti/views/login.py:124
+#: kotti/views/login.py:121
 #, python-format
 msgid "Register - ${title}"
 msgstr "Registrara - ${title}"
 
-#: kotti/views/login.py:155
+#: kotti/views/login.py:152
 #, python-format
 msgid "Welcome, ${user}!"
 msgstr "Välkommen, ${user}!"
 
-#: kotti/views/login.py:180
+#: kotti/views/login.py:177
 msgid "You should be receiving an email with a link to reset your password. Doing so will activate your account."
 msgstr "Du bör ha fått ett epostmeddelande med en länk för att ställa in ditt lösenord. Genom att göra det aktiverar du ditt konto-"
 
-#: kotti/views/login.py:213
+#: kotti/views/login.py:210
 msgid "Login failed."
 msgstr "Inloggningen misslyckades."
 
-#: kotti/views/login.py:223
+#: kotti/views/login.py:220
 msgid "That username or email is not known by this system."
 msgstr "Användarnamnet eller epostadressen är inte bekanta för systemet."
 
-#: kotti/views/login.py:245
+#: kotti/views/login.py:242
 msgid "You have been logged out."
 msgstr "Du har loggats ut."
 
-#: kotti/views/login.py:283
+#: kotti/views/login.py:280
 msgid "You have reset your password."
 msgstr "Du har återställt ditt lösenord."
 
-#: kotti/views/login.py:302
+#: kotti/views/login.py:299
 msgid "Set password"
 msgstr "Ställ in lösenord"
 
-#: kotti/views/login.py:330
+#: kotti/views/login.py:327
 msgid "Your password reset token may have expired."
 msgstr "Lösenordsåterställningen kan vara föråldrad."
 
-#: kotti/views/login.py:337
+#: kotti/views/login.py:334
 #, python-format
 msgid "Reset your password - ${title}."
 msgstr "Återställ ditt lösenord - ${title}."
 
-#: kotti/views/site_setup.py:8 kotti/views/users.py:390
-msgid "User Management"
-msgstr "Hantera användare"
-
-#: kotti/views/users.py:75 kotti/views/users.py:479
-#: kotti/views/edit/actions.py:313 kotti/views/edit/actions.py:379
-#: kotti/views/edit/actions.py:421 kotti/views/edit/actions.py:425
-msgid "No changes were made."
-msgstr "Inga ändringar har gjorts."
-
-#: kotti/views/users.py:108
-msgid "No users or groups were found."
-msgstr "Inga användare eller grupper hittades."
-
-#: kotti/views/users.py:155
-msgid "Invalid value"
-msgstr "Felaktigt värde"
-
-#: kotti/views/users.py:161
-msgid "A user with that name already exists."
-msgstr "En användare med det namnet finns redan."
-
-#: kotti/views/users.py:168
-msgid "A user with that email already exists."
-msgstr "En användare med den epostadressen finns redan."
-
-#: kotti/views/users.py:191
-#, python-format
-msgid "No such group: ${group}"
-msgstr "Ingen sådan grupp: ${group}"
-
-#: kotti/views/users.py:229
-msgid "Active"
-msgstr "Aktiv"
-
-#: kotti/views/users.py:230
-msgid "Untick this to deactivate the account."
-msgstr "Ta bort det här valet för att inaktivera kontot."
-
-#: kotti/views/users.py:236
-msgid "Global roles"
-msgstr "Globala roller"
-
-#: kotti/views/users.py:240
-msgid "Groups"
-msgstr "Grupper"
-
-#: kotti/views/users.py:277
-msgid "Leave this empty and tick the 'Send password registration' box below to have the user set their own password."
-msgstr "Lämna det här tomt och välj 'Sänd länk för lösenordsregistrering' nedan för att låta användaren själv välja lösenord."
-
-#: kotti/views/users.py:325
-msgid "Add User"
-msgstr "Lägg till användare"
-
-#: kotti/views/users.py:335
-msgid "Send password registration link."
-msgstr "Sänd länk för lösenordsregistrering."
-
-#: kotti/views/users.py:350
-#, python-format
-msgid "${title} was added."
-msgstr "${title} lades till."
-
-#: kotti/views/users.py:360
-msgid "Add Group"
-msgstr "Lägg till grupp"
-
-#: kotti/views/users.py:521
-#, python-format
-msgid "Edit ${principal_type} ${title}"
-msgstr "Redigera ${principal_type} ${title}"
-
-#: kotti/views/users.py:549
-msgid "User was not found."
-msgstr "Användaren kunde inte hittas."
-
-#: kotti/views/users.py:559
-#, python-format
-msgid "${principal_type} ${title} was deleted."
-msgstr "${principal_type} ${title} raderades."
+#: kotti/views/edit/default_views.py:86
+msgid "Default view"
+msgstr "Standardvy"
 
-#: kotti/views/users.py:567
-#, python-format
-msgid "Delete ${principal_type} ${title}"
-msgstr "Radera ${principal_type} ${title}"
+#: kotti/views/edit/default_views.py:107
+msgid "Default view has been reset to default."
+msgstr "Standardvyn har återställts till förvald inställning."
 
-#: kotti/views/users.py:574
-msgid "No name was given."
-msgstr "Inget namn angavs."
+#: kotti/views/edit/default_views.py:114
+msgid "Default view has been set."
+msgstr "Standadvyn har ställts in."
 
-#: kotti/views/users.py:603
-#, python-format
-msgid "My preferences - ${title}"
-msgstr "Mina preferenser - ${title}"
+#: kotti/views/edit/default_views.py:119
+msgid "Default view could not be set."
+msgstr "Standardvyn kunde inte ställas in."
 
-#: kotti/views/edit/actions.py:107
+#: kotti/views/edit/actions.py:102
 #, python-format
 msgid "${title} was copied."
 msgstr "${title} har kopierats."
 
-#: kotti/views/edit/actions.py:125
+#: kotti/views/edit/actions.py:120
 #, python-format
 msgid "${title} was cut."
 msgstr "${title} har klippts ut."
 
-#: kotti/views/edit/actions.py:160
+#: kotti/views/edit/actions.py:155
 #, python-format
 msgid "${title} was pasted."
 msgstr "${title} har klistrats in."
 
-#: kotti/views/edit/actions.py:163
+#: kotti/views/edit/actions.py:158
 msgid "Could not paste node. It no longer exists."
 msgstr "Kunde inte klistra in noden. Den finns inte längre."
 
-#: kotti/views/edit/actions.py:184
+#: kotti/views/edit/actions.py:180
 #, python-format
 msgid "${title} was moved."
 msgstr "${title} har flyttats."
 
-#: kotti/views/edit/actions.py:226
+#: kotti/views/edit/actions.py:222
 #, python-format
 msgid "${title} is now visible in the navigation."
 msgstr "${title} är ny synlig i navigationsträdet"
 
-#: kotti/views/edit/actions.py:229
+#: kotti/views/edit/actions.py:225
 #, python-format
 msgid "${title} is no longer visible in the navigation."
 msgstr "${title} visas inte längre i navigationsträdet"
 
-#: kotti/views/edit/actions.py:278 kotti/views/edit/actions.py:307
+#: kotti/views/edit/actions.py:274 kotti/views/edit/actions.py:303
 #, python-format
 msgid "${title} was deleted."
 msgstr "${title} har raderats."
 
-#: kotti/views/edit/actions.py:304
+#: kotti/views/edit/actions.py:300
 msgid "Nothing was deleted."
 msgstr "Ingenting raderades."
 
-#: kotti/views/edit/actions.py:340 kotti/views/edit/actions.py:367
+#: kotti/views/edit/actions.py:336 kotti/views/edit/actions.py:363
 msgid "Name and title are required."
 msgstr "Namn och rubrik krävs"
 
-#: kotti/views/edit/actions.py:344
+#: kotti/views/edit/actions.py:340
 msgid "Item was renamed."
 msgstr "Dokumentet har döpts om."
 
-#: kotti/views/edit/actions.py:465
+#: kotti/views/edit/actions.py:461
 msgid "Change State"
 msgstr "Ändra läge"
 
-#: kotti/views/edit/actions.py:466
+#: kotti/views/edit/actions.py:462
 msgid "Move up"
 msgstr "Flytta upp"
 
-#: kotti/views/edit/actions.py:467
+#: kotti/views/edit/actions.py:463
 msgid "Move down"
 msgstr "Flytta ner"
 
-#: kotti/views/edit/actions.py:468
+#: kotti/views/edit/actions.py:464
 msgid "Show"
 msgstr "Visa"
 
-#: kotti/views/edit/actions.py:469
+#: kotti/views/edit/actions.py:465
 msgid "Hide"
 msgstr "Göm"
 
-#: kotti/views/edit/actions.py:508
+#: kotti/views/edit/actions.py:504
 msgid "You have to select items to perform an action."
 msgstr "Du måste välja något att utföra operationen på först"
 
-#: kotti/views/edit/content.py:41
+#: kotti/views/edit/content.py:34
 msgid "Description"
 msgstr "Beskrivning"
 
-#: kotti/views/edit/content.py:47
+#: kotti/views/edit/content.py:40
 msgid "Tags"
 msgstr "Taggar"
 
-#: kotti/views/edit/content.py:56
+#: kotti/views/edit/content.py:49
 msgid "Body"
 msgstr "Brödtext"
-
-#: kotti/views/edit/default_views.py:89
-msgid "Default view"
-msgstr "Standardvy"
-
-#: kotti/views/edit/default_views.py:110
-msgid "Default view has been reset to default."
-msgstr "Standardvyn har återställts till förvald inställning."
-
-#: kotti/views/edit/default_views.py:117
-msgid "Default view has been set."
-msgstr "Standadvyn har ställts in."
-
-#: kotti/views/edit/default_views.py:122
-msgid "Default view could not be set."
-msgstr "Standardvyn kunde inte ställas in."
diff --git a/kotti/message.py b/kotti/message.py
index a53fe404b..4c7f5d795 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -1,16 +1,18 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-import hashlib
 import time
-import urllib
+from typing import Dict
+from typing import List
+from typing import Optional
+from urllib.parse import urlencode
 
+import hashlib
 from html2text import HTML2Text
 from pyramid.renderers import render
 from pyramid_mailer.mailer import Mailer
 from pyramid_mailer.message import Message
 
 from kotti import get_settings
+from kotti.request import Request
+from kotti.security import Principal
 
 _inject_mailer = []
 
@@ -22,15 +24,18 @@ def get_mailer():
     return Mailer.from_settings(get_settings())  # pragma: no cover
 
 
-def make_token(user, seconds=None):
+def make_token(user: Principal, seconds: Optional[float]=None) -> str:
     secret = get_settings()['kotti.secret2']
     if seconds is None:
         seconds = time.time()
-    token = '{0}:{1}:{2}'.format(user.name, secret, seconds)
-    return '{0}:{1}'.format(hashlib.sha224(token).hexdigest(), seconds)
+    token = '{}:{}:{}'.format(user.name, secret, seconds)
+    return '{}:{}'.format(hashlib.sha224(token.encode('utf8')).hexdigest(),
+                          seconds)
 
 
-def validate_token(user, token, valid_hrs=24):
+def validate_token(user: Principal,
+                   token: str,
+                   valid_hrs: int=24) -> bool:
     """
         >>> from kotti.testing import setUp, tearDown
         >>> ignore = setUp()
@@ -64,7 +69,10 @@ def validate_token(user, token, valid_hrs=24):
     return False
 
 
-def send_email(request, recipients, template_name, template_vars=None):
+def send_email(request: Request,
+               recipients: List[str],
+               template_name: str,
+               template_vars: Optional[Dict[str, str]]=None) -> None:
     """ General email sender.
 
     :param request: current request.
@@ -102,21 +110,22 @@ def send_email(request, recipients, template_name, template_vars=None):
     mailer.send(message)
 
 
-def email_set_password(user, request,
-                       template_name='kotti:templates/email-set-password.pt',
-                       add_query=None):
+def email_set_password(user: Principal,
+                       request: Request,
+                       template_name: Optional[str]='kotti:templates/email-set-password.pt',  # noqa
+                       add_query: Optional[Dict[str, str]]=None) -> None:
     site_title = get_settings()['kotti.site_title']
     token = make_token(user)
-    user.confirm_token = unicode(token)
+    user.confirm_token = token
     set_password_query = {'token': token, 'email': user.email}
     if add_query:
         set_password_query.update(add_query)
     url = '{0}/@@set-password?{1}'.format(
         request.application_url,
-        urllib.urlencode(set_password_query))
+        urlencode(set_password_query))
     variables = dict(
         user_title=user.title,
         site_title=site_title,
         url=url)
-    recipients = [u'"{0}" <{1}>'.format(user.title, user.email)]  # XXX naive?
+    recipients = ['"{0}" <{1}>'.format(user.title, user.email)]  # XXX naive?
     send_email(request, recipients, template_name, variables)
diff --git a/kotti/migrate.py b/kotti/migrate.py
index 5fdd91012..a1ea638cd 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This module aims to make it easier to run the Alembic migration
 scripts of Kotti and Kotti add-ons by providing a uniform access.
 
@@ -39,8 +38,6 @@ def kotti_configure(settings):
 ``kotti-migrate`` commands 'list_all', 'upgrade_all' and
 'stamp_heads' will then include the add-on.
 """
-from __future__ import absolute_import, division, print_function
-
 import os
 
 import pkg_resources
@@ -55,63 +52,66 @@ def kotti_configure(settings):
 from kotti import get_settings
 from kotti.util import command
 
-
+from typing import Callable, List
 KOTTI_SCRIPT_DIR = pkg_resources.resource_filename('kotti', 'alembic')
 DEFAULT_LOCATION = 'kotti:alembic'
 
 
 class ScriptDirectoryWithDefaultEnvPy(ScriptDirectory):
     @property
-    def env_py_location(self):
+    def env_py_location(self) -> str:
         loc = super(ScriptDirectoryWithDefaultEnvPy, self).env_py_location
         if not os.path.exists(loc):
             loc = os.path.join(KOTTI_SCRIPT_DIR, 'env.py')
         return loc
 
-    def run_env(self):
+    def run_env(self) -> None:
         dir_, filename = self.env_py_location.rsplit(os.path.sep, 1)
         load_python_file(dir_, filename)
 
 
 class PackageEnvironment(object):
-    def __init__(self, location):
+    def __init__(self,
+                 location: str) -> None:
         self.location = location
         self.config = self._make_config(location)
         self.script_dir = self._make_script_dir(self.config)
 
     @property
-    def pkg_name(self):
+    def pkg_name(self) -> str:
         return self.location.split(':')[0]
 
     @property
-    def version_table(self):
+    def version_table(self) -> str:
         return '{0}_alembic_version'.format(self.pkg_name)
 
-    def run_env(self, fn, **kw):
+    def run_env(self,
+                fn: Callable, **kw) -> None:
         with EnvironmentContext(self.config, self.script_dir, fn=fn,
                                 version_table=self.version_table, **kw):
             self.script_dir.run_env()
 
     @staticmethod
-    def _make_config(location):
+    def _make_config(location: str) -> Config:
         cfg = Config()
         cfg.set_main_option("script_location", location)
         cfg.set_main_option("sqlalchemy.url", get_settings()['sqlalchemy.url'])
         return cfg
 
     @staticmethod
-    def _make_script_dir(alembic_cfg):
+    def _make_script_dir(alembic_cfg: Config) -> ScriptDirectoryWithDefaultEnvPy:
         script_dir = ScriptDirectory.from_config(alembic_cfg)
         script_dir.__class__ = ScriptDirectoryWithDefaultEnvPy  # O_o
         return script_dir
 
 
-def get_locations():
+def get_locations() -> List[str]:
     conf_str = get_settings()['kotti.alembic_dirs']
     return [l.strip() for l in conf_str.split() if l.strip()]
 
 
-def stamp_head(location=DEFAULT_LOCATION, revision=None):
+def stamp_head(location: str = DEFAULT_LOCATION,
+               revision: None = None) -> None:
 
     env = PackageEnvironment(location)
 
@@ -130,12 +130,13 @@ def do_stamp(rev, context, revision=revision):
     env.run_env(do_stamp)
 
 
-def stamp_heads():
+def stamp_heads() -> None:
     for location in get_locations():
         stamp_head(location)
 
 
-def upgrade(location=DEFAULT_LOCATION, revision=None):
+def upgrade(location=DEFAULT_LOCATION,
+            revision=None):
     # We don't want to fire any kind of events during a migration,
     # because "migrations are a low-level thing".
     from kotti import events
@@ -145,7 +146,7 @@ def upgrade(location=DEFAULT_LOCATION, revision=None):
 
     if revision is None:
         revision = pkg_env.script_dir.get_current_head()
-    print(u'Upgrading {0}:'.format(pkg_env.location))
+    print('Upgrading {0}:'.format(pkg_env.location))
 
     def upgrade(heads, context):
         # alembic supports multiple heads, we don't.
@@ -153,10 +154,10 @@ def upgrade(heads, context):
         rev = heads[0] if heads else None
 
         if rev == revision:
-            print(u'  - already up to date.')
+            print('  - already up to date.')
             return []
 
-        print(u'  - upgrading from {0} to {1}...'.format(rev, revision))
+        print('  - upgrading from {0} to {1}...'.format(rev, revision))
 
         return context.script._upgrade_revs(revision, rev)
 
@@ -176,10 +177,10 @@ def upgrade_all():
 def list_all():
     pkg_envs = [PackageEnvironment(l) for l in get_locations()]
     for pkg_env in pkg_envs:
-        print(u'{0}:'.format(pkg_env.pkg_name))
+        print('{0}:'.format(pkg_env.pkg_name))
 
         for script in pkg_env.script_dir.walk_revisions():
-            print(u"  - {0} -> {1}: {2}".format(
+            print("  - {0} -> {1}: {2}".format(
                 script.down_revision,
                 script.revision,
                 script.doc,
@@ -187,7 +188,7 @@ def list_all():
 
         def current_revision(rev, context):
             rev = rev[0] if rev else None
-            print(u"  - current revision: {0}".format(rev))
+            print("  - current revision: {0}".format(rev))
             return []
         pkg_env.run_env(current_revision)
         print()
diff --git a/kotti/populate.py b/kotti/populate.py
index 5a2adcbc7..d82790e40 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 """
 Populate contains two functions that are called on application startup
 (if you haven't modified kotti.populators).
 """
 
-from __future__ import absolute_import, division, print_function
-
 from pyramid.i18n import LocalizerRequestMixin
 from pyramid.threadlocal import get_current_registry
 from six import iteritems
@@ -27,12 +24,12 @@ def populate_users():
     """
 
     principals = get_principals()
-    if u'admin' not in principals:
-        principals[u'admin'] = {
-            'name': u'admin',
+    if 'admin' not in principals:
+        principals['admin'] = {
+            'name': 'admin',
             'password': get_settings()['kotti.secret'],
-            'title': u"Administrator",
-            'groups': [u'role:admin'],
+            'title': 'Administrator',
+            'groups': ['role:admin'],
         }
 
 
@@ -43,6 +40,7 @@ def populate():
     """
     lrm = LocalizerRequestMixin()
     lrm.registry = get_current_registry()
+    # noinspection PyPropertyAccess
     lrm.locale_name = get_settings()['pyramid.default_locale_name']
     localizer = lrm.localizer
 
@@ -59,15 +57,16 @@ def populate():
         wf = get_workflow(root)
         if wf is not None:
             DBSession.flush()  # Initializes workflow
-            wf.transition_to_state(root, None, u'public')
+            wf.transition_to_state(root, None, 'public')
 
     populate_users()
 
+
 _ROOT_ATTRS = dict(
-    name=u'',  # (at the time of writing) root must have empty name!
-    title=_(u'Welcome to Kotti'),
-    description=_(u'Congratulations! You have successfully installed Kotti.'),
-    body=_(u"""
+    name='',  # (at the time of writing) root must have empty name!
+    title=_('Welcome to Kotti'),
+    description=_('Congratulations! You have successfully installed Kotti.'),
+    body=_("""
 <h2>Log in</h2>
 <p>
     You can <a class="btn btn-success" href="login">log in</a> to your site
@@ -124,9 +123,9 @@ def populate():
 """))
 
 _ABOUT_ATTRS = dict(
-    title=_(u'About'),
-    description=_(u'Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products.'),  # noqa
-    body=_(u"""
+    title=_('About'),
+    description=_('Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products.'),  # noqa
+    body=_("""
 <p>
   <img alt="five colorful Extra EA300 airplanes flying in formation"
    src="http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg"
diff --git a/kotti/request.py b/kotti/request.py
index d5aa34a59..64471b36f 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -1,11 +1,14 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
+from typing import Optional
+from typing import Union
 
 import pyramid.request
 from pyramid.decorator import reify
 from pyramid.interfaces import IRequest
+from pyramid.security import Allowed
+from pyramid.security import Denied
 from zope.interface import implementer
 
+from kotti.security import Principal
 from kotti.security import get_user
 
 
@@ -19,7 +22,7 @@ class Request(pyramid.request.Request):
     """
 
     @reify
-    def user(self):
+    def user(self) -> Optional[Principal]:
         """ Add the authenticated user to the request object.
 
         :result: the currently authenticated user
@@ -29,7 +32,9 @@ def user(self):
         """
         return get_user(self)
 
-    def has_permission(self, permission, context=None):
+    def has_permission(self,
+                       permission: str,
+                       context: object = None) -> Union[Allowed, Denied]:
         """ Check if the current request has the given permission on the
         current or explicitly passed context.  This is different from
         :meth:`pyramid.request.Request.has_permission`` in that a context other
diff --git a/kotti/resources.py b/kotti/resources.py
index ef2de5c3f..dceba4c22 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 The :mod:`~kotti.resources` module contains all the classes for Kotti's
 persistence layer, which is based on SQLAlchemy.
@@ -8,18 +7,25 @@
 
 .. inheritance-diagram:: kotti.resources
 """
-
-from __future__ import absolute_import, division, print_function
-
+import datetime
+from cgi import FieldStorage
+from collections import MutableMapping
+from typing import Any
+from typing import Iterable
+from typing import List
+from typing import Optional
+from typing import Union
+
+import abc
 import os
 import warnings
-from UserDict import DictMixin
-from cStringIO import StringIO
 from copy import copy
-from fnmatch import fnmatch
-
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.sqlalchemy import _SQLAMutationTracker
+from depot.fields.upload import UploadedFile
+from fnmatch import fnmatch
+from io import BufferedReader
+from io import BytesIO
 from pyramid.decorator import reify
 from pyramid.traversal import resource_path
 from sqlalchemy import Boolean
@@ -33,17 +39,23 @@
 from sqlalchemy import UniqueConstraint
 from sqlalchemy import bindparam
 from sqlalchemy import event
+from sqlalchemy.engine.base import Engine
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.ext.orderinglist import OrderingList
 from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.orm import backref
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.orm import relation
+from sqlalchemy.orm.attributes import Event
 from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm.scoping import scoped_session
 from sqlalchemy.sql import and_
 from sqlalchemy.sql import select
 from sqlalchemy.util import classproperty
+from sqlalchemy.util.langhelpers import _symbol
 from transaction import commit
 from zope.interface import implementer
 
@@ -59,6 +71,7 @@
 from kotti.interfaces import IFile
 from kotti.interfaces import INode
 from kotti.migrate import stamp_heads
+from kotti.request import Request
 from kotti.security import PersistentACLMixin
 from kotti.security import view_permitted
 from kotti.sqla import ACLType
@@ -75,22 +88,28 @@
 from kotti.util import get_paste_items
 
 
-class ContainerMixin(object, DictMixin):
+class ContainerMixin(MutableMapping):
     """ Containers form the API of a Node that's used for subitem
     access and in traversal.
     """
 
-    def __setitem__(self, key, node):
-        node.name = unicode(key)
+    def __iter__(self):
+        return iter(self.children)
+
+    def __len__(self):
+        return len(self.keys())
+
+    def __setitem__(self, key: str, node: 'Node') -> None:
+        node.name = key
         self.children.append(node)
         self.children.reorder()
 
-    def __delitem__(self, key):
-        node = self[unicode(key)]
+    def __delitem__(self, key: str) -> None:
+        node = self[key]
         self.children.remove(node)
         DBSession.delete(node)
 
-    def keys(self):
+    def keys(self) -> List[str]:
         """
         :result: children names
         :rtype: list
@@ -98,13 +117,17 @@ def keys(self):
 
         return [child.name for child in self.children]
 
-    def __getitem__(self, path):
+    def values(self) -> OrderingList:
+        return self.children
+
+    def __getitem__(self, path: Union[str, Iterable[str]]) -> 'Node':
         db_session = DBSession()
         db_session._autoflush()
 
-        if not hasattr(path, '__iter__'):
+        # if not hasattr(path, '__iter__'):
+        if isinstance(path, str):
             path = (path,)
-        path = [unicode(p) for p in path]
+        path = [p for p in path]
 
         # Optimization: don't query children if self._children already there:
         if '_children' in self.__dict__:
@@ -155,7 +178,9 @@ def children(self):
 
         return self._children
 
-    def children_with_permission(self, request, permission='view'):
+    def children_with_permission(self,
+                                 request: Request,
+                                 permission: str = 'view') -> 'List[Node]':
         """ Return only those children for which the user initiating the
         request has the asked permission.
 
@@ -200,12 +225,12 @@ class LocalGroup(Base):
     #: (:class:`sqlalchemy.types.Unicode`)
     group_name = Column(Unicode(100))
 
-    def __init__(self, node, principal_name, group_name):
+    def __init__(self, node: 'Node', principal_name: str, group_name: str):
         self.node = node
         self.principal_name = principal_name
         self.group_name = group_name
 
-    def copy(self, **kwargs):
+    def copy(self, **kwargs) -> 'LocalGroup':
         kwargs.setdefault('node', self.node)
         kwargs.setdefault('principal_name', self.principal_name)
         kwargs.setdefault('group_name', self.group_name)
@@ -213,13 +238,17 @@ def copy(self, **kwargs):
         return self.__class__(**kwargs)
 
     def __repr__(self):
-        return u'<{0} {1} => {2} at {3}>'.format(
+        return '<{0} {1} => {2} at {3}>'.format(
             self.__class__.__name__, self.principal_name, self.group_name,
             resource_path(self.node))
 
 
+class NodeMeta(DeclarativeMeta, abc.ABCMeta):
+    """ """
+
+
 @implementer(INode)
-class Node(Base, ContainerMixin, PersistentACLMixin):
+class Node(Base, ContainerMixin, PersistentACLMixin, metaclass=NodeMeta):
     """Basic node in the persistance hierarchy.
     """
 
@@ -274,9 +303,15 @@ class Node(Base, ContainerMixin, PersistentACLMixin):
         backref=backref('node'),
         cascade='all',
         lazy='joined',
-        )
+    )
+
+    __hash__ = Base.__hash__
 
-    def __init__(self, name=None, parent=None, title=u"", annotations=None,
+    def __init__(self,
+                 name: str = None,
+                 parent: 'Node' = None,
+                 title: str = '',
+                 annotations: dict = None,
                  **kwargs):
         """Constructor"""
 
@@ -301,20 +336,24 @@ def __parent__(self):
     def __parent__(self, value):
         self.parent = value
 
-    def __repr__(self):
-        return u'<{0} {1} at {2}>'.format(
+    def __repr__(self) -> str:
+        return '<{0} {1} at {2}>'.format(
             self.__class__.__name__, self.id, resource_path(self))
 
-    def __eq__(self, other):
+    def __eq__(self, other: Any) -> bool:
         return isinstance(other, Node) and self.id == other.id
 
-    def __ne__(self, other):
+    def __ne__(self, other: Any) -> bool:
         return not self == other
 
     copy_properties_blacklist = (
         'id', 'parent', 'parent_id', '_children', 'local_groups', '_tags')
 
-    def copy(self, **kwargs):
+    def clear(self) -> None:
+
+        DBSession.query(Node).filter(Node.parent == self).delete()
+
+    def copy(self, **kwargs) -> 'Node':
         """
         :result: A copy of the current instance
         :rtype: :class:`~kotti.resources.Node`
@@ -355,7 +394,7 @@ class TypeInfo(object):
     edit_links = ()
     action_links = ()  # BBB
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs) -> None:
         if 'action_links' in kwargs:
             msg = ("'action_links' is deprecated as of Kotti 1.0.0.  "
                    "'edit_links' includes 'action_links' and should "
@@ -375,7 +414,7 @@ def __init__(self, **kwargs):
 
         self.__dict__.update(kwargs)
 
-    def copy(self, **kwargs):
+    def copy(self, **kwargs) -> 'TypeInfo':
         """
 
         :result: a copy of the current TypeInfo instance
@@ -388,7 +427,9 @@ def copy(self, **kwargs):
 
         return TypeInfo(**d)
 
-    def addable(self, context, request):
+    def addable(self,
+                context: 'Content',
+                request: Optional[Request]) -> bool:
         """
 
         :param context:
@@ -407,11 +448,11 @@ def addable(self, context, request):
         if self.add_view is None:
             return False
         if context.type_info.name in self.addable_to:
-            return view_permitted(context, request, self.add_view)
+            return bool(view_permitted(context, request, self.add_view))
         else:
             return False
 
-    def add_selectable_default_view(self, name, title):
+    def add_selectable_default_view(self, name: str, title: str) -> None:
         """Add a view to the list of default views selectable by the
         user in the UI.
 
@@ -419,11 +460,11 @@ def add_selectable_default_view(self, name, title):
         :type name: str
 
         :param title: Title for the view for display in the UI.
-        :type title: unicode or TranslationString
+        :type title: str or TranslationString
         """
         self.selectable_default_views.append((name, title))
 
-    def is_uploadable_mimetype(self, mimetype):
+    def is_uploadable_mimetype(self, mimetype: str) -> int:
         """ Check if uploads of the given MIME type are allowed.
 
         :param mimetype: MIME type
@@ -459,11 +500,11 @@ class Tag(Base):
     #: :class:`sqlalchemy.types.Unicode`
     title = Column(Unicode(100), unique=True, nullable=False)
 
-    def __repr__(self):
-        return u"<Tag ('{0}')>".format(self.title)
+    def __repr__(self) -> str:
+        return "<Tag ('{0}')>".format(self.title)
 
     @property
-    def items(self):
+    def items(self) -> List[Node]:
         """
 
         :result:
@@ -499,12 +540,12 @@ class TagsToContents(Base):
     title = association_proxy('tag', 'title')
 
     @classmethod
-    def _tag_find_or_create(cls, title):
+    def _tag_find_or_create(cls, title: str) -> 'TagsToContents':
         """
         Find or create a tag with the given title.
 
         :param title: Title of the tag to find or create.
-        :type title: unicode
+        :type title: str
         :result:
         :rtype: :class:`~kotti.resources.TagsToContents`
         """
@@ -516,33 +557,34 @@ def _tag_find_or_create(cls, title):
         return cls(tag=tag)
 
 
-def _not_root(context, request):
+# noinspection PyUnusedLocal
+def _not_root(context: Node, request: Request) -> bool:
     return context is not get_root()
 
 
 default_actions = [
-    Link('copy', title=_(u'Copy')),
-    Link('cut', title=_(u'Cut'), predicate=_not_root),
-    Link('paste', title=_(u'Paste'), predicate=get_paste_items),
-    Link('rename', title=_(u'Rename'), predicate=_not_root),
-    Link('delete', title=_(u'Delete'), predicate=_not_root),
+    Link('copy', title=_('Copy')),
+    Link('cut', title=_('Cut'), predicate=_not_root),
+    Link('paste', title=_('Paste'), predicate=get_paste_items),
+    Link('rename', title=_('Rename'), predicate=_not_root),
+    Link('delete', title=_('Delete'), predicate=_not_root),
     LinkRenderer('default-view-selector'),
 ]
 
 
 default_type_info = TypeInfo(
-    name=u'Content',
-    title=u'type_info title missing',   # BBB
+    name='Content',
+    title='type_info title missing',   # BBB
     add_view=None,
     addable_to=[],
     edit_links=[
-        Link('contents', title=_(u'Contents')),
-        Link('edit', title=_(u'Edit')),
-        Link('share', title=_(u'Share')),
-        LinkParent(title=_(u'Actions'), children=default_actions),
+        Link('contents', title=_('Contents')),
+        Link('edit', title=_('Edit')),
+        Link('share', title=_('Share')),
+        LinkParent(title=_('Actions'), children=default_actions),
         ],
     selectable_default_views=[
-        ("folder_view", _(u"Folder view")),
+        ("folder_view", _("Folder view")),
         ],
     )
 
@@ -604,10 +646,20 @@ def __mapper_args__(cls):
     #: type_info is a class attribute (:class:`TypeInfo`)
     type_info = default_type_info
 
-    def __init__(self, name=None, parent=None, title=u"", annotations=None,
-                 default_view=None, description=u"", language=None,
-                 owner=None, creation_date=None, modification_date=None,
-                 in_navigation=True, tags=None, **kwargs):
+    def __init__(self,
+                 name: Optional[str] = None,
+                 parent: Optional[Node] = None,
+                 title: Optional[str] = '',
+                 annotations: Optional[dict] = None,
+                 default_view: Optional[str] = None,
+                 description: Optional[str] = '',
+                 language: Optional[str] = None,
+                 owner: Optional[str] = None,
+                 creation_date: Optional[datetime.datetime] = None,
+                 modification_date: Optional[datetime.datetime] = None,
+                 in_navigation: Optional[bool] = True,
+                 tags: Optional[List[str]] = None,
+                 **kwargs):
 
         super(Content, self).__init__(
             name, parent, title, annotations, **kwargs)
@@ -622,7 +674,7 @@ def __init__(self, name=None, parent=None, title=u"", annotations=None,
         self.modification_date = modification_date
         self.tags = tags or []
 
-    def copy(self, **kwargs):
+    def copy(self, **kwargs) -> 'Content':
         # Same as `Node.copy` with additional tag support.
         kwargs['tags'] = self.tags
         return super(Content, self).copy(**kwargs)
@@ -650,13 +702,16 @@ class Document(Content):
     #: type_info is a class attribute
     #: (:class:`~kotti.resources.TypeInfo`)
     type_info = Content.type_info.copy(
-        name=u'Document',
-        title=_(u'Document'),
-        add_view=u'add_document',
-        addable_to=[u'Document'],
+        name='Document',
+        title=_('Document'),
+        add_view='add_document',
+        addable_to=['Document'],
         )
 
-    def __init__(self, body=u"", mime_type='text/html', **kwargs):
+    def __init__(self,
+                 body: Optional[str] = '',
+                 mime_type: Optional[str] = 'text/html',
+                 **kwargs):
 
         super(Document, self).__init__(**kwargs)
 
@@ -664,6 +719,7 @@ def __init__(self, body=u"", mime_type='text/html', **kwargs):
         self.mime_type = mime_type
 
 
+# noinspection PyMethodParameters
 class SaveDataMixin(object):
     """ The classmethods must not be implemented on a class that inherits
         from ``Base`` with ``SQLAlchemy>=1.0``, otherwise that class cannot be
@@ -686,15 +742,13 @@ class SaveDataMixin(object):
     #: Filedepot mapped blob
     #: (:class:`depot.fileds.sqlalchemy.UploadedFileField`)
     @declared_attr
-    def data(cls):
-
+    def data(cls) -> Column:
         return cls.__table__.c.get('data',
                                    Column(UploadedFileField(cls.data_filters)))
-
     data_filters = ()
 
     @classmethod
-    def __declare_last__(cls):
+    def __declare_last__(cls) -> None:
         """ Unconfigure the event set in _SQLAMutationTracker,
         we have _save_data """
 
@@ -708,7 +762,10 @@ def __declare_last__(cls):
         event.listen(cls.data, 'set', cls._save_data, retval=True)
 
     @staticmethod
-    def _save_data(target, value, oldvalue, initiator):
+    def _save_data(target: 'File',
+                   value: Optional[Union[FieldStorage, bytes, UploadedFile, BufferedReader]],  # noqa
+                   oldvalue: Optional[Union[UploadedFile, _symbol]],
+                   initiator: Event) -> Optional[UploadedFile]:
         """ Refresh metadata and save the binary data to the data field.
 
         :param target: The File instance
@@ -719,7 +776,8 @@ def _save_data(target, value, oldvalue, initiator):
         """
 
         if isinstance(value, bytes):
-            value = _to_fieldstorage(fp=StringIO(value),
+            fp = BytesIO(value)
+            value = _to_fieldstorage(fp=fp,
                                      filename=target.filename,
                                      mimetype=target.mimetype,
                                      size=len(value))
@@ -750,12 +808,16 @@ def from_field_storage(cls, fs):
         """
 
         if not cls.type_info.is_uploadable_mimetype(fs.type):
-            raise ValueError(u"Unsupported MIME type: {0}".format(fs.type))
+            raise ValueError("Unsupported MIME type: {0}".format(fs.type))
 
         return cls(data=fs)
 
-    def __init__(self, data=None, filename=None, mimetype=None, size=None,
-                 **kwargs):
+    def __init__(self,
+                 data: Optional[Union[bytes, BufferedReader, FieldStorage]]=None,  # noqa
+                 filename: Optional[str] = None,
+                 mimetype: Optional[str] = None,
+                 size: Optional[int] = None,
+                 **kwargs) -> None:
 
         super(SaveDataMixin, self).__init__(**kwargs)
 
@@ -764,7 +826,7 @@ def __init__(self, data=None, filename=None, mimetype=None, size=None,
         self.size = size
         self.data = data
 
-    def copy(self, **kwargs):
+    def copy(self, **kwargs) -> 'File':
         """ Same as `Content.copy` with additional data support.  ``data`` needs
         some special attention, because we don't want the same depot file to be
         assigned to multiple content nodes.
@@ -785,16 +847,16 @@ class File(SaveDataMixin, Content):
     id = Column(ForeignKey(Content.id), primary_key=True)
 
     type_info = Content.type_info.copy(
-        name=u'File',
-        title=_(u'File'),
-        add_view=u'add_file',
-        addable_to=[u'Document'],
+        name='File',
+        title=_('File'),
+        add_view='add_file',
+        addable_to=['Document'],
         selectable_default_views=[],
         uploadable_mimetypes=['*', ],
         )
 
 
-def get_root(request=None):
+def get_root(request: Optional[Request] = None) -> Node:
     """Call the function defined by the ``kotti.root_factory`` setting and
        return its result.
 
@@ -811,8 +873,9 @@ class DefaultRootCache(object):
     """ Default implementation for :func:`~kotti.resources.get_root` """
     _id = None
 
+    # noinspection PyComparisonWithNone,PyPep8
     @reify
-    def root_id(self):
+    def root_id(self) -> int:
         """ Query for the one node without a parent and return its id.
         :result: The root node's id.
         :rtype: int
@@ -824,7 +887,7 @@ def root_id(self):
 
         return query(DBSession()).one().id
 
-    def get_root(self):
+    def get_root(self) -> Node:
         """ Query for the root node by its id.  This enables SQLAlchemy's
         session cache (query is executed only once per session).
         :result: The root node.
@@ -833,7 +896,7 @@ def get_root(self):
 
         return Node.query.get(self.root_id)
 
-    def __call__(self, request=None):
+    def __call__(self, request: Optional[Request] = None) -> Node:
         """ Default implementation for :func:`~kotti.resources.get_root`
         :param request: Current request (optional)
         :type request: :class:`kotti.request.Request`
@@ -846,20 +909,21 @@ def __call__(self, request=None):
 
         return self.get_root()
 
+
 default_get_root = DefaultRootCache()
 
 
-def _adjust_for_engine(engine):
+def _adjust_for_engine(engine: Engine) -> None:
     if engine.dialect.name == 'mysql':  # pragma: no cover
         # We disable the Node.path index for Mysql; in some conditions
         # the index can't be created for columns even with 767 bytes,
         # the maximum default size for column indexes
         Node.__table__.indexes = set(
             index for index in Node.__table__.indexes
-            if index.name != u"ix_nodes_path")
+            if index.name != "ix_nodes_path")
 
 
-def initialize_sql(engine, drop_all=False):
+def initialize_sql(engine: Engine, drop_all: bool = False) -> scoped_session:
     DBSession.registry.clear()
     DBSession.configure(bind=engine)
     metadata.bind = engine
@@ -888,14 +952,3 @@ def initialize_sql(engine, drop_all=False):
     commit()
 
     return DBSession
-
-
-# DEPRECATED
-
-from zope.deprecation.deprecation import deprecated
-from kotti_image.resources import Image
-
-__ = Image
-deprecated('Image',
-           'Image was outfactored to the kotti_image package.  '
-           'Please import from there.')
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index 7662c3c0b..895a257d3 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -1,18 +1,17 @@
-# -*- coding: utf-8 -*-
-
-"""
-For a high level introduction and available configuration options
+""" For a high level introduction and available configuration options
 see :ref:`sanitizers`.
 """
-from __future__ import absolute_import, division, print_function
+from typing import Dict
+from typing import Union
 
 from bleach import clean
-from bleach_whitelist import all_styles
-from bleach_whitelist import generally_xss_safe
-from bleach_whitelist import markdown_attrs
-from bleach_whitelist import markdown_tags
-from bleach_whitelist import print_attrs
-from bleach_whitelist import print_tags
+from bleach_whitelist.bleach_whitelist import all_styles
+from bleach_whitelist.bleach_whitelist import generally_xss_safe
+from bleach_whitelist.bleach_whitelist import markdown_attrs
+from bleach_whitelist.bleach_whitelist import markdown_tags
+from bleach_whitelist.bleach_whitelist import print_attrs
+from bleach_whitelist.bleach_whitelist import print_tags
+from pyramid.config import Configurator
 from pyramid.util import DottedNameResolver
 from six import string_types
 
@@ -22,7 +21,7 @@
 from kotti.events import objectevent_listeners
 
 
-def sanitize(html, sanitizer):
+def sanitize(html: str, sanitizer: str) -> str:
     """ Sanitize HTML
 
     :param html: HTML to be sanitized
@@ -32,7 +31,7 @@ def sanitize(html, sanitizer):
     :type sanitizer: str
 
     :result: sanitized HTML
-    :rtype: unicode
+    :rtype: str
     """
 
     sanitized = get_settings()['kotti.sanitizers'][sanitizer](html)
@@ -40,7 +39,7 @@ def sanitize(html, sanitizer):
     return sanitized
 
 
-def xss_protection(html):
+def xss_protection(html: str) -> str:
     """ Sanitizer that removes tags that are not considered XSS safe.  See
     ``bleach_whitelist.generally_xss_unsafe`` for a complete list of tags that
     are removed.  Attributes and styles are left untouched.
@@ -49,7 +48,7 @@ def xss_protection(html):
     :type html: basestring
 
     :result: sanitized HTML
-    :rtype: unicode
+    :rtype: str
     """
 
     sanitized = clean(
@@ -62,7 +61,7 @@ def xss_protection(html):
     return sanitized
 
 
-def minimal_html(html):
+def minimal_html(html: str) -> str:
     """ Sanitizer that only leaves a basic set of tags and attributes.  See
     ``bleach_whitelist.markdown_tags``, ``bleach_whitelist.print_tags``,
     ``bleach_whitelist.markdown_attrs``, ``bleach_whitelist.print_attrs`` for a
@@ -73,12 +72,12 @@ def minimal_html(html):
     :type html: basestring
 
     :result: sanitized HTML
-    :rtype: unicode
+    :rtype: str
     """
 
     attributes = dict(zip(
-        markdown_attrs.keys() + print_attrs.keys(),
-        markdown_attrs.values() + print_attrs.values()))
+        list(markdown_attrs.keys()) + list(print_attrs.keys()),
+        list(markdown_attrs.values()) + list(print_attrs.values())))
 
     sanitized = clean(
         html,
@@ -90,14 +89,14 @@ def minimal_html(html):
     return sanitized
 
 
-def no_html(html):
+def no_html(html: str) -> str:
     """ Sanitizer that removes **all** tags.
 
     :param html: HTML to be sanitized
     :type html: basestring
 
     :result: plain text
-    :rtype: unicode
+    :rtype: str
     """
 
     sanitized = clean(
@@ -110,7 +109,7 @@ def no_html(html):
     return sanitized
 
 
-def _setup_sanitizers(settings):
+def _setup_sanitizers(settings: Dict[str, Union[str, bool]]) -> None:
 
     # step 1: resolve sanitizer functions and make ``kotti.sanitizers`` a
     # dictionary containing resolved functions
@@ -151,7 +150,7 @@ def handler(event):
             _create_handler(attributename, sanitizers))
 
 
-def includeme(config):
+def includeme(config: Configurator) -> None:
     """ Pyramid includeme hook.
 
     :param config: app config
diff --git a/kotti/scaffolds/__init__.py b/kotti/scaffolds/__init__.py
deleted file mode 100644
index a46e98bfe..000000000
--- a/kotti/scaffolds/__init__.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on 2014-11-17
-:author: Andreas Kaiser (disko)
-
-Scaffolds for Kotti.
-
-The methods of :class:`KottiTemplate` are marked with ``pragma: no cover``
-because they are not directly touched during testsuite runs, but only within
-subprocesses which seems to be not recorded by coverage.
-"""
-
-from __future__ import absolute_import, division, print_function
-
-import datetime
-import os
-from textwrap import dedent
-
-from pyramid.decorator import reify
-from pyramid.scaffolds import PyramidTemplate
-from usersettings import Settings
-
-
-class KottiTemplate(PyramidTemplate):
-    """ Base class for Kotti Templates """
-
-    @reify
-    def _settings(self):  # pragma: no cover
-        s = Settings('org.pylonsproject.kotti.ScaffoldDefaults')
-        s.add_setting("author", unicode, default='')
-        s.add_setting("email", str, default='')
-        s.add_setting("gh_user", str, '')
-        s.load_settings()  # loads anything that might be saved
-
-        return s
-
-    def _get(self, key, caption):  # pragma: no cover
-
-        env = os.environ.get(key)
-        if env is not None:
-            return env
-
-        s = self._settings
-        s[key] = raw_input(u'{0} [{1}]: '.format(caption, s[key])) or s[key]
-
-        try:
-            s.save_settings()
-        except OSError:
-            self.out("Your answers were not saved for later use.")
-
-        return s[key]
-
-    def pre(self, command, output_dir, vars):  # pragma: no cover
-        """ Overrides :meth:`pyramid.scaffolds.PyramidTemplate.pre`, adding
-        several variables to the default variables list.
-
-        :param command: Command that invoked the template
-        :type command: :class:`pyramid.scripts.pcreate.PCreateCommand`
-
-        :param output_dir: Full filesystem path where the created package will
-                           be created
-        :type output_dir: str
-
-        :param vars: Dictionary of vars passed to the templates for rendering
-        :type vars: dict
-        """
-
-        vars['project_line'] = '*' * len(vars['project'])
-        vars['date'] = datetime.date.today().strftime('%Y-%m-%d')
-
-        vars['author'] = self._get('author', 'Author name')
-        vars['email'] = self._get('email', 'Author email')
-        vars['gh_user'] = self._get('gh_user', 'Github username')
-
-        return PyramidTemplate.pre(self, command, output_dir, vars)
-
-    def post(self, command, output_dir, vars):  # pragma: no cover
-        """ Overrides :meth:`pyramid.scaffolds.PyramidTemplate.post`, to
-        print some info after a successful scaffolding rendering."""
-
-        separator = "=" * 79
-        msg = dedent(
-            u"""
-            {0}
-            Welcome to Kotti!
-
-            Documentation: https://kotti.readthedocs.io/
-            Development:   https://github.com/Kotti/Kotti/
-            Issues:        https://github.com/Kotti/Kotti/issues?state=open
-            IRC:           irc://irc.freenode.net/#kotti
-            Mailing List:  https://groups.google.com/group/kotti
-            {0}
-        """.format(separator))
-
-        self.out(msg)
-
-
-class KottiPackageTemplate(KottiTemplate):
-
-    _template_dir = 'package'
-    summary = 'A Kotti package that can be used for a project or an add on'
diff --git a/kotti/scaffolds/package/+dot+coveragerc_tmpl b/kotti/scaffolds/package/+dot+coveragerc_tmpl
deleted file mode 100644
index 01a74fed3..000000000
--- a/kotti/scaffolds/package/+dot+coveragerc_tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-[run]
-omit = {{package}}/tests/*
diff --git a/kotti/scaffolds/package/+dot+gitignore b/kotti/scaffolds/package/+dot+gitignore
deleted file mode 100644
index 52e6aa54d..000000000
--- a/kotti/scaffolds/package/+dot+gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-*.egg
-*.egg-info/
-*.log
-*.manifest
-*.py[cod]
-*.so
-*.spec
-.cache
-.coverage
-.installed.cfg
-.Python
-.tox/
-__pycache__/
-build/
-coverage.xml
-develop-eggs/
-dist/
-docs/_build/
-downloads/
-eggs/
-env/
-htmlcov/
-lib/
-lib64/
-nosetests.xml
-parts/
-pip-delete-this-directory.txt
-pip-log.txt
-sdist/
-target/
-var/
diff --git a/kotti/scaffolds/package/+dot+travis.yml_tmpl b/kotti/scaffolds/package/+dot+travis.yml_tmpl
deleted file mode 100644
index 7768a2c0f..000000000
--- a/kotti/scaffolds/package/+dot+travis.yml_tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
-language: python
-sudo: false
-cache:
-  directories:
-    - $HOME/.cache/pip
-before_cache:
-  - rm -f $HOME/.cache/pip/log/debug.log
-python:
-  - "2.7"
-env:
-  - KOTTI_TEST_DB_STRING=postgresql://postgres@localhost:5432/{{package}}_testing
-  - KOTTI_TEST_DB_STRING=mysql+oursql://root@localhost:3306/{{package}}_testing
-  - KOTTI_TEST_DB_STRING=sqlite://
-install:
-  - travis_retry pip install -U pip wheel setuptools
-  - travis_retry pip install psycopg2 oursql python-coveralls codecov
-  - pip install -e . -r https://raw.github.com/Kotti/Kotti/stable/requirements.txt
-  - pip install --pre Kotti
-  - python setup.py devbefore_script:
-  - psql -c 'create database {{package}}_testing;' -U postgres
-  - mysql -e 'create database {{package}}_testing;'
-script: py.test --tb=native --cov={{package}} --cov-report=term-missing
diff --git a/kotti/scaffolds/package/+package+/__init__.py_tmpl b/kotti/scaffolds/package/+package+/__init__.py_tmpl
deleted file mode 100644
index ca226d965..000000000
--- a/kotti/scaffolds/package/+package+/__init__.py_tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-from kotti.resources import File
-from pyramid.i18n import TranslationStringFactory
-
-_ = TranslationStringFactory('{{package}}')
-
-
-def kotti_configure(settings):
-    """ Add a line like this to you .ini file::
-
-            kotti.configurators =
-                {{package}}.kotti_configure
-
-        to enable the ``{{package}}`` add-on.
-
-    :param settings: Kotti configuration dictionary.
-    :type settings: dict
-    """
-
-    settings['pyramid.includes'] += ' {{package}}'
-    settings['kotti.alembic_dirs'] += ' {{package}}:alembic'
-    settings['kotti.available_types'] += ' {{package}}.resources.CustomContent'
-    settings['kotti.fanstatic.view_needed'] += ' {{package}}.fanstatic.css_and_js'
-    File.type_info.addable_to.append('CustomContent')
-
-
-def includeme(config):
-    """ Don't add this to your ``pyramid_includes``, but add the
-    ``kotti_configure`` above to your ``kotti.configurators`` instead.
-
-    :param config: Pyramid configurator object.
-    :type config: :class:`pyramid.config.Configurator`
-    """
-
-    config.add_translation_dirs('{{package}}:locale')
-    config.add_static_view('static-{{package}}', '{{package}}:static')
-
-    config.scan(__name__)
diff --git a/kotti/scaffolds/package/+package+/alembic/script.py.mako b/kotti/scaffolds/package/+package+/alembic/script.py.mako
deleted file mode 100644
index 95702017e..000000000
--- a/kotti/scaffolds/package/+package+/alembic/script.py.mako
+++ /dev/null
@@ -1,22 +0,0 @@
-"""${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/kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep b/kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep
deleted file mode 100644
index b5e8af4e0..000000000
--- a/kotti/scaffolds/package/+package+/alembic/versions/+dot+gitkeep
+++ /dev/null
@@ -1,2 +0,0 @@
-# Don't delete.  A file is necessary to have an otherwise empty folder
-# added to a git repository.
diff --git a/kotti/scaffolds/package/+package+/alembic/versions/.keep b/kotti/scaffolds/package/+package+/alembic/versions/.keep
deleted file mode 100644
index b5e8af4e0..000000000
--- a/kotti/scaffolds/package/+package+/alembic/versions/.keep
+++ /dev/null
@@ -1,2 +0,0 @@
-# Don't delete.  A file is necessary to have an otherwise empty folder
-# added to a git repository.
diff --git a/kotti/scaffolds/package/+package+/fanstatic.py_tmpl b/kotti/scaffolds/package/+package+/fanstatic.py_tmpl
deleted file mode 100644
index 43b0163aa..000000000
--- a/kotti/scaffolds/package/+package+/fanstatic.py_tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-from __future__ import absolute_import, division, print_function
-
-from fanstatic import Group
-from fanstatic import Library
-from fanstatic import Resource
-
-
-library = Library("{{package}}", "static")
-
-css = Resource(
-    library,
-    "styles.css",
-    minified="styles.min.css")
-js = Resource(
-    library,
-    "scripts.js",
-    minified="scripts.min.js")
-
-css_and_js = Group([css, js])
diff --git a/kotti/scaffolds/package/+package+/locale/+dot+gitkeep b/kotti/scaffolds/package/+package+/locale/+dot+gitkeep
deleted file mode 100644
index b5e8af4e0..000000000
--- a/kotti/scaffolds/package/+package+/locale/+dot+gitkeep
+++ /dev/null
@@ -1,2 +0,0 @@
-# Don't delete.  A file is necessary to have an otherwise empty folder
-# added to a git repository.
diff --git a/kotti/scaffolds/package/+package+/overrides/kotti/static/icons/.gitkeep b/kotti/scaffolds/package/+package+/overrides/kotti/static/icons/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/kotti/scaffolds/package/+package+/resources.py_tmpl b/kotti/scaffolds/package/+package+/resources.py_tmpl
deleted file mode 100644
index 0024e484c..000000000
--- a/kotti/scaffolds/package/+package+/resources.py_tmpl
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-from kotti.interfaces import IDefaultWorkflow
-from kotti.resources import Content
-from sqlalchemy import Column
-from sqlalchemy import ForeignKey
-from sqlalchemy import Integer
-from sqlalchemy import Unicode
-from zope.interface import implements
-
-from {{package}} import _
-
-
-class CustomContent(Content):
-    """ A custom content type. """
-
-    implements(IDefaultWorkflow)
-
-    id = Column(ForeignKey('contents.id'), primary_key=True)
-    custom_attribute = Column(Unicode(1000))
-
-    type_info = Content.type_info.copy(
-        name=u'CustomContent',
-        title=_(u'CustomContent'),
-        add_view=u'add_custom_content',
-        addable_to=[u'Document'],
-        selectable_default_views=[
-            ("alternative-view", _(u"Alternative view")),
-        ],
-    )
-
-    def __init__(self, custom_attribute=None, **kwargs):
-        """ Constructor
-
-        :param custom_attribute: A very custom attribute
-        :type custom_attribute: unicode
-
-        :param **kwargs: Arguments that are passed to the base class(es)
-        :type **kwargs: see :class:`kotti.resources.Content`
-        """
-
-        super(CustomContent, self).__init__(**kwargs)
-
-        self.custom_attribute = custom_attribute
diff --git a/kotti/scaffolds/package/+package+/static/scripts.js b/kotti/scaffolds/package/+package+/static/scripts.js
deleted file mode 100644
index bf8cd0baf..000000000
--- a/kotti/scaffolds/package/+package+/static/scripts.js
+++ /dev/null
@@ -1 +0,0 @@
-/* JS */
diff --git a/kotti/scaffolds/package/+package+/static/scripts.min.js b/kotti/scaffolds/package/+package+/static/scripts.min.js
deleted file mode 100644
index bf8cd0baf..000000000
--- a/kotti/scaffolds/package/+package+/static/scripts.min.js
+++ /dev/null
@@ -1 +0,0 @@
-/* JS */
diff --git a/kotti/scaffolds/package/+package+/static/styles.css b/kotti/scaffolds/package/+package+/static/styles.css
deleted file mode 100644
index f077569bd..000000000
--- a/kotti/scaffolds/package/+package+/static/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS */
diff --git a/kotti/scaffolds/package/+package+/static/styles.min.css b/kotti/scaffolds/package/+package+/static/styles.min.css
deleted file mode 100644
index f077569bd..000000000
--- a/kotti/scaffolds/package/+package+/static/styles.min.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS */
diff --git a/kotti/scaffolds/package/+package+/templates/custom-content-alternative.pt_tmpl b/kotti/scaffolds/package/+package+/templates/custom-content-alternative.pt_tmpl
deleted file mode 100644
index b54067052..000000000
--- a/kotti/scaffolds/package/+package+/templates/custom-content-alternative.pt_tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xml:lang="en"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="api.macro('kotti:templates/view/master.pt')">
-
-  <article metal:fill-slot="content"
-           class="content custom-content-alternative-view"
-           i18n:domain="{{package}}">
-
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="panel-title">${context.title}</h3>
-      </div>
-      <div class="panel-body">
-        ${context.description}
-      </div>
-      <div class="panel-footer">
-        ${context.custom_attribute | ''}
-      </div>
-    </div>
-
-  </article>
-</html>
diff --git a/kotti/scaffolds/package/+package+/templates/custom-content-default.pt_tmpl b/kotti/scaffolds/package/+package+/templates/custom-content-default.pt_tmpl
deleted file mode 100644
index 6157f5393..000000000
--- a/kotti/scaffolds/package/+package+/templates/custom-content-default.pt_tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xml:lang="en"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="api.macro('kotti:templates/view/master.pt')">
-
-  <article metal:fill-slot="content"
-           class="content custom-content-default-view"
-           i18n:domain="{{package}}">
-
-    <h1>${context.title}</h1>
-    <p class="lead">
-      ${context.description}
-    </p>
-    <div tal:content="structure context.custom_attribute | None"></div>
-
-  </article>
-</html>
diff --git a/kotti/scaffolds/package/+package+/tests/conftest.py_tmpl b/kotti/scaffolds/package/+package+/tests/conftest.py_tmpl
deleted file mode 100644
index 9f46d9105..000000000
--- a/kotti/scaffolds/package/+package+/tests/conftest.py_tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-pytest_plugins = "kotti"
-
-from pytest import fixture
-
-
-@fixture(scope='session')
-def custom_settings():
-    import {{package}}.resources
-    {{package}}.resources  # make pyflakes happy
-    return {
-        'kotti.configurators': 'kotti_tinymce.kotti_configure '
-                               '{{package}}.kotti_configure'}
diff --git a/kotti/scaffolds/package/+package+/tests/test_functional.py_tmpl b/kotti/scaffolds/package/+package+/tests/test_functional.py_tmpl
deleted file mode 100644
index 590e64edb..000000000
--- a/kotti/scaffolds/package/+package+/tests/test_functional.py_tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-from pytest import mark
-
-
-def test_login_required(webtest, root):
-    resp = webtest.get('/add_custom_content')
-    assert resp.status_code == 302
-
-
-@mark.user('admin')
-def test_add(webtest, root):
-
-    resp = webtest.get('/add_custom_content')
-
-    # submit empty form
-    form = resp.forms['deform']
-    resp = form.submit('save')
-    assert 'There was a problem' in resp.body
-
-    # submit valid form
-    form = resp.forms['deform']
-    form['title'] = 'My Custom Content'
-    form['custom_attribute'] = 'My Custom Attribute Value'
-    resp = form.submit('save')
-    assert resp.status_code == 302
-    resp = resp.follow()
-    assert 'Item was added.' in resp.body
-
-
-@mark.user('admin')
-def test_edit(webtest, root):
-
-    from {{package}}.resources import CustomContent
-
-    root['cc'] = CustomContent(title=u'Content Title')
-
-    resp = webtest.get('/cc/@@edit')
-    form = resp.forms['deform']
-    assert form['title'].value == u'Content Title'
-    assert form['custom_attribute'].value == u''
-    form['custom_attribute'] = u'Bazinga'
-    resp = form.submit('save').maybe_follow()
-    assert u'Your changes have been saved.' in resp.body
-    assert u'Bazinga' in resp.body
diff --git a/kotti/scaffolds/package/+package+/tests/test_resources.py_tmpl b/kotti/scaffolds/package/+package+/tests/test_resources.py_tmpl
deleted file mode 100644
index c2bf6ea3c..000000000
--- a/kotti/scaffolds/package/+package+/tests/test_resources.py_tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-from pytest import raises
-
-
-def test_model(root, db_session):
-    from {{package}}.resources import CustomContent
-
-    cc = CustomContent()
-    assert cc.custom_attribute is None
-
-    cc = CustomContent(custom_attribute=u'Foo')
-    assert cc.custom_attribute == u'Foo'
-
-    root['cc'] = cc = CustomContent()
-    assert cc.name == 'cc'
-
-    with raises(TypeError):
-        cc = CustomContent(doesnotexist=u'Foo')
diff --git a/kotti/scaffolds/package/+package+/tests/test_view.py_tmpl b/kotti/scaffolds/package/+package+/tests/test_view.py_tmpl
deleted file mode 100644
index d7aa09d66..000000000
--- a/kotti/scaffolds/package/+package+/tests/test_view.py_tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-from pytest import fixture
-
-
-@fixture
-def dummy_content(root):
-
-    from {{package}}.resources import CustomContent
-
-    root['cc'] = cc = CustomContent(
-        title=u'My content',
-        description=u'My very custom content is custom',
-        custom_attribute='Lorem ipsum'
-    )
-
-    return cc
-
-
-def test_view(dummy_content, dummy_request):
-
-    from {{package}}.views.view import CustomContentViews
-
-    views = CustomContentViews(dummy_content, dummy_request)
-
-    default = views.default_view()
-    assert 'foo' in default
-
-    alternative = views.alternative_view()
-    assert alternative['foo'] == u'bar'
diff --git a/kotti/scaffolds/package/+package+/views/__init__.py_tmpl b/kotti/scaffolds/package/+package+/views/__init__.py_tmpl
deleted file mode 100644
index 4e050c322..000000000
--- a/kotti/scaffolds/package/+package+/views/__init__.py_tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-
-class BaseView(object):
-    """ Base class for views """
-
-    def __init__(self, context, request):
-        """ Constructor
-
-        :param context: Context of the view
-        :type context: :class:`kotti.resources.Content`
-
-        :param request: Current request
-        :type request: :class:`kotti.request.Request`
-        """
-
-        super(BaseView, self).__init__()
-
-        self.context = context
-        self.request = request
diff --git a/kotti/scaffolds/package/+package+/views/edit.py_tmpl b/kotti/scaffolds/package/+package+/views/edit.py_tmpl
deleted file mode 100644
index 1b935a17b..000000000
--- a/kotti/scaffolds/package/+package+/views/edit.py_tmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-import colander
-from kotti.views.edit import ContentSchema
-from kotti.views.form import AddFormView
-from kotti.views.form import EditFormView
-from pyramid.view import view_config
-
-from {{package}} import _
-from {{package}}.resources import CustomContent
-
-
-class CustomContentSchema(ContentSchema):
-    """ Schema for CustomContent. """
-
-    custom_attribute = colander.SchemaNode(
-        colander.String(),
-        title=_(u"Custom attribute"))
-
-
-@view_config(name=CustomContent.type_info.add_view,
-             permission=CustomContent.type_info.add_permission,
-             renderer='kotti:templates/edit/node.pt')
-class CustomContentAddForm(AddFormView):
-    """ Form to add a new instance of CustomContent. """
-
-    schema_factory = CustomContentSchema
-    add = CustomContent
-    item_type = _(u"CustomContent")
-
-
-@view_config(name='edit', context=CustomContent, permission='edit',
-             renderer='kotti:templates/edit/node.pt')
-class CustomContentEditForm(EditFormView):
-    """ Form to edit existing CustomContent objects. """
-
-    schema_factory = CustomContentSchema
diff --git a/kotti/scaffolds/package/+package+/views/view.py_tmpl b/kotti/scaffolds/package/+package+/views/view.py_tmpl
deleted file mode 100644
index f6e7970ce..000000000
--- a/kotti/scaffolds/package/+package+/views/view.py_tmpl
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Created on {{date}}
-:author: {{author}} ({{email}})
-"""
-
-from pyramid.view import view_config
-from pyramid.view import view_defaults
-
-from {{package}} import _
-from {{package}}.resources import CustomContent
-from {{package}}.fanstatic import css_and_js
-from {{package}}.views import BaseView
-
-
-@view_defaults(context=CustomContent, permission='view')
-class CustomContentViews(BaseView):
-    """ Views for :class:`{{package}}.resources.CustomContent` """
-
-    @view_config(name='view', permission='view',
-                 renderer='{{package}}:templates/custom-content-default.pt')
-    def default_view(self):
-        """ Default view for :class:`{{package}}.resources.CustomContent`
-
-        :result: Dictionary needed to render the template.
-        :rtype: dict
-        """
-
-        return {
-            'foo': _(u'bar'),
-        }
-
-    @view_config(name='alternative-view', permission='view',
-                 renderer='{{package}}:templates/custom-content-alternative.pt')
-    def alternative_view(self):
-        """ Alternative view for :class:`{{package}}.resources.CustomContent`.
-        This view requires the JS / CSS resources defined in
-        :mod:`{{package}}.fanstatic`.
-
-        :result: Dictionary needed to render the template.
-        :rtype: dict
-        """
-
-        css_and_js.need()
-
-        return {
-            'foo': _(u'bar'),
-        }
diff --git a/kotti/scaffolds/package/CHANGES.rst_tmpl b/kotti/scaffolds/package/CHANGES.rst_tmpl
deleted file mode 100644
index f386d9be8..000000000
--- a/kotti/scaffolds/package/CHANGES.rst_tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-History
-=======
-
-0.1 - unreleased
-----------------
-
-- Create package with ``pcreate -s kotti {{project}}``.
diff --git a/kotti/scaffolds/package/LICENSE.txt_tmpl b/kotti/scaffolds/package/LICENSE.txt_tmpl
deleted file mode 100644
index 7ef40f26e..000000000
--- a/kotti/scaffolds/package/LICENSE.txt_tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{{project}} is supplied under this license ("RPL", a BSD-derived license):
-
-  A copyright notice accompanies this license document that identifies
-  the copyright holders.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-
-  1.  Redistributions in source code must retain the accompanying
-      copyright notice, this list of conditions, and the following
-      disclaimer.
-
-  2.  Redistributions in binary form must reproduce the accompanying
-      copyright notice, this list of conditions, and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-  3.  Names of the copyright holders must not be used to endorse or
-      promote products derived from this software without prior
-      written permission from the copyright holders.
-
-  4.  If any files are modified, you must cause the modified files to
-      carry prominent notices stating that you changed the files and
-      the date of any change.
-
-  Disclaimer
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND
-    ANY EXPRESSED 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
-    HOLDERS 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.
diff --git a/kotti/scaffolds/package/README.rst_tmpl b/kotti/scaffolds/package/README.rst_tmpl
deleted file mode 100644
index 7dca69884..000000000
--- a/kotti/scaffolds/package/README.rst_tmpl
+++ /dev/null
@@ -1,63 +0,0 @@
-{{project}}
-{{project_line}}
-
-This is an extension to Kotti that allows to add foo to your site.
-
-|pypi|_
-|downloads_month|_
-|license|_
-|build_status_stable|_
-
-.. |pypi| image:: https://img.shields.io/pypi/v/{{package}}.svg?style=flat-square
-.. _pypi: https://pypi.python.org/pypi/{{package}}/
-
-.. |downloads_month| image:: https://img.shields.io/pypi/dm/{{package}}.svg?style=flat-square
-.. _downloads_month: https://pypi.python.org/pypi/{{package}}/
-
-.. |license| image:: https://img.shields.io/pypi/l/{{package}}.svg?style=flat-square
-.. _license: http://www.repoze.org/LICENSE.txt
-
-.. |build_status_stable| image:: https://img.shields.io/travis/{{gh_user}}/{{package}}/production.svg?style=flat-square
-.. _build_status_stable: http://travis-ci.org/{{gh_user}}/{{package}}
-
-`Find out more about Kotti`_
-
-Development happens at https://github.com/{{gh_user}}/{{package}}
-
-.. _Find out more about Kotti: http://pypi.python.org/pypi/Kotti
-
-Setup
-=====
-
-To enable the extension in your Kotti site, activate the configurator::
-
-    kotti.configurators =
-        {{package}}.kotti_configure
-
-Database upgrade
-================
-
-If you are upgrading from a previous version you might have to migrate your
-database.  The migration is performed with `alembic`_ and Kotti's console script
-``kotti-migrate``. To migrate, run
-``kotti-migrate upgrade --scripts={{package}}:alembic``.
-
-For integration of alembic in your environment please refer to the
-`alembic documentation`_. If you have problems with the upgrade,
-please create a new issue in the `tracker`_.
-
-Development
-===========
-
-|build_status_master|_
-
-.. |build_status_master| image:: https://img.shields.io/travis/{{gh_user}}/{{package}}/master.svg?style=flat-square
-.. _build_status_master: http://travis-ci.org/{{gh_user}}/{{package}}
-
-Contributions to {{project}} are highly welcome.
-Just clone its `Github repository`_ and submit your contributions as pull requests.
-
-.. _alembic: http://pypi.python.org/pypi/alembic
-.. _alembic documentation: https://alembic.readthedocs.io/en/latest/index.html
-.. _tracker: https://github.com/{{gh_user}}/{{package}}/issues
-.. _Github repository: https://github.com/{{gh_user}}/{{package}}
diff --git a/kotti/scaffolds/package/development.ini_tmpl b/kotti/scaffolds/package/development.ini_tmpl
deleted file mode 100644
index 7bca90bd1..000000000
--- a/kotti/scaffolds/package/development.ini_tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-[app:{{project}}]
-use = egg:kotti
-
-pyramid.reload_templates = true
-pyramid.debug_templates = true
-pyramid.debug_authorization = false
-pyramid.debug_notfound = true
-pyramid.debug_routematch = false
-pyramid.includes =
-    pyramid_debugtoolbar
-    pyramid_tm
-pyramid.default_locale_name = en
-
-sqlalchemy.url = sqlite:///%(here)s/{{package}}.db
-#mail.default_sender = yourname@yourhost
-
-kotti.configurators =
-    kotti_tinymce.kotti_configure
-    {{package}}.kotti_configure
-kotti.site_title = {{project}} site
-kotti.secret = qwerty
-
-[filter:fanstatic]
-use = egg:fanstatic#fanstatic
-
-[pipeline:main]
-pipeline =
-    fanstatic
-    {{project}}
-
-[server:main]
-use = egg:waitress#main
-port = 5000
-
-[alembic]
-script_location = {{package}}:alembic
-
-# Begin logging configuration
-
-[loggers]
-keys = root, {{package}}, sqlalchemy
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[logger_{{package}}]
-level = DEBUG
-handlers =
-qualname = {{package}}
-
-[logger_sqlalchemy]
-level = INFO
-handlers =
-qualname = sqlalchemy.engine
-# "level = INFO" logs SQL queries.
-# "level = DEBUG" logs SQL queries and results.
-# "level = WARN" logs neither.  (Recommended for production systems.)
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
diff --git a/kotti/scaffolds/package/i18n.sh_tmpl b/kotti/scaffolds/package/i18n.sh_tmpl
deleted file mode 100755
index 1f9ae990e..000000000
--- a/kotti/scaffolds/package/i18n.sh_tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-# Usage:
-#     Initial catalog creation (lang is the language identifier):
-#         ./i18n.sh lang
-#     Updating translation and compile catalog:
-#         ./i18n.sh
-
-# configuration
-DOMAIN="{{package}}"
-SEARCH_PATH="{{package}}"
-LOCALES_PATH="{{package}}/locale"
-# end configuration
-
-# create locales folder if not exists
-if [ ! -d "$LOCALES_PATH" ]; then
-    echo "Locales directory not exists, create"
-    mkdir -p "$LOCALES_PATH"
-fi
-
-# create pot if not exists
-if [ ! -f "$LOCALES_PATH"/$DOMAIN.pot ]; then
-    echo "Create pot file"
-    touch "$LOCALES_PATH"/$DOMAIN.pot
-fi
-
-# no arguments, extract and update
-if [ $# -eq 0 ]; then
-    echo "Extract messages"
-    pot-create "$SEARCH_PATH" -d $DOMAIN -o "$LOCALES_PATH"/$DOMAIN.pot
-
-    echo "Update translations"
-    for po in "$LOCALES_PATH"/*/LC_MESSAGES/$DOMAIN.po; do
-        msgmerge --no-wrap -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
-    done
-
-    echo "Compile message catalogs"
-    for po in "$LOCALES_PATH"/*/LC_MESSAGES/*.po; do
-        echo "Compiling file $po..."
-        msgfmt --statistics -o "${po%.*}.mo" "$po"
-    done
-
-# first argument represents language identifier, create catalog
-else
-    cd "$LOCALES_PATH"
-    mkdir -p $1/LC_MESSAGES
-    msginit -i $DOMAIN.pot -o $1/LC_MESSAGES/$DOMAIN.po -l $1
-fi
diff --git a/kotti/scaffolds/package/pytest.ini_tmpl b/kotti/scaffolds/package/pytest.ini_tmpl
deleted file mode 100644
index 530a1b32b..000000000
--- a/kotti/scaffolds/package/pytest.ini_tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-[pytest]
-addopts =
-    --doctest-modules
-    --doctest-glob='*.txt'
-    --capture=no
-    --cov={{package}}
-    --cov-report=term-missing
-    --cov-config .coveragerc
-    --ignore={{package}}/templates/
-    --strict
-    --pep8
-    {{package}}/tests
-python_files = test*py
-markers =
-    user: mark test to be run as the given user
-    pep8: pep8 marker
-pep8ignore = E501 E122 E123 E125 E128 E711 E402
diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
deleted file mode 100644
index 378a55dd8..000000000
--- a/kotti/scaffolds/package/requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# ``master`` is where development happens:
-# -e git://github.com/Kotti/Kotti.git#egg=kotti
-
-# ``testing`` is *always* the latest non final release (alpha, beta, etc.):
-# -e git://github.com/Kotti/Kotti.git@testing#egg=kotti
-
-# ``production`` is *always* the latest final release:
-# -e git://github.com/Kotti/Kotti.git@production#egg=kotti
-
-# You can also install a specific version with its pinned requirements:
--r https://raw.githubusercontent.com/Kotti/Kotti/1.3.0/requirements.txt
-Kotti == 1.3.0
diff --git a/kotti/scaffolds/package/rtd.txt b/kotti/scaffolds/package/rtd.txt
deleted file mode 100644
index 2e2ff10c5..000000000
--- a/kotti/scaffolds/package/rtd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-repoze.sphinx.autointerface
-setuptools-git  # needed to make "python setup.py install" on rtd.
-pytest  # needed for testing apidocs
-
-# include requirements.txt
--r requirements.txt
diff --git a/kotti/scaffolds/package/setup.cfg_tmpl b/kotti/scaffolds/package/setup.cfg_tmpl
deleted file mode 100644
index 753c3c6cd..000000000
--- a/kotti/scaffolds/package/setup.cfg_tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
-[aliases]
-dev = develop easy_install kotti[testing] kotti[development]
-docs = develop easy_install kotti[docs]
diff --git a/kotti/scaffolds/package/setup.py_tmpl b/kotti/scaffolds/package/setup.py_tmpl
deleted file mode 100644
index fea7ec0cd..000000000
--- a/kotti/scaffolds/package/setup.py_tmpl
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-
-from setuptools import setup
-from setuptools import find_packages
-
-here = os.path.abspath(os.path.dirname(__file__))
-try:
-    README = open(os.path.join(here, 'README.rst')).read()
-except IOError:
-    README = ''
-try:
-    CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
-except IOError:
-    CHANGES = ''
-
-version = '0.1dev'
-
-install_requires = [
-    'Kotti>=1.3.0',
-    'kotti_tinymce',
-]
-
-
-setup(
-    name='{{project}}',
-    version=version,
-    description="Add on for Kotti",
-    long_description='\n\n'.join([README, CHANGES]),
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        # 'Development Status :: 4 - Beta',
-        # 'Development Status :: 5 - Production/Stable',
-        'Environment :: Web Environment',
-        'Framework :: Pylons',
-        'Framework :: Pyramid',
-        'License :: Repoze Public License',
-        'Operating System :: POSIX',
-        'Operating System :: Unix',
-        # 'Programming Language :: JavaScript',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        # 'Programming Language :: Python :: 3',
-        # 'Programming Language :: Python :: 3.3',
-        # 'Programming Language :: Python :: 3.4',
-        # 'Programming Language :: Python :: 3.5',
-        # 'Programming Language :: Python :: 3.6',
-        'Topic :: Internet',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Internet :: WWW/HTTP :: WSGI',
-        'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
-    ],
-    author='Kotti developers',
-    author_email='kotti@googlegroups.com',
-    url='https://github.com/{{gh_user}}/{{package}}',
-    keywords='kotti web cms wcms pylons pyramid sqlalchemy bootstrap',
-    license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
-    packages=find_packages(),
-    include_package_data=True,
-    zip_safe=False,
-    install_requires=install_requires,
-    tests_require=[],
-    dependency_links=[],
-    entry_points={
-        'fanstatic.libraries': [
-            '{{package}} = {{package}}.fanstatic:library',
-        ],
-    },
-    extras_require={},
-)
diff --git a/kotti/security.py b/kotti/security.py
index fdfd41aa2..542f39175 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -1,13 +1,18 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-from __future__ import with_statement
-
-from UserDict import DictMixin
+from collections import MutableMapping
 from contextlib import contextmanager
 from datetime import datetime
+from typing import Dict
+from typing import Iterable
+from typing import Iterator
+from typing import List
+from typing import Optional
+from typing import Set
+from typing import Tuple
+from typing import Union
 
 import bcrypt
 from pyramid.location import lineage
+from pyramid.security import PermitsResult
 from pyramid.security import view_execution_permitted
 from six import string_types
 from sqlalchemy import Boolean
@@ -18,9 +23,9 @@
 from sqlalchemy import bindparam
 from sqlalchemy import func
 from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm.query import Query
 from sqlalchemy.sql.expression import and_
 from sqlalchemy.sql.expression import or_
-from zope.deprecation.deprecation import deprecated
 
 from kotti import Base
 from kotti import DBSession
@@ -33,43 +38,23 @@
 from kotti.util import request_cache
 
 
-def get_principals():
+def has_permission(permission: str,
+                   context: 'Node',
+                   request: 'Request') -> PermitsResult:
+    """ Default permission checker """
+    return request.has_permission(permission, context=context)
+
+
+def get_principals() -> 'Principals':
     return get_settings()['kotti.principals_factory'][0]()
 
 
-@request_cache(lambda request: None)
-def get_user(request):
+# @request_cache(lambda request: None)
+def get_user(request: 'Request') -> Optional['Principal']:
     userid = request.unauthenticated_userid
     return get_principals().get(userid)
 
 
-def has_permission(permission, context, request):
-    """ Check if the current request has a permission on the given context.
-
-    .. deprecated:: 0.9
-
-    :param permission: permission to check for
-    :type permission: str
-
-    :param context: context that should be checked for the given permission
-    :type context: :class:``kotti.resources.Node``
-
-    :param request: current request
-    :type request: :class:`kotti.request.Request`
-
-    :result: ``True`` if request has the permission, ``False`` else
-    :rtype: bool
-    """
-
-    return request.has_permission(permission, context)
-
-
-deprecated(u'has_permission',
-           u"kotti.security.has_permission is deprecated as of Kotti 1.0 and "
-           u"will be no longer available starting with Kotti 2.0.  "
-           u"Please use the has_permission method of request instead.")
-
-
 class Principal(Base):
     """A minimal 'Principal' implementation.
 
@@ -106,8 +91,14 @@ class Principal(Base):
         order_by=name,
         )
 
-    def __init__(self, name, password=None, active=True, confirm_token=None,
-                 title=u"", email=None, groups=None):
+    def __init__(self,
+                 name: str,
+                 password: Optional[str] = None,
+                 active: Optional[bool] = True,
+                 confirm_token: Optional[str] = None,
+                 title: Optional[str] = '',
+                 email: Optional[str] = None,
+                 groups: Optional[List[str]] = None):
         self.name = name
         if password is not None:
             password = get_principals().hash_password(password)
@@ -123,7 +114,7 @@ def __init__(self, name, password=None, active=True, confirm_token=None,
         self.last_login_date = None
 
     def __repr__(self):  # pragma: no cover
-        return u'<Principal {0!r}>'.format(self.name)
+        return '<Principal {0!r}>'.format(self.name)
 
 
 class AbstractPrincipals(object):
@@ -142,11 +133,12 @@ class AbstractPrincipals(object):
     Use the 'kotti.principals' settings variable to override Kotti's
     default Principals implementation with your own.
     """
-    def __getitem__(self, name):
+    def __getitem__(self, name: str):
         """Return the Principal object with the id 'name'.
         """
 
-    def __setitem__(self, name, principal):
+    def __setitem__(self, name: str,
+                    principal: Union[Principal, dict]):
         """Add a given Principal object to the database.
 
         'name' is expected to the the same as 'principal.name'.
@@ -154,55 +146,56 @@ def __setitem__(self, name, principal):
         'principal' may also be a dict of attributes.
         """
 
-    def __delitem__(self, name):
+    def __delitem__(self, name: str) -> None:
         """Remove the principal with the given name from the database.
         """
 
-    def keys(self):
+    def keys(self) -> List[str]:
         """Return a list of principal ids that are in the database.
         """
 
-    def search(self, **kwargs):
+    def search(self, **kwargs) -> List[Principal]:
         """Return an iterable with principal objects that correspond
         to the search arguments passed in.
 
         This example would return all principals with the id 'bob':
 
-          get_principals().search(name=u'bob')
+          get_principals().search(name='bob')
 
         Here, we ask for all principals that have 'bob' in either
         their 'name' or their 'title'.  We pass '*bob*' instead of
         'bob' to indicate that we want case-insensitive substring
         matching:
 
-          get_principals().search(name=u'*bob*', title=u'*bob*')
+          get_principals().search(name='*bob*', title='*bob*')
 
         This call should fail with AttributeError unless there's a
         'foo' attribute on principal objects that supports search:
 
-          get_principals().search(name=u'bob', foo=u'bar')
+          get_principals().search(name='bob', foo='bar')
         """
 
-    def hash_password(self, password):
+    def hash_password(self, password: str) -> str:
         """Return a hash of the given password.
 
         This is what's stored in the database as 'principal.password'.
         """
 
-    def validate_password(self, clear, hashed):
+    def validate_password(self, clear: str, hashed: str) -> bool:
         """Returns True if the clear text password matches the hash.
         """
 
+
 ROLES = {
-    u'role:viewer': Principal(u'role:viewer', title=_(u'Viewer')),
-    u'role:editor': Principal(u'role:editor', title=_(u'Editor')),
-    u'role:owner': Principal(u'role:owner', title=_(u'Owner')),
-    u'role:admin': Principal(u'role:admin', title=_(u'Admin')),
+    'role:viewer': Principal('role:viewer', title=_('Viewer')),
+    'role:editor': Principal('role:editor', title=_('Editor')),
+    'role:owner': Principal('role:owner', title=_('Owner')),
+    'role:admin': Principal('role:admin', title=_('Admin')),
     }
 _DEFAULT_ROLES = ROLES.copy()
 
 # These roles are visible in the sharing tab
-SHARING_ROLES = [u'role:viewer', u'role:editor', u'role:owner']
+SHARING_ROLES = ['role:viewer', 'role:editor', 'role:owner']
 USER_MANAGEMENT_ROLES = SHARING_ROLES + ['role:admin']
 _DEFAULT_SHARING_ROLES = SHARING_ROLES[:]
 _DEFAULT_USER_MANAGEMENT_ROLES = USER_MANAGEMENT_ROLES[:]
@@ -218,54 +211,55 @@ def validate_password(self, clear, hashed):
     ]
 
 
-def set_roles(roles_dict):
+def set_roles(roles_dict: Dict[str, Principal]) -> None:
     ROLES.clear()
     ROLES.update(roles_dict)
 
 
-def set_sharing_roles(role_names):
+def set_sharing_roles(role_names: List[str]) -> None:
     SHARING_ROLES[:] = role_names
 
 
-def set_user_management_roles(role_names):
+def set_user_management_roles(role_names: List[str]) -> None:
     USER_MANAGEMENT_ROLES[:] = role_names
 
 
-def reset_roles():
+def reset_roles() -> None:
     ROLES.clear()
     ROLES.update(_DEFAULT_ROLES)
 
 
-def reset_sharing_roles():
+def reset_sharing_roles() -> None:
     SHARING_ROLES[:] = _DEFAULT_SHARING_ROLES
 
 
-def reset_user_management_roles():
+def reset_user_management_roles() -> None:
     USER_MANAGEMENT_ROLES[:] = _DEFAULT_USER_MANAGEMENT_ROLES
 
 
-def reset():
+def reset() -> None:
     reset_roles()
     reset_sharing_roles()
     reset_user_management_roles()
 
 
 class PersistentACLMixin(object):
-    def _get_acl(self):
+    def _get_acl(self) -> MutationList:
         if self._acl is None:
             raise AttributeError('__acl__')
         return self._acl
 
-    def _set_acl(self, value):
+    def _set_acl(self, value) -> None:
         self._acl = value
 
-    def _del_acl(self):
+    def _del_acl(self) -> None:
         self._acl = None
 
     __acl__ = property(_get_acl, _set_acl, _del_acl)
 
 
-def _cachekey_list_groups_raw(name, context):
+def _cachekey_list_groups_raw(name: str,
+                              context: 'Node') -> Tuple[str, Union[int, 'NoneType']]:  # noqa
     context_id = context is not None and getattr(context, 'id', id(context))
     return name, context_id
 
@@ -288,7 +282,7 @@ def list_groups_raw(name, context):
     return set()
 
 
-def list_groups(name, context=None):
+def list_groups(name: str, context: Optional['Node'] = None) -> List[str]:
     """List groups for principal with a given ``name``.
 
     The optional ``context`` argument may be passed to check the list
@@ -297,17 +291,20 @@ def list_groups(name, context=None):
     return list_groups_ext(name, context)[0]
 
 
-def _cachekey_list_groups_ext(name, context=None, _seen=None, _inherited=None):
+def _cachekey_list_groups_ext(name: str,
+                              context: Optional['Node'] = None,
+                              _seen: Optional[Set[str]] = None,
+                              _inherited: Optional[Set[str]] = None) -> Tuple[str, Union[int, 'NoneType']]:  # noqa
     if _seen is not None or _inherited is not None:
         raise DontCache
     else:
         context_id = getattr(context, 'id', id(context))
-        return unicode(name), context_id
+        return name, context_id
 
 
 @request_cache(_cachekey_list_groups_ext)
 def list_groups_ext(name, context=None, _seen=None, _inherited=None):
-    name = unicode(name)
+    name = name
     groups = set()
     recursing = _inherited is not None
     _inherited = _inherited or set()
@@ -343,28 +340,30 @@ def list_groups_ext(name, context=None, _seen=None, _inherited=None):
     return list(groups), list(_inherited)
 
 
-def set_groups(name, context, groups_to_set=()):
+def set_groups(name: str,
+               context: 'Node',
+               groups_to_set: Iterable[str] = ()) -> None:
     """Set the list of groups for principal with given ``name`` and in
     given ``context``.
     """
 
     from kotti.resources import LocalGroup
 
-    name = unicode(name)
     context.local_groups = [
         # keep groups for "other" principals
         lg for lg in context.local_groups
         if lg.principal_name != name
     ] + [
         # reset groups for given principal
-        LocalGroup(context, name, unicode(group_name))
+        LocalGroup(context, name, group_name)
         for group_name in groups_to_set
     ]
 
 
-def list_groups_callback(name, request):
+def list_groups_callback(name: str,
+                         request: 'Request') -> Optional[List[str]]:
     """ List the groups for the principal identified by ``name``.  Consider
-    ``authz_context`` to support assigment of local roles to groups. """
+    ``authz_context`` to support assignment of local roles to groups. """
     if not is_user(name):
         return None  # Disallow logging in with groups
     if name in get_principals():
@@ -378,7 +377,7 @@ def list_groups_callback(name, request):
 
 
 @contextmanager
-def authz_context(context, request):
+def authz_context(context: object, request: 'Request'):
     before = request.environ.pop('authz_context', None)
     request.environ['authz_context'] = context
     try:
@@ -390,7 +389,7 @@ def authz_context(context, request):
 
 
 @contextmanager
-def request_method(request, method):
+def request_method(request: 'Request', method: str):
     before = request.method
     request.method = method
     try:
@@ -399,13 +398,17 @@ def request_method(request, method):
         request.method = before
 
 
-def view_permitted(context, request, name='', method='GET'):
+def view_permitted(context: object,
+                   request: 'Request',
+                   name: Optional[str] = '',
+                   method: Optional[str] = 'GET') -> PermitsResult:
     with authz_context(context, request):
         with request_method(request, method):
             return view_execution_permitted(context, request, name)
 
 
-def principals_with_local_roles(context, inherit=True):
+def principals_with_local_roles(context: 'Node',
+                                inherit: Optional[bool] = True) -> List[str]:
     """Return a list of principal names that have local roles in the
     context.
     """
@@ -425,7 +428,7 @@ def principals_with_local_roles(context, inherit=True):
     return list(principals)
 
 
-def map_principals_with_local_roles(context):
+def map_principals_with_local_roles(context: 'Node'):
     principals = get_principals()
     value = []
     for principal_name in principals_with_local_roles(context):
@@ -439,13 +442,13 @@ def map_principals_with_local_roles(context):
     return sorted(value, key=lambda t: t[0].name)
 
 
-def is_user(principal):
+def is_user(principal: Union[Principal, str]) -> bool:
     if not isinstance(principal, string_types):
         principal = principal.name
     return ':' not in principal
 
 
-class Principals(DictMixin):
+class Principals(MutableMapping):
     """Kotti's default principal database.
 
     Look at 'AbstractPrincipals' for documentation.
@@ -456,14 +459,15 @@ class Principals(DictMixin):
     factory = Principal
 
     @classmethod
-    def _principal_by_name(cls, name):
+    def _principal_by_name(cls, name: str) -> Principal:
         query = bakery(lambda session: session.query(cls.factory).filter(
             cls.factory.name == bindparam('name')))
         return query(DBSession()).params(name=name).one()
 
-    @request_cache(lambda self, name: unicode(name))
+    @request_cache(lambda self, name: name)
     def __getitem__(self, name):
-        name = unicode(name)
+        if name is None or not isinstance(name, str):
+            raise KeyError(name)
         # avoid calls to the DB for roles
         # (they're not stored in the ``principals`` table)
         if name.startswith('role:'):
@@ -475,28 +479,39 @@ def __getitem__(self, name):
         except NoResultFound:
             raise KeyError(name)
 
-    def __setitem__(self, name, principal):
-        name = unicode(name)
+    def __setitem__(self,
+                    name: str,
+                    principal: Union[Principal, dict]) -> None:
+        name = name
         if isinstance(principal, dict):
             principal = self.factory(**principal)
         DBSession.add(principal)
 
-    def __delitem__(self, name):
-        name = unicode(name)
+    def __delitem__(self, name: str) -> None:
+        name = name
         try:
             principal = self._principal_by_name(name)
             DBSession.delete(principal)
         except NoResultFound:
             raise KeyError(name)
 
-    def iterkeys(self):
+    def __iter__(self) -> Iterator[str]:
+        for k in self.keys():
+            yield k
+
+    def __len__(self):
+        return len(self.keys())
+
+    def iterkeys(self) -> Iterator[str]:
         for (principal_name,) in DBSession.query(self.factory.name):
             yield principal_name
 
-    def keys(self):
+    def keys(self) -> List[str]:
         return list(self.iterkeys())
 
-    def search(self, match='any', **kwargs):
+    def search(self,
+               match: Optional[str] = 'any',
+               **kwargs) -> Query:
         """ Search the principal database.
 
         :param match: ``any`` to return all principals matching any search
@@ -537,18 +552,19 @@ def search(self, match='any', **kwargs):
 
     log_rounds = 10
 
-    def hash_password(self, password, hashed=None):
+    def hash_password(self,
+                      password: str,
+                      hashed: Optional[str] = None) -> str:
         if hashed is None:
             hashed = bcrypt.gensalt(self.log_rounds)
-        return unicode(
-            bcrypt.hashpw(password.encode('utf-8'), hashed.encode('utf-8')))
+        return bcrypt.hashpw(password.encode('utf-8'), hashed.encode('utf-8'))
 
-    def validate_password(self, clear, hashed):
+    def validate_password(self, clear: str, hashed: str) -> bool:
         try:
             return self.hash_password(clear, hashed) == hashed
         except ValueError:
             return False
 
 
-def principals_factory():
+def principals_factory() -> Principals:
     return Principals()
diff --git a/kotti/sqla.py b/kotti/sqla.py
index 581f1727c..3c27f53e6 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -1,13 +1,9 @@
-# -*- coding: utf-8 -*-
-
 """
 Inheritance Diagram
 -------------------
 
 .. inheritance-diagram:: kotti.sqla
 """
-from __future__ import absolute_import, division, print_function
-
 from pyramid.compat import json
 from pyramid.security import ALL_PERMISSIONS
 from pyramid.security import Allow
diff --git a/kotti/templates/actions-dropdown.pt b/kotti/templates/actions-dropdown.pt
index 6de774026..3ebe16df7 100644
--- a/kotti/templates/actions-dropdown.pt
+++ b/kotti/templates/actions-dropdown.pt
@@ -9,6 +9,6 @@
         ${link.title}
       </a>
     </li>
-    <li tal:replace="api.render_view('default-view-selector')" />
+    <li tal:replace="api.render_view('default-view-selector')"></li>
   </ul>
 </li>
diff --git a/kotti/templates/edit/contents.pt b/kotti/templates/edit/contents.pt
index da3f5e37c..b03406fb4 100644
--- a/kotti/templates/edit/contents.pt
+++ b/kotti/templates/edit/contents.pt
@@ -59,8 +59,7 @@
               </td>
               <td>
                 <ul style="list-style-type: none; padding: 0; margin: 0;">
-                  <div tal:replace="api.render_view(
-                    'workflow-dropdown', context=child)" />
+                  <div tal:replace="api.render_view('workflow-dropdown', context=child)"></div>
                 </ul>
               </td>
               <td>
diff --git a/kotti/templates/edit/master.pt b/kotti/templates/edit/master.pt
index 524d4d239..219134378 100644
--- a/kotti/templates/edit/master.pt
+++ b/kotti/templates/edit/master.pt
@@ -2,9 +2,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      tal:define="page_slots api.slots;
-                  dummy api.edit_needed;
-                  has_location_context api.is_location(context);"
+      tal:define="page_slots api.slots; dummy api.edit_needed; has_location_context api.is_location(context);"
       metal:define-macro="main">
   <head>
     <meta charset="utf-8" />
@@ -39,8 +37,8 @@
     <div class="container">
       <div class="row">
         <div class="col-md-12">
-          <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')" />
-          <div tal:replace="api.render_template('kotti:templates/messages.pt')" />
+          <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')"></div>
+          <div tal:replace="api.render_template('kotti:templates/messages.pt')"></div>
           <div class="inner-content">
             <metal:content define-slot="content">
               <h1>${context.title}</h1>
diff --git a/kotti/templates/edit/nav-tree.pt b/kotti/templates/edit/nav-tree.pt
index cb0940c31..8a9185a26 100644
--- a/kotti/templates/edit/nav-tree.pt
+++ b/kotti/templates/edit/nav-tree.pt
@@ -11,8 +11,6 @@
       <i class="glyphicon glyphicon-edit"></i>
     </a>
     <em>(${child.type_info.title})</em>
-    <ul tal:replace="api.render_template(
-                         'kotti:templates/edit/nav-tree.pt',
-                         tree=child)" />
+    <ul tal:replace="api.render_template('kotti:templates/edit/nav-tree.pt', tree=child)"></ul>
   </li>
 </ul>
diff --git a/kotti/templates/edit/node.pt b/kotti/templates/edit/node.pt
index 7af5fc520..407096710 100644
--- a/kotti/templates/edit/node.pt
+++ b/kotti/templates/edit/node.pt
@@ -4,7 +4,7 @@
 
   <div metal:fill-slot="content">
     <h1 tal:content="first_heading | default">${api.page_title}</h1>
-    <form tal:replace="structure form" />
+    <form tal:replace="structure form"></form>
   </div>
 
 </html>
diff --git a/kotti/templates/edit/simpleform.pt b/kotti/templates/edit/simpleform.pt
index 710861773..075416c19 100644
--- a/kotti/templates/edit/simpleform.pt
+++ b/kotti/templates/edit/simpleform.pt
@@ -4,6 +4,6 @@
 
   <div metal:fill-slot="content">
     <h1 tal:content="first_heading | default">${api.page_title}</h1>
-    <form tal:replace="structure form" />
+    <form tal:replace="structure form"></form>
   </div>
 </html>
diff --git a/kotti/templates/editor-bar.pt b/kotti/templates/editor-bar.pt
index 4584e8793..1f2dbf39d 100644
--- a/kotti/templates/editor-bar.pt
+++ b/kotti/templates/editor-bar.pt
@@ -13,7 +13,7 @@
     </div>
     <div class="collapse navbar-collapse" id="navbar-edit">
       <ul class="nav navbar-nav navbar-left">
-        <li tal:replace="api.render_view('workflow-dropdown')" />
+        <li tal:replace="api.render_view('workflow-dropdown')"></li>
 
         <li class="${api.url() == (request.url.endswith('/') and request.url or request.url + '/') and 'active' or None}">
           <a href="${api.url()}" i18n:translate="">View</a>
@@ -27,11 +27,11 @@
 
         <tal:condition tal:condition="not disable_context_links">
           <tal:condition tal:condition="api.has_permission('edit')">
-            <ul tal:replace="api.render_view('actions-dropdown')" />
+            <ul tal:replace="api.render_view('actions-dropdown')"></ul>
           </tal:condition>
           <tal:condition tal:condition="api.has_permission('add')">
             <li class="divider-vertical"></li>
-            <ul tal:replace="api.render_view('add-dropdown')" />
+            <ul tal:replace="api.render_view('add-dropdown')"></ul>
           </tal:condition>
         </tal:condition>
       </ul>
diff --git a/kotti/templates/email-reset-password.pt b/kotti/templates/email-reset-password.pt
index c58ecc86b..a2987add5 100644
--- a/kotti/templates/email-reset-password.pt
+++ b/kotti/templates/email-reset-password.pt
@@ -1,6 +1,6 @@
 <tal:block i18n:domain="Kotti">
-Subject: <tal:block i18n:translate="">Reset your password for <span tal:replace="site_title" i18n:name="site_title" />.</tal:block>
+Subject: <tal:block i18n:translate="">Reset your password for <span tal:replace="site_title" i18n:name="site_title"></span>.</tal:block>
 
-<p i18n:translate="">Hello, <span tal:replace="user_title" i18n:name="user_title" />!</p>
-<p i18n:translate="">Click this link to reset your password at <span tal:replace="site_title" i18n:name="site_title" />: <span tal:replace="url" i18n:name="url" /></p>
+<p i18n:translate="">Hello, <span tal:replace="user_title" i18n:name="user_title"></span>!</p>
+<p i18n:translate="">Click this link to reset your password at <span tal:replace="site_title" i18n:name="site_title"></span>: <span tal:replace="url" i18n:name="url"></span></p>
 </tal:block>
diff --git a/kotti/templates/email-set-password.pt b/kotti/templates/email-set-password.pt
index 2942fb33d..9a3c05700 100644
--- a/kotti/templates/email-set-password.pt
+++ b/kotti/templates/email-set-password.pt
@@ -1,7 +1,7 @@
 <tal:block i18n:domain="Kotti">
-Subject: <tal:block i18n:translate="">Your registration for <span tal:replace="site_title" i18n:name="site_title" /></tal:block>
+Subject: <tal:block i18n:translate="">Your registration for <span tal:replace="site_title" i18n:name="site_title"></span></tal:block>
 
-<p i18n:translate="">Hello, <span tal:replace="user_title" i18n:name="user_title" />!</p>
-<p i18n:translate="">You are joining <span tal:replace="site_title" i18n:name="site_title" />.</p>
-<p i18n:translate="">Click here to set your password and log in: <span tal:replace="url" i18n:name="url" /></p>
+<p i18n:translate="">Hello, <span tal:replace="user_title" i18n:name="user_title"></span>!</p>
+<p i18n:translate="">You are joining <span tal:replace="site_title" i18n:name="site_title"></span>.</p>
+<p i18n:translate="">Click here to set your password and log in: <span tal:replace="url" i18n:name="url"></span></p>
 </tal:block>
diff --git a/kotti/templates/master-bare.pt b/kotti/templates/master-bare.pt
index ebb70f620..b749d4043 100644
--- a/kotti/templates/master-bare.pt
+++ b/kotti/templates/master-bare.pt
@@ -1,11 +1,9 @@
 <!--
     This template is used for XHR requests and when content is rendered inline.
 -->
-<html tal:omit-tag=""
-      metal:define-macro="main">
+<html tal:omit-tag="" metal:define-macro="main">
 
-  <div tal:replace="api.render_template('kotti:templates/messages.pt')"
-       tal:condition="request.is_xhr" />
+  <div tal:replace="api.render_template('kotti:templates/messages.pt')" tal:condition="request.is_xhr"></div>
 
   <div metal:define-slot="content">
     <h1>${context.title}</h1>
diff --git a/kotti/templates/site-setup/master.pt b/kotti/templates/site-setup/master.pt
index c2f579ba5..6c56fe60a 100644
--- a/kotti/templates/site-setup/master.pt
+++ b/kotti/templates/site-setup/master.pt
@@ -4,6 +4,6 @@
 
     <div metal:fill-slot="editor-bar"
          tal:condition="request.user is not None"
-         tal:replace="api.render_template('kotti:templates/editor-bar.pt', disable_context_links=True)" />
+         tal:replace="api.render_template('kotti:templates/editor-bar.pt', disable_context_links=True)"></div>
 
 </html>
diff --git a/kotti/templates/site-setup/user.pt b/kotti/templates/site-setup/user.pt
index 446d46a7f..144c1f9c6 100644
--- a/kotti/templates/site-setup/user.pt
+++ b/kotti/templates/site-setup/user.pt
@@ -21,7 +21,7 @@
     <h1 i18n:translate="">
       Edit <em i18n:name="title">${api.principal.title}</em>
     </h1>
-    <form tal:replace="structure form" />
+    <form tal:replace="structure form"></form>
 
   </div>
 
diff --git a/kotti/templates/site-setup/users.pt b/kotti/templates/site-setup/users.pt
index 4a868e03a..7b29cd98b 100644
--- a/kotti/templates/site-setup/users.pt
+++ b/kotti/templates/site-setup/users.pt
@@ -115,13 +115,13 @@
       <div class="tab-pane ${active_tab == 'add_user' and 'active'}"
            id="add-user-tab">
         <h2 i18n:translate="">Add new user</h2>
-        <form tal:replace="structure user_addform" />
+        <form tal:replace="structure user_addform"></form>
       </div>
 
       <div class="tab-pane ${active_tab == 'add_group' and 'active'}"
            id="add-group-tab">
         <h2 i18n:translate="">Add new group</h2>
-        <form tal:replace="structure group_addform" />
+        <form tal:replace="structure group_addform"></form>
       </div>
     </div>
 
diff --git a/kotti/templates/view/document.pt b/kotti/templates/view/document.pt
index bf95621b3..1b3f454e3 100644
--- a/kotti/templates/view/document.pt
+++ b/kotti/templates/view/document.pt
@@ -7,7 +7,7 @@
     <p class="lead">
       ${context.description}
     </p>
-    <div tal:replace="api.render_template('kotti:templates/view/tags.pt')" />
+    <div tal:replace="api.render_template('kotti:templates/view/tags.pt')"></div>
     <div class="body" tal:content="structure context.body | None">
     </div>
   </article>
diff --git a/kotti/templates/view/file.pt b/kotti/templates/view/file.pt
index 756e133d7..677d7b996 100644
--- a/kotti/templates/view/file.pt
+++ b/kotti/templates/view/file.pt
@@ -7,7 +7,7 @@
     <p class="lead">
       ${context.description}
     </p>
-    <div tal:replace="api.render_template('kotti:templates/view/tags.pt')" />
+    <div tal:replace="api.render_template('kotti:templates/view/tags.pt')"></div>
     <div class="body">
       <a href="${api.url(context, '@@attachment-view')}">
         Download file
diff --git a/kotti/templates/view/folder.pt b/kotti/templates/view/folder.pt
index ee8ba786a..f78b2b32e 100644
--- a/kotti/templates/view/folder.pt
+++ b/kotti/templates/view/folder.pt
@@ -11,7 +11,7 @@
     <p class="lead">
       ${context.description}
     </p>
-    <div tal:replace="api.render_template('kotti:templates/view/tags.pt')" />
+    <div tal:replace="api.render_template('kotti:templates/view/tags.pt')"></div>
     <h2 i18n:translate="">Contents</h2>
     <div class="body">
       <table class="table table-condensed">
diff --git a/kotti/templates/view/master.pt b/kotti/templates/view/master.pt
index d91b81ea6..5113f50aa 100644
--- a/kotti/templates/view/master.pt
+++ b/kotti/templates/view/master.pt
@@ -2,9 +2,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      tal:define="page_slots api.slots;
-                  dummy api.view_needed;
-                  has_location_context api.is_location(context);"
+      tal:define="page_slots api.slots; dummy api.view_needed; has_location_context api.is_location(context);"
       metal:define-macro="main">
 
   <head>
@@ -32,15 +30,15 @@
                ${api.body_css_class}">
 
     <nav tal:omit-tag="" metal:define-slot="nav-bar">
-      <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
+      <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')"></nav>
     </nav>
     <editbar tal:omit-tag="" metal:define-slot="editor-bar">
       <div tal:condition="request.user is not None and has_location_context"
-           tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+           tal:replace="api.render_template('kotti:templates/editor-bar.pt')"></div>
     </editbar>
 
     <div class="container">
-      <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')" />
+      <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')"></div>
 
       <div class="row"
            tal:define="n_slots_left has_location_context and int(bool(page_slots.left)) * 3 or 0;
@@ -56,7 +54,7 @@
                tal:content="api.render_template('kotti:templates/render_content_slot.pt', slot=page_slots.abovecontent)">
           </div>
 
-          <div tal:replace="api.render_template('kotti:templates/messages.pt')" />
+          <div tal:replace="api.render_template('kotti:templates/messages.pt')"></div>
 
           <div class="inner-content">
             <div metal:define-slot="content">
diff --git a/kotti/templates/view/nav.pt b/kotti/templates/view/nav.pt
index 398f931b7..973f254ad 100644
--- a/kotti/templates/view/nav.pt
+++ b/kotti/templates/view/nav.pt
@@ -28,7 +28,7 @@
           <a href="${api.url(item)}" title="${item.description}">${item.title}</a>
         </li>
       </ul>
-      <div tal:replace="api.render_template('kotti:templates/view/search.pt')" />
+      <div tal:replace="api.render_template('kotti:templates/view/search.pt')"></div>
     </div>
   </div>
 </nav>
diff --git a/kotti/testing.py b/kotti/testing.py
index b0bd6142f..26294e5f7 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
 """
 Inheritance Diagram
 -------------------
 
 .. inheritance-diagram:: kotti.testing
 """
-from __future__ import absolute_import, division, print_function
-
 import os
-from os.path import join, dirname
+from os.path import dirname
+from os.path import join
 from unittest import TestCase
 from warnings import catch_warnings
 
@@ -24,9 +22,9 @@
 # however, let the `ImportWarning` produced by Babel's
 # `localedata.py` vs `localedata/` show up once...
 with catch_warnings():
-    from babel import localedata
-    import compiler
-    localedata, compiler    # make pyflakes happy... :p
+    pass
+    # import compiler
+    # localedata, compiler    # make pyflakes happy... :p
 
 
 # py.test markers (see http://pytest.org/latest/example/markers.html)
@@ -37,6 +35,7 @@
 
 
 class Dummy(dict):
+    # noinspection PyMissingConstructor
     def __init__(self, **kwargs):
         self.__dict__.update(kwargs)
 
@@ -52,6 +51,7 @@ def is_response(ob):
         return (hasattr(ob, 'app_iter') and hasattr(ob, 'headerlist') and
                 hasattr(ob, 'status'))
 
+    # noinspection PyPep8Naming
     @classmethod
     def blank(cls,
               path, environ=None, base_url=None, headers=None, POST=None,
@@ -60,15 +60,16 @@ def blank(cls,
         ``request.blank`` is used in Kotti only when assigning slots, where
         the POST parameters are faked as a querystring.
         """
-        import urlparse
+        from urllib.parse import parse_qsl
 
         def _decode(body):
             if not body:
                 return {}
-            return dict([(x, y.decode('utf-8'))
-                         for x, y in urlparse.parse_qsl(body)])
+            return dict([(x, y) for x, y in parse_qsl(body)])
 
-        if POST and isinstance(POST, basestring):
+        if POST and isinstance(POST, bytes):
+            POST = POST.decode()
+        if POST and isinstance(POST, str):
             POST = _decode(POST)
         req = testing.DummyRequest(path=path, environ=environ, headers=headers,
                                    cookies=None, post=POST, **kw)
@@ -112,14 +113,14 @@ def login_view(request):
 
 
 def dummy_search(search_term, request):
-    return u"Not found. Sorry!"
+    return "Not found. Sorry!"
 
 
 def testing_db_url():
     return os.environ.get('KOTTI_TEST_DB_STRING', 'sqlite://')
 
 
-def _initTestingDB():
+def _init_testing_db():
     from sqlalchemy import create_engine
     from kotti import get_settings
     from kotti.resources import initialize_sql
@@ -150,6 +151,7 @@ def _turn_warnings_into_errors():  # pragma: no cover
     filterwarnings("error")
 
 
+# noinspection PyPep8Naming
 def setUp(init_db=True, **kwargs):
     # _turn_warnings_into_errors()
 
@@ -161,6 +163,7 @@ def setUp(init_db=True, **kwargs):
     settings['kotti.secret'] = 'secret'
     settings['kotti.secret2'] = 'secret2'
     settings['kotti.populators'] = 'kotti.testing._populator'
+    settings['pyramid_deform.tempdir'] = '/tmp'
     settings.update(kwargs.get('settings', {}))
     settings = _resolve_dotted(settings)
     kwargs['settings'] = settings
@@ -168,12 +171,13 @@ def setUp(init_db=True, **kwargs):
     config.add_default_renderers()
 
     if init_db:
-        _initTestingDB()
+        _init_testing_db()
 
     transaction.begin()
     return config
 
 
+# noinspection PyPep8Naming
 def tearDown():
     from depot.manager import DepotManager
     from kotti import events
@@ -223,6 +227,7 @@ def _zope_testbrowser_pyquery(self):
         self.contents.replace('xmlns="http://www.w3.org/1999/xhtml', ''))
 
 
+# noinspection PyPep8Naming
 def setUpFunctional(global_config=None, **settings):
     from kotti import main
     from zope.testbrowser.wsgi import Browser
@@ -264,7 +269,7 @@ def setUp(self, **kwargs):
     def tearDown(self):
         tearDown()
 
-    def login(self, login=u'admin', password=u'secret'):
+    def login(self, login='admin', password='secret'):
         return self.test_app.post(
             '/@@login',
             {'login': login, 'password': password, 'submit': 'submit'},
@@ -308,6 +313,7 @@ def include_testing_view(config):
         )
 
 
+# noinspection PyPep8Naming
 def setUpFunctionalStrippedDownApp(global_config=None, **settings):
     # An app that doesn't use Nodes at all
     _settings = {
@@ -325,6 +331,7 @@ def setUpFunctionalStrippedDownApp(global_config=None, **settings):
     return setUpFunctional(global_config, **_settings)
 
 
+# noinspection PyPep8Naming
 def registerDummyMailer():
     from pyramid_mailer.mailer import DummyMailer
     from kotti.message import _inject_mailer
@@ -336,12 +343,7 @@ def registerDummyMailer():
 
 # set up deprecation warnings
 from zope.deprecation.deprecation import deprecated  # noqa
-for item in UnitTestBase, EventTestBase, FunctionalTestBase, _initTestingDB:
+for item in UnitTestBase, EventTestBase, FunctionalTestBase, _init_testing_db:
     name = getattr(item, '__name__', item)
     deprecated(name, 'Unittest-style tests are deprecated as of Kotti 0.7. '
                'Please use pytest function arguments instead.')
-
-TestingRootFactory = RootFactory
-deprecated('TestingRootFactory',
-           "TestingRootFactory has been renamed to RootFactory and will be no "
-           "longer available starting with Kotti 2.0.0.")
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 7b4f3e91a..b8879d789 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 
 Fixture dependencies
@@ -44,13 +42,13 @@
 
 """
 
-from __future__ import absolute_import, division, print_function
-
 import warnings
 from datetime import datetime
 
+from depot.io.memory import MemoryFileStorage
 from mock import MagicMock
 from pytest import fixture
+from pytest import yield_fixture
 
 from kotti import testing
 
@@ -69,15 +67,12 @@ def image_asset2():
     return testing.asset('logo.png')
 
 
-@fixture
+@yield_fixture
 def allwarnings(request):
     save_filters = warnings.filters[:]
     warnings.filters[:] = []
-
-    def restore():
-        warnings.filters[:] = save_filters
-
-    request.addfinalizer(restore)
+    yield
+    warnings.filters[:] = save_filters
 
 
 @fixture(scope='session')
@@ -117,8 +112,8 @@ def settings(unresolved_settings):
     return _resolve_dotted(unresolved_settings)
 
 
-@fixture
-def config(request, settings):
+@yield_fixture
+def config(settings):
     """ returns a Pyramid `Configurator` object initialized
         with Kotti's default (test) settings.
     """
@@ -127,9 +122,9 @@ def config(request, settings):
     config = testing.setUp(settings=settings)
     config.include('pyramid_chameleon')
     config.add_default_renderers()
-    request.addfinalizer(security.reset)
-    request.addfinalizer(testing.tearDown)
-    return config
+    yield config
+    security.reset()
+    testing.tearDown()
 
 
 @fixture(scope='session')
@@ -180,22 +175,22 @@ def content(connection, settings):
     # tests, and because the 'content' fixture does not depend on
     # 'event' and therefore the event handlers aren't fired for root
     # otherwise:
-    get_root().path = u'/'
+    get_root().path = '/'
     commit()
 
 
-@fixture
-def db_session(config, content, connection, request):
+@yield_fixture
+def db_session(config, content, connection):
     """ returns a db session object and sets up a db transaction
         savepoint, which will be rolled back after the test.
     """
 
-    from transaction import abort
+    import transaction
     trans = connection.begin()          # begin a non-orm transaction
-    request.addfinalizer(trans.rollback)
-    request.addfinalizer(abort)
     from kotti import DBSession
-    return DBSession()
+    yield DBSession()
+    trans.rollback()
+    transaction.abort()
 
 
 @fixture
@@ -227,14 +222,14 @@ def dummy_mailer(monkeypatch):
     return mailer
 
 
-@fixture
-def events(config, request):
+@yield_fixture
+def events(config):
     """ sets up Kotti's default event handlers.
     """
     from kotti.events import clear
     config.include('kotti.events')
-    request.addfinalizer(clear)
-    return config
+    yield config
+    clear()
 
 
 @fixture
@@ -304,50 +299,17 @@ def workflow(config):
     xmlconfig.file('workflow.zcml', kotti, execute=True)
 
 
-class TestStorage:
-    def __init__(self):
-        self._storage = {}
-        self._storage.setdefault(0)
-
-    def get(self, id):
-        info = self._storage[int(id)]
-
-        from StringIO import StringIO
-
-        f = MagicMock(wraps=StringIO(info['content']))
-        f.seek(0)
-        f.public_url = None
-        f.filename = info['filename']
-        f.content_type = info['content_type']
-        f.content_length = len(info['content'])
-        # needed to make JSON serializable, Mock objects are not
+class TestStorage(MemoryFileStorage):
+    def get(self, file_or_id):
+        f = super(TestStorage, self).get(file_or_id)
         f.last_modified = datetime(2012, 12, 30)
-
         return f
 
-    def create(self, content, filename=None, content_type=None):
-        _id = max(self._storage) + 1
-        filename = filename or getattr(content, 'filename', None)
-        content_type = content_type or getattr(content, 'type', None)
-
-        if hasattr(content, 'file') and hasattr(content.file, 'read'):
-            content = content.file.read()
-        elif hasattr(content, 'read'):
-            content = content.read()
-
-        self._storage[_id] = {'content': content,
-                              'filename': filename,
-                              'content_type': content_type}
-        return _id
-
-    def delete(self, id):
-        del self._storage[int(id)]
 
-
-@fixture
-def depot_tween(request, config, dummy_request):
+@yield_fixture
+def depot_tween(config, dummy_request):
     """ Sets up the Depot tween and patches Depot's ``set_middleware`` to
-    suppress exceptions on subsequent calls """
+    suppress exceptions on subsequent calls. Yields the ``DepotManager``. """
 
     from depot.manager import DepotManager
     from kotti.filedepot import TweenFactory
@@ -367,14 +329,13 @@ def set_middleware_patched(cls, mw):
 
     DepotManager.set_middleware = set_middleware_patched
 
-    def restore():
-        DepotManager.set_middleware = _set_middleware
+    yield DepotManager
 
-    request.addfinalizer(restore)
+    DepotManager.set_middleware = _set_middleware
 
 
-@fixture
-def mock_filedepot(request, depot_tween):
+@yield_fixture
+def mock_filedepot(depot_tween):
     """ Configures a mock depot store for :class:`depot.manager.DepotManager`
 
     This filedepot is not integrated with dbsession.
@@ -387,14 +348,13 @@ def mock_filedepot(request, depot_tween):
     }
     DepotManager._default_depot = 'mockdepot'
 
-    def restore():
-        DepotManager._clear()
+    yield DepotManager
 
-    request.addfinalizer(restore)
+    DepotManager._clear()
 
 
-@fixture
-def filedepot(db_session, request, depot_tween):
+@yield_fixture
+def filedepot(db_session, depot_tween):
     """ Configures a dbsession integrated mock depot store for
     :class:`depot.manager.DepotManager`
     """
@@ -405,15 +365,14 @@ def filedepot(db_session, request, depot_tween):
     }
     DepotManager._default_depot = 'filedepot'
 
-    def restore():
-        db_session.rollback()
-        DepotManager._clear()
+    yield DepotManager
 
-    request.addfinalizer(restore)
+    db_session.rollback()
+    DepotManager._clear()
 
 
-@fixture
-def no_filedepots(db_session, request, depot_tween):
+@yield_fixture
+def no_filedepots(db_session, depot_tween):
     """ A filedepot fixture to empty and then restore DepotManager configuration
     """
     from depot.manager import DepotManager
@@ -421,8 +380,7 @@ def no_filedepots(db_session, request, depot_tween):
     DepotManager._depots = {}
     DepotManager._default_depot = None
 
-    def restore():
-        db_session.rollback()
-        DepotManager._clear()
+    yield DepotManager
 
-    request.addfinalizer(restore)
+    db_session.rollback()
+    DepotManager._clear()
diff --git a/kotti/tests/conftest.py b/kotti/tests/conftest.py
index 7d1bdf6be..55ebf011c 100644
--- a/kotti/tests/conftest.py
+++ b/kotti/tests/conftest.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from pytest import fixture
 from pytest import skip
 
@@ -11,12 +8,12 @@
 
 
 def pytest_addoption(parser):
-    parser.addoption("--runslow", action="store_true", help="run slow tests")
+    parser.addoption('--runslow', action='store_true', help='run slow tests')
 
 
 def pytest_runtest_setup(item):
-    if 'slow' in item.keywords and not item.config.getoption("--runslow"):
-        skip("need --runslow option to run")
+    if 'slow' in item.keywords and not item.config.getoption('--runslow'):
+        skip('need --runslow option to run')
 
 
 # non-public test fixtures
@@ -30,10 +27,14 @@ def app(db_session, setup_app):
 
 @fixture
 def extra_principals(db_session):
+    """ Setup additional users 'bob', 'frank' and groups 'bobsgroup' and
+    'franksgroup'.  Return the result of ``get_pricipals()``. """
+
     from kotti.security import get_principals
     P = get_principals()
-    P[u'bob'] = dict(name=u'bob', title=u"Bob")
-    P[u'frank'] = dict(name=u'frank', title=u"Frank")
-    P[u'group:bobsgroup'] = dict(name=u'group:bobsgroup', title=u"Bob's Group")
-    P[u'group:franksgroup'] = dict(name=u'group:franksgroup',
-                                   title=u"Frank's Group")
+    P['bob'] = dict(name='bob', title='Bob')
+    P['frank'] = dict(name='frank', title='Frank')
+    P['group:bobsgroup'] = dict(name='group:bobsgroup', title="Bob's Group")
+    P['group:franksgroup'] = dict(name='group:franksgroup',
+                                  title="Frank's Group")
+    return P
diff --git a/kotti/tests/nodes.txt b/kotti/tests/nodes.txt
index 01f7f08d2..e66986ff9 100644
--- a/kotti/tests/nodes.txt
+++ b/kotti/tests/nodes.txt
@@ -16,16 +16,16 @@ may be accessed through the ``node.__parent__`` property.
   >>> root = get_root()
   >>> root.__parent__ is None
   True
-  >>> root.title = u'A new title'
+  >>> root.title = 'A new title'
 
 Let us add three documents to our root:
 
 .. code-block:: python
 
-  >>> from kotti.resources import Document  
-  >>> root['first'] = Document(title=u'First page')
-  >>> root['second'] = Document(title=u'Second page')
-  >>> root['third'] = Document(title=u'Third page')
+  >>> from kotti.resources import Document
+  >>> root['first'] = Document(title='First page')
+  >>> root['second'] = Document(title='Second page')
+  >>> root['third'] = Document(title='Third page')
 
 Note how the keys in the dict correspond to the ``name`` of child
 nodes:
@@ -34,7 +34,7 @@ nodes:
 
   >>> first = root['first']
   >>> first.name
-  u'first'
+  'first'
   >>> first.__parent__ == root
   True
   >>> third = root['third']
@@ -52,9 +52,9 @@ The lists of keys and values are ordered:
 .. code-block:: python
 
   >>> root.keys()
-  [u'first', u'third']
+  ['first', 'third']
   >>> first.keys()
-  [u'copy-of-second']
+  ['copy-of-second']
   >>> root.values()
   [<Document ... at /first>, <Document ... at /third>]
 
@@ -84,9 +84,9 @@ You can move a node by setting its ``__parent__``:
   <Document ... at />
   >>> third.__parent__ = first
   >>> root.keys()
-  [u'first']
+  ['first']
   >>> first.keys()
-  [u'copy-of-second', u'third']
+  ['copy-of-second', 'third']
 
 # start of teardown
 
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 200614b4e..722c25b2f 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from warnings import filterwarnings
 
 from mock import Mock
@@ -149,16 +146,16 @@ def test_setting_values_as_unicode(self, db_session, filedepot):
         from kotti import main
 
         settings = self.required_settings()
-        settings['kotti.site_title'] = 'K\xc3\xb6tti'  # Kötti
-        settings['kotti_foo.site_title'] = 'K\xc3\xb6tti'
-        settings['foo.site_title'] = 'K\xc3\xb6tti'
+        settings['kotti.site_title'] = b'K\xc3\xb6tti'  # Kötti
+        settings['kotti_foo.site_title'] = b'K\xc3\xb6tti'
+        settings['foo.site_title'] = b'K\xc3\xb6tti'
 
         with patch('kotti.resources.initialize_sql'):
             with patch('kotti.filedepot.TweenFactory'):
                 main({}, **settings)
-        assert get_settings()['kotti.site_title'] == u'K\xf6tti'
-        assert get_settings()['kotti_foo.site_title'] == u'K\xf6tti'
-        assert get_settings()['foo.site_title'] == 'K\xc3\xb6tti'
+        assert get_settings()['kotti.site_title'] == 'Kötti'
+        assert get_settings()['kotti_foo.site_title'] == 'Kötti'
+        assert get_settings()['foo.site_title'] == b'K\xc3\xb6tti'
 
     def test_default_filedepot(self, db_session):
         from kotti import main
@@ -210,7 +207,7 @@ def test_search_content(self, db_session):
         with patch('kotti.resources.initialize_sql'):
             with patch('kotti.filedepot.TweenFactory'):
                 main({}, **settings)
-        assert search_content(u"Nuno") == u"Not found. Sorry!"
+        assert search_content('Nuno') == 'Not found. Sorry!'
 
     def test_stamp_heads(self, db_session, connection):
         from kotti import main
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index 8a09e196a..5ed59e788 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import datetime
 import time
 
@@ -9,7 +6,6 @@
 from mock import patch
 
 from kotti.resources import File
-from kotti.resources import Image
 from kotti.testing import Dummy
 from kotti.testing import asset
 from kotti.views.cache import set_max_age
@@ -25,14 +21,16 @@ def delta(date_string):
     return parse_expires(date_string) - now
 
 
+# noinspection PyUnusedLocal
 @pytest.fixture
 def cachetest_content(root, filedepot):
     image = asset('sendeschluss.jpg')
-    root['textfile'] = File("file contents", u"mytext.txt", u"text/plain")
-    root['image'] = Image(image.read(), u"sendeschluss.jpg", u"image/jpeg")
+    root['textfile'] = File(b"file contents", 'mytext.txt', 'text/plain')
+    root['image'] = File(image.read(), 'sendeschluss.jpg', 'image/jpeg')
 
 
 class TestSetMaxAge:
+    # noinspection PyUnresolvedReferences
     def test_preserve_existing_headers(self):
         response = Dummy(headers={
             "cache-control": "max-age=17,s-max-age=42,foo,bar=42"})
@@ -158,12 +156,12 @@ def test_cache_auth(self, webtest, cachetest_content):
 
         # media content
         resp = webtest.app.get('/textfile/inline-view')
-        resp.headers.get('X-Caching-Policy') == 'No Cache'
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
         assert resp.headers.get('Cache-Control') == 'max-age=0,public'
         d = delta(resp.headers.get('Expires'))
         assert (d.days, d.seconds) <= (0, 0)
         resp = webtest.app.get('/image/inline-view')
-        resp.headers.get('X-Caching-Policy') == 'No Cache'
+        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
         assert resp.headers.get('Cache-Control') == 'max-age=0,public'
         d = delta(resp.headers.get('Expires'))
         assert (d.days, d.seconds) <= (0, 0)
diff --git a/kotti/tests/test_default_view_selection.py b/kotti/tests/test_default_view_selection.py
index 194b765a2..6a2eff467 100644
--- a/kotti/tests/test_default_view_selection.py
+++ b/kotti/tests/test_default_view_selection.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import warnings
 
 from pyramid.httpexceptions import HTTPFound
diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 05b59d53b..44e548dab 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import warnings
 
 from pytest import raises
@@ -34,58 +31,19 @@ def test_type_info_action_links_deprecated(self, allwarnings):
             # error, since we can't do anything useful with the link.
             TypeInfo(edit_links=[], action_links=[my_item])
 
-    def test_security_has_permission(self, allwarnings):
-        with warnings.catch_warnings(record=True) as w:
-            from kotti.security import has_permission
-            __ = has_permission  # pyflakes
-            assert_deprecations(w, "deprecated as of Kotti 1.0")
-
     def test_object_after_delete(self, allwarnings):
         with warnings.catch_warnings(record=True) as w:
             from kotti.events import ObjectAfterDelete
             __ = ObjectAfterDelete  # pyflakes
             assert_deprecations(w, "Kotti 0.10")
 
-    def test_is_root_permission(self, allwarnings):
-        with warnings.catch_warnings(record=True) as w:
-            from kotti.views.util import is_root
-            __ = is_root  # pyflakes
-            assert_deprecations(w, "deprecated as of Kotti 1.0")
-
-    def test_uploaded_file_response(self, allwarnings):
-        with warnings.catch_warnings(record=True) as w:
-            from kotti.views.file import UploadedFileResponse
-            __ = UploadedFileResponse  # pyflakes
-            assert_deprecations(w, "removed in Kotti 2.0.0")
-
-    def test_image_deprecations(self, allwarnings):
-        with warnings.catch_warnings(record=True) as w:
-            from kotti.interfaces import IImage
-            from kotti.resources import Image
-            from kotti.views.edit.content import ImageAddForm
-            from kotti.views.edit.content import ImageEditForm
-            from kotti.views.image import _load_image_scales
-            from kotti.views.image import image_scales
-            from kotti.views.image import ImageView
-            from kotti.views.image import includeme
-            __ = (IImage, Image, _load_image_scales, image_scales, ImageView,
-                  includeme, ImageAddForm, ImageEditForm)  # pyflakes
-            assert_deprecations(w, *('kotti_image', ) * 8)
-
     def test_translate_titles_deprecated(self, allwarnings):
         from kotti.views.edit import _translate_titles
 
         with warnings.catch_warnings(record=True) as w:
             info = [
-                {'data': {'title': u"_(u'Private')"}, 'title': u"_(u'Private')", },
-                {'data': {'title': u"_(u'Public')"}, 'title': u"_(u'Public')", },
+                {'data': {'title': "_('Private')"}, 'title': "_('Private')", },
+                {'data': {'title': "_('Public')"}, 'title': "_('Public')", },
             ]
             _translate_titles(info)
             assert_deprecations(w, "removed in Kotti 2.0.0")
-
-    def test_testing_root_factory(self, allwarnings):
-        with warnings.catch_warnings(record=True) as w:
-            from kotti.testing import TestingRootFactory
-            __ = TestingRootFactory  # pyflakes
-            assert_deprecations(w, "will be no longer available starting with "
-                                   "Kotti 2.0.0.")
diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 2c13a2aa2..4524349cb 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import warnings
 
 from pytest import mark
@@ -22,19 +19,19 @@ def test_owner(self, root, db_session, events, dummy_request):
         from kotti.security import list_groups_raw
         from kotti.util import clear_cache
 
-        child = root[u'child'] = Content()
+        child = root['child'] = Content()
         db_session.flush()
-        assert child.owner == u'bob'
-        assert list_groups(u'bob', child) == [u'role:owner']
+        assert child.owner == 'bob'
+        assert list_groups('bob', child) == ['role:owner']
 
         clear_cache()
 
         # The event listener does not set the role again for subitems:
-        grandchild = child[u'grandchild'] = Content()
+        grandchild = child['grandchild'] = Content()
         db_session.flush()
-        assert grandchild.owner == u'bob'
-        assert list_groups(u'bob', grandchild) == [u'role:owner']
-        assert len(list_groups_raw(u'bob', grandchild)) == 0
+        assert grandchild.owner == 'bob'
+        assert list_groups('bob', grandchild) == ['role:owner']
+        assert len(list_groups_raw('bob', grandchild)) == 0
 
     def test_sqlalchemy_events(self, root, db_session, events):
         from kotti import events
@@ -71,12 +68,12 @@ def lengths():
         with warnings.catch_warnings(record=True):
             lis[(events.ObjectAfterDelete, None)].append(after_delete)
 
-        child = root[u'child'] = Content()
+        child = root['child'] = Content()
         db_session.flush()
         assert lengths() == (1, 0, 0, 0)
         assert insert_events[0].object == child
 
-        child.title = u"Bar"
+        child.title = 'Bar'
         db_session.flush()
         assert lengths() == (1, 1, 0, 0)
         assert update_events[0].object == child
@@ -142,8 +139,8 @@ def test_set_modification_date(self, root, db_session, events):
         from kotti.resources import Document
 
         # create 2 documents
-        d1 = root['d1'] = Document(title=u'One')
-        d2 = root['d2'] = Document(title=u'Two')
+        d1 = root['d1'] = Document(title='One')
+        d2 = root['d2'] = Document(title='Two')
         assert d1.position == 0
         assert d2.position == 1
         db_session.flush()
@@ -161,8 +158,8 @@ def test_set_modification_date(self, root, db_session, events):
         assert d2.modification_date == md2
 
         # changing anything else should update modification_date
-        d1.title = u'Eins'
-        d2.title = u'Zwei'
+        d1.title = 'Eins'
+        d2.title = 'Zwei'
         db_session.flush()
         assert d1.modification_date != md1
         assert d2.modification_date != md2
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index e8154283c..497b6681e 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-from StringIO import StringIO
+from io import BytesIO
 
 import pytest
 from colander import null
@@ -12,7 +9,6 @@
 from kotti.filedepot import StoredFileResponse
 from kotti.testing import DummyRequest
 from kotti.testing import asset
-from kotti.views.file import UploadedFileResponse
 from kotti.views.file import attachment_view
 from kotti.views.file import inline_view
 
@@ -20,13 +16,13 @@
 class TestFileViews:
     def _create_file(self, config):
         from kotti.resources import File
-        self.file = File(asset('logo.png').read(), u"myfüle.png", u"image/png")
+        self.file = File(asset('logo.png').read(), 'myfüle.png', 'image/png')
 
     def _test_common_headers(self, headers):
         for name in ('Content-Disposition', 'Content-Length', 'Content-Type'):
             assert isinstance(headers[name], str)
-        assert headers["Content-Length"] == "55715"
-        assert headers["Content-Type"] == "image/png"
+        assert headers["Content-Length"] == '55715'
+        assert headers["Content-Type"] == 'image/png'
 
     @pytest.mark.parametrize("params",
                              [(inline_view, 'inline'),
@@ -43,9 +39,9 @@ def test_file_views(self, params, config, filedepot, dummy_request,
         assert res.content_disposition.startswith(
             '{0}; filename=my'.format(disposition))
 
-        assert res.app_iter.file.read() == asset('logo.png').read()
-        res.app_iter.file.seek(0)
-        assert res.body == asset('logo.png').read()
+        data = asset('logo.png').read()
+        assert res.body == data
+        assert b''.join(res.app_iter) == data
 
 
 class TestFileEditForm:
@@ -58,41 +54,41 @@ def make_one(self):
     def test_edit_with_file(self, db_session, filedepot):
         view = self.make_one()
         view.edit(
-            title=u'A title', description=u'A description',
-            tags=[u"A tag"],
+            title='A title', description='A description',
+            tags=['A tag'],
             file=dict(
-                fp=StringIO('filecontents'),
-                filename=u'myfile.png',
-                mimetype=u'image/png',
+                fp=BytesIO(b'filecontents'),
+                filename='myfile.png',
+                mimetype='image/png',
                 size=10,
-                uid="randomabc",
+                uid='randomabc',
                 ),
             )
-        assert view.context.title == u'A title'
-        assert view.context.description == u'A description'
-        assert view.context.data.file.read() == 'filecontents'
-        assert view.context.filename == u'myfile.png'
-        assert view.context.mimetype == u'image/png'
-        assert view.context.size == len('filecontents')
-        assert view.context.tags == [u"A tag"]
+        assert view.context.title == 'A title'
+        assert view.context.description == 'A description'
+        assert view.context.data.file.read() == b'filecontents'
+        assert view.context.filename == 'myfile.png'
+        assert view.context.mimetype == 'image/png'
+        assert view.context.size == len(b'filecontents')
+        assert view.context.tags == ["A tag"]
 
     def test_edit_without_file(self, filedepot):
         view = self.make_one()
-        view.context.data = 'filecontents'
-        view.context.filename = u'myfile.png'
-        view.context.mimetype = u'image/png'
+        view.context.data = b'filecontents'
+        view.context.filename = 'myfile.png'
+        view.context.mimetype = 'image/png'
         view.context.size = 777
         with patch("kotti.views.edit.content._to_fieldstorage") as tfs:
-            view.edit(title=u'A title',
-                      description=u'A description',
+            view.edit(title='A title',
+                      description='A description',
                       tags=[],
                       file=null)
             assert tfs.call_count == 0
-            assert view.context.title == u'A title'
-            assert view.context.description == u'A description'
-            assert view.context.data.file.read() == 'filecontents'
-            assert view.context.filename == u'myfile.png'
-            assert view.context.mimetype == u'image/png'
+            assert view.context.title == 'A title'
+            assert view.context.description == 'A description'
+            assert view.context.data.file.read() == b'filecontents'
+            assert view.context.filename == 'myfile.png'
+            assert view.context.mimetype == 'image/png'
             assert view.context.size == 777
 
 
@@ -104,25 +100,25 @@ def make_one(self):
     def test_add(self, config, filedepot):
         view = self.make_one()
         file = view.add(
-            title=u'A title',
-            description=u'A description',
+            title='A title',
+            description='A description',
             tags=[],
             file=dict(
-                fp=StringIO('filecontents'),
-                filename=u'myfile.png',
-                mimetype=u'image/png',
+                fp=BytesIO(b'filecontents'),
+                filename='myfile.png',
+                mimetype='image/png',
                 size=None,
                 uid="randomabc",
                 ),
             )
 
-        assert file.title == u'A title'
-        assert file.description == u'A description'
+        assert file.title == 'A title'
+        assert file.description == 'A description'
         assert file.tags == []
-        assert file.data.file.read() == 'filecontents'
-        assert file.filename == u'myfile.png'
-        assert file.mimetype == u'image/png'
-        assert file.size == len('filecontents')
+        assert file.data.file.read() == b'filecontents'
+        assert file.filename == 'myfile.png'
+        assert file.mimetype == 'image/png'
+        assert file.size == len(b'filecontents')
 
 
 class TestFileUploadTempStore:
@@ -144,25 +140,25 @@ def test_delitem(self):
 
     def test_setitem_with_stream(self):
         ts = self.make_one()
-        ts['a'] = {'fp': StringIO('test'), 'marker': 'yes'}
-        assert ts.session['a'] == {'file_contents': 'test', 'marker': 'yes'}
+        ts['a'] = {'fp': BytesIO(b'test'), 'marker': 'yes'}
+        assert ts.session['a'] == {'file_contents': b'test', 'marker': 'yes'}
         v = ts['a']
         assert 'fp' in v.keys()
         assert v['marker'] == 'yes'
-        assert v['fp'].read() == 'test'
+        assert v['fp'].read() == b'test'
 
     def test_setitem_with_empty(self):
         ts = self.make_one()
         ts['a'] = {'fp': None, 'marker': 'yes'}
-        assert ts.session['a'] == {'file_contents': '', 'marker': 'yes'}
+        assert ts.session['a'] == {'file_contents': b'', 'marker': 'yes'}
         assert ts['a'] == {'fp': None, 'marker': 'yes'}
 
 
 class TestDepotStore:
 
-    from kotti.resources import File, Image
+    from kotti.resources import File
 
-    @pytest.mark.parametrize("factory", [File, Image])
+    @pytest.mark.parametrize("factory", [File, ])
     def test_create(self, factory, filedepot, image_asset, app):
         data = image_asset.read()
         f = factory(data)
@@ -172,7 +168,7 @@ def test_create(self, factory, filedepot, image_asset, app):
             assert len(f.data['files']) == 4
         assert f.data.file.read() == data
 
-    @pytest.mark.parametrize("factory", [File, Image])
+    @pytest.mark.parametrize("factory", [File, ])
     def test_edit_content(self, factory, filedepot, image_asset, image_asset2,
                           app, db_session):
         data = image_asset.read()
@@ -185,75 +181,82 @@ def test_edit_content(self, factory, filedepot, image_asset, image_asset2,
 
         assert f.data.file.read() == data2
 
-    @pytest.mark.parametrize("factory", [File, Image])
+    @pytest.mark.parametrize("factory", [File, ])
     def test_session_rollback(self, factory, db_session, filedepot, image_asset,
                               app):
-        from depot.manager import DepotManager
+        storage = filedepot.get()
 
-        f = factory(data=image_asset.read(), name=u'content', title=u'content')
+        f = factory(data=image_asset.read(), name='content', title='content')
         id = f.data['file_id']
 
         db_session.add(f)
         db_session.flush()
-        assert id in DepotManager.get()._storage.keys()
+        storage.get(id)
 
         db_session.rollback()
-        assert id not in DepotManager.get()._storage.keys()
-        assert DepotManager.get().delete.called
+        with pytest.raises(IOError):
+            storage.get(id)
+        assert storage.delete.called
 
-    @pytest.mark.parametrize("factory", [File, Image])
+    @pytest.mark.parametrize("factory", [File, ])
     def test_delete(self, factory, db_session, root, filedepot, image_asset,
                     app):
-        from depot.manager import DepotManager
 
-        f = factory(data=image_asset, name=u'content', title=u'content')
+        storage = filedepot.get()
+
+        f = factory(data=image_asset, name='content', title='content')
         id = f.data['file_id']
         root[str(id)] = f
         db_session.flush()
 
-        assert id in DepotManager.get()._storage.keys()
+        storage.get(id)
 
         del root[str(id)]
         import transaction
         transaction.commit()
 
-        assert DepotManager.get().delete.called
-        assert id not in DepotManager.get()._storage.keys()
+        with pytest.raises(IOError):
+            storage.get(id)
+        assert storage.delete.called
 
 
 class TestUploadedFileResponse:
     def _create_file(self,
-                     data="file contents",
-                     filename=u"myfüle.png",
-                     mimetype=u"image/png"):
+                     data=b'file contents',
+                     filename='myfüle.png',
+                     mimetype='image/png'):
         from kotti.resources import File
         return File(data, filename, mimetype)
 
-    def test_as_body(self, filedepot, image_asset):
+    def test_as_body(self, filedepot, image_asset, dummy_request):
         data = image_asset.read()
         f = self._create_file(data)
-        resp = UploadedFileResponse(f.data, DummyRequest())
+        # resp = UploadedFileResponse(f.data, DummyRequest())
+        resp = dummy_request.uploaded_file_response(f.data)
         assert resp.body == data
 
-    def test_as_app_iter(self, filedepot, image_asset):
+    def test_as_app_iter(self, filedepot, image_asset, dummy_request):
         from pyramid.response import FileIter
         data = image_asset.read()
         f = self._create_file(data)
-        resp = UploadedFileResponse(f.data, DummyRequest())
+        # resp = UploadedFileResponse(f.data, DummyRequest())
+        resp = dummy_request.uploaded_file_response(f.data)
         assert isinstance(resp.app_iter, FileIter)
-        assert ''.join(resp.app_iter) == data
+        assert b''.join(resp.app_iter) == data
 
-    def test_unknown_filename(self, filedepot, image_asset2):
-        f = self._create_file(b'foo', u"file.bar", None)
-        resp = UploadedFileResponse(f.data, DummyRequest())
+    def test_unknown_filename(self, filedepot, image_asset2, dummy_request):
+        f = self._create_file(b'foo', "file.bar", None)
+        # resp = UploadedFileResponse(f.data, DummyRequest())
+        resp = dummy_request.uploaded_file_response(f.data)
         assert resp.headers['Content-Type'] == 'application/octet-stream'
 
-    def test_guess_content_type(self, filedepot, image_asset):
-        f = self._create_file(image_asset.read(), u"file.png", None)
-        resp = UploadedFileResponse(f.data, DummyRequest())
+    def test_guess_content_type(self, filedepot, image_asset, dummy_request):
+        f = self._create_file(image_asset.read(), "file.png", None)
+        # resp = UploadedFileResponse(f.data, DummyRequest())
+        resp = dummy_request.uploaded_file_response(f.data)
         assert resp.headers['Content-Type'] == 'image/png'
 
-    def test_caching(self, filedepot, monkeypatch):
+    def test_caching(self, filedepot, monkeypatch, dummy_request):
         import datetime
         import webob.response
 
@@ -267,13 +270,14 @@ def utcnow():
 
         monkeypatch.setattr(webob.response, 'datetime', mockdatetime)
 
-        resp = UploadedFileResponse(f.data, DummyRequest(), cache_max_age=10)
+        # resp = UploadedFileResponse(f.data, DummyRequest(), cache_max_age=10)
+        resp = dummy_request.uploaded_file_response(f.data, cache_max_age=10)
 
         # this is set by filedepot fixture
         assert resp.headers['Last-Modified'] == 'Sun, 30 Dec 2012 00:00:00 GMT'
         assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
 
-    def test_redirect(self, filedepot):
+    def test_redirect(self, filedepot, dummy_request):
 
         class PublicFile(object):
             public_url = 'http://example.com'
@@ -282,7 +286,8 @@ class PublicData(object):
             file = PublicFile()
 
         with pytest.raises(HTTPMovedPermanently) as e:
-            UploadedFileResponse(PublicData(), DummyRequest())
+            # UploadedFileResponse(PublicData(), DummyRequest())
+            dummy_request.uploaded_file_response(PublicData())
 
         response = e.value
         assert response.headers['Location'] == 'http://example.com'
@@ -290,37 +295,37 @@ class PublicData(object):
 
 class TestStoredFileResponse:
     def _create_file(self,
-                     data="file contents",
-                     filename=u"myfüle.png",
-                     mimetype=u"image/png"):
+                     data=b"file contents",
+                     filename="myfüle.png",
+                     mimetype="image/png"):
         from kotti.resources import File
         return File(data, filename, mimetype)
 
-    def test_as_body(self, filedepot, image_asset):
+    def test_as_body(self, filedepot, image_asset, dummy_request):
         data = image_asset.read()
         f = self._create_file(data)
-        resp = StoredFileResponse(f.data.file, DummyRequest())
+        resp = StoredFileResponse(f.data.file, dummy_request)
         assert resp.body == data
 
-    def test_as_app_iter(self, filedepot, image_asset):
+    def test_as_app_iter(self, filedepot, image_asset, dummy_request):
         from pyramid.response import FileIter
         data = image_asset.read()
         f = self._create_file(data)
-        resp = StoredFileResponse(f.data.file, DummyRequest())
+        resp = StoredFileResponse(f.data.file, dummy_request)
         assert isinstance(resp.app_iter, FileIter)
-        assert ''.join(resp.app_iter) == data
+        assert b''.join(resp.app_iter) == data
 
-    def test_unknown_filename(self, filedepot, image_asset2):
-        f = self._create_file(b'foo', u"file.bar", None)
-        resp = StoredFileResponse(f.data.file, DummyRequest())
+    def test_unknown_filename(self, filedepot, image_asset2, dummy_request):
+        f = self._create_file(b'foo', "file.bar", None)
+        resp = StoredFileResponse(f.data.file, dummy_request)
         assert resp.headers['Content-Type'] == 'application/octet-stream'
 
-    def test_guess_content_type(self, filedepot, image_asset):
-        f = self._create_file(image_asset.read(), u"file.png", None)
-        resp = StoredFileResponse(f.data.file, DummyRequest())
+    def test_guess_content_type(self, filedepot, image_asset, dummy_request):
+        f = self._create_file(image_asset.read(), "file.png", None)
+        resp = StoredFileResponse(f.data.file, dummy_request)
         assert resp.headers['Content-Type'] == 'image/png'
 
-    def test_caching(self, filedepot, monkeypatch):
+    def test_caching(self, filedepot, monkeypatch, dummy_request):
         import datetime
         import webob.response
 
@@ -334,18 +339,21 @@ def utcnow():
 
         monkeypatch.setattr(webob.response, 'datetime', mockdatetime)
 
-        resp = StoredFileResponse(f.data.file, DummyRequest(), cache_max_age=10)
+        resp = dummy_request.uploaded_file_response(f.data)
+        assert resp.headers['Expires'] == 'Mon, 07 Jan 2013 13:00:00 GMT'
+
+        resp = dummy_request.uploaded_file_response(f.data, cache_max_age=10)
+        assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
 
         # this is set by filedepot fixture
         assert resp.headers['Last-Modified'] == 'Sun, 30 Dec 2012 00:00:00 GMT'
-        assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
 
-    def test_redirect(self, filedepot):
+    def test_redirect(self, filedepot, dummy_request):
         class PublicFile(object):
             public_url = 'http://example.com'
 
         with pytest.raises(HTTPMovedPermanently) as e:
-            StoredFileResponse(PublicFile(), DummyRequest())
+            StoredFileResponse(PublicFile(), dummy_request)
 
         response = e.value
         assert response.headers['Location'] == 'http://example.com'
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index 8ced6056a..c15a230d1 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import datetime
 
 import pytest
@@ -8,40 +5,39 @@
 from kotti.filedepot import DBFileStorage
 from kotti.filedepot import DBStoredFile
 from kotti.resources import File
-from kotti.resources import Image
 
 
 class TestDBStoredFile:
 
     def test_storedfile_interface(self, db_session, events, setup_app):
-        f = DBStoredFile('fileid', filename=u'f.jpg', content_type='image/jpeg',
-                         content_length=1000, data='content')
+        f = DBStoredFile('fileid', filename='f.jpg', content_type='image/jpeg',
+                         content_length=1000, data=b'content')
 
         assert f.close() is None
         assert f.closed() is False
         assert f.seekable() is True
         assert f.writable() is False
 
-        assert f.read() == 'content'
-        assert f.read() == ''
+        assert f.read() == b'content'
+        assert f.read() == b''
         f.seek(0)
-        assert f.read() == 'content'
+        assert f.read() == b'content'
         f.seek(0)
-        assert f.read(-1) == 'content'
+        assert f.read(-1) == b'content'
         f.seek(0)
-        assert f.read(2) == 'co'
-        assert f.read(4) == 'nten'
+        assert f.read(2) == b'co'
+        assert f.read(4) == b'nten'
         assert f.tell() == 6
         f.seek(0)
         f.seek(100)
         assert f.tell() == 100
-        assert f.read() == ''
+        assert f.read() == b''
 
         assert f.content_length == 1000
         assert f.content_type == 'image/jpeg'
         assert f.file_id == 'fileid'
-        assert f.filename == u'f.jpg'
-        assert f.name == u"f.jpg"
+        assert f.filename == 'f.jpg'
+        assert f.name == "f.jpg"
         assert f.public_url is None
 
         f.data = None
@@ -50,16 +46,16 @@ def test_storedfile_interface(self, db_session, events, setup_app):
         assert f.content_length == 0
 
     def test_content_length(self, db_session, events, setup_app):
-        f = DBStoredFile('fileid', data="content")
+        f = DBStoredFile('fileid', data=b"content")
         db_session.add(f)
         db_session.flush()
 
         assert f.content_length == 7
 
-        f.data = 'content changed'
+        f.data = b'content changed'
         db_session.flush()
 
-        assert f.content_length == len('content changed')
+        assert f.content_length == len(b'content changed')
 
     def test_last_modified(self, monkeypatch, db_session, events, setup_app):
         from kotti import filedepot
@@ -73,14 +69,14 @@ def now():
 
         monkeypatch.setattr(filedepot, 'datetime', mockdatetime)
 
-        f = DBStoredFile('fileid', data="content")
+        f = DBStoredFile('fileid', data=b"content")
         db_session.add(f)
         db_session.flush()
 
         assert f.last_modified == now
 
         f.last_modified = None
-        f.data = 'content changed'
+        f.data = b'content changed'
         db_session.flush()
 
         assert f.last_modified == now
@@ -89,8 +85,8 @@ def now():
 class TestDBFileStorage:
 
     def make_one(self,
-                 content='content here',
-                 filename=u'f.jpg',
+                 content=b'content here',
+                 filename='f.jpg',
                  content_type='image/jpg'):
 
         file_id = DBFileStorage().create(
@@ -102,7 +98,7 @@ def test_create(self, db_session):
         assert len(file_id) == 36
 
         fs = db_session.query(DBStoredFile).filter_by(file_id=file_id).one()
-        assert fs.data == "content here"
+        assert fs.data == b"content here"
 
     def test_list(self):
         with pytest.raises(NotImplementedError):
@@ -118,10 +114,10 @@ def test_get(self, db_session):
             DBFileStorage().get("1")
 
         file_id = self.make_one()
-        assert DBFileStorage().get(file_id).data == "content here"
+        assert DBFileStorage().get(file_id).data == b"content here"
 
     def test_delete(self, db_session):
-        file_id = DBFileStorage().create('content here', u'f.jpg', 'image/jpg')
+        file_id = DBFileStorage().create(b'content here', 'f.jpg', 'image/jpg')
         fs = DBFileStorage().get(file_id)
 
         db_session.add(fs)
@@ -135,16 +131,16 @@ def test_delete(self, db_session):
     def test_replace(self, db_session):
         file_id = self.make_one()
 
-        DBFileStorage().replace(file_id, 'second content', u'f2.jpg', 'doc')
+        DBFileStorage().replace(file_id, b'second content', 'f2.jpg', 'doc')
         fs = DBFileStorage().get(file_id)
-        assert fs.filename == u'f2.jpg'
+        assert fs.filename == 'f2.jpg'
         assert fs.content_type == 'doc'
-        assert fs.read() == 'second content'
+        assert fs.read() == b'second content'
 
-        DBFileStorage().replace(fs, 'third content', u'f3.jpg', 'xls')
-        assert fs.filename == u'f3.jpg'
+        DBFileStorage().replace(fs, b'third content', 'f3.jpg', 'xls')
+        assert fs.filename == 'f3.jpg'
         assert fs.content_type == 'xls'
-        assert fs.read() == 'third content'
+        assert fs.read() == b'third content'
 
     def test_session_integration(self, db_session):
         from depot.manager import DepotManager
@@ -153,7 +149,7 @@ def test_session_integration(self, db_session):
         DepotManager._depots = {'default': DBFileStorage()}
 
         file_id = DepotManager.get().create(
-            'content here', u'f.jpg', 'image/jpg')
+            b'content here', 'f.jpg', 'image/jpg')
         fs = DepotManager.get().get(file_id)
 
         db_session.add(fs)
@@ -172,19 +168,19 @@ class TestMigrateBetweenStorage:
 
     def _create_content(self, db_session, root, image1, image2):
         data = [
-            ('f1...', u'file1.jpg', 'image/jpeg'),
-            ('f2...', u'file2.png', 'image/png'),
+            (b'f1...', 'file1.jpg', 'image/jpeg'),
+            (b'f2...', 'file2.png', 'image/png'),
         ]
         for row in data:
             f = File(data=row[0], filename=row[1], mimetype=row[2])
             root[row[1]] = f
 
         data = [
-            (image2, u'image1.jpg', 'image/jpeg'),
-            (image1, u'image2.png', 'image/png'),
+            (image2, 'image1.jpg', 'image/jpeg'),
+            (image1, 'image2.png', 'image/png'),
         ]
         for row in data:
-            f = Image(data=row[0], filename=row[1], mimetype=row[2])
+            f = File(data=row[0], filename=row[1], mimetype=row[2])
             root[row[1]] = f
 
         db_session.flush()
@@ -220,12 +216,12 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots,
         image2 = image_asset2.read()
         self._create_content(db_session, root, image1, image2)
 
-        assert db_session.query(DBStoredFile).count() == 8
+        assert db_session.query(DBStoredFile).count() == 4
 
         migrate_storage('dbfiles', 'localfs')
 
         folders = os.listdir(tmp_location)
-        assert len(folders) == 8
+        assert len(folders) == 4
 
         db_session.flush()
 
@@ -236,11 +232,11 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots,
         root = db_session.query(Node).filter_by(parent=None).one()
         f1 = root['file1.jpg']
         assert f1.data.file_id in folders
-        assert f1.data.file.read() == 'f1...'
+        assert f1.data.file.read() == b'f1...'
 
         f2 = root['file2.png']
         assert f2.data.file_id in folders
-        assert f2.data.file.read() == 'f2...'
+        assert f2.data.file.read() == b'f2...'
 
         i1 = root['image1.jpg']
         assert i1.data.file_id in folders
@@ -262,10 +258,11 @@ class TestTween:
     @pytest.mark.user('admin')
     def test_tween(self, webtest, filedepot, root, image_asset, db_session):
 
-        from kotti.resources import Image, get_root
+        from kotti.resources import File
+        from kotti.resources import get_root
 
         # create an image resource
-        img = root['img'] = Image(data=image_asset.read(), title='Image')
+        root['img'] = File(data=image_asset.read(), title='Image')
         db_session.flush()
         root = get_root()
         img = root['img']
@@ -275,25 +272,8 @@ def test_tween(self, webtest, filedepot, root, image_asset, db_session):
         assert resp.content_type == 'text/html'
         assert resp.etag is None
         assert resp.cache_control.max_age == 0
-        assert '<img src="http://localhost/img/image" />' in resp.body
-
-        # the attachments (created by the filters) are served by the
-        # FiledepotServeApp
-        resp = webtest.app.get(img.data[u'thumb_128x128_url'])
-
-        assert resp.etag is not None
-        assert resp.cache_control.max_age == 604800
-        assert resp.body.startswith('\x89PNG')
-
-        resp = webtest.app.get(img.data[u'thumb_256x256_url'])
-        assert resp.etag is not None
-        assert resp.cache_control.max_age == 604800
-        assert resp.body.startswith('\x89PNG')
+        assert '<a href="http://localhost/img/@@attachment-view">' in resp.text
 
         # test 404
         resp = webtest.app.get('/depot/non_existing/fileid', status=404)
         assert resp.status_code == 404
-
-        resp = webtest.app.get(img.data[u'thumb_256x256_url'] + 'not',
-                               status=404)
-        assert resp.status_code == 404
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 4de82bdaa..21333bbf3 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import pytest
 from mock import patch
 from webtest.forms import Upload
@@ -32,13 +29,19 @@ def test_forbidden_redirect_when_authenticated(self, app):
         assert res.location == 'http://localhost/@@forbidden'
 
 
+# noinspection PyUnusedLocal
 class TestUploadFile:
 
-    def add_file(self, browser, contents='ABC'):
+    def add_file(self, browser, contents=b'ABC'):
         file_ctrl = browser.getControl("File")
         file_ctrl.add_file(contents, 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
 
+    def add_file2(self, resp, contents=b'ABC'):
+        form = resp.forms['deform']
+        form['upload'] = Upload('my_image.gif', contents, 'image/gif')
+        return form.submit().maybe_follow()
+
     @user('admin')
     def test_it(self, browser, filedepot):
         browser.open(BASE_URL + '/@@add_file')
@@ -51,30 +54,42 @@ def test_view_uploaded_file(self, browser, filedepot):
         self.add_file(browser)
         browser.getLink("View").click()
         browser.getLink("Download file").click()
-        assert browser.contents == 'ABC'
+        assert browser.contents == b'ABC'
 
     @user('admin')
-    def test_tempstorage(self, browser, filedepot):
+    def test_tempstorage(self, app, filedepot, browser):
+
+        # 1. upload a file
         browser.open(BASE_URL + '/@@add_file')
-        self.add_file(browser, contents='DEF')
+        self.add_file(browser, contents=b'DEF')
+
+        # 2. edit the uploaded file, blanking out the title field
         browser.getLink("Edit").click()
         browser.getControl("Title").value = ''  # the error
+        browser.getControl('save').click()
         assert "Your changes have been saved" not in browser.contents
+
+        # 3. fill out the title field again
         browser.getControl("Title").value = 'A title'
         browser.getControl('save').click()
         assert "Your changes have been saved" in browser.contents
+
+        # 4. view / download the file
         browser.getLink("View").click()
         browser.getLink("Download file").click()
-        assert browser.contents == 'DEF'
+        assert browser.contents == b'DEF'
 
     @user('admin')
     def test_edit_uploaded_file(self, browser, filedepot):
+        # 1. upload a file
         browser.open(BASE_URL + '/@@add_file')
-        self.add_file(browser, contents='GHI')
+        self.add_file(browser, contents=b'GHI')
+        # 2. edit without making changes
         browser.getLink("Edit").click()
         browser.getControl('save').click()
+        # 3. download
         browser.getLink("Download file").click()
-        assert browser.contents == 'GHI'
+        assert browser.contents == b'GHI'
 
 
 class TestValidatorMaxLength:
@@ -104,7 +119,7 @@ def test_title_max_length_file_ok(self, browser):
         max_length = Node.name.property.columns[0].type.length
         browser.getControl("Title").value = '1' * max_length
         file_ctrl = browser.getControl("File")
-        file_ctrl.add_file("abc", 'image/gif', 'my_image.gif')
+        file_ctrl.add_file(b"abc", 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
         assert "Item was added" in browser.contents
 
@@ -115,7 +130,7 @@ def test_title_max_length_file_ko(self, browser):
         max_length = Node.name.property.columns[0].type.length
         browser.getControl("Title").value = '1' * (max_length + 1)  # the error
         file_ctrl = browser.getControl("File")
-        file_ctrl.add_file("abc", 'image/gif', 'my_image.gif')
+        file_ctrl.add_file(b"abc", 'image/gif', 'my_image.gif')
         browser.getControl('save').click()
         assert "Item was added" not in browser.contents
 
@@ -161,11 +176,11 @@ def test_login(self, webtest):
 
         # get the frontpage
         resp = webtest.app.get('/')
-        assert "You have successfully installed Kotti." in resp.body
+        assert "You have successfully installed Kotti." in resp.text
 
         # access a protected URL
         resp = webtest.app.get('/edit').maybe_follow()
-        assert "Log in" in resp.body
+        assert "Log in" in resp.text
 
         # submit the login form
         form = resp.forms['login-form']
@@ -174,11 +189,11 @@ def test_login(self, webtest):
         form['password'] = 'secret'
 
         resp = form.submit('submit').maybe_follow()
-        assert "Welcome, Administrator" in resp.body
+        assert "Welcome, Administrator" in resp.text
 
         # log out
         resp = resp.click('Logout').maybe_follow()
-        assert "You have been logged out" in resp.body
+        assert "You have been logged out" in resp.text
 
         # attempt to login with wrong credentials
         form = resp.forms['login-form']
@@ -187,8 +202,8 @@ def test_login(self, webtest):
         form['password'] = 'funny'
 
         resp = form.submit('submit')
-        assert "Welcome, Adminstrator" not in resp.body
-        assert "Login failed" in resp.body
+        assert "Welcome, Adminstrator" not in resp.text
+        assert "Login failed" in resp.text
 
         # and again, this time with correct credentials
         form = resp.forms['login-form']
@@ -196,56 +211,55 @@ def test_login(self, webtest):
         form['login'] = 'admin'
         form['password'] = 'secret'
         resp = form.submit('submit').maybe_follow()
-        assert "Welcome, Administrator" in resp.body
+        assert "Welcome, Administrator" in resp.text
 
     @pytest.mark.user('admin')
     def test_exception_views(self, webtest):
         app = webtest.app
         resp = app.get('/this-does-not-exist', status=404)
-        assert "<h1>Not Found</h1>" in resp.body
+        assert "<h1>Not Found</h1>" in resp.text
 
     @pytest.mark.user('admin')
     def test_content_management(self, webtest):
 
         from kotti.resources import Document
         from kotti.resources import File
-        from kotti_image.resources import Image
 
         save_addable_document = Document.type_info.addable_to
         save_addable_file = File.type_info.addable_to
-        save_addable_image = Image.type_info.addable_to
 
         app = webtest.app
         resp = app.get('/')
 
         # Add a document
         resp = resp.click('Document', index=0)
-        assert "Add Document to Welcome to Kotti" in resp.body
+        assert "Add Document to Welcome to Kotti" in resp.text
         form = resp.forms['deform']
         form['title'] = "Child One"
         resp = form.submit('save').maybe_follow()
-        assert "Item was added" in resp.body
+        assert "Item was added" in resp.text
         assert resp.request.path == '/child-one/'
 
         # Edit the document
         resp = resp.click('Edit')
-        assert "Edit Child One" in resp.body
+        assert "Edit Child One" in resp.text
         form = resp.forms['deform']
         form['title'] = "First Child"
         resp = form.submit('save').maybe_follow()
-        assert "Your changes have been saved" in resp.body
+        assert "Your changes have been saved" in resp.text
+
         resp = resp.click('Edit')
         form = resp.forms['deform']
         assert form['title'].value == "First Child"
         resp = resp.click('Edit')
-        assert "First Child" in resp.body
+        assert "First Child" in resp.text
 
         # And now force a validation error:
         resp = resp.click('Edit')
         form = resp.forms['deform']
         form['title'] = ""
         resp = form.submit('save')
-        assert "There was a problem" in resp.body
+        assert "There was a problem" in resp.text
         assert form['title'].value == ''
 
         # And now click the 'Cancel' button:
@@ -254,7 +268,7 @@ def test_content_management(self, webtest):
         form['title'] = "Firstborn"
         resp = form.submit('cancel').maybe_follow()
         assert 'deform' not in resp.forms
-        assert "Firstborn" not in resp.body
+        assert "Firstborn" not in resp.text
 
         # Now click the 'Cancel' button for an invalid form entry:
         resp = resp.click('Edit')
@@ -262,7 +276,7 @@ def test_content_management(self, webtest):
         form['title'] = ""
         resp = form.submit('cancel').maybe_follow()
         assert 'deform' not in resp.forms
-        assert "Firstborn" not in resp.body
+        assert "Firstborn" not in resp.text
 
         # Add two more documents, at different levels
         resp = app.get('/')
@@ -270,14 +284,14 @@ def test_content_management(self, webtest):
         form = resp.forms['deform']
         form['title'] = "Second Child"
         resp = form.submit('save').maybe_follow()
-        assert "Item was added" in resp.body
+        assert "Item was added" in resp.text
         assert resp.request.path == '/second-child/'
 
         resp = resp.click('Document', index=0)
         form = resp.forms['deform']
         form['title'] = "Grandchild"
         resp = form.submit('save').maybe_follow()
-        assert "Item was added" in resp.body
+        assert "Item was added" in resp.text
         assert resp.request.path == '/second-child/grandchild/'
 
         # Add another grandchild with the same name:
@@ -286,7 +300,7 @@ def test_content_management(self, webtest):
         form = resp.forms['deform']
         form['title'] = "Grandchild"
         resp = form.submit('save').maybe_follow()
-        assert "Item was added" in resp.body
+        assert "Item was added" in resp.text
         assert resp.request.path == '/second-child/grandchild-1/'
 
         # There's no Add link if nothing can be added:
@@ -294,22 +308,20 @@ def test_content_management(self, webtest):
         try:
             Document.type_info.addable_to = ()
             File.type_info.addable_to = ()
-            Image.type_info.addable_to = ()
             with pytest.raises(IndexError):
                 resp.click(href='add_')
         finally:
             Document.type_info.addable_to = save_addable_document
             File.type_info.addable_to = save_addable_file
-            Image.type_info.addable_to = save_addable_image
 
         # Add a file
         resp = app.get('/')
         resp = resp.click('File', index=0)
         form = resp.forms['deform']
         form['description'] = "A tiny file"
-        form['upload'] = Upload('tiny.txt', 'tiny', 'text/plain')
+        form['upload'] = Upload('tiny.txt', b'tiny', 'text/plain')
         resp = form.submit('save').maybe_follow()
-        assert "Item was added" in resp.body
+        assert "Item was added" in resp.text
         assert resp.request.path == '/tiny.txt/'
 
         # Add a file larger than maximum file size
@@ -317,12 +329,12 @@ def test_content_management(self, webtest):
         resp = resp.click('File', index=0)
         form = resp.forms['deform']
         form['title'] = "Huge file"
-        form['description'] = "An uge file"
+        form['description'] = "A huge file"
         form['upload'] = Upload('huge.txt',
-                                '*' * (10 * 1024 * 1024 + 1), 'text/plain')
+                                b'*' * (1024 * 1024 * 1024), 'text/plain')
         resp = form.submit('save')
-        assert "There was a problem" in resp.body
-        assert "Maximum file size" in resp.body
+        assert "There was a problem" in resp.text
+        assert "Maximum file size" in resp.text
 
         # Add tags to a document:
         resp = app.get('/second-child/')
@@ -339,59 +351,59 @@ def test_content_management(self, webtest):
         form.submit('save').maybe_follow()
         resp = app.get('/second-child/grandchild-2/@@edit')
         form = resp.forms['deform']
-        assert 'tag 1' in resp.body
-        assert 'tag 2' in resp.body
-        assert 'tag 3' in resp.body
+        assert 'tag 1' in resp.text
+        assert 'tag 2' in resp.text
+        assert 'tag 3' in resp.text
         form['tags'] = 'tag 1, tag 4, tag 5,tag 6, tag 7, übertag'
         form.submit('save').maybe_follow()
         resp = app.get('/second-child/grandchild-2/@@edit')
-        assert 'value="tag 1,tag 4,tag 5,tag 6,tag 7,übertag"' in resp.body
+        assert 'value="tag 1,tag 4,tag 5,tag 6,tag 7,übertag"' in resp.text
 
         # Delete a document
         resp = app.get('/second-child/grandchild/')
         resp = resp.click('Delete', index=0)
         form = resp.forms['form-delete']
         resp = form.submit('cancel')
-        assert "Grandchild was deleted" not in resp.body
+        assert "Grandchild was deleted" not in resp.text
         resp = app.get('/second-child/grandchild/')
         resp = resp.click('Delete', index=0)
         form = resp.forms['form-delete']
         resp = form.submit('delete', value='delete').maybe_follow()
-        assert "Grandchild was deleted" in resp.body
+        assert "Grandchild was deleted" in resp.text
         assert resp.request.path == '/second-child/'
 
         # Copy and paste
         resp = app.get('/second-child/')
         resp = resp.click('Cut', index=0).maybe_follow()
-        assert "Second Child was cut" in resp.body
+        assert "Second Child was cut" in resp.text
         resp = app.get('/child-one/')
         resp = resp.click('Paste', index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.body
+        assert "Second Child was pasted" in resp.text
         app.get('/second-child/', status=404)
         resp = app.get('/child-one/second-child/')
         resp = resp.click('Copy', index=0).maybe_follow()
-        assert "Second Child was copied" in resp.body
+        assert "Second Child was copied" in resp.text
         resp = app.get('/')
         resp = resp.click('Paste', index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.body
+        assert "Second Child was pasted" in resp.text
 
         # We can paste twice since we copied:
         resp = app.get('/')
         resp = resp.click('Paste', index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.body
+        assert "Second Child was pasted" in resp.text
         resp = app.get('/second-child/')
-        assert "Second Child" in resp.body
+        assert "Second Child" in resp.text
         resp = app.get('/second-child-1/')
-        assert "Second Child" in resp.body
+        assert "Second Child" in resp.text
 
         # We can also copy and paste items that contain children,
         # like the whole site:
         resp = app.get('/')
         resp = resp.click('Copy', index=0).maybe_follow()
-        assert "Welcome to Kotti was copied" in resp.body
+        assert "Welcome to Kotti was copied" in resp.text
         resp = app.get('/second-child/')
         resp = resp.click('Paste', index=0).maybe_follow()
-        assert "Welcome to Kotti was pasted" in resp.body
+        assert "Welcome to Kotti was pasted" in resp.text
         resp = app.get('/second-child/welcome-to-kotti/')
         assert resp.status_code == 200
         resp = app.get('/second-child/welcome-to-kotti/second-child/')
@@ -402,7 +414,7 @@ def test_content_management(self, webtest):
         resp.click('Cut', index=0).maybe_follow()
         resp = app.get('/child-one/second-child/')
         resp = resp.click('Paste', index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.body
+        assert "Second Child was pasted" in resp.text
         app.get('/second-child/', status=404)
 
         # Note how we can't cut and paste an item into itself:
@@ -444,7 +456,7 @@ def test_content_management(self, webtest):
         form['name'] = 'thi/rd-ch/ild'
         form['title'] = 'My Third Child'
         resp = form.submit('rename').maybe_follow()
-        assert "Item was renamed" in resp.body
+        assert "Item was renamed" in resp.text
         assert resp.request.path == '/child-one/third-child/'
 
         # We cannot rename the root:
@@ -466,22 +478,22 @@ def test_content_management(self, webtest):
         resp = resp.click('Contents', index=0)
         assert resp.request.path == '/child-one/@@contents'
         resp = resp.forms['form-contents'].submit('copy').maybe_follow()
-        assert 'You have to select items' in resp.body
+        assert 'You have to select items' in resp.text
         form = self._select_children(resp, 0)
         resp = form.submit('copy').maybe_follow()
-        assert 'My Third Child was copied.' in resp.body
+        assert 'My Third Child was copied.' in resp.text
         resp = app.get('/second-child-1/@@contents')
-        assert 'My Third Child' not in resp.body
+        assert 'My Third Child' not in resp.text
         resp = resp.forms['form-contents'].submit('paste').maybe_follow()
-        assert 'My Third Child' in resp.body
+        assert 'My Third Child' in resp.text
         resp = app.get('/second-child-1/@@contents')
         form = self._select_children(resp, 0)
         resp = form.submit('cut').maybe_follow()
-        assert 'cut.' in resp.body
+        assert 'cut.' in resp.text
         resp = app.get('/child-one/@@contents')
-        assert "Grandchild" not in resp.body
+        assert "Grandchild" not in resp.text
         resp = resp.forms['form-contents'].submit('paste').maybe_follow()
-        assert "Grandchild" in resp.body
+        assert "Grandchild" in resp.text
         with pytest.raises(IndexError):
             resp.click('Paste')
         resp = app.get('/child-one/@@contents')
@@ -493,23 +505,23 @@ def test_content_management(self, webtest):
         form['title'] = 'Forth child'
         form.submit('save').maybe_follow()
         resp = app.get('/forth-child/@@contents')
-        assert "Grandchild" not in resp.body
-        assert "My Third Child" not in resp.body
+        assert "Grandchild" not in resp.text
+        assert "My Third Child" not in resp.text
         resp.forms['form-contents'].submit('paste').maybe_follow()
         resp = app.get('/forth-child/@@contents')
-        assert "Grandchild" in resp.body
-        assert "My Third Child" in resp.body
+        assert "Grandchild" in resp.text
+        assert "My Third Child" in resp.text
         resp = app.get('/child-one/@@contents')
-        assert "Grandchild" not in resp.body
+        assert "Grandchild" not in resp.text
         resp = app.get('/forth-child/@@contents')
-        assert 'third-child' in resp.body
-        assert 'Grandchild' in resp.body
-        assert 'child-the-third' not in resp.body
-        assert 'Hello Bob' not in resp.body
+        assert 'third-child' in resp.text
+        assert 'Grandchild' in resp.text
+        assert 'child-the-third' not in resp.text
+        assert 'Hello Bob' not in resp.text
         form = self._select_children(resp, 0, 1)
         resp = form.submit('rename_nodes').maybe_follow()
         resp = resp.forms['form-rename-nodes'].submit('cancel').maybe_follow()
-        assert 'No changes were made.' in resp.body
+        assert 'No changes were made.' in resp.text
         assert resp.request.path == '/forth-child/@@contents'
         form = self._select_children(resp, 0, 1)
         resp = form.submit('rename_nodes').maybe_follow()
@@ -520,76 +532,84 @@ def test_content_management(self, webtest):
         form[form.submit_fields()[5][0]] = 'Hello Bob'
         resp = form.submit('rename_nodes').maybe_follow()
         assert resp.request.path == '/forth-child/@@contents'
-        assert 'third-child' not in resp.body
-        assert 'Grandchild' not in resp.body
-        assert 'child-the-third' in resp.body
-        assert 'Hello Bob' in resp.body
+        assert 'third-child' not in resp.text
+        assert 'Grandchild' not in resp.text
+        assert 'child-the-third' in resp.text
+        assert 'Hello Bob' in resp.text
 
         resp = resp.click('File', index=0)
         form = resp.forms['deform']
         form['description'] = 'A file'
-        form['upload'] = Upload('some.txt', 'something', 'text/plain')
+        form['upload'] = Upload('some.txt', b'something', 'text/plain')
         form.submit('save').maybe_follow()
         resp = app.get('/forth-child/@@contents')
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('delete_nodes').maybe_follow()
         resp = resp.forms['form-delete-nodes'].submit('cancel').maybe_follow()
-        assert 'No changes were made.' in resp.body
+        assert 'No changes were made.' in resp.text
         assert resp.request.path == '/forth-child/@@contents'
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('delete_nodes').maybe_follow()
-        assert "Are you sure" in resp.body
+        assert "Are you sure" in resp.text
         resp = resp.forms['form-delete-nodes'].submit('delete_nodes',
                                                       status=302).maybe_follow()
-        assert "child, the third was deleted." in resp.body
-        assert "Hello Bob was deleted." in resp.body
-        assert "some.txt was deleted." in resp.body
+        assert "child, the third was deleted." in resp.text
+        assert "Hello Bob was deleted." in resp.text
+        assert "some.txt was deleted." in resp.text
         resp = app.get('/forth-child/@@contents')
-        assert "Welcome to Kotti" in resp.body
-        assert '<i class="glyphicon glyphicon-home"></i>' in resp.body
-        assert '<i class="glyphicon glyphicon-folder-open"></i>' in resp.body
-        assert '<i class="glyphicon glyphicon-folder-close"></i>' not in resp.body  # noqa
+        assert "Welcome to Kotti" in resp.text
+        assert '<i class="glyphicon glyphicon-home"></i>' in resp.text
+        assert '<i class="glyphicon glyphicon-folder-open"></i>' in resp.text
+        assert '<i class="glyphicon glyphicon-folder-close"></i>' not in resp.text  # noqa
 
-        # Contents view change state actions
+        # Contents view change state actions (workflow)
         resp = resp.click("Second Child")
         resp = resp.click("Contents")
-        assert '/second-child-1/third-child/@@workflow-change?new_state=public' in resp.body  # noqa
+        assert '/second-child-1/third-child/@@workflow-change?new_state=public' in resp.text  # noqa
+
         resp = app.get('/second-child-1/third-child/@@workflow-change?new_state=public').maybe_follow()  # noqa
-        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.body  # noqa
+        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.text  # noqa
+
         resp = app.get('/second-child-1/third-child/@@contents')
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('change_state').maybe_follow()
-        assert 'Change workflow state' in resp.body
+        assert 'Change workflow state' in resp.text
+
         resp = resp.forms['form-change-state'].submit('cancel').maybe_follow()
-        assert 'No changes were made.' in resp.body
+        assert 'No changes were made.' in resp.text
         assert resp.request.path == '/second-child-1/third-child/@@contents'
+
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('change_state').maybe_follow()
         form = resp.forms['form-change-state']
         form['children-to-change-state'] = []
         resp = form.submit('change_state').maybe_follow()
-        assert 'No changes were made.' in resp.body
+        assert 'No changes were made.' in resp.text
+
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('change_state').maybe_follow()
         form = resp.forms['form-change-state']
         form['to-state'] = 'public'
         resp = form.submit('change_state').maybe_follow()
-        assert 'Your changes have been saved.' in resp.body
-        assert '/second-child-1/third-child/grandchild-1/@@workflow-change?new_state=private' in resp.body  # noqa
-        assert '/second-child-1/third-child/grandchild-2/@@workflow-change?new_state=private' in resp.body  # noqa
-        assert '/second-child-1/third-child/grandchild-3/@@workflow-change?new_state=private' in resp.body  # noqa
+        assert 'Your changes have been saved.' in resp.text
+        assert '/second-child-1/third-child/grandchild-1/@@workflow-change?new_state=private' in resp.text  # noqa
+        assert '/second-child-1/third-child/grandchild-2/@@workflow-change?new_state=private' in resp.text  # noqa
+        assert '/second-child-1/third-child/grandchild-3/@@workflow-change?new_state=private' in resp.text  # noqa
 
         resp = resp.click('My Third Child')
-        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=public' in resp.body  # noqa
+        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=public' in resp.text  # noqa
+
         app.get('/second-child-1/third-child/child-one/@@workflow-change?new_state=public')  # noqa
         resp = app.get('/second-child-1/third-child/@@contents')
-        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=private' in resp.body  # noqa
+        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=private' in resp.text  # noqa
+
         resp = resp.click('First Child', index=1)
         resp = resp.click('Document', index=0)
         form = resp.forms['deform']
         form['title'] = 'Sub child'
         resp = form.submit('save').maybe_follow()
-        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.body  # noqa
+        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.text  # noqa
+
         resp = resp.click("Second Child", index=0)
         resp = resp.click("Contents")
         form = self._select_children(resp, 0, 1, 2)
@@ -598,10 +618,11 @@ def test_content_management(self, webtest):
         form['include-children'] = 'include-children'
         form['to-state'] = 'public'
         resp = form.submit('change_state').maybe_follow()
-        assert 'Your changes have been saved.' in resp.body
-        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.body
+        assert 'Your changes have been saved.' in resp.text
+        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.text  # noqa
+
         resp = app.get('/second-child-1/third-child/child-one/sub-child/')
-        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=private' in resp.body
+        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=private' in resp.text  # noqa
 
         # Navigation
         resp = resp.click("Navigate")
@@ -610,7 +631,7 @@ def test_content_management(self, webtest):
 
     def test_user_management(self, webtest, settings, dummy_mailer):
         from kotti import get_settings
-        get_settings()['kotti.site_title'] = u'Website des Kottbusser Tors'
+        get_settings()['kotti.site_title'] = 'Website des Kottbusser Tors'
 
         app = webtest.app
         resp = self._login(app, 'admin', 'secret').maybe_follow()
@@ -625,7 +646,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form['title'] = "Bob's Group"
         form.get('checkbox', index=0).checked = True
         resp = form.submit('add_group').maybe_follow()
-        assert "Bob's Group was added" in resp.body
+        assert "Bob's Group was added" in resp.text
         assert resp.forms['form-global-roles'][
             'role::group:bobsgroup::role:viewer'].value == 'on'
 
@@ -638,7 +659,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form['password-confirm'] = "secret"
         form["email"] = "bob@DABOLINA.com"
         resp = form.submit("add_user")
-        assert "There was a problem" in resp.body
+        assert "There was a problem" in resp.text
 
         # Use a valid username now.  Note how the checkbox to send a password
         # registration link is ticked:
@@ -647,7 +668,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form["email"] = "bob@DABOLINA.com"
         form["send_email"].checked = True
         resp = form.submit("add_user").maybe_follow()
-        assert "Bob Dabolina was added" in resp.body
+        assert "Bob Dabolina was added" in resp.text
 
         # We cannot add Bob twice:
         form = resp.forms['deform_user_add']
@@ -656,7 +677,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form["password"] = "secret"
         form["password-confirm"] = "secret"
         resp = form.submit("add_user")
-        assert "A user with that name already exists" in resp.body
+        assert "A user with that name already exists" in resp.text
 
         # We cannot add Bob Dabolina's email twice:
         form = resp.forms['deform_user_add']
@@ -666,18 +687,18 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form["password"] = "secret"
         form['password-confirm'] = "secret"
         resp = form.submit("add_user")
-        assert "A user with that email already exists" in resp.body
+        assert "A user with that email already exists" in resp.text
         form = resp.forms['deform_user_add']
         form["email"] = "bob@gmail.com"
         resp = form.submit("add_user").maybe_follow()
-        assert "Bobby Brown was added" in resp.body
+        assert "Bobby Brown was added" in resp.text
 
         # Searching for Bob will return both Bob and Bob's Group:
         form = resp.forms['form-principal-search']
         form["query"] = "Bob"
         resp = form.submit("search")
-        assert "Bob Dabolina" in resp.body
-        assert "Bob's Group" in resp.body
+        assert "Bob Dabolina" in resp.text
+        assert "Bob's Group" in resp.text
         form = resp.forms['form-global-roles']
         assert form["role::group:bobsgroup::role:viewer"].checked
         assert not form["role::group:bobsgroup::role:editor"].checked
@@ -689,7 +710,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form = resp.forms['deform']
         form["group"] = "bobsgroup"
         resp = form.submit("save").maybe_follow()
-        assert "Your changes have been saved" in resp.body
+        assert "Your changes have been saved" in resp.text
 
         # We cannot update on the Bobby Brown's entry with duplicated email:
         resp = resp.click("Back to User Management")
@@ -700,12 +721,12 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form = resp.forms['deform']
         form["email"] = "bob@dabolina.com"
         resp = form.submit("save")
-        assert "A user with that email already exists" in resp.body
+        assert "A user with that email already exists" in resp.text
 
         # If we cancel the edit of the user, we are redirected to the
         # user management screen:
         resp = resp.forms['deform'].submit("cancel").maybe_follow()
-        assert "No changes were made." in resp.body
+        assert "No changes were made." in resp.text
         assert resp.request.path == '/@@setup-users'
 
         # Back in user management we can see how Bob's inherited the
@@ -725,7 +746,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form = resp.forms['deform']
         form["email"] = 'bogsgroup@gmail.com'
         resp = form.submit("save").maybe_follow()
-        assert "Your changes have been saved" in resp.body
+        assert "Your changes have been saved" in resp.text
 
         # Set password
         # ------------
@@ -733,13 +754,14 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         # Remember that we sent Bob an email for registration.
         # He can use it to set his own password:
         [email, email2] = dummy_mailer.outbox
-        assert email.recipients == [u'"Bob Dabolina" <bob@dabolina.com>']
+        assert email.recipients == ['"Bob Dabolina" <bob@dabolina.com>']
         assert email.subject == "Your registration for Website des " \
                                 "Kottbusser Tors"
         assert "Hello, Bob Dabolina!" in email.body
         assert "You are joining Website des Kottbusser Tors." in email.body
         assert "Click here to set your password and log in:" in email.body
-        assert "@@set-password?token=" in email.body
+        assert "@@set-password?" in email.body
+        assert "?token=" in email.body or "&token=" in email.body
 
         # We'll use that link to set our password:
         resp.click("Logout").maybe_follow()
@@ -749,12 +771,12 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form['password'] = "newpassword"
         form['password-confirm'] = "newpasswoops"  # a silly error
         resp = form.submit("submit")
-        assert "There was a problem with your submission" in resp.body
+        assert "There was a problem with your submission" in resp.text
         form = resp.forms['deform']
         form['password'] = "newpassword"
         form['password-confirm'] = "newpassword"
         resp = form.submit("submit").maybe_follow()
-        assert "You have reset your password" in resp.body
+        assert "You have reset your password" in resp.text
 
         # We cannot use that link again:
         resp = app.get(path)
@@ -762,21 +784,21 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form['password'] = "won't work"
         form['password-confirm'] = "won't work"
         resp = form.submit("submit")
-        assert "Your password reset token may have expired" in resp.body
+        assert "Your password reset token may have expired" in resp.text
 
         # Log in as Bob with the new password:
         resp = self._login(app, 'bOB', 'newpassword').maybe_follow()
-        assert "Welcome, Bob Dabolina" in resp.body
+        assert "Welcome, Bob Dabolina" in resp.text
         app.get('/@@edit')
         resp = resp.click("Logout").maybe_follow()
 
         # The login form has a "Reset password" button.  Let's try it:
         resp = self._login(app, "bobby", "")
-        assert "Login failed." in resp.body
+        assert "Login failed." in resp.text
         form = resp.forms['forgot-password-form']
         form['login'] = "bob"
         resp = form.submit('reset-password').maybe_follow()
-        assert "You should be receiving an email" in resp.body
+        assert "You should be receiving an email" in resp.text
         [email1, email2, email3] = dummy_mailer.outbox
         assert 'Hello, Bob Dabolina!' in email3.body
         assert 'Click this link to reset your password at Website des ' \
@@ -788,13 +810,13 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         # The "Preferences" link leads us to a form where the user can change
         # their preferences so the user need to be authenticated:
         resp = self._login(app, 'admin', 'secret').maybe_follow()
-        assert "Welcome, Administrator" in resp.body
+        assert "Welcome, Administrator" in resp.text
         resp = app.get('/@@prefs')
         form = resp.forms['deform']
         form['title'] = "Mr. Administrator"
         form['email'] = 'admin@minad.com'
         resp = form.submit("save").maybe_follow()
-        assert "Your changes have been saved" in resp.body
+        assert "Your changes have been saved" in resp.text
 
         # The email could not be used if already a users with that email exists:
         form = resp.forms['deform']
@@ -804,7 +826,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         # If the user cancel the process he will be redirected to the site root:
         form = resp.forms['deform']
         resp = form.submit("cancel").maybe_follow()
-        assert 'Welcome to Kotti' in resp.body
+        assert 'Welcome to Kotti' in resp.text
 
         # Share
         # -----
@@ -820,8 +842,8 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         resp = form.submit("search")
 
         # Bob and Bob's Group are listed now:
-        assert "Bob Dabolina" in resp.body
-        assert "Bob's Group" in resp.body
+        assert "Bob Dabolina" in resp.text
+        assert "Bob's Group" in resp.text
 
         # We add Bob's Group to Owners and Editors before taking away Owners
         # again:
@@ -829,20 +851,20 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form["role::group:bobsgroup::role:owner"].checked = True
         form["role::group:bobsgroup::role:editor"].checked = True
         resp = form.submit("apply").maybe_follow()
-        assert "Your changes have been saved" in resp.body
+        assert "Your changes have been saved" in resp.text
         resp = app.get(resp.request.path)  # >>> browser.reload()
         form = resp.forms['form-share-assign']
         assert form["role::group:bobsgroup::role:owner"].checked
         assert form["role::group:bobsgroup::role:editor"].checked
         form["role::group:bobsgroup::role:owner"].checked = False
         resp = form.submit("apply").maybe_follow()
-        assert "Your changes have been saved" in resp.body
+        assert "Your changes have been saved" in resp.text
         form = resp.forms['form-share-assign']
         assert not form["role::group:bobsgroup::role:owner"].checked
 
         # Not making any changes will give us a different feedback message:
         resp = form.submit("apply")
-        assert "Your changes have been saved" not in resp.body
+        assert "Your changes have been saved" not in resp.text
         form = resp.forms['form-share-assign']
         assert not form["role::group:bobsgroup::role:owner"].checked
         assert form["role::group:bobsgroup::role:editor"].checked
@@ -859,11 +881,11 @@ def test_user_management(self, webtest, settings, dummy_mailer):
 
         # Lastly, let's take away the remaining Editor role from Bob's Group
         # again:
-        assert "Bob's Group" in resp.body
+        assert "Bob's Group" in resp.text
         form["role::group:bobsgroup::role:editor"].checked = None
         resp = form.submit("apply").maybe_follow()
-        assert "Your changes have been saved" in resp.body
-        # TODO assert "Bob's Group" not in resp.body
+        assert "Your changes have been saved" in resp.text
+        # TODO assert "Bob's Group" not in resp.text
         form = resp.forms['form-share-assign']
         assert not form["role::group:bobsgroup::role:editor"].checked
 
@@ -879,7 +901,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form['title'] = "Pelayo Group"
         form.get('checkbox', index=3).checked = True
         resp = form.submit("add_group").maybe_follow()
-        assert "Pelayo Group was added" in resp.body
+        assert "Pelayo Group was added" in resp.text
         form = resp.forms['form-global-roles']
         assert form["role::group:pelayogroup::role:admin"].checked
 
@@ -892,7 +914,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form['email'] = "bruce@pelayno.com"
         form["group"] = "pelayogroup"
         resp = form.submit("add_user").maybe_follow()
-        assert "Bruce Pelayo was added" in resp.body
+        assert "Bruce Pelayo was added" in resp.text
 
         form = resp.forms['deform_user_add']
         form['name'] = "Brian"
@@ -902,12 +924,12 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         form['email'] = "brian@pelayno.com"
         form["group"] = "pelayogroup"
         resp = form.submit("add_user").maybe_follow()
-        assert "Brian Pelayo was added" in resp.body
+        assert "Brian Pelayo was added" in resp.text
 
         # Lets login as Bruce and add some content:
         resp.click("Logout").maybe_follow()
         resp = self._login(app, 'bruce', 'secret').maybe_follow()
-        assert "Welcome, Bruce Pelayo!" in resp.body
+        assert "Welcome, Bruce Pelayo!" in resp.text
         resp = resp.click("Document", index=0)
         form = resp.forms['deform']
         form["title"] = "Bruce one"
@@ -927,12 +949,12 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         resp = form.submit("search").maybe_follow()
         resp = resp.click("Bruce Pelayo")
         resp = resp.forms['deform'].submit('delete').maybe_follow()
-        assert "Delete <em>Bruce Pelayo</em>" in resp.body
+        assert "Delete <em>Bruce Pelayo</em>" in resp.text
         assert "Are you sure you want to delete <span>User</span> " \
-               "<em>Bruce Pelayo</em>?" in resp.body
+               "<em>Bruce Pelayo</em>?" in resp.text
         resp = resp.forms['form-delete-user'].submit('delete').maybe_follow()
-        assert "User Bruce Pelayo was deleted." in resp.body
+        assert "User Bruce Pelayo was deleted." in resp.text
         form = resp.forms['form-principal-search']
         form["query"] = "Bruce"
         resp = form.submit("search").maybe_follow()
-        assert "No users or groups were found." in resp.body
+        assert "No users or groups were found." in resp.text
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
index a45fd721c..bf55d15d6 100644
--- a/kotti/tests/test_httpexceptions.py
+++ b/kotti/tests/test_httpexceptions.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import pytest
 
 
diff --git a/kotti/tests/test_message.py b/kotti/tests/test_message.py
index d11f6c208..0353b3124 100644
--- a/kotti/tests/test_message.py
+++ b/kotti/tests/test_message.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from warnings import filterwarnings
 
 from mock import patch
@@ -9,11 +6,11 @@
 from kotti.testing import Dummy
 from kotti.testing import DummyRequest
 
-
 # filter deprecation warnings for code that is still tested...
 filterwarnings('ignore', '^send_set_password is deprecated')
 
 
+# noinspection PyAttributeOutsideInit
 class TestSendEmail:
     def setup_method(self, method):
         get_mailer_patcher = patch('kotti.message.get_mailer')
@@ -30,23 +27,23 @@ def test_send_email(self, dummy_request):
         from kotti.message import send_email
 
         send_email(dummy_request,
-                   [u'"John Doe" <joedoe@foo.com>'],
+                   ['"John Doe" <joedoe@foo.com>'],
                    'kotti:templates/email-reset-password.pt',
-                   {'site_title': u'My site',
-                    'user_title': u'John Doe',
-                    'url': u'http://foo.com'}
+                   {'site_title': 'My site',
+                    'user_title': 'John Doe',
+                    'url': 'http://foo.com'}
                    )
 
         assert self.mailer.send.called
         message = self.mailer.send.call_args[0][0]
-        assert [u'"John Doe" <joedoe@foo.com>'] == message.recipients
+        assert ['"John Doe" <joedoe@foo.com>'] == message.recipients
         assert 'Reset your password' in message.subject
 
     def test_send_email_without_template_vars(self, dummy_request):
         from kotti.message import send_email
         with raises(NameError):
             send_email(dummy_request,
-                       [u'"John Doe" <joedoe@foo.com>'],
+                       ['"John Doe" <joedoe@foo.com>'],
                        'kotti:templates/email-reset-password.pt')
 
 
@@ -72,7 +69,7 @@ def teardown_method(self, method):
     def test_email_set_password_basic(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name=u'joe', email='joe@bar.com', title=u'Joe')
+        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
         email_set_password(user, DummyRequest())
 
         assert hasattr(user, 'confirm_token')
@@ -85,7 +82,7 @@ def test_email_set_password_basic(self, db_session):
     def test_email_set_password_add_query(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name=u'joe', email='joe@bar.com', title=u'Joe')
+        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
         email_set_password(
             user, DummyRequest(), add_query={'another': 'param'})
 
@@ -116,7 +113,7 @@ def teardown_method(self, method):
     def test_email_set_password_basic(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name=u'joe', email='joe@bar.com', title=u'Joe')
+        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
         email_set_password(user, DummyRequest())
 
         assert hasattr(user, 'confirm_token')
@@ -132,7 +129,7 @@ def test_email_set_password_basic(self, db_session):
     def test_email_set_password_other_template(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name=u'joe', email='joe@bar.com', title=u'Joe')
+        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
         email_set_password(
             user, DummyRequest(),
             template_name='kotti:templates/email-reset-password.pt')
@@ -144,7 +141,7 @@ def test_email_set_password_other_template(self, db_session):
     def test_email_set_password_add_query(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name=u'joe', email='joe@bar.com', title=u'Joe')
+        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
         email_set_password(
             user, DummyRequest(), add_query={'another': 'param'})
 
diff --git a/kotti/tests/test_migrate.py b/kotti/tests/test_migrate.py
index 0d9ea4912..c545bdf69 100644
--- a/kotti/tests/test_migrate.py
+++ b/kotti/tests/test_migrate.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from alembic.migration import MigrationContext
 from mock import patch
 
@@ -38,7 +35,7 @@ def make(self):
         from kotti.migrate import DEFAULT_LOCATION
 
         with patch('kotti.migrate.get_settings',
-                   return_value={'sqlalchemy.url': u'database_url'}):
+                   return_value={'sqlalchemy.url': 'database_url'}):
             return PackageEnvironment(DEFAULT_LOCATION)
 
     def test_pkg_name(self, db_session, events):
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index 693880744..a3b0cfb39 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from mock import Mock
 from mock import patch
 from pyramid.security import ALL_PERMISSIONS
@@ -18,19 +15,19 @@ def test_root_acl(self, db_session, root):
 
         # The root object has a persistent ACL set:
         for ace in (
-            (Allow, 'role:owner', u'view'),
-            (Allow, 'role:owner', u'add'),
-            (Allow, 'role:owner', u'edit'),
-            (Allow, 'role:owner', u'delete'),
-            (Allow, 'role:owner', u'manage'),
-            (Allow, 'role:owner', u'state_change'),
-            (Allow, 'role:viewer', u'view'),
-            (Allow, 'role:editor', u'view'),
-            (Allow, 'role:editor', u'add'),
-            (Allow, 'role:editor', u'edit'),
-            (Allow, 'role:editor', u'delete'),
-            (Allow, 'role:editor', u'state_change'),
-            (Allow, Everyone, u'view'),
+            (Allow, 'role:owner', 'view'),
+            (Allow, 'role:owner', 'add'),
+            (Allow, 'role:owner', 'edit'),
+            (Allow, 'role:owner', 'delete'),
+            (Allow, 'role:owner', 'manage'),
+            (Allow, 'role:owner', 'state_change'),
+            (Allow, 'role:viewer', 'view'),
+            (Allow, 'role:editor', 'view'),
+            (Allow, 'role:editor', 'add'),
+            (Allow, 'role:editor', 'edit'),
+            (Allow, 'role:editor', 'delete'),
+            (Allow, 'role:editor', 'state_change'),
+            (Allow, Everyone, 'view'),
         ):
             assert ace in root.__acl__[1:-1]
 
@@ -110,8 +107,8 @@ def test_unique_constraint(self, db_session, root):
         from kotti.resources import Node
 
         # Try to add two children with the same name to the root node:
-        db_session.add(Node(name=u'child1', parent=root))
-        db_session.add(Node(name=u'child1', parent=root))
+        db_session.add(Node(name='child1', parent=root))
+        db_session.add(Node(name='child1', parent=root))
         with raises(IntegrityError):
             db_session.flush()
 
@@ -121,59 +118,62 @@ def test_container_methods(self, db_session, root):
         # Test some of Node's container methods:
         assert root.keys() == []
 
-        child1 = Node(name=u'child1', parent=root)
+        child1 = Node(name='child1', parent=root)
         db_session.add(child1)
-        assert root.keys() == [u'child1']
-        assert root[u'child1'] == child1
+        assert root.keys() == ['child1']
+        assert root['child1'] == child1
 
-        del root[u'child1']
+        del root['child1']
         assert root.keys() == []
 
         # When we delete a parent node, all its child nodes will be
         # released as well:
-        root[u'child2'] = Node()
-        root[u'child2'][u'subchild'] = Node()
+        root['child2'] = Node()
+        root['child2']['subchild'] = Node()
         assert (
             db_session.query(Node).filter(
-                Node.name == u'subchild').count() == 1)
-        del root[u'child2']
+                Node.name == 'subchild').count() == 1)
+        del root['child2']
         assert (
             db_session.query(Node).filter(
-                Node.name == u'subchild').count() == 0)
+                Node.name == 'subchild').count() == 0)
 
         # We can pass a tuple as the key to more efficiently reach
         # down to child objects:
-        root[u'child3'] = Node()
-        subchild33 = Node(name=u'subchild33', parent=root[u'child3'])
+        root['child3'] = Node()
+        subchild33 = Node(name='subchild33', parent=root['child3'])
         db_session.add(subchild33)
         del root.__dict__['_children']  # force a different code path
-        assert root[u'child3', u'subchild33'] is root[u'child3'][u'subchild33']
-        assert root[(u'child3', u'subchild33')] is subchild33
-        assert root[(u'child3', u'subchild33')] is subchild33
+        assert root['child3', 'subchild33'] is root['child3']['subchild33']
+        assert root[('child3', 'subchild33')] is subchild33
+        assert root[('child3', 'subchild33')] is subchild33
         with raises(KeyError):
-            root[u'child3', u'bad-name']
+            # noinspection PyStatementEffect
+            root['child3', 'bad-name']
+        # noinspection PyStatementEffect
         root.children  # force a different code path
         with raises(KeyError):
-            root[u'child3', u'bad-name']
-        del root[u'child3']
+            # noinspection PyStatementEffect
+            root['child3', 'bad-name']
+        del root['child3']
 
         # Overwriting an existing Node is an error; first delete manually!
-        child4 = Node(name=u'child4', parent=root)
+        child4 = Node(name='child4', parent=root)
         db_session.add(child4)
-        assert root.keys() == [u'child4']
+        assert root.keys() == ['child4']
 
-        child44 = Node(name=u'child4')
+        child44 = Node(name='child4')
         db_session.add(child44)
 
         with raises(SQLAlchemyError):
-            root[u'child4'] = child44
+            root['child4'] = child44
             db_session.flush()
 
     def test_node_copy_name(self, db_session, root):
 
-        copy_of_root = root.copy(name=u'copy_of_root')
-        assert copy_of_root.name == u'copy_of_root'
-        assert root.name == u''
+        copy_of_root = root.copy(name='copy_of_root')
+        assert copy_of_root.name == 'copy_of_root'
+        assert root.name == ''
 
     def test_node_copy_variants(self, db_session, root):
         from kotti.resources import Node
@@ -192,7 +192,7 @@ def test_node_copy_variants(self, db_session, root):
         # attempt to put the new node into the db already, e.g. when
         # the copy is already being back-referenced by some other
         # object in the db.
-        child1.copy(parent=child2, name=u'child3')
+        child1.copy(parent=child2, name='child3')
 
         assert [child.name for child in child2.children] == [
             'child1', 'child2', 'child3']
@@ -212,7 +212,7 @@ def test_node_copy_with_local_groups(self, db_session, root):
         from kotti.resources import LocalGroup
 
         child1 = root['child1'] = Node()
-        local_group1 = LocalGroup(child1, u'joe', u'role:admin')
+        local_group1 = LocalGroup(child1, 'joe', 'role:admin')
         db_session.add(local_group1)
         db_session.flush()
 
@@ -224,14 +224,14 @@ def test_clear(self, db_session, root):
         from kotti.resources import Node
 
         child = root['child'] = Node()
-        assert db_session.query(Node).filter(Node.name == u'child').all() == [
+        assert db_session.query(Node).filter(Node.name == 'child').all() == [
             child]
         root.clear()
-        assert db_session.query(Node).filter(Node.name == u'child').all() == []
+        assert db_session.query(Node).filter(Node.name == 'child').all() == []
 
     def test_annotations_mutable(self, db_session, root):
 
-        root.annotations['foo'] = u'bar'
+        root.annotations['foo'] = 'bar'
         assert root in db_session.dirty
         del root.annotations['foo']
 
@@ -241,12 +241,12 @@ def test_nested_annotations_mutable(self, db_session, root):
         db_session.flush()
         db_session.expire_all()
 
-        root.annotations['foo']['bar'] = u'baz'
+        root.annotations['foo']['bar'] = 'baz'
         assert root in db_session.dirty
         db_session.flush()
         db_session.expire_all()
 
-        assert root.annotations['foo']['bar'] == u'baz'
+        assert root.annotations['foo']['bar'] == 'baz'
 
     def test_annotations_coerce_fail(self, db_session, root):
 
@@ -260,7 +260,7 @@ def test_attribute(self, db_session, root, events):
 
         assert root.path == "/"
         child = root['child-1'] = Node()
-        assert child.path == u'/child-1/'
+        assert child.path == '/child-1/'
         subchild = root['child-1']['subchild'] = Node()
         assert subchild.path == '/child-1/subchild/'
 
@@ -290,7 +290,7 @@ def test_object_renamed(self, db_session, root, events):
         child = root['child-1'] = Node()
         subchild = child['subchild'] = Node()
 
-        subchild.name = u'renamed'
+        subchild.name = 'renamed'
         assert subchild.path == '/child-1/renamed/'
 
     @mark.parametrize("flush", [True, False])
@@ -303,9 +303,9 @@ def test_parent_renamed(self, db_session, root, events, flush):
         if flush:
             db_session.flush()
 
-        child2.name = u'renamed'
+        child2.name = 'renamed'
         assert subchild.path == '/child-1/renamed/subchild/'
-        child1.name = u'renamed-1'
+        child1.name = 'renamed-1'
         assert child2.path == '/renamed-1/renamed/'
         assert subchild.path == '/renamed-1/renamed/subchild/'
         assert child1.path == '/renamed-1/'
@@ -334,18 +334,18 @@ def test_parent_copied(self, db_session, root, events, flush):
     def test_children_append(self, db_session, root, events):
         from kotti.resources import Node
 
-        child = Node(u'child-1')
+        child = Node('child-1')
         root.children.append(child)
         assert child.path == '/child-1/'
 
-        child2 = Node(u'child-2')
+        child2 = Node('child-2')
         child.children.append(child2)
         assert child2.path == '/child-1/child-2/'
 
     def test_replace_root(self, db_session, root, events):
         from kotti.resources import Node
         db_session.delete(root)
-        new_root = Node(u'')
+        new_root = Node('')
         db_session.add(new_root)
         assert new_root.path == '/'
 
@@ -356,20 +356,20 @@ def test_query_api(self, db_session, root, events):
         subchild = child2['subchild'] = Node()
 
         assert db_session.query(Node).filter(
-            Node.path.startswith(u'/')).count() == 4
+            Node.path.startswith('/')).count() == 4
 
         assert db_session.query(Node).filter(
-            Node.path.startswith(u'/child-1/')).count() == 3
+            Node.path.startswith('/child-1/')).count() == 3
 
         objs = db_session.query(Node).filter(
-            Node.path.startswith(u'/child-1/child-2/')).all()
+            Node.path.startswith('/child-1/child-2/')).all()
 
         assert len(objs) == 2
         assert subchild in objs
         assert child2 in objs
 
         db_session.query(Node).filter(
-            Node.path.startswith(u'/child-1/child-3/')).count() == 0
+            Node.path.startswith('/child-1/child-3/')).count() == 0
 
     def test_add_child_to_unnamed_parent(self, db_session, root, events):
         from kotti.resources import Node
@@ -378,9 +378,9 @@ def test_add_child_to_unnamed_parent(self, db_session, root, events):
         child2 = child1['child-2'] = Node()
         assert child2.__parent__.__parent__ is parent
         root['parent'] = parent
-        assert parent.path == u'/parent/'
-        assert child1.path == u'/parent/child-1/'
-        assert child2.path == u'/parent/child-1/child-2/'
+        assert parent.path == '/parent/'
+        assert child1.path == '/parent/child-1/'
+        assert child2.path == '/parent/child-1/child-2/'
 
     def test_add_child_to_unrooted_parent(self, db_session, root, events):
         from kotti.resources import Node
@@ -388,9 +388,9 @@ def test_add_child_to_unrooted_parent(self, db_session, root, events):
         child1 = parent['child-1'] = Node()
         child2 = child1['child-2'] = Node()
         root['parent'] = parent
-        assert parent.path == u'/parent/'
-        assert child1.path == u'/parent/child-1/'
-        assert child2.path == u'/parent/child-1/child-2/'
+        assert parent.path == '/parent/'
+        assert child1.path == '/parent/child-1/'
+        assert child2.path == '/parent/child-1/child-2/'
 
     def test_node_lineage_not_loaded_new_name(self, db_session, root, events):
 
@@ -405,7 +405,7 @@ def test_node_lineage_not_loaded_new_name(self, db_session, root, events):
 
         child2 = db_session.query(Node).get(child2_id)
         child3 = Node('child-3', parent=child2)
-        assert child3.path == u'/parent/child-1/child-2/child-3/'
+        assert child3.path == '/parent/child-1/child-2/child-3/'
 
     def test_node_lineage_not_loaded_new_parent(self, db_session, root, events):
 
@@ -427,14 +427,14 @@ def test_node_lineage_not_loaded_new_parent(self, db_session, root, events):
         child1_id = child1.id
         db_session.expunge_all()
 
-        child2 = Node(name=u'child-2')
-        child3 = Node(name=u'child-3')
+        child2 = Node(name='child-2')
+        child3 = Node(name='child-3')
 
         child1 = db_session.query(Node).get(child1_id)
         child3.parent = child2
         child2.parent = child1
 
-        assert child3.path == u"/parent/child-1/child-2/child-3/"
+        assert child3.path == "/parent/child-1/child-2/child-3/"
 
 
 class TestLocalGroup:
@@ -459,9 +459,9 @@ def test_add_selectable_default_view(self):
         from kotti.resources import TypeInfo
 
         type_info = TypeInfo(selectable_default_views=[])
-        type_info.add_selectable_default_view('foo', u'Fannick')
+        type_info.add_selectable_default_view('foo', 'Fannick')
         assert type_info.selectable_default_views == [
-            ('foo', u'Fannick'),
+            ('foo', 'Fannick'),
             ]
 
         Document.type_info.add_selectable_default_view('one', 'two')
diff --git a/kotti/tests/test_node_views.py b/kotti/tests/test_node_views.py
index 2ce4823a8..bceab28dc 100644
--- a/kotti/tests/test_node_views.py
+++ b/kotti/tests/test_node_views.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-from kotti.testing import DummyRequest
 from pyramid.exceptions import Forbidden
 from pytest import raises
 from webob.multidict import MultiDict
 
+from kotti.testing import DummyRequest
+
 
 class TestAddableTypes:
     def test_view_permitted_yes(self, config, root):
@@ -71,7 +69,7 @@ def test_paste_without_edit_permission(self, config, root):
         from kotti.views.edit.actions import NodeActions
 
         request = DummyRequest()
-        request.params['paste'] = u'on'
+        request.params['paste'] = 'on'
         config.testing_securitypolicy(permissive=False)
 
         # We need to have the 'edit' permission on the original object
@@ -100,44 +98,44 @@ def test_rename_to_empty_name(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        child = root['child'] = Document(title=u"Child")
+        child = root['child'] = Document(title="Child")
         request = DummyRequest()
-        request.params['rename'] = u'on'
-        request.params['name'] = u''
-        request.params['title'] = u'foo'
+        request.params['rename'] = 'on'
+        request.params['name'] = ''
+        request.params['title'] = 'foo'
         NodeActions(child, request).rename_node()
         assert (request.session.pop_flash('error') ==
-                [u'Name and title are required.'])
+                ['Name and title are required.'])
 
     def test_multi_rename(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
         self.setUp()
-        root['child1'] = Document(title=u"Child 1")
-        root['child2'] = Document(title=u"Child 2")
+        root['child1'] = Document(title="Child 1")
+        root['child2'] = Document(title="Child 2")
         request = DummyRequest()
         request.POST = MultiDict()
         id1 = str(root['child1'].id)
         id2 = str(root['child2'].id)
         request.POST.add('children-to-rename', id1)
         request.POST.add('children-to-rename', id2)
-        request.POST.add(id1 + '-name', u'')
-        request.POST.add(id1 + '-title', u'Unhappy Child')
-        request.POST.add(id2 + '-name', u'happy-child')
-        request.POST.add(id2 + '-title', u'')
-        request.POST.add('rename_nodes', u'rename_nodes')
+        request.POST.add(id1 + '-name', '')
+        request.POST.add(id1 + '-title', 'Unhappy Child')
+        request.POST.add(id2 + '-name', 'happy-child')
+        request.POST.add(id2 + '-title', '')
+        request.POST.add('rename_nodes', 'rename_nodes')
         NodeActions(root, request).rename_nodes()
         assert request.session.pop_flash('error') ==\
-            [u'Name and title are required.']
+            ['Name and title are required.']
 
-        request.POST.add(id1 + '-name', u'unhappy-child')
-        request.POST.add(id1 + '-title', u'Unhappy Child')
-        request.POST.add(id2 + '-name', u'happy-child')
-        request.POST.add(id2 + '-title', u'Happy Child')
-        request.POST.add('rename_nodes', u'rename_nodes')
+        request.POST.add(id1 + '-name', 'unhappy-child')
+        request.POST.add(id1 + '-title', 'Unhappy Child')
+        request.POST.add(id2 + '-name', 'happy-child')
+        request.POST.add(id2 + '-title', 'Happy Child')
+        request.POST.add('rename_nodes', 'rename_nodes')
         NodeActions(root, request).rename_nodes()
         assert request.session.pop_flash('success') ==\
-            [u'Your changes have been saved.']
+            ['Your changes have been saved.']
 
 
 class TestNodeDelete:
@@ -147,28 +145,28 @@ def test_multi_delete(self, root):
         from kotti.resources import File
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title=u"Child 1")
-        root['child2'] = Document(title=u"Child 2")
-        root['file1'] = File(title=u"File 1")
+        root['child1'] = Document(title="Child 1")
+        root['child2'] = Document(title="Child 2")
+        root['file1'] = File(title="File 1")
 
         request = DummyRequest()
         request.POST = MultiDict()
         id1 = str(root['child1'].id)
         id2 = str(root['child2'].id)
         id3 = str(root['file1'].id)
-        request.POST.add('delete_nodes', u'delete_nodes')
+        request.POST.add('delete_nodes', 'delete_nodes')
         NodeActions(root, request).delete_nodes()
         assert request.session.pop_flash('info') ==\
-            [u'Nothing was deleted.']
+            ['Nothing was deleted.']
 
         request.POST.add('children-to-delete', id1)
         request.POST.add('children-to-delete', id2)
         request.POST.add('children-to-delete', id3)
         NodeActions(root, request).delete_nodes()
         assert request.session.pop_flash('success') == \
-            [u'${title} was deleted.',
-             u'${title} was deleted.',
-             u'${title} was deleted.']
+            ['${title} was deleted.',
+             '${title} was deleted.',
+             '${title} was deleted.']
 
 
 class TestNodeMove:
@@ -176,24 +174,24 @@ def test_move_up(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title=u"Child 1")
-        root['child2'] = Document(title=u"Child 2")
+        root['child1'] = Document(title="Child 1")
+        root['child2'] = Document(title="Child 2")
         assert root['child1'].position < root['child2'].position
 
         request = DummyRequest()
         request.session['kotti.selected-children'] = [str(root['child2'].id)]
         NodeActions(root, request).up()
         assert request.session.pop_flash('success') ==\
-            [u'${title} was moved.']
+            ['${title} was moved.']
         assert root['child1'].position > root['child2'].position
 
     def test_move_down(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title=u"Child 1")
-        root['child2'] = Document(title=u"Child 2")
-        root['child3'] = Document(title=u"Child 3")
+        root['child1'] = Document(title="Child 1")
+        root['child2'] = Document(title="Child 2")
+        root['child3'] = Document(title="Child 3")
         assert root['child1'].position < root['child3'].position
         assert root['child2'].position < root['child3'].position
 
@@ -202,7 +200,7 @@ def test_move_down(self, root):
         request.session['kotti.selected-children'] = ids
         NodeActions(root, request).down()
         assert request.session.pop_flash('success') ==\
-            [u'${title} was moved.', u'${title} was moved.']
+            ['${title} was moved.', '${title} was moved.']
         assert root['child1'].position > root['child3'].position
         assert root['child2'].position > root['child3'].position
 
@@ -215,15 +213,15 @@ def test_move_child_position_post(self, root, db_session):
         from kotti.views.edit.actions import move_child_position
 
         # Create some documents
-        root['child1'] = Document(title=u"Child 1")
-        root['child2'] = Document(title=u"Child 2")
-        root['child3'] = Document(title=u"Child 3")
-        root['child4'] = Document(title=u"Child 4")
-        root['child5'] = Document(title=u"Child 5")
+        root['child1'] = Document(title="Child 1")
+        root['child2'] = Document(title="Child 2")
+        root['child3'] = Document(title="Child 3")
+        root['child4'] = Document(title="Child 4")
+        root['child5'] = Document(title="Child 5")
 
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            u'child1', u'child2', u'child3', u'child4', u'child5']
+            'child1', 'child2', 'child3', 'child4', 'child5']
 
         request = DummyRequest()
 
@@ -235,7 +233,7 @@ def test_move_child_position_post(self, root, db_session):
         assert result['result'] == 'success'
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            u'child2', u'child3', u'child4', u'child1', u'child5']
+            'child2', 'child3', 'child4', 'child1', 'child5']
 
         # Move up
         request.POST = {'from': '4', 'to': '0'}
@@ -245,7 +243,7 @@ def test_move_child_position_post(self, root, db_session):
         assert result['result'] == 'success'
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            u'child5', u'child2', u'child3', u'child4', u'child1']
+            'child5', 'child2', 'child3', 'child4', 'child1']
 
         # Invalid param value
         request.POST = {'from': 'a', 'to': '3'}
@@ -282,15 +280,15 @@ def test_move_child_position_json(self, root, db_session):
         from kotti.views.edit.actions import move_child_position
 
         # Create some documents
-        root['child1'] = Document(title=u"Child 1")
-        root['child2'] = Document(title=u"Child 2")
-        root['child3'] = Document(title=u"Child 3")
-        root['child4'] = Document(title=u"Child 4")
-        root['child5'] = Document(title=u"Child 5")
+        root['child1'] = Document(title="Child 1")
+        root['child2'] = Document(title="Child 2")
+        root['child3'] = Document(title="Child 3")
+        root['child4'] = Document(title="Child 4")
+        root['child5'] = Document(title="Child 5")
 
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            u'child1', u'child2', u'child3', u'child4', u'child5']
+            'child1', 'child2', 'child3', 'child4', 'child5']
 
         request = DummyRequest()
 
@@ -302,7 +300,7 @@ def test_move_child_position_json(self, root, db_session):
         assert result['result'] == 'success'
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            u'child2', u'child3', u'child4', u'child1', u'child5']
+            'child2', 'child3', 'child4', 'child1', 'child5']
 
         # Move up
         request.json_body = {'from': '4', 'to': '0'}
@@ -312,7 +310,7 @@ def test_move_child_position_json(self, root, db_session):
         assert result['result'] == 'success'
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            u'child5', u'child2', u'child3', u'child4', u'child1']
+            'child5', 'child2', 'child3', 'child4', 'child1']
 
         # Invalid param value
         request.json_body = {'from': 'a', 'to': '3'}
@@ -346,20 +344,20 @@ def test_show_hide(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title=u"Child 1")
+        root['child1'] = Document(title="Child 1")
         assert root['child1'].in_navigation is True
 
         request = DummyRequest()
         request.session['kotti.selected-children'] = [str(root['child1'].id)]
         NodeActions(root, request).hide()
         assert request.session.pop_flash('success') ==\
-            [u'${title} is no longer visible in the navigation.']
+            ['${title} is no longer visible in the navigation.']
         assert root['child1'].in_navigation is False
 
         request.session['kotti.selected-children'] = [str(root['child1'].id)]
         NodeActions(root, request).show()
         assert request.session.pop_flash('success') ==\
-            [u'${title} is now visible in the navigation.']
+            ['${title} is now visible in the navigation.']
         assert root['child1'].in_navigation is True
 
 
@@ -375,9 +373,10 @@ def test_roles(self, root):
             [r.name for r in share_node(root, request)['available_roles']] ==
             SHARING_ROLES)
 
-    def test_search(self, extra_principals, root):
+    def test_search(self, extra_principals, root, db_session):
         from kotti.security import get_principals
         from kotti.security import set_groups
+        from kotti.testing import DummyRequest
         from kotti.views.users import share_node
 
         request = DummyRequest()
@@ -385,8 +384,8 @@ def test_search(self, extra_principals, root):
 
         # Search for "Bob", which will return both the user and the
         # group, both of which have no roles:
-        request.params['search'] = u''
-        request.params['query'] = u'Bob'
+        request.params['search'] = ''
+        request.params['query'] = 'Bob'
         entries = share_node(root, request)['entries']
         assert len(entries) == 2
         assert entries[0][0] == P['bob']
@@ -396,29 +395,31 @@ def test_search(self, extra_principals, root):
 
         # We make Bob an Editor in this context, and Bob's Group
         # becomes global Admin:
-        set_groups(u'bob', root, [u'role:editor'])
-        P[u'group:bobsgroup'].groups = [u'role:admin']
+        set_groups('bob', root, ['role:editor'])
+        db_session.flush()
+        P['group:bobsgroup'].groups = ['role:admin']
+        db_session.flush()
         entries = share_node(root, request)['entries']
         assert len(entries) == 2
         assert entries[0][0] == P['bob']
-        assert entries[0][1] == ([u'role:editor'], [])
+        assert entries[0][1] == (['role:editor'], [])
         assert entries[1][0] == P['group:bobsgroup']
-        assert entries[1][1] == ([u'role:admin'], [u'role:admin'])
+        assert entries[1][1] == (['role:admin'], ['role:admin'])
 
         # A search that doesn't return any items will still include
         # entries with existing local roles:
-        request.params['query'] = u'Weeee'
+        request.params['query'] = 'Weeee'
         entries = share_node(root, request)['entries']
         assert len(entries) == 1
-        assert entries[0][0] == P[u'bob']
-        assert entries[0][1] == ([u'role:editor'], [])
+        assert entries[0][0] == P['bob']
+        assert entries[0][1] == (['role:editor'], [])
         assert (request.session.pop_flash('info') ==
-                [u'No users or groups were found.'])
+                ['No users or groups were found.'])
 
         # It does not, however, include entries that have local group
         # assignments only:
-        set_groups(u'frank', root, [u'group:franksgroup'])
-        request.params['query'] = u'Weeee'
+        set_groups('frank', root, ['group:franksgroup'])
+        request.params['query'] = 'Weeee'
         entries = share_node(root, request)['entries']
         assert len(entries) == 1
         assert entries[0][0] == P['bob']
@@ -430,20 +431,20 @@ def test_apply(self, extra_principals, root):
 
         request = DummyRequest()
 
-        request.params['apply'] = u''
+        request.params['apply'] = ''
         share_node(root, request)
-        assert (request.session.pop_flash('info') == [u'No changes were made.'])
+        assert (request.session.pop_flash('info') == ['No changes were made.'])
         assert list_groups('bob', root) == []
         set_groups('bob', root, ['role:special'])
 
-        request.params['role::bob::role:owner'] = u'1'
-        request.params['role::bob::role:editor'] = u'1'
-        request.params['orig-role::bob::role:owner'] = u''
-        request.params['orig-role::bob::role:editor'] = u''
+        request.params['role::bob::role:owner'] = '1'
+        request.params['role::bob::role:editor'] = '1'
+        request.params['orig-role::bob::role:owner'] = ''
+        request.params['orig-role::bob::role:editor'] = ''
 
         share_node(root, request)
         assert (request.session.pop_flash('success') ==
-                [u'Your changes have been saved.'])
+                ['Your changes have been saved.'])
         assert (
             set(list_groups('bob', root)) ==
             {'role:owner', 'role:editor', 'role:special'}
@@ -451,8 +452,8 @@ def test_apply(self, extra_principals, root):
 
         # We cannot set a role that's not displayed, even if we forged
         # the request:
-        request.params['role::bob::role:admin'] = u'1'
-        request.params['orig-role::bob::role:admin'] = u''
+        request.params['role::bob::role:admin'] = '1'
+        request.params['orig-role::bob::role:admin'] = ''
         with raises(Forbidden):
             share_node(root, request)
         assert (
diff --git a/kotti/tests/test_principals.py b/kotti/tests/test_principals.py
index 68b023b5f..cadf3b828 100644
--- a/kotti/tests/test_principals.py
+++ b/kotti/tests/test_principals.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-
 class TestMassageGroups:
 
     def test_massage_groups_in(self):
diff --git a/kotti/tests/test_register.py b/kotti/tests/test_register.py
index 8ebdc5800..ad6b30710 100644
--- a/kotti/tests/test_register.py
+++ b/kotti/tests/test_register.py
@@ -1,8 +1,4 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-from mock import call
-from mock import patch
+import mock  # must not ``from mock import call``, causes memory error.
 
 from kotti.testing import DummyRequest
 
@@ -20,7 +16,7 @@ def test_register_submit_empty(self, root):
         from kotti.views.login import register
 
         request = DummyRequest()
-        request.POST['register'] = u'register'
+        request.POST['register'] = 'register'
         res = register(root, request)
         assert 'There was a problem with your submission' in res['form']
 
@@ -29,35 +25,35 @@ def test_register_submit(self, root):
         from pyramid.httpexceptions import HTTPFound
 
         request = DummyRequest()
-        request.POST['title'] = u'Test User'
-        request.POST['name'] = u'test'
-        request.POST['email'] = u'test@example.com'
-        request.POST['register'] = u'register',
+        request.POST['title'] = 'Test User'
+        request.POST['name'] = 'test'
+        request.POST['email'] = 'test@example.com'
+        request.POST['register'] = 'register',
 
-        with patch('kotti.views.login.UserAddFormView') as form:
-            with patch('kotti.views.login.get_principals'):
+        with mock.patch('kotti.views.login.UserAddFormView') as form:
+            with mock.patch('kotti.views.login.get_principals'):
                 res = register(root, request)
-                form.assert_has_calls([call().add_user_success({
-                    'name': u'test',
-                    'roles': u'',
-                    'title': u'Test User',
+                form.assert_has_calls([mock.call().add_user_success({
+                    'name': 'test',
+                    'roles': '',
+                    'title': 'Test User',
                     'send_email': True,
-                    'groups': u'',
-                    'email': u'test@example.com'})]
+                    'groups': '',
+                    'email': 'test@example.com'})]
                 )
         assert(isinstance(res, HTTPFound))
 
     def test_register_event(self, root):
         from kotti.views.login import register
         request = DummyRequest()
-        request.POST['title'] = u'Test User'
-        request.POST['name'] = u'test'
-        request.POST['email'] = u'test@example.com'
-        request.POST['register'] = u'register',
-
-        with patch('kotti.views.login.UserAddFormView'):
-            with patch('kotti.views.login.get_principals'):
-                with patch('kotti.views.login.notify') as notify:
+        request.POST['title'] = 'Test User'
+        request.POST['name'] = 'test'
+        request.POST['email'] = 'test@example.com'
+        request.POST['register'] = 'register',
+
+        with mock.patch('kotti.views.login.UserAddFormView'):
+            with mock.patch('kotti.views.login.get_principals'):
+                with mock.patch('kotti.views.login.notify') as notify:
                     register(root, request)
         assert(notify.call_count == 1)
 
@@ -66,14 +62,14 @@ def test_register_submit_groups_and_roles(self, root):
         from pyramid.httpexceptions import HTTPFound
 
         request = DummyRequest()
-        request.POST['title'] = u'Test User'
-        request.POST['name'] = u'test'
-        request.POST['email'] = u'test@example.com'
-        request.POST['register'] = u'register',
-
-        with patch('kotti.views.login.UserAddFormView') as form:
-            with patch('kotti.views.login.get_principals'):
-                with patch('kotti.views.login.get_settings') as get_settings:
+        request.POST['title'] = 'Test User'
+        request.POST['name'] = 'test'
+        request.POST['email'] = 'test@example.com'
+        request.POST['register'] = 'register',
+
+        with mock.patch('kotti.views.login.UserAddFormView') as form:
+            with mock.patch('kotti.views.login.get_principals'):
+                with mock.patch('kotti.views.login.get_settings') as get_settings:  # noqa
                     get_settings.return_value = {
                         'kotti.register.group': 'mygroup',
                         'kotti.register.role': 'myrole',
@@ -82,13 +78,13 @@ def test_register_submit_groups_and_roles(self, root):
                     res = register(root, request)
 
         form.assert_has_calls([
-            call().add_user_success({
-                'name': u'test',
-                'roles': {u'role:myrole'},
-                'title': u'Test User',
+            mock.call().add_user_success({
+                'name': 'test',
+                'roles': {'role:myrole'},
+                'title': 'Test User',
                 'send_email': True,
-                'groups': [u'mygroup'],
-                'email': u'test@example.com',
+                'groups': ['mygroup'],
+                'email': 'test@example.com',
                 })])
         assert(isinstance(res, HTTPFound))
 
diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index 1bcbda156..abd848694 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-
 class TestExtendingRequest:
 
     def test_it(self):
diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
index 7e9d82797..86da03788 100644
--- a/kotti/tests/test_sanitizers.py
+++ b/kotti/tests/test_sanitizers.py
@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-unsanitized = u'''
+unsanitized = '''
 <h1>Title</h1>
 <div class="teaser umlaut">Descrüptiön</div>
 <p>
@@ -19,8 +16,8 @@
 
 
 def _verify_no_html(sanitized):
-    assert u'<' not in sanitized
-    assert u'external links' in sanitized
+    assert '<' not in sanitized
+    assert 'external links' in sanitized
 
 
 def test_no_html():
@@ -32,16 +29,16 @@ def test_no_html():
 
 def _verify_minimal_html(sanitized):
 
-    from bleach_whitelist import all_tags
-    from bleach_whitelist import markdown_tags
-    from bleach_whitelist import print_tags
+    from bleach_whitelist.bleach_whitelist import all_tags
+    from bleach_whitelist.bleach_whitelist import markdown_tags
+    from bleach_whitelist.bleach_whitelist import print_tags
 
     for tag in set(all_tags) - set(markdown_tags) - set(print_tags):
-        assert u'<{0}'.format(tag) not in sanitized
+        assert '<{}'.format(tag) not in sanitized
 
-    assert u'style=""' in sanitized
-    assert u'<a href="http://external.com/">' in sanitized
-    assert u'size' not in sanitized.lower()
+    assert 'style=""' in sanitized
+    assert '<a href="http://external.com/">' in sanitized
+    assert 'size' not in sanitized.lower()
 
 
 def test_minmal_html():
@@ -53,11 +50,11 @@ def test_minmal_html():
 
 def _verify_xss_protection(sanitized):
 
-    assert u'<script>' not in sanitized
-    assert u'<h1>Title</h1>' in sanitized
-    assert u'<a href="internal.html" target="_blank">internal</a>' in sanitized
-    assert u'b size="17"' in sanitized
-    assert u'<p>Unclosed paragraph\n</p>' in sanitized
+    assert '<script>' not in sanitized
+    assert '<h1>Title</h1>' in sanitized
+    assert '<a href="internal.html" target="_blank">internal</a>' in sanitized
+    assert 'b size="17"' in sanitized
+    assert '<p>Unclosed paragraph\n</p>' in sanitized
 
 
 def test_xss_protection():
@@ -69,11 +66,11 @@ def test_xss_protection():
 
 def test_default_config(unresolved_settings):
 
-    assert u'kotti.sanitizers' in unresolved_settings
-    assert u'kotti.sanitize_on_write' in unresolved_settings
+    assert 'kotti.sanitizers' in unresolved_settings
+    assert 'kotti.sanitize_on_write' in unresolved_settings
 
-    assert unresolved_settings[u'kotti.sanitizers'] == u'xss_protection:kotti.sanitizers.xss_protection minimal_html:kotti.sanitizers.minimal_html no_html:kotti.sanitizers.no_html'  # noqa
-    assert unresolved_settings[u'kotti.sanitize_on_write'] == u'kotti.resources.Document.body:xss_protection kotti.resources.Content.title:no_html kotti.resources.Content.description:no_html'  # noqa
+    assert unresolved_settings['kotti.sanitizers'] == 'xss_protection:kotti.sanitizers.xss_protection minimal_html:kotti.sanitizers.minimal_html no_html:kotti.sanitizers.no_html'  # noqa
+    assert unresolved_settings['kotti.sanitize_on_write'] == 'kotti.resources.Document.body:xss_protection kotti.resources.Content.title:no_html kotti.resources.Content.description:no_html'  # noqa
 
 
 def test_setup_sanitizers(unresolved_settings):
@@ -84,30 +81,30 @@ def test_setup_sanitizers(unresolved_settings):
 
     _setup_sanitizers(unresolved_settings)
 
-    settings = unresolved_settings[u'kotti.sanitizers']
+    settings = unresolved_settings['kotti.sanitizers']
 
-    assert u'minimal_html' in settings
-    assert u'no_html' in settings
-    assert u'xss_protection' in settings
+    assert 'minimal_html' in settings
+    assert 'no_html' in settings
+    assert 'xss_protection' in settings
 
-    assert settings[u'minimal_html'] == minimal_html
-    assert settings[u'no_html'] == no_html
-    assert settings[u'xss_protection'] == xss_protection
+    assert settings['minimal_html'] == minimal_html
+    assert settings['no_html'] == no_html
+    assert settings['xss_protection'] == xss_protection
 
 
 def test_listeners(app, root, db_session):
 
     from kotti.resources import Document
 
-    root[u'd'] = doc = Document(
-        name=u'test',
-        title=u'<h1>Title</h1>',
+    root['d'] = doc = Document(
+        name='test',
+        title='<h1>Title</h1>',
         description=unsanitized,
         body=unsanitized)
 
     db_session.flush()
 
-    assert doc.title == u'Title'
+    assert doc.title == 'Title'
     _verify_no_html(doc.description)
     _verify_xss_protection(doc.body)
 
diff --git a/kotti/tests/test_search.py b/kotti/tests/test_search.py
index f2222bbf7..d6771a52e 100644
--- a/kotti/tests/test_search.py
+++ b/kotti/tests/test_search.py
@@ -1,22 +1,19 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from kotti.testing import DummyRequest
 
 
 def _create_contents(root):
     from kotti.resources import Content, File
     doc1 = root['doc1'] = Content(
-        title=u'First Document',
-        description=u'I am the first.')
+        title='First Document',
+        description='I am the first.')
     doc11 = root['doc1']['doc11'] = Content(
-        title=u'Second Document',
-        description=u'And I am the second.')
+        title='Second Document',
+        description='And I am the second.')
     doc12 = root['doc1']['doc12'] = Content(
-        title=u'Third Document')
+        title='Third Document')
     file1 = root['doc1']['file1'] = File(
-        title=u'First File',
-        description=u'this is a file')
+        title='First File',
+        description='this is a file')
     return doc1, doc11, doc12, file1
 
 
@@ -26,20 +23,20 @@ def _create_contents_with_tags(root=None):
     if root is None:
         root = get_root()
 
-    animals = root['animals'] = Content(title=u'Animals')
-    cat = root['animals']['cat'] = Content(title=u'Cat')
-    dog = root['animals']['dog'] = Content(title=u'Dog')
-    monkey = root['animals']['monkey'] = Content(title=u'Monkey')
-    gorilla = root['animals']['gorilla'] = Content(title=u'Gorilla')
+    animals = root['animals'] = Content(title='Animals')
+    cat = root['animals']['cat'] = Content(title='Cat')
+    dog = root['animals']['dog'] = Content(title='Dog')
+    monkey = root['animals']['monkey'] = Content(title='Monkey')
+    gorilla = root['animals']['gorilla'] = Content(title='Gorilla')
     monkey_file = root['animals']['monkey_file'] = File(
-        title=u'Monkey File',
-        description=u'A Rhesus Macaque and a Green Monkey walk into a bar...')
+        title='Monkey File',
+        description='A Rhesus Macaque and a Green Monkey walk into a bar...')
 
-    root[u'animals'][u'cat'].tags = [u'Animals', u'Cat']
-    root[u'animals'][u'dog'].tags = [u'Animals', u'Dog']
-    root[u'animals'][u'monkey'].tags = [u'Animals', u'Monkey', u'Primate']
-    root[u'animals'][u'monkey_file'].tags = [u'Animals', u'Monkey', u'Primate']
-    root[u'animals'][u'gorilla'].tags = [u'Animals', u'Gorilla', u'Primate']
+    root['animals']['cat'].tags = ['Animals', 'Cat']
+    root['animals']['dog'].tags = ['Animals', 'Dog']
+    root['animals']['monkey'].tags = ['Animals', 'Monkey', 'Primate']
+    root['animals']['monkey_file'].tags = ['Animals', 'Monkey', 'Primate']
+    root['animals']['gorilla'].tags = ['Animals', 'Gorilla', 'Primate']
 
     return animals, cat, dog, monkey, gorilla, monkey_file
 
@@ -47,7 +44,7 @@ def _create_contents_with_tags(root=None):
 def test_search_empty_content(db_session):
     from kotti.views.util import search_content
     request = DummyRequest()
-    results = search_content(u'teststring', request)
+    results = search_content('teststring', request)
     assert results == []
 
 
@@ -58,15 +55,15 @@ def test_search_content(root):
 
     request = DummyRequest()
     doc1, doc11, doc12, file1 = _create_contents(root)
-    results = search_content(u'First Document', request)
+    results = search_content('First Document', request)
     assert len(results) == 1
-    assert results[0]['name'] == u'doc1'
-    assert results[0]['title'] == u'First Document'
-    results = search_content(u'Document', request)
+    assert results[0]['name'] == 'doc1'
+    assert results[0]['title'] == 'First Document'
+    results = search_content('Document', request)
     # The frontpage contains 'Documentation' in its body!
     assert len(results) == 4
-    assert results[1]['name'] == u'doc11'
-    assert results[1]['title'] == u'Second Document'
+    assert results[1]['name'] == 'doc11'
+    assert results[1]['title'] == 'Second Document'
     assert results[1]['path'] == '/doc1/doc11/'
     assert results[1]['path'][-1] == '/'
 
@@ -75,11 +72,11 @@ def test_search_content(root):
 
     tags = DBSession.query(Tag).all()
     assert len(tags) == 6
-    results = search_content(u'Animals', request)
+    results = search_content('Animals', request)
     assert len(results) == 6
-    results = search_content(u'Cat', request)
+    results = search_content('Cat', request)
     assert len(results) == 1
-    results = search_content(u'Primate', request)
+    results = search_content('Primate', request)
     assert len(results) == 3
 
     # Tags were included in general search by modifying the pre-existing
@@ -98,7 +95,7 @@ def test_search_content(root):
     # Note: this ordering is done to have some method, but it does not
     #       necessarily constitute a specification.
     #
-    results = search_content(u'Animals', request)
+    results = search_content('Animals', request)
     assert len(results) == 6
     assert results[0]['name'] == 'animals'
 
@@ -107,7 +104,7 @@ def test_search_file_description(root):
     from kotti.views.util import search_content
     request = DummyRequest()
     doc1, doc11, doc12, file1 = _create_contents(root)
-    results = search_content(u'this is a file', request)
+    results = search_content('this is a file', request)
     assert len(results) == 1
     assert results[0]['name'] == 'file1'
     assert results[0]['title'] == 'First File'
@@ -119,7 +116,7 @@ def test_search_content_without_permission(config, root):
     request = DummyRequest()
     _create_contents(root)
     config.testing_securitypolicy(permissive=False)
-    results = search_content(u'Document', request)
+    results = search_content('Document', request)
     assert len(results) == 0
 
 
@@ -130,20 +127,20 @@ def test_search_functional(webtest, root):
     resp = webtest.app.get('/')
 
     search_form = resp.forms['form-search']
-    search_form['search-term'] = u'First Document'
+    search_form['search-term'] = 'First Document'
     resp = search_form.submit()
-    assert 'I am the first' in resp.body
-    assert 'And I am the second' not in resp.body
+    assert 'I am the first' in resp.text
+    assert 'And I am the second' not in resp.text
 
     search_form = resp.forms['form-search']
-    search_form['search-term'] = u'Document'
+    search_form['search-term'] = 'Document'
     resp = search_form.submit()
-    assert 'I am the first' in resp.body
-    assert 'And I am the second' in resp.body
+    assert 'I am the first' in resp.text
+    assert 'And I am the second' in resp.text
 
     search_form = resp.forms['form-search']
-    search_form['search-term'] = u'is a file'
+    search_form['search-term'] = 'is a file'
     resp = search_form.submit()
-    assert 'And I am the second' not in resp.body
-    assert 'Third' not in resp.body
-    assert 'First File' in resp.body
+    assert 'And I am the second' not in resp.text
+    assert 'Third' not in resp.text
+    assert 'First File' in resp.text
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index e3302e538..ec4f5399c 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from mock import patch
 from pyramid.authentication import CallbackAuthenticationPolicy
 from pytest import raises
@@ -8,13 +5,26 @@
 from kotti.testing import DummyRequest
 
 
+class HasPermissionTests:
+
+    def test_has_permission(self):
+        import mock
+        from kotti.security import has_permission
+        permission = 'edit'
+        context = object()
+        request = mock.MagicMock()
+        has_permission(permission, context, request)
+        assert request.has_permission.assert_called_once_with(
+            permission, context=context) is None
+
+
 class TestGroups:
     def test_root_default(self, db_session, root):
         from kotti.security import list_groups
         from kotti.security import list_groups_raw
 
         assert list_groups('admin', root) == ['role:admin']
-        assert list_groups_raw(u'admin', root) == set([])
+        assert list_groups_raw('admin', root) == set([])
 
     def test_empty(self, db_session, root):
         from kotti.security import list_groups
@@ -28,12 +38,12 @@ def test_simple(self, db_session, root):
 
         set_groups('bob', root, ['role:editor'])
         assert list_groups('bob', root) == ['role:editor']
-        assert list_groups_raw(u'bob', root) == {'role:editor'}
+        assert list_groups_raw('bob', root) == {'role:editor'}
 
     def test_not_a_node(self):
         from kotti.security import list_groups_raw
 
-        assert list_groups_raw(u'bob', object()) == set()
+        assert list_groups_raw('bob', object()) == set()
 
     def test_overwrite_and_delete(self, db_session, root):
         from kotti.resources import get_root
@@ -43,11 +53,11 @@ def test_overwrite_and_delete(self, db_session, root):
 
         set_groups('bob', root, ['role:editor'])
         assert list_groups('bob', root) == ['role:editor']
-        assert list_groups_raw(u'bob', root) == {'role:editor'}
+        assert list_groups_raw('bob', root) == {'role:editor'}
 
         set_groups('bob', root, ['role:admin'])
         assert list_groups('bob', root) == ['role:admin']
-        assert list_groups_raw(u'bob', root) == {'role:admin'}
+        assert list_groups_raw('bob', root) == {'role:admin'}
 
         set_groups('bob', root)
         assert list_groups('bob', root) == []
@@ -59,7 +69,7 @@ def test_inherit(self, db_session, root):
         from kotti.security import list_groups_raw
         from kotti.security import set_groups
 
-        child = root[u'child'] = Node()
+        child = root['child'] = Node()
         db_session.flush()
 
         assert list_groups('bob', child) == []
@@ -74,15 +84,15 @@ def test_inherit(self, db_session, root):
             )
 
         # We can ask to list only those groups that are defined locally:
-        assert list_groups_raw(u'bob', child) == {'group:somegroup'}
+        assert list_groups_raw('bob', child) == {'group:somegroup'}
 
     @staticmethod
     def add_some_groups(db_session, root):
         from kotti.resources import Node
         from kotti.security import set_groups
 
-        child = root[u'child'] = Node()
-        grandchild = child[u'grandchild'] = Node()
+        child = root['child'] = Node()
+        grandchild = child['grandchild'] = Node()
         db_session.flush()
 
         # root:
@@ -116,8 +126,8 @@ def test_nested_groups(self, db_session, root):
         from kotti.security import list_groups_ext
 
         self.add_some_groups(db_session, root)
-        child = root[u'child']
-        grandchild = child[u'grandchild']
+        child = root['child']
+        grandchild = child['grandchild']
 
         # Check bob's groups on every level:
         assert list_groups('bob', root) == ['group:bobsgroup']
@@ -163,7 +173,7 @@ def test_works_with_auth(self, db_session, root):
         from kotti.security import list_groups_callback
         from kotti.security import set_groups
 
-        child = root[u'child'] = Node()
+        child = root['child'] = Node()
         db_session.flush()
 
         request = DummyRequest()
@@ -177,7 +187,7 @@ def test_works_with_auth(self, db_session, root):
             ['system.Everyone']
             )
 
-        get_principals()[u'bob'] = dict(name=u'bob')
+        get_principals()['bob'] = dict(name='bob')
         assert (
             auth.effective_principals(request) ==
             ['system.Everyone', 'system.Authenticated', 'bob']
@@ -194,7 +204,7 @@ def test_works_with_auth(self, db_session, root):
             )
 
         # define that bob belongs to franksgroup in the user db:
-        get_principals()[u'bob'].groups = [u'group:franksgroup']
+        get_principals()['bob'].groups = ['group:franksgroup']
         set_groups('group:franksgroup', child, ['group:anothergroup'])
         assert (
             set(auth.effective_principals(request)) == {'system.Everyone',
@@ -207,10 +217,10 @@ def test_works_with_auth(self, db_session, root):
 
         # And lastly test that circular group defintions are not a
         # problem here either:
-        get_principals()[u'group:franksgroup'] = dict(
-            name=u'group:franksgroup',
-            title=u"Frank's group",
-            groups=[u'group:funnygroup', u'group:bobsgroup'],
+        get_principals()['group:franksgroup'] = dict(
+            name='group:franksgroup',
+            title="Frank's group",
+            groups=['group:funnygroup', 'group:bobsgroup'],
             )
         assert (
             set(auth.effective_principals(request)) == {'system.Everyone',
@@ -228,12 +238,12 @@ def test_list_groups_callback_with_groups(self, db_session):
 
         # Although group definitions are also in the user database,
         # we're not allowed to authenticate with a group id:
-        get_principals()[u'bob'] = dict(name=u'bob')
-        get_principals()[u'group:bobsgroup'] = dict(name=u'group:bobsgroup')
+        get_principals()['bob'] = dict(name='bob')
+        get_principals()['group:bobsgroup'] = dict(name='group:bobsgroup')
 
         request = DummyRequest()
-        assert list_groups_callback(u'bob', request) == []
-        assert list_groups_callback(u'group:bobsgroup', request) is None
+        assert list_groups_callback('bob', request) == []
+        assert list_groups_callback('group:bobsgroup', request) is None
 
     def test_principals_with_local_roles(self, db_session, root):
         from kotti.resources import Node
@@ -241,7 +251,7 @@ def test_principals_with_local_roles(self, db_session, root):
         from kotti.security import principals_with_local_roles
         from kotti.security import set_groups
 
-        child = root[u'child'] = Node()
+        child = root['child'] = Node()
         db_session.flush()
 
         assert principals_with_local_roles(root) == []
@@ -271,7 +281,7 @@ def test_copy_local_groups(self, db_session, root):
         from kotti.security import set_groups
 
         self.test_principals_with_local_roles(db_session, root)
-        child = root[u'child']
+        child = root['child']
         assert (
             set(principals_with_local_roles(child)) ==
             {'bob', 'group:bobsgroup', 'group:franksgroup'}
@@ -283,7 +293,7 @@ def test_copy_local_groups(self, db_session, root):
         db_session.flush()
         assert (
             set(principals_with_local_roles(child2)) ==
-            {u'bob', u'group:franksgroup'})
+            {'bob', 'group:franksgroup'})
         assert len(principals_with_local_roles(child)) == 3
 
         # When we now change the local roles of 'child', the copy is
@@ -297,14 +307,14 @@ def test_map_principals_with_local_roles(self, db_session, root):
         from kotti.security import map_principals_with_local_roles
 
         self.test_principals_with_local_roles(db_session, root)
-        child = root[u'child']
+        child = root['child']
         P = get_principals()
 
         # No users are defined in P, thus we get the empty list:
         assert map_principals_with_local_roles(root) == []
 
-        P['bob'] = {'name': u'bob'}
-        P['group:bobsgroup'] = {'name': u'group:bobsgroup'}
+        P['bob'] = {'name': 'bob'}
+        P['group:bobsgroup'] = {'name': 'group:bobsgroup'}
 
         value = map_principals_with_local_roles(root)
         assert len(value) == 1
@@ -326,7 +336,7 @@ def test_local_roles_db_cascade(self, db_session, root):
         from kotti.resources import Node
         from kotti.security import set_groups
 
-        child = root[u'child'] = Node()
+        child = root['child'] = Node()
         db_session.flush()
 
         # We set a local group on child and delete child.  We then
@@ -335,7 +345,7 @@ def test_local_roles_db_cascade(self, db_session, root):
         assert db_session.query(LocalGroup).count() == 0
         set_groups('group:bobsgroup', child, ['role:editor'])
         assert db_session.query(LocalGroup).count() == 1
-        del root[u'child']
+        del root['child']
         db_session.flush()
         assert db_session.query(LocalGroup).count() == 0
 
@@ -347,67 +357,67 @@ def get_principals(self):
 
     def make_bob(self):
         users = self.get_principals()
-        users[u'bob'] = dict(
-            name=u'bob',
-            password=u'secret',
-            email=u'bob@dabolina.com',
-            title=u'Bob Dabolina',
-            groups=[u'group:bobsgroup'],
+        users['bob'] = dict(
+            name='bob',
+            password='secret',
+            email='bob@dabolina.com',
+            title='Bob Dabolina',
+            groups=['group:bobsgroup'],
             )
-        return users[u'bob']
+        return users['bob']
 
     def _assert_is_bob(self, bob):
-        assert bob.name == u'bob'
-        assert bob.title == u'Bob Dabolina'
-        assert bob.groups == [u'group:bobsgroup']
+        assert bob.name == 'bob'
+        assert bob.title == 'Bob Dabolina'
+        assert bob.groups == ['group:bobsgroup']
 
     def test_hash_password_non_ascii(self, db_session):
-        self.get_principals().hash_password(u'\xd6TEst')
+        self.get_principals().hash_password('\xd6TEst')
 
     def test_default_admin(self, db_session):
-        admin = self.get_principals()[u'admin']
+        admin = self.get_principals()['admin']
         assert self.get_principals().validate_password(
-            u'secret', admin.password)
-        assert admin.groups == [u'role:admin']
+            'secret', admin.password)
+        assert admin.groups == ['role:admin']
 
     def test_users_empty(self, db_session):
         users = self.get_principals()
         with raises(KeyError):
-            users[u'bob']
+            users['bob']
         with raises(KeyError):
-            del users[u'bob']
-        assert users.keys() == [u'admin']
+            del users['bob']
+        assert users.keys() == ['admin']
 
     def test_users_add_and_remove(self, db_session):
         self.make_bob()
         users = self.get_principals()
-        self._assert_is_bob(users[u'bob'])
-        assert set(users.keys()) == {u'admin', u'bob'}
+        self._assert_is_bob(users['bob'])
+        assert set(users.keys()) == {'admin', 'bob'}
 
         del users['bob']
         with raises(KeyError):
-            users[u'bob']
+            users['bob']
         with raises(KeyError):
-            del users[u'bob']
+            del users['bob']
 
     def test_users_search(self, db_session):
         users = self.get_principals()
-        assert list(users.search(name=u"*Bob*")) == []
+        assert list(users.search(name="*Bob*")) == []
         self.make_bob()
-        [bob] = list(users.search(name=u"bob"))
+        [bob] = list(users.search(name="bob"))
         self._assert_is_bob(bob)
-        [bob] = list(users.search(name=u"*Bob*"))
+        [bob] = list(users.search(name="*Bob*"))
         self._assert_is_bob(bob)
-        [bob] = list(users.search(name=u"*Bob*", title=u"*Frank*"))
+        [bob] = list(users.search(name="*Bob*", title="*Frank*"))
         self._assert_is_bob(bob)
         with raises(AttributeError):
-            users.search(name=u"bob", foo=u"bar")
+            users.search(name="bob", foo="bar")
         assert list(users.search()) == []
         # search on a non string attribute
         assert bob in list(users.search(active=True))
         # test operator
-        assert len(list(users.search(name=u'bob', active=True))) == 2
-        assert len(list(users.search(match=u'all', name=u'bob',
+        assert len(list(users.search(name='bob', active=True))) == 2
+        assert len(list(users.search(match='all', name='bob',
                                      active=True))) == 1
 
     def test_groups_from_users(self, db_session, root):
@@ -416,7 +426,7 @@ def test_groups_from_users(self, db_session, root):
         from kotti.security import set_groups
 
         self.make_bob()
-        child = root[u'child'] = Node()
+        child = root['child'] = Node()
         db_session.flush()
 
         assert list_groups('bob', root) == ['group:bobsgroup']
@@ -434,30 +444,30 @@ def test_is_user(self, db_session):
 
         bob = self.make_bob()
         assert is_user(bob) is True
-        bob.name = u'group:bobsgroup'
+        bob.name = 'group:bobsgroup'
         assert is_user(bob) is False
 
     def test_hash_and_validate_password(self, db_session):
-        password = u"secret"
+        password = "secret"
         principals = self.get_principals()
         hashed = principals.hash_password(password)
         assert principals.validate_password(password, hashed)
-        assert principals.validate_password(u"foo", hashed) is False
+        assert principals.validate_password("foo", hashed) is False
 
     def test_bobs_hashed_password(self, db_session):
         bob = self.make_bob()
         principals = self.get_principals()
-        assert principals.validate_password(u"secret", bob.password)
+        assert principals.validate_password("secret", bob.password)
 
         # When we set the 'password' attribute directly, we have to do
         # the hashing ourselves.  This won't work:
-        bob.password = u'anothersecret'
+        bob.password = 'anothersecret'
         assert principals.validate_password(
-            u"anothersecret", bob.password) is False
+            "anothersecret", bob.password) is False
 
         # This will:
-        bob.password = principals.hash_password(u"anothersecret")
-        assert principals.validate_password(u"anothersecret", bob.password)
+        bob.password = principals.hash_password("anothersecret")
+        assert principals.validate_password("anothersecret", bob.password)
 
     def test_active(self, db_session):
         bob = self.make_bob()
@@ -470,15 +480,15 @@ def test_reset_password(self, db_session):
 
         request = DummyRequest()
         self.make_bob()
-        request.params['reset-password'] = u'on'
-        request.params['login'] = u'bob'
-        request.params['password'] = u'secret'
+        request.params['reset-password'] = 'on'
+        request.params['login'] = 'bob'
+        request.params['password'] = 'secret'
         with patch(
                 'kotti.views.login.email_set_password') as email_set_password:
             login(None, request)
         assert (request.session.pop_flash('success') == [
-            u"You should be receiving an email with a link to reset your "
-            u"password. Doing so will activate your account."])
+            "You should be receiving an email with a link to reset your "
+            "password. Doing so will activate your account."])
         assert email_set_password.call_count == 1
 
     def test_reset_password_inactive_user(self, db_session):
@@ -486,14 +496,14 @@ def test_reset_password_inactive_user(self, db_session):
 
         request = DummyRequest()
         self.make_bob().active = False
-        request.params['reset-password'] = u'on'
-        request.params['login'] = u'bob'
-        request.params['password'] = u'secret'
+        request.params['reset-password'] = 'on'
+        request.params['login'] = 'bob'
+        request.params['password'] = 'secret'
         with patch(
                 'kotti.views.login.email_set_password') as email_set_password:
             login(None, request)
         assert (request.session.pop_flash('error') ==
-                [u"That username or email is not known by this system."])
+                ["That username or email is not known by this system."])
         assert email_set_password.call_count == 0
 
     def test_login(self, db_session):
@@ -507,13 +517,13 @@ def test_login(self, db_session):
         assert request.session.pop_flash('error') == []
 
         # Attempt to log in before Bob exists:
-        request.params['submit'] = u'on'
-        request.params['login'] = u'bob'
-        request.params['password'] = u'secret'
+        request.params['submit'] = 'on'
+        request.params['login'] = 'bob'
+        request.params['password'] = 'secret'
         result = login(None, request)
         assert isinstance(result, dict)
         assert request.session.pop_flash('success') == []
-        assert (request.session.pop_flash('error') == [u'Login failed.'])
+        assert (request.session.pop_flash('error') == ['Login failed.'])
 
         # Make Bob and do it again:
         bob = self.make_bob()
@@ -522,46 +532,46 @@ def test_login(self, db_session):
         assert result.status == '302 Found'
         assert (
             [request.session.pop_flash('success')[0].interpolate()] ==
-            [u'Welcome, Bob Dabolina!'])
+            ['Welcome, Bob Dabolina!'])
         last_login_date = bob.last_login_date
         assert last_login_date is not None
         assert request.session.pop_flash('error') == []
 
         # Log in with email:
-        request.params['login'] = u'bob@dabolina.com'
+        request.params['login'] = 'bob@dabolina.com'
         result = login(None, request)
         assert result.status == '302 Found'
         assert (
             [request.session.pop_flash('success')[0].interpolate()] ==
-            [u'Welcome, Bob Dabolina!'])
+            ['Welcome, Bob Dabolina!'])
         assert last_login_date < bob.last_login_date
 
         # Deactive Bob, logging in is no longer possible:
         bob.active = False
         result = login(None, request)
         assert isinstance(result, dict)
-        assert (request.session.pop_flash('error') == [u'Login failed.'])
+        assert (request.session.pop_flash('error') == ['Login failed.'])
 
         # If Bob has a 'confirm_token' set, logging in is still possible:
         bob.active = True
-        bob.confirm_token = u'token'
+        bob.confirm_token = 'token'
         result = login(None, request)
         assert result.status == '302 Found'
         assert (
             [request.session.pop_flash('success')[0].interpolate()] ==
-            [u'Welcome, Bob Dabolina!'])
+            ['Welcome, Bob Dabolina!'])
 
     def test_login_with_email_remembers(self, db_session):
         from kotti.views.login import login
         request = DummyRequest()
 
         self.make_bob()
-        request.params['submit'] = u'on'
-        request.params['login'] = u'bob@dabolina.com'
-        request.params['password'] = u'secret'
+        request.params['submit'] = 'on'
+        request.params['login'] = 'bob@dabolina.com'
+        request.params['password'] = 'secret'
         with patch('kotti.views.login.remember') as remember:
             login(None, request)
-            remember.assert_called_with(request, u'bob')
+            remember.assert_called_with(request, 'bob')
 
 
 class TestAuthzContextManager:
diff --git a/kotti/tests/test_security_views.py b/kotti/tests/test_security_views.py
index 1795b32ea..c9557cb21 100644
--- a/kotti/tests/test_security_views.py
+++ b/kotti/tests/test_security_views.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import colander
 import pytest
 from mock import Mock
@@ -27,24 +24,25 @@ def test_search(self, extra_principals, root):
         request = DummyRequest()
         P = get_principals()
 
-        request.params['search'] = u''
-        request.params['query'] = u'Joe'
+        request.params['search'] = ''
+        request.params['query'] = 'Joe'
         entries = UsersManage(root, request)()['entries']
         assert len(entries) == 0
         assert (request.session.pop_flash('info') ==
-                [u'No users or groups were found.'])
-        request.params['query'] = u'Bob'
+                ['No users or groups were found.'])
+        request.params['query'] = 'Bob'
         entries = UsersManage(root, request)()['entries']
         assert entries[0][0] == P['bob']
         assert entries[0][1] == ([], [])
         assert entries[1][0] == P['group:bobsgroup']
         assert entries[1][1] == ([], [])
 
-        P[u'bob'].groups = [u'group:bobsgroup']
-        P[u'group:bobsgroup'].groups = [u'role:admin']
+        P['bob'].groups = ['group:bobsgroup']
+        P['group:bobsgroup'].groups = ['role:admin']
         entries = UsersManage(root, request)()['entries']
-        assert (entries[0][1] ==
-                (['group:bobsgroup', 'role:admin'], ['role:admin']))
+        # assert entries[0][1] == (['group:bobsgroup', 'role:admin'], ['role:admin'])  # noqa
+        assert set(entries[0][1][0]) == {'group:bobsgroup', 'role:admin'}
+        assert entries[0][1][1] == ['role:admin']
         assert entries[1][1] == (['role:admin'], [])
 
     def test_apply(self, extra_principals, root):
@@ -54,31 +52,29 @@ def test_apply(self, extra_principals, root):
 
         request = DummyRequest()
 
-        bob = get_principals()[u'bob']
+        bob = get_principals()['bob']
 
-        request.params['apply'] = u''
+        request.params['apply'] = ''
         UsersManage(root, request)()
-        assert (request.session.pop_flash('info') == [u'No changes were made.'])
+        assert (request.session.pop_flash('info') == ['No changes were made.'])
         assert list_groups('bob') == []
-        bob.groups = [u'role:special']
+        bob.groups = ['role:special']
 
-        request.params['role::bob::role:owner'] = u'1'
-        request.params['role::bob::role:editor'] = u'1'
-        request.params['orig-role::bob::role:owner'] = u''
-        request.params['orig-role::bob::role:editor'] = u''
+        request.params['role::bob::role:owner'] = '1'
+        request.params['role::bob::role:editor'] = '1'
+        request.params['orig-role::bob::role:owner'] = ''
+        request.params['orig-role::bob::role:editor'] = ''
 
         UsersManage(root, request)()
         assert (request.session.pop_flash('success') ==
-                [u'Your changes have been saved.'])
-        assert (
-            set(list_groups('bob')) ==
-            {'role:owner', 'role:editor', 'role:special'}
-            )
+                ['Your changes have been saved.'])
+        assert (set(list_groups('bob')) == {'role:owner', 'role:editor',
+                                            'role:special'})
 
     def test_group_validator(self, db_session):
         from kotti.views.users import group_validator
         with raises(colander.Invalid):
-            group_validator(None, u'this-group-never-exists')
+            group_validator(None, 'this-group-never-exists')
 
 
 class TestUserDelete:
@@ -87,32 +83,33 @@ def test_user_delete(self, events, extra_principals, root):
         from kotti.views.users import user_delete
 
         request = DummyRequest()
-        bob = get_principals()[u'bob']
+        bob = get_principals()['bob']
 
-        request.params['name'] = u''
+        request.params['name'] = ''
         user_delete(root, request)
-        assert request.session.pop_flash('error') == [u'No name was given.']
-        assert u'bob' in get_principals().keys()
+        assert request.session.pop_flash('error') == ['No name was given.']
+        assert 'bob' in get_principals().keys()
 
-        request.params['name'] = u'bob'
+        request.params['name'] = 'bob'
         result = user_delete(root, request)
-        assert u'api' in result
-        api = result[u'api']
+        assert 'api' in result
+        api = result['api']
         assert api.principal == bob
-        assert api.principal_type == u'User'
-        assert u'bob' in get_principals().keys()
+        assert api.principal_type == 'User'
+        assert 'bob' in get_principals().keys()
 
-        request.params['name'] = u'john'
-        request.params['delete'] = u'delete'
+        request.params['name'] = 'john'
+        request.params['delete'] = 'delete'
         user_delete(root, request)
-        assert request.session.pop_flash('error') == [u"User was not found."]
-        assert u'bob' in get_principals().keys()
+        assert request.session.pop_flash('error') == ["User was not found."]
+        assert 'bob' in get_principals().keys()
 
-        request.params['name'] = u'bob'
-        request.params['delete'] = u'delete'
+        request.params['name'] = 'bob'
+        request.params['delete'] = 'delete'
         user_delete(root, request)
         with pytest.raises(KeyError):
-            get_principals()[u'bob']
+            # noinspection PyStatementEffect
+            get_principals()['bob']
 
     def test_deleted_group_removed_in_usergroups(self, events, extra_principals,
                                                  root, db_session):
@@ -120,16 +117,17 @@ def test_deleted_group_removed_in_usergroups(self, events, extra_principals,
         from kotti.views.users import user_delete
 
         request = DummyRequest()
-        bob = get_principals()[u'bob']
-        bob.groups = [u'group:bobsgroup']
-        assert bob.groups == [u'group:bobsgroup']
+        bob = get_principals()['bob']
+        bob.groups = ['group:bobsgroup']
+        assert bob.groups == ['group:bobsgroup']
 
-        request.params['name'] = u'group:bobsgroup'
-        request.params['delete'] = u'delete'
+        request.params['name'] = 'group:bobsgroup'
+        request.params['delete'] = 'delete'
         user_delete(root, request)
         db_session.expire(bob)
         with pytest.raises(KeyError):
-            get_principals()[u'group:bobsgroup']
+            # noinspection PyStatementEffect
+            get_principals()['group:bobsgroup']
         assert bob.groups == []
 
     def test_deleted_group_removed_from_localgroups(self, events,
@@ -139,13 +137,13 @@ def test_deleted_group_removed_from_localgroups(self, events,
         from kotti.views.users import user_delete
 
         request = DummyRequest()
-        set_groups(u'group:bobsgroup', root, ['role:admin'])
+        set_groups('group:bobsgroup', root, ['role:admin'])
         local_group = LocalGroup.query.first()
-        assert local_group.principal_name == u'group:bobsgroup'
+        assert local_group.principal_name == 'group:bobsgroup'
         assert local_group.node == root
 
-        request.params['name'] = u'group:bobsgroup'
-        request.params['delete'] = u'delete'
+        request.params['name'] = 'group:bobsgroup'
+        request.params['delete'] = 'delete'
         user_delete(root, request)
         assert LocalGroup.query.first() is None
 
@@ -155,16 +153,17 @@ def test_reset_owner_to_none(self, events, extra_principals, root):
 
         request = DummyRequest()
 
-        root[u'content_1'] = Content()
-        root[u'content_1'].owner = u'bob'
-        assert root[u'content_1'].owner == u'bob'
+        root['content_1'] = Content()
+        root['content_1'].owner = 'bob'
+        assert root['content_1'].owner == 'bob'
 
-        request.params['name'] = u'bob'
-        request.params['delete'] = u'delete'
+        request.params['name'] = 'bob'
+        request.params['delete'] = 'delete'
         user_delete(root, request)
-        assert root[u'content_1'].owner is None
+        assert root['content_1'].owner is None
 
 
+# noinspection PyAttributeOutsideInit
 class TestSetPassword:
     def setup_method(self, method):
         Form_patcher = patch('kotti.views.login.Form')
@@ -295,16 +294,16 @@ def test_hashed_password_save(self, root):
         user = Mock()
         request = DummyRequest()
         view = UserManageFormView(user, request)
-        appstruct = {'password': u'foo'}
+        appstruct = {'password': 'foo'}
         view.save_success(appstruct)
-        assert user.password.startswith(u'$2a$10$')
+        assert user.password.startswith('$2a$10$')
 
     def test_hashed_password_empty(self, root):
         from kotti.views.users import UserManageFormView
 
-        user = Mock(password=u'before')
+        user = Mock(password='before')
         request = DummyRequest()
         view = UserManageFormView(user, request)
-        appstruct = {'password': u''}
+        appstruct = {'password': ''}
         view.save_success(appstruct)
-        assert user.password == u"before"
+        assert user.password == "before"
diff --git a/kotti/tests/test_sqla.py b/kotti/tests/test_sqla.py
index 03dcac967..c9736f04b 100644
--- a/kotti/tests/test_sqla.py
+++ b/kotti/tests/test_sqla.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import json
 
 from mock import MagicMock
diff --git a/kotti/tests/test_static.py b/kotti/tests/test_static.py
index 72635f3ef..1b7bd3539 100644
--- a/kotti/tests/test_static.py
+++ b/kotti/tests/test_static.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from pytest import raises
 
 
diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index a28f17aa3..8f63abd07 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import colander
 from mock import Mock
 
@@ -8,8 +5,8 @@
 
 
 class DummyContext(object):
-    view_name = u'view_name'
-    tags = [u'tag 1', u'tag 2', u'tag 3']
+    view_name = 'view_name'
+    tags = ['tag 1', 'tag 2', 'tag 3']
 
 
 class TestTags:
@@ -18,84 +15,84 @@ def test_empty(self, root):
 
     def test_tags(self, db_session):
         from kotti.resources import Tag
-        new_tag = Tag(title=u"test tag")
+        new_tag = Tag(title="test tag")
         assert str(new_tag) == "<Tag ('test tag')>"
 
     def test_add(self, root):
         from kotti.resources import Tag, TagsToContents
 
-        root.tags = [u'tag 1', u'tag 2']
+        root.tags = ['tag 1', 'tag 2']
         result = Tag.query.filter(TagsToContents.item == root).all()
         assert result[0].items == [root]
-        assert root.tags == [u'tag 1', u'tag 2']
+        assert root.tags == ['tag 1', 'tag 2']
         assert len(Tag.query.all()) == 2
 
     def test_edit(self, root):
-        root.tags = [u'tag 1', u'tag_2']
-        assert root._tags[0].tag.title == u'tag 1'
-        root.tags = [u'edited tag', u'tag_2']
-        assert root._tags[0].tag.title == u'edited tag'
+        root.tags = ['tag 1', 'tag_2']
+        assert root._tags[0].tag.title == 'tag 1'
+        root.tags = ['edited tag', 'tag_2']
+        assert root._tags[0].tag.title == 'edited tag'
 
     def test_association_proxy(self, root):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root[u'content_1'] = Content()
-        root[u'content_1'].tags = [u'tag 1', u'tag 2']
-        assert root[u'content_1'].tags == [u'tag 1', u'tag 2']
-        assert type(root[u'content_1']._tags[0]) == TagsToContents
-        assert type(root[u'content_1']._tags[0].tag) == Tag
-        assert root[u'content_1']._tags[0].tag.title == u'tag 1'
-        assert root[u'content_1']._tags[0].position == 0
-        assert root[u'content_1']._tags[1].tag.title == u'tag 2'
-        assert root[u'content_1']._tags[1].position == 1
-        assert len(root[u'content_1']._tags) == 2
-
-        root[u'content_2'] = Content()
-        root[u'content_2'].tags = [u'tag 1', u'tag 3']
-        assert len(root[u'content_2']._tags) == 2
-        assert root[u'content_2']._tags[0].tag.title == u'tag 1'
-        assert root[u'content_2']._tags[0].position == 0
-        assert root[u'content_2']._tags[1].tag.title == u'tag 3'
-        assert root[u'content_2']._tags[1].position == 1
+        root['content_1'] = Content()
+        root['content_1'].tags = ['tag 1', 'tag 2']
+        assert root['content_1'].tags == ['tag 1', 'tag 2']
+        assert type(root['content_1']._tags[0]) == TagsToContents
+        assert type(root['content_1']._tags[0].tag) == Tag
+        assert root['content_1']._tags[0].tag.title == 'tag 1'
+        assert root['content_1']._tags[0].position == 0
+        assert root['content_1']._tags[1].tag.title == 'tag 2'
+        assert root['content_1']._tags[1].position == 1
+        assert len(root['content_1']._tags) == 2
+
+        root['content_2'] = Content()
+        root['content_2'].tags = ['tag 1', 'tag 3']
+        assert len(root['content_2']._tags) == 2
+        assert root['content_2']._tags[0].tag.title == 'tag 1'
+        assert root['content_2']._tags[0].position == 0
+        assert root['content_2']._tags[1].tag.title == 'tag 3'
+        assert root['content_2']._tags[1].position == 1
         assert len(Tag.query.all()) == 3
 
     def test_delete_tag_doesnt_touch_content(self, root, db_session):
         from kotti.resources import Tag, Content
 
-        root[u'content_1'] = Content()
-        root[u'content_1'].tags = [u'my tag']
+        root['content_1'] = Content()
+        root['content_1'].tags = ['my tag']
 
-        assert Content.query.filter_by(name=u'content_1').count() == 1
-        db_session.delete(Tag.query.filter_by(title=u'my tag').one())
-        assert Content.query.filter_by(name=u'content_1').count() == 1
+        assert Content.query.filter_by(name='content_1').count() == 1
+        db_session.delete(Tag.query.filter_by(title='my tag').one())
+        assert Content.query.filter_by(name='content_1').count() == 1
 
     def test_delete_content_deletes_orphaned_tags(self, root, events):
         from kotti.resources import Tag, Content
 
-        root[u'content_1'] = Content()
-        root[u'content_2'] = Content()
-        root[u'content_1'].tags = [u'tag 1', u'tag 2']
-        root[u'content_2'].tags = [u'tag 2']
+        root['content_1'] = Content()
+        root['content_2'] = Content()
+        root['content_1'].tags = ['tag 1', 'tag 2']
+        root['content_2'].tags = ['tag 2']
         assert Tag.query.count() == 2
-        del root[u'content_1']
-        assert Tag.query.one().title == u'tag 2'
+        del root['content_1']
+        assert Tag.query.one().title == 'tag 2'
 
     def test_delete_tag_assignment_doesnt_touch_content(self, root, db_session):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root[u'content_1'] = Content()
-        root[u'content_1'].tags = [u'my tag']
+        root['content_1'] = Content()
+        root['content_1'].tags = ['my tag']
 
         assert Tag.query.count() == 1
-        assert Content.query.filter_by(name=u'content_1').count() == 1
+        assert Content.query.filter_by(name='content_1').count() == 1
         db_session.delete(TagsToContents.query.one())
-        assert Content.query.filter_by(name=u'content_1').count() == 1
+        assert Content.query.filter_by(name='content_1').count() == 1
 
     def test_delete_tag_assignment_delete_tag(self, root, events, db_session):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root[u'content_1'] = Content()
-        root[u'content_1'].tags = [u'my tag']
+        root['content_1'] = Content()
+        root['content_1'].tags = ['my tag']
 
         assert Tag.query.count() == 1
         db_session.delete(TagsToContents.query.one())
@@ -104,15 +101,15 @@ def test_delete_tag_assignment_delete_tag(self, root, events, db_session):
     def test_copy_content_copy_tags(self, root, db_session):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root[u'content_1'] = Content()
-        root[u'content_1'].tags = [u'my tag']
+        root['content_1'] = Content()
+        root['content_1'].tags = ['my tag']
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
-        root[u'content_2'] = root[u'content_1'].copy()
+        root['content_2'] = root['content_1'].copy()
         db_session.flush()
-        assert root[u'content_1'].tags == [u'my tag']
-        assert root[u'content_2'].tags == [u'my tag']
+        assert root['content_1'].tags == ['my tag']
+        assert root['content_2'].tags == ['my tag']
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 2
 
@@ -120,17 +117,17 @@ def test_cut_and_paste_content_copy_tags(self, root):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.edit.actions import NodeActions
 
-        root[u'folder_1'] = Content()
-        root[u'content_1'] = Content()
-        root[u'content_1'].tags = [u'my tag']
+        root['folder_1'] = Content()
+        root['content_1'] = Content()
+        root['content_1'].tags = ['my tag']
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
         request = DummyRequest()
-        request.params['paste'] = u'on'
-        request.session['kotti.paste'] = ([root[u'content_1'].id], 'cut')
-        NodeActions(root[u'folder_1'], request).paste_nodes()
-        assert root[u'folder_1'][u'content_1'].tags == [u'my tag']
+        request.params['paste'] = 'on'
+        request.session['kotti.paste'] = ([root['content_1'].id], 'cut')
+        NodeActions(root['folder_1'], request).paste_nodes()
+        assert root['folder_1']['content_1'].tags == ['my tag']
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
@@ -138,18 +135,18 @@ def test_copy_and_paste_content_copy_tags(self, root, events):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.edit.actions import NodeActions
 
-        root[u'folder_1'] = Content()
-        root[u'content_1'] = Content()
-        root[u'content_1'].tags = [u'my tag']
+        root['folder_1'] = Content()
+        root['content_1'] = Content()
+        root['content_1'].tags = ['my tag']
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
         request = DummyRequest()
-        request.params['paste'] = u'on'
-        request.session['kotti.paste'] = ([root[u'content_1'].id], 'copy')
-        NodeActions(root[u'folder_1'], request).paste_nodes()
-        assert root[u'content_1'].tags == [u'my tag']
-        assert root[u'folder_1'][u'content_1'].tags == [u'my tag']
+        request.params['paste'] = 'on'
+        request.session['kotti.paste'] = ([root['content_1'].id], 'copy')
+        NodeActions(root['folder_1'], request).paste_nodes()
+        assert root['content_1'].tags == ['my tag']
+        assert root['folder_1']['content_1'].tags == ['my tag']
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 2
 
@@ -157,59 +154,59 @@ def test_delete_content_delete_tags_and_assignments(self, root, events):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.edit.actions import NodeActions
 
-        root[u'folder_1'] = Content()
-        root[u'folder_1'].tags = [u'first tag']
-        root[u'folder_1'][u'content_1'] = Content()
-        root[u'folder_1'][u'content_1'].tags = [u'second tag']
-        root[u'folder_1'][u'content_2'] = Content()
-        root[u'folder_1'][u'content_2'].tags = [u'third tag']
+        root['folder_1'] = Content()
+        root['folder_1'].tags = ['first tag']
+        root['folder_1']['content_1'] = Content()
+        root['folder_1']['content_1'].tags = ['second tag']
+        root['folder_1']['content_2'] = Content()
+        root['folder_1']['content_2'].tags = ['third tag']
         assert Tag.query.count() == 3
         assert TagsToContents.query.count() == 3
 
         request = DummyRequest()
         request.POST['delete'] = 'delete'
-        NodeActions(root[u'folder_1'], request).delete_node()
+        NodeActions(root['folder_1'], request).delete_node()
         assert Tag.query.count() == 0
         assert TagsToContents.query.count() == 0
 
     def test_get_content_items_from_tag(self, root):
         from kotti.resources import Tag, Content
 
-        root[u'folder_1'] = Content()
-        root[u'folder_1'].tags = [u'first tag', u'second tag']
-        root[u'folder_1'][u'content_1'] = Content()
-        root[u'folder_1'][u'content_1'].tags = [u'third tag']
-        root[u'folder_1'][u'content_2'] = Content()
-        root[u'folder_1'][u'content_2'].tags = [u'first tag', u'third tag']
-        first_tag = Tag.query.filter(Tag.title == u'first tag').one()
+        root['folder_1'] = Content()
+        root['folder_1'].tags = ['first tag', 'second tag']
+        root['folder_1']['content_1'] = Content()
+        root['folder_1']['content_1'].tags = ['third tag']
+        root['folder_1']['content_2'] = Content()
+        root['folder_1']['content_2'].tags = ['first tag', 'third tag']
+        first_tag = Tag.query.filter(Tag.title == 'first tag').one()
         assert [rel.name for rel in first_tag.items] == [
-            u'folder_1', u'content_2']
-        second_tag = Tag.query.filter(Tag.title == u'second tag').one()
-        assert [rel.name for rel in second_tag.items] == [u'folder_1']
-        third_tag = Tag.query.filter(Tag.title == u'third tag').one()
+            'folder_1', 'content_2']
+        second_tag = Tag.query.filter(Tag.title == 'second tag').one()
+        assert [rel.name for rel in second_tag.items] == ['folder_1']
+        third_tag = Tag.query.filter(Tag.title == 'third tag').one()
         assert [rel.name for rel in third_tag.items] == [
-            u'content_1', u'content_2']
+            'content_1', 'content_2']
 
     def test_get_content_items_for_tag_title(self, root):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.util import content_with_tags
 
-        root[u'folder_1'] = Content()
-        root[u'folder_1'].tags = [u'first tag', u'second tag']
-        root[u'folder_1'][u'content_1'] = Content()
-        root[u'folder_1'][u'content_1'].tags = [u'third tag']
-        root[u'folder_1'][u'content_2'] = Content()
-        root[u'folder_1'][u'content_2'].tags = [u'first tag', u'third tag']
+        root['folder_1'] = Content()
+        root['folder_1'].tags = ['first tag', 'second tag']
+        root['folder_1']['content_1'] = Content()
+        root['folder_1']['content_1'].tags = ['third tag']
+        root['folder_1']['content_2'] = Content()
+        root['folder_1']['content_2'].tags = ['first tag', 'third tag']
 
         result = Content.query.join(TagsToContents).join(Tag).filter(
-            Tag.title == u'first tag').all()
-        assert [res.name for res in result] == [u'folder_1', u'content_2']
+            Tag.title == 'first tag').all()
+        assert [res.name for res in result] == ['folder_1', 'content_2']
         result = Content.query.join(TagsToContents).join(Tag).filter(
-            Tag.title == u'second tag').all()
-        assert [res.name for res in result] == [u'folder_1']
+            Tag.title == 'second tag').all()
+        assert [res.name for res in result] == ['folder_1']
         result = Content.query.join(TagsToContents).join(Tag).filter(
-            Tag.title == u'third tag').all()
-        assert [res.name for res in result] == [u'content_1', u'content_2']
+            Tag.title == 'third tag').all()
+        assert [res.name for res in result] == ['content_1', 'content_2']
 
         # The same tests again, using content_with_tags():
         #
@@ -224,12 +221,12 @@ def test_get_content_items_for_tag_title(self, root):
         # add-ons for searching, we do not support multiple tags searching, in
         # part to avoid establishing a specification.
         #
-        result = content_with_tags([u'first tag'])
-        assert [res.name for res in result] == [u'folder_1', u'content_2']
-        result = content_with_tags([u'second tag'])
-        assert [res.name for res in result] == [u'folder_1']
-        result = content_with_tags([u'third tag'])
-        assert [res.name for res in result] == [u'content_1', u'content_2']
+        result = content_with_tags(['first tag'])
+        assert [res.name for res in result] == ['folder_1', 'content_2']
+        result = content_with_tags(['second tag'])
+        assert [res.name for res in result] == ['folder_1']
+        result = content_with_tags(['third tag'])
+        assert [res.name for res in result] == ['content_1', 'content_2']
 
 
 class TestCommaSeparatedListWidget:
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index baa3af402..cc2fc7b26 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import json
 
 from pytest import raises
@@ -19,18 +16,18 @@ def test_upload_anonymous(root, dummy_request, browser):
 
     link = browser.getLink
 
-    browser.open(u'{0}/'.format(BASE_URL))
+    browser.open('{0}/'.format(BASE_URL))
 
     # There must be no Upload Link for anonymous users
     with raises(LinkNotFoundError):
         link('Upload Content').click()
 
     # Upload views must redirect to login for anonymous users
-    browser.open(u'{0}/upload'.format(BASE_URL))
-    assert browser.url.startswith(u'{0}/@@login'.format(BASE_URL))
+    browser.open('{0}/upload'.format(BASE_URL))
+    assert browser.url.startswith('{0}/@@login'.format(BASE_URL))
 
-    browser.open(u'{0}/content_types'.format(BASE_URL))
-    assert browser.url.startswith(u'{0}/@@login'.format(BASE_URL))
+    browser.open('{0}/content_types'.format(BASE_URL))
+    assert browser.url.startswith('{0}/@@login'.format(BASE_URL))
 
 
 @user('admin')
@@ -38,18 +35,21 @@ def test_upload_authenticated_wo_mimetype(root, dummy_request, browser):
 
     # cannot call content_types without mimetype
     with raises(KeyError):
-        browser.open(u'{0}/content_types'.format(BASE_URL))
+        browser.open('{0}/content_types'.format(BASE_URL))
 
 
 @user('admin')
 def test_upload_authenticated_text(root, dummy_request, browser):
 
     # get possible content types for text/plain
-    browser.open(u'{0}/content_types?mimetype=text/plain'.format(BASE_URL))
-    j = json.loads(browser.contents)
+    browser.open('{0}/content_types?mimetype=text/plain'.format(BASE_URL))
+    c = browser.contents
+    if isinstance(c, bytes):
+        c = c.decode()
+    j = json.loads(c)
     assert 'content_types' in j
 
     # only files are allowed
     types = j['content_types']
     assert len(types) == 1
-    assert types[0]['name'] == u'File'
+    assert types[0]['name'] == 'File'
diff --git a/kotti/tests/test_url_normalizer.py b/kotti/tests/test_url_normalizer.py
index 3a1e205e2..cbd11adfd 100644
--- a/kotti/tests/test_url_normalizer.py
+++ b/kotti/tests/test_url_normalizer.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from kotti import get_settings
 from kotti.url_normalizer import url_normalizer
 
@@ -8,40 +5,40 @@
 class URLNormalizerTests:
 
     def test_normalizer(self):
-        assert url_normalizer(u'simpleandsafe') == u'simpleandsafe'
-        assert url_normalizer(u' Whitespace and capital Letters  ') == \
-            u'whitespace-and-capital-letters'
-        assert url_normalizer(u">here's another!") == u'heres-another'
-        assert url_normalizer(u">>>here'!--s yet another!!!") == \
-            u"here-s-yet-another"
-        assert url_normalizer(u"Doe, Joe") == u"doe-joe"
-        assert url_normalizer(u"umläut.doc") == u"umläut.doc"
-        assert url_normalizer(u"ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == u"zażółć-gęślą-jaźń"
-        assert url_normalizer(u"zażółć gęślą jaźń") == u"zażółć-gęślą-jaźń"
-        assert url_normalizer(u'quote-this') == u'quote-this'
-        assert url_normalizer(u"quote 'this'!") == u"quote-this"
-        assert url_normalizer(u"I'm not a FILE.txt") == u"im-not-a-file.txt"
-        assert url_normalizer(u"I'm a big file.TXT") == u"im-a-big-file.txt"
-        assert url_normalizer(u"rest `n` peace") == u"rest-n-peace"
-        assert (len(url_normalizer(u"aa" * 2000))) == 255
-        assert url_normalizer(u"short-hello-version", max_length=10) == u"short"
+        assert url_normalizer('simpleandsafe') == 'simpleandsafe'
+        assert url_normalizer(' Whitespace and capital Letters  ') == \
+            'whitespace-and-capital-letters'
+        assert url_normalizer(">here's another!") == 'heres-another'
+        assert url_normalizer(">>>here'!--s yet another!!!") == \
+            "here-s-yet-another"
+        assert url_normalizer("Doe, Joe") == "doe-joe"
+        assert url_normalizer("umläut.doc") == "umläut.doc"
+        assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zażółć-gęślą-jaźń"
+        assert url_normalizer("zażółć gęślą jaźń") == "zażółć-gęślą-jaźń"
+        assert url_normalizer('quote-this') == 'quote-this'
+        assert url_normalizer("quote 'this'!") == "quote-this"
+        assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
+        assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
+        assert url_normalizer("rest `n` peace") == "rest-n-peace"
+        assert (len(url_normalizer("aa" * 2000))) == 255
+        assert url_normalizer("short-hello-version", max_length=10) == "short"
 
     def test_normalizer_map_non_ascii_characters(self):
         get_settings()['kotti.url_normalizer.map_non_ascii_characters'] = True
-        assert url_normalizer(u'simpleandsafe') == u'simpleandsafe'
-        assert url_normalizer(u' Whitespace and capital Letters  ') == \
-            u'whitespace-and-capital-letters'
-        assert url_normalizer(u">here's another!") == u'heres-another'
-        assert url_normalizer(u">>>here'!--s yet another!!!") == \
-            u"here-s-yet-another"
-        assert url_normalizer(u"Doe, Joe") == u"doe-joe"
-        assert url_normalizer(u"umläut.doc") == u"umlaut.doc"
-        assert url_normalizer(u"ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == u"zazolc-gesla-jazn"
-        assert url_normalizer(u"zażółć gęślą jaźń") == u"zazolc-gesla-jazn"
-        assert url_normalizer(u'quote-this') == u'quote-this'
-        assert url_normalizer(u"quote 'this'!") == u"quote-this"
-        assert url_normalizer(u"I'm not a FILE.txt") == u"im-not-a-file.txt"
-        assert url_normalizer(u"I'm a big file.TXT") == u"im-a-big-file.txt"
-        assert url_normalizer(u"rest `n` peace") == u"rest-n-peace"
-        assert (len(url_normalizer(u"aa" * 2000))) == 255
-        assert url_normalizer(u"short-hello-version", max_length=10) == u"short"
+        assert url_normalizer('simpleandsafe') == 'simpleandsafe'
+        assert url_normalizer(' Whitespace and capital Letters  ') == \
+            'whitespace-and-capital-letters'
+        assert url_normalizer(">here's another!") == 'heres-another'
+        assert url_normalizer(">>>here'!--s yet another!!!") == \
+            "here-s-yet-another"
+        assert url_normalizer("Doe, Joe") == "doe-joe"
+        assert url_normalizer("umläut.doc") == "umlaut.doc"
+        assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zazolc-gesla-jazn"
+        assert url_normalizer("zażółć gęślą jaźń") == "zazolc-gesla-jazn"
+        assert url_normalizer('quote-this') == 'quote-this'
+        assert url_normalizer("quote 'this'!") == "quote-this"
+        assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
+        assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
+        assert url_normalizer("rest `n` peace") == "rest-n-peace"
+        assert (len(url_normalizer("aa" * 2000))) == 255
+        assert url_normalizer("short-hello-version", max_length=10) == "short"
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 9ee326018..d5f821e08 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from mock import Mock
 from mock import patch
 
@@ -67,45 +64,45 @@ def setUp(self):
     def test_max_length_40(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 50)) == 50
+        assert len(title_to_name('a' * 50)) == 50
 
     def test_max_length_250(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 250)) == 240
+        assert len(title_to_name('a' * 250)) == 240
 
     def test_max_length_255(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 255)) == 240
+        assert len(title_to_name('a' * 255)) == 240
 
     def test_normal(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert title_to_name(u'Foo Bar') == u'foo-bar'
+        assert title_to_name('Foo Bar') == 'foo-bar'
 
     def test_max_length_40_no_default(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name(u'a' * 50, max_length=40)) == 40
+        assert len(title_to_name('a' * 50, max_length=40)) == 40
 
     def test_numbering(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert title_to_name(u'Report Part 1',
-                             blacklist=[]) == u'report-part-1'
-        assert title_to_name(u'Report Part 1',
-                             blacklist=['report-part-1']) == u'report-part-1-1'
-        assert title_to_name(u'Report Part 3',
-                             blacklist=['report-part-3']) == u'report-part-3-1'
+        assert title_to_name('Report Part 1',
+                             blacklist=[]) == 'report-part-1'
+        assert title_to_name('Report Part 1',
+                             blacklist=['report-part-1']) == 'report-part-1-1'
+        assert title_to_name('Report Part 3',
+                             blacklist=['report-part-3']) == 'report-part-3-1'
         assert title_to_name(
-            u'Report Part 3', blacklist=['report-part-3', 'report-part-3-1']
-        ) == u'report-part-3-2'
+            'Report Part 3', blacklist=['report-part-3', 'report-part-3-1']
+        ) == 'report-part-3-2'
 
     def test_disambiguate_name(self):
         from kotti.util import disambiguate_name
-        assert disambiguate_name(u'foo') == u'foo-1'
-        assert disambiguate_name(u'foo-3') == u'foo-4'
+        assert disambiguate_name('foo') == 'foo-1'
+        assert disambiguate_name('foo-3') == 'foo-4'
 
 
 class TestCommand:
@@ -129,8 +126,8 @@ class TestTemplateStructure:
     def test_getattr(self):
         from kotti.util import TemplateStructure
 
-        item = TemplateStructure(u'123')
-        assert item.split('2') == [u'1', u'3']
+        item = TemplateStructure('123')
+        assert item.split('2') == ['1', '3']
 
 
 class TestLink:
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 5dfcfdbd4..86c89a6e2 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import decimal
 import time
 from warnings import filterwarnings
@@ -58,19 +55,20 @@ def make(self, context=None, request=None, id=1, **kwargs):
 
     def test_page_title(self, db_session):
         api = self.make()
-        api.context.title = u"Hello, world!"
-        assert api.page_title == u"Hello, world! - Hello, world!"
+        api.context.title = "Hello, world!"
+        assert api.page_title == "Hello, world! - Hello, world!"
 
         api = self.make()
-        api.context.title = u"Hello, world!"
-        api.site_title = u"Wasnhierlos"
-        assert api.page_title == u"Hello, world! - Wasnhierlos"
+        api.context.title = "Hello, world!"
+        # noinspection PyPropertyAccess
+        api.site_title = "Wasnhierlos"
+        assert api.page_title == "Hello, world! - Wasnhierlos"
 
     def test_site_title(self, db_session):
         with patch('kotti.views.util.get_settings',
-                   return_value={'kotti.site_title': u'This is it.'}):
+                   return_value={'kotti.site_title': 'This is it.'}):
             api = self.make()
-            assert api.site_title == u'This is it.'
+            assert api.site_title == 'This is it.'
 
     def test_list_children(self, db_session):
         api = self.make()  # the default context is root
@@ -164,10 +162,10 @@ def test_contenttypefactories_with_invalid_add_link(self, config):
 
         class TestContent(object):
             type_info = default_type_info.copy(
-                name=u'TestContent',
-                title=u'Test Content',
+                name='TestContent',
+                title='Test Content',
                 add_view=None,
-                addable_to=[u'Document'],
+                addable_to=['Document'],
             )
 
         config.include(content)
@@ -199,9 +197,9 @@ def test_edit_links(self, config, db_session):
         config.include(users)
 
         assert (api.edit_links[:3] == [
-            Link('contents', u'Contents'),
-            Link('edit', u'Edit'),
-            Link('share', u'Share'),
+            Link('contents', 'Contents'),
+            Link('edit', 'Edit'),
+            Link('share', 'Share'),
             ])
 
         # Edit links are controlled through
@@ -227,20 +225,20 @@ def test_default_actions(self):
         from kotti.resources import default_actions, Document
         from kotti.util import Link
 
-        default_actions.append(Link('test', u'Test'))
+        default_actions.append(Link('test', 'Test'))
         assert Document().type_info.edit_links[-1].children[-1].name == 'test'
 
     def test_find_edit_view_not_permitted(self, db_session):
         with patch('kotti.views.util.view_permitted', return_value=False):
             api = self.make()
-            api.request.view_name = u'edit'
-            assert api.find_edit_view(api.context) == u''
+            api.request.view_name = 'edit'
+            assert api.find_edit_view(api.context) == ''
 
     def test_find_edit_view(self, db_session):
         with patch('kotti.views.util.view_permitted', return_value=True):
             api = self.make()
-            api.request.view_name = u'share'
-            assert api.find_edit_view(api.context) == u'share'
+            api.request.view_name = 'share'
+            assert api.find_edit_view(api.context) == 'share'
 
     def test_macro(self, db_session):
         with patch('kotti.views.util.get_renderer') as get_renderer:
@@ -311,19 +309,19 @@ def test_assign_to_slots(self, config, db_session, events):
 
         def foo(context, request):
             greeting = request.POST['greeting']
-            return Response(u"{0} world!".format(greeting))
+            return Response("{} world!".format(greeting))
         config.add_view(foo, name='foo')
-        assign_slot('foo', 'left', params=dict(greeting=u"Y\u0153"))
+        assign_slot('foo', 'left', params=dict(greeting="Y\u0153"))
 
         api = self.make()
-        assert api.slots.left == [u"Y\u0153 world!"]
+        assert api.slots.left == ["Y\u0153 world!"]
 
     def test_assign_to_slot_predicate_mismatch(self, config, db_session,
                                                events):
         from kotti.views.slots import assign_slot
 
         def special(context, request):
-            return Response(u"Hello world!")
+            return Response("Hello world!")
         assign_slot('special', 'right')
 
         config.add_view(special, name='special', request_method="GET")
@@ -332,7 +330,7 @@ def special(context, request):
 
         config.add_view(special, name='special')
         api = self.make()
-        assert api.slots.right == [u"Hello world!"]
+        assert api.slots.right == ["Hello world!"]
 
     def test_assign_to_slot_forbidden(self, config, db_session,
                                       events):
@@ -340,7 +338,7 @@ def test_assign_to_slot_forbidden(self, config, db_session,
         from pyramid.exceptions import HTTPForbidden
 
         def special(context, request):
-            return Response(u"Hello world!")
+            return Response("Hello world!")
         assign_slot('special', 'right')
 
         config.add_view(special, name='special', permission='admin')
@@ -363,60 +361,60 @@ def my_viewlet(request):
             assert hasattr(request, 'registry')
             assert hasattr(request, 'context')
             assert hasattr(request, 'user')
-            return Response(u"Hello world!")
+            return Response("Hello world!")
         assign_slot('my-viewlet', 'right')
 
         config.add_view(my_viewlet, name='my-viewlet')
         api = self.make()
-        assert api.slots.right == [u"Hello world!"]
+        assert api.slots.right == ["Hello world!"]
 
     def test_slot_request_has_parameters(self, config, db_session):
         from kotti.views.slots import assign_slot
 
         def foo(context, request):
             bar = request.POST['bar']
-            return Response(u"{0} world!".format(bar))
+            return Response("{} world!".format(bar))
         config.add_view(foo, name='foo')
-        assign_slot('foo', 'left', params=dict(greeting=u"Y\u0153"))
+        assign_slot('foo', 'left', params=dict(greeting="Y\u0153"))
 
         request = DummyRequest()
-        request.params['bar'] = u'Hello'
+        request.params['bar'] = 'Hello'
         api = self.make(request=request)
-        assert api.slots.left == [u"Hello world!"]
+        assert api.slots.left == ["Hello world!"]
 
     def test_slot_view_know_slot(self, config, db_session):
         from kotti.views.slots import assign_slot
 
         def foo(context, request):
             slot = request.kotti_slot
-            return Response(u"I'm in slot {0}.".format(slot))
+            return Response("I'm in slot {}.".format(slot))
         config.add_view(foo, name='foo')
         assign_slot('foo', 'beforebodyend')
         assign_slot('foo', 'right')
 
         request = DummyRequest()
         api = self.make(request=request)
-        assert api.slots.beforebodyend == [u"I'm in slot beforebodyend."]
-        assert api.slots.right == [u"I'm in slot right."]
+        assert api.slots.beforebodyend == ["I'm in slot beforebodyend."]
+        assert api.slots.right == ["I'm in slot right."]
 
     # def test_deprecated_slots(self, db_session):
     #     from kotti.views.slots import register, RenderAboveContent
 
     #     def render_something(context, request):
-    #         return u"Hello, %s!" % context.title
+    #         return "Hello, %s!" % context.title
     #     register(RenderAboveContent, None, render_something)
 
     #     api = self.make()
-    #     assert (api.slots.abovecontent == [u'Hello, %s!' %api.context.title])
+    #     assert (api.slots.abovecontent == ['Hello, %s!' %api.context.title])
 
     #     # Slot renderers may also return lists:
     #     def render_a_list(context, request):
-    #         return [u"a", u"list"]
+    #         return ["a", "list"]
     #     register(RenderAboveContent, None, render_a_list)
     #     api = self.make()
     #     assert (
     #         api.slots.abovecontent ==
-    #         [u'Hello, %s!' % api.context.title, u'a', u'list']
+    #         ['Hello, %s!' % api.context.title, 'a', 'list']
     #         )
 
     #     with raises(AttributeError):
@@ -429,7 +427,7 @@ def test_slots_only_rendered_when_accessed(self, config, events):
 
         def foo(context, request):
             called.append(True)
-            return Response(u"")
+            return Response("")
 
         config.add_view(foo, name='foo')
         assign_slot('foo', 'abovecontent')
@@ -445,11 +443,11 @@ def foo(context, request):
 
     def test_format_currency(self, db_session):
         api = self.make()
-        assert u'€13.99' == api.format_currency(13.99, 'EUR')
-        assert u'$15,499.12' == api.format_currency(15499.12, 'USD')
-        assert u'€1.00' == api.format_currency(
-            1, fmt=u'€#,##0', currency='EUR')
-        assert u'CHF3.14' == api.format_currency(
+        assert '€13.99' == api.format_currency(13.99, 'EUR')
+        assert '$15,499.12' == api.format_currency(15499.12, 'USD')
+        assert '€1.00' == api.format_currency(
+            1, fmt='€#,##0', currency='EUR')
+        assert 'CHF3.14' == api.format_currency(
             decimal.Decimal((0, (3, 1, 4), -2)), 'CHF')
 
     def test_format_datetime(self, db_session):
@@ -467,6 +465,7 @@ def test_format_datetime(self, db_session):
         assert (
             api.format_datetime(first, fmt='short') ==
             format_datetime(first, format='short', locale='en'))
+        # noinspection PyPropertyAccess
         api.locale_name = 'unknown'
         with raises(UnknownLocaleError):
             api.format_datetime(first)
@@ -483,6 +482,7 @@ def test_format_date(self, db_session):
         assert (
             api.format_date(first, fmt='short') ==
             format_date(first, format='short', locale='en'))
+        # noinspection PyPropertyAccess
         api.locale_name = 'unknown'
         with raises(UnknownLocaleError):
             api.format_date(first)
@@ -499,24 +499,25 @@ def test_format_time(self, db_session):
         assert (
             api.format_time(first, fmt='short') ==
             format_time(first, format='short', locale='en'))
+        # noinspection PyPropertyAccess
         api.locale_name = 'unknown'
         with raises(UnknownLocaleError):
             api.format_time(first)
 
     def test_render_view(self, config, db_session):
         def first_view(context, request):
-            return Response(u'first')
+            return Response('first')
 
         def second_view(context, request):
-            return Response(u'second')
+            return Response('second')
 
         config.add_view(first_view, name='')
         config.add_view(second_view, name='second')
         api = self.make()
-        assert api.render_view().__unicode__() == u'first'
-        assert api.render_view('second').__unicode__() == u'second'
+        assert api.render_view().__unicode__() == 'first'
+        assert api.render_view('second').__unicode__() == 'second'
         assert api.render_view(
-            context=api.context, request=api.request).__unicode__() == u'first'
+            context=api.context, request=api.request).__unicode__() == 'first'
 
     def test_render_template(self, config, db_session):
         renderer = MagicMock()
@@ -552,7 +553,7 @@ def test_add_renderer_globals_json(self):
 
         event = {'renderer_name': 'json'}
         add_renderer_globals(event)
-        assert event.keys() == ['renderer_name']
+        assert list(event.keys()) == ['renderer_name']
 
     def test_add_renderer_globals_request_has_template_api(self):
         from kotti.views.util import add_renderer_globals
diff --git a/kotti/tests/test_views_form.py b/kotti/tests/test_views_form.py
index e761712a9..054269c52 100644
--- a/kotti/tests/test_views_form.py
+++ b/kotti/tests/test_views_form.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import colander
 from mock import MagicMock
 from mock import patch
@@ -108,7 +105,7 @@ def test_save_success_calls_add(self):
         view = self.make()
         view.add = MagicMock()
         view.find_name = lambda appstruct: 'somename'
-        view.request.resource_url = lambda context: u''
+        view.request.resource_url = lambda context: ''
         view.save_success({'three': 3})
         view.add.assert_called_with(three=3)
         assert view.add.return_value == view.context['somename']
@@ -117,7 +114,7 @@ def test_save_success_redirects(self):
         view = self.make()
         view.add = MagicMock()
         view.find_name = lambda appstruct: 'somename'
-        view.request.resource_url = lambda context: u'MagicMock'
+        view.request.resource_url = lambda context: 'MagicMock'
         result = view.save_success({'three': 3})
         assert result.status == '302 Found'
         assert result.location == 'MagicMock'
@@ -136,4 +133,4 @@ def test_find_name_uses_title_to_name(self, title_to_name):
         view = self.make()
         title_to_name.return_value = 'cafe'
         assert view.find_name({'title': 'Bar'}) == 'cafe'
-        title_to_name.assert_called_with('Bar', blacklist=[])
+        title_to_name.assert_called_with('Bar', blacklist={}.keys())
diff --git a/kotti/tests/test_workflow.py b/kotti/tests/test_workflow.py
index 029144e0b..856418b81 100644
--- a/kotti/tests/test_workflow.py
+++ b/kotti/tests/test_workflow.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from mock import patch
 from pyramid.security import ALL_PERMISSIONS
 
@@ -138,16 +135,16 @@ def test_workflow_root(self, root, workflow):
         from kotti.workflow import get_workflow
 
         wf = get_workflow(root)
-        assert wf.name == u'simple'
-        assert root.state == u'public'
+        assert wf.name == 'simple'
+        assert root.state == 'public'
 
     def test_workflow_new_content(self, root, workflow, events):
         from kotti.workflow import get_workflow
 
         content = self.make_document(root)
         wf = get_workflow(content)
-        assert wf.name == u'simple'
-        assert content.state == u'private'
+        assert wf.name == 'simple'
+        assert content.state == 'private'
         assert content.__acl__[0] == (
             'Allow', 'role:admin', ALL_PERMISSIONS)
         assert content.__acl__[-1] == (
@@ -157,8 +154,8 @@ def test_workflow_transition(self, root, workflow, events):
         from kotti.workflow import get_workflow
         content = self.make_document(root)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, u'public')
-        assert content.state == u'public'
+        wf.transition_to_state(content, None, 'public')
+        assert content.state == 'public'
 
     def test_reset_workflow(self, root, workflow, events):
         from kotti.workflow import get_workflow
@@ -166,13 +163,13 @@ def test_reset_workflow(self, root, workflow, events):
 
         content = self.make_document(root)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, u'public')
-        assert content.state == u'public'
+        wf.transition_to_state(content, None, 'public')
+        assert content.state == 'public'
         save_acl = content.__acl__
         content.__acl__ = []
         with patch('kotti.workflow.transaction.commit'):
             reset_workflow()
-        assert content.state == u'public'
+        assert content.state == 'public'
         assert len(content.__acl__) == len(save_acl)
 
     def test_reset_workflow_purge_existing(self, root, workflow, events):
@@ -181,11 +178,11 @@ def test_reset_workflow_purge_existing(self, root, workflow, events):
 
         content = self.make_document(root)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, u'public')
-        assert content.state == u'public'
+        wf.transition_to_state(content, None, 'public')
+        assert content.state == 'public'
         with patch('kotti.workflow.transaction.commit'):
             reset_workflow(purge_existing=True)
-        assert content.state == u'private'
+        assert content.state == 'private'
 
     def test_translate_titles(self, root, dummy_request):
         from pyramid.i18n import TranslationString
@@ -210,5 +207,5 @@ def test_add_wf_interface_to_content(self, workflow):
 
         interface.directlyProvides(content, IDefaultWorkflow)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, u'public')
-        assert content.state == u'public'
+        wf.transition_to_state(content, None, 'public')
+        assert content.state == 'public'
diff --git a/kotti/tests/test_zzz_scaffolds.py b/kotti/tests/test_zzz_scaffolds.py
deleted file mode 100644
index 330ff7d03..000000000
--- a/kotti/tests/test_zzz_scaffolds.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-""" This module contains the tests for the scaffolds.  Each test tries to
-simulate actual usage of the scaffolds as much as possible.  A clean virtualenv
-is created, a package created from a scaffold and the tests of that package are
-run.  Because this is potentially really time consuming the scaffolding tests
-are marked with ``slow`` and are not run unless ``py.test`` is invoked with the
-``--runslow`` option.
-
-The module name starts with ``test_zzz`` to make the contained tests always the
-last in a complete test run.
-"""
-from __future__ import absolute_import, division, print_function
-
-import os
-
-from pkg_resources import working_set
-from pytest import mark
-
-slow = mark.slow
-
-
-@slow
-def test_scaffold_kotti_addon(virtualenv, travis):
-
-    # install kotti and dependencies in a fresh virtualenv
-    with travis.folding_output():
-
-        for pkgname in ('pip', 'wheel', 'setuptools', 'setuptools-git',
-                        'psycopg2', 'oursql', ):
-            virtualenv.run('pip install -U ' + pkgname)
-
-        pkg = [p for p in working_set if p.project_name == 'Kotti'][0]
-        d = {'python': virtualenv.python, 'src_dir': pkg.location, }
-
-        virtualenv.run('pip install -r %(src_dir)s/requirements.txt' % d)
-        if 'Kotti' in [p for p in virtualenv.installed_packages()]:
-            virtualenv.run('pip uninstall -y Kotti')
-        virtualenv.run('cd %(src_dir)s; %(python)s setup.py develop' % d)
-        virtualenv.run('cd %(src_dir)s; %(python)s setup.py dev' % d)
-
-    # create and develop an addon with the scaffold and run the generated tests
-    with travis.folding_output():
-
-        # print available scaffolds
-        virtualenv.run('pcreate -l')
-
-        # set some environment variables to make pcreate non interactive
-        os.environ["author"] = "Kotti developers"
-        os.environ["email"] = "kotti@googlegroups.com"
-        os.environ["gh_user"] = "Kotti"
-
-        virtualenv.run('pcreate -s kotti kotti_my_addon', env=os.environ)
-
-        # develop the package
-        cwd = os.path.join(virtualenv.workspace, 'kotti_my_addon')
-        virtualenv.run('python setup.py develop', cwd=cwd)
-        virtualenv.run('python setup.py dev', cwd=cwd)
-
-        # run the tests
-        virtualenv.run('py.test', cwd=cwd)
diff --git a/kotti/traversal.py b/kotti/traversal.py
index ec8ed70b3..233951fa8 100644
--- a/kotti/traversal.py
+++ b/kotti/traversal.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """ This module contains Kotti's node tree traverser.
 
 In Kotti versions < 1.3.0, Pyramid's default traverser
@@ -33,8 +32,6 @@
 
 """
 
-from __future__ import absolute_import, division, print_function
-
 from pyramid.compat import decode_path_info
 from pyramid.compat import is_nonstr_iter
 from pyramid.exceptions import URLDecodeError
diff --git a/kotti/url_normalizer.py b/kotti/url_normalizer.py
index ba50dcd61..bf61c7015 100644
--- a/kotti/url_normalizer.py
+++ b/kotti/url_normalizer.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import re
 
 from pyramid.settings import asbool
@@ -52,15 +49,15 @@ def url_normalizer(text, locale=None, max_length=MAX_URL_LENGTH):
         base = m.groups()[0]
         ext = m.groups()[1]
 
-    base = base.replace(u' ', '-')
-    base = IGNORE_REGEX.sub(u'', base)
-    base = URL_DANGEROUS_CHARS_REGEX.sub(u'-', base)
-    base = EXTRA_DASHES_REGEX.sub(u'', base)
-    base = MULTIPLE_DASHES_REGEX.sub(u'-', base)
+    base = base.replace(' ', '-')
+    base = IGNORE_REGEX.sub('', base)
+    base = URL_DANGEROUS_CHARS_REGEX.sub('-', base)
+    base = EXTRA_DASHES_REGEX.sub('', base)
+    base = MULTIPLE_DASHES_REGEX.sub('-', base)
 
     base = crop_name(base, maxLength=max_length)
 
     if ext != '':
-        base = base + u'.' + ext
+        base = base + '.' + ext
 
     return base
diff --git a/kotti/util.py b/kotti/util.py
index 63545449a..0dfba4910 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Inheritance Diagram
 -------------------
@@ -7,16 +5,14 @@
 .. inheritance-diagram:: kotti.util
 """
 
-from __future__ import absolute_import, division, print_function
-
 import cgi
 import re
 
 from docopt import docopt
-from pyramid.i18n import get_localizer
+from pyramid.i18n import TranslationStringFactory
 from pyramid.i18n import get_locale_name
+from pyramid.i18n import get_localizer
 from pyramid.i18n import make_localizer
-from pyramid.i18n import TranslationStringFactory
 from pyramid.interfaces import ITranslationDirectories
 from pyramid.location import inside
 from pyramid.paster import bootstrap
@@ -27,7 +23,6 @@
 from pyramid.url import resource_url
 from pyramid.view import render_view_to_response
 from repoze.lru import LRUCache
-from zope.deprecation import deprecated
 
 from kotti import DBSession
 
@@ -122,15 +117,6 @@ def visible(self, context, request):
                 return True
         return False
 
-    @property
-    def path(self):  # BBB
-        return self.name
-    path = deprecated(
-        path,
-        "The 'path' attribute has been deprecated as of Kotti 1.0.0.  Please "
-        "use 'name' instead.",
-        )
-
 
 class LinkRenderer(LinkBase):
     """A menu link that renders a view to render the link.
@@ -188,12 +174,12 @@ def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)
 
     def __repr__(self):
-        return u'Link({0}, {1})'.format(self.name, self.title)
+        return 'Link({0}, {1})'.format(self.name, self.title)
 
 
 class ActionButton(Link):
     def __init__(self, path, title=None, no_children=False,
-                 css_class=u"btn btn-default"):
+                 css_class='btn btn-default'):
         super(ActionButton, self).__init__(path, title)
         self.no_children = no_children
         self.css_class = css_class
@@ -202,6 +188,7 @@ def __init__(self, path, title=None, no_children=False,
 class DontCache(Exception):
     pass
 
+
 _CACHE_ATTR = 'kotti_cache'
 
 
@@ -228,7 +215,7 @@ def replacement(*args, **kwargs):
                 key = compute_key(*args, **kwargs)
             except DontCache:
                 return func(*args, **kwargs)
-            key = u'{0}.{1}:{2}'.format(func.__module__, func.__name__, key)
+            key = '{0}.{1}:{2}'.format(func.__module__, func.__name__, key)
             cached_value = cache.get(key, marker)
             if cached_value is marker:
                 cached_value = cache[key] = func(*args, **kwargs)
@@ -247,6 +234,7 @@ def request_cache(compute_key):
 class LRUCacheSetItem(LRUCache):
     __setitem__ = LRUCache.put
 
+
 _lru_cache = LRUCacheSetItem(1000)
 
 
@@ -278,17 +266,17 @@ def extract_from_settings(prefix, settings=None):
 
 
 def disambiguate_name(name):
-    parts = name.split(u'-')
+    parts = name.split('-')
     if len(parts) > 1:
         try:
             index = int(parts[-1])
         except ValueError:
-            parts.append(u'1')
+            parts.append('1')
         else:
-            parts[-1] = unicode(index + 1)
+            parts[-1] = str(index + 1)
     else:
-        parts.append(u'1')
-    return u'-'.join(parts)
+        parts.append('1')
+    return '-'.join(parts)
 
 
 def title_to_name(title, blacklist=(), max_length=None):
@@ -306,10 +294,10 @@ def title_to_name(title, blacklist=(), max_length=None):
         locale_name = 'en'
     from kotti import get_settings
     urlnormalizer = get_settings()['kotti.url_normalizer'][0]
-    name = unicode(urlnormalizer(title, locale_name, max_length=max_length))
+    name = urlnormalizer(title, locale_name, max_length=max_length)
     if name not in blacklist:
         return name
-    name += u'-1'
+    name += '-1'
     while name in blacklist:
         name = disambiguate_name(name)
     return name
@@ -346,13 +334,6 @@ def command(func, doc):
     return 0
 
 
-ViewLink = Link
-deprecated(
-    'ViewLink',
-    "kotti.util.ViewLink has been renamed to Link as of Kotti 1.0.0."
-    )
-
-
 def _to_fieldstorage(fp, filename, mimetype, size, **_kwds):
     """ Build a :class:`cgi.FieldStorage` instance.
 
diff --git a/kotti/views/__init__.py b/kotti/views/__init__.py
index 53ebdf37f..306070a62 100644
--- a/kotti/views/__init__.py
+++ b/kotti/views/__init__.py
@@ -1,10 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
-from kotti.views.util import RootOnlyPredicate
-from kotti.views.util import SettingHasValuePredicate
-
-
 class BaseView(object):
     """ Very basic view class that can be subclassed.  Does nothing more than
     assignment of ``context`` and ``request`` to instance attributes on
@@ -34,18 +27,7 @@ def includeme(config):
 
     config.add_static_view('static-kotti', 'kotti:static')
 
-    # deform stuff
-    # config.include('deform_bootstrap')
     config.include('pyramid_deform')
     config.include('js.deform')
-    # config.include('js.deform_bootstrap')
-
-    # disable deform CSS autoneeding
-    # from js.deform import resource_mapping
-    # from js.deform import deform_js
-    # resource_mapping['deform'] = deform_js
 
-    config.add_view_predicate(
-        'root_only', RootOnlyPredicate)
-    config.add_view_predicate(
-        'if_setting_has_value', SettingHasValuePredicate)
+    config.include('kotti.views.util')
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index 609201530..5cab7a11a 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import datetime
 from logging import getLogger
 
diff --git a/kotti/views/edit/__init__.py b/kotti/views/edit/__init__.py
index 7e788545d..706aff88b 100644
--- a/kotti/views/edit/__init__.py
+++ b/kotti/views/edit/__init__.py
@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
 """
 Edit views.
 """
-from __future__ import absolute_import, division, print_function
-
 import warnings
 
 from kotti.util import _
@@ -22,8 +19,8 @@ def _translate_titles(info):
         d = d.copy()
         try:
             d['title'] = eval(d['title']) if 'title' in d else d['name']
-            warnings.warn(u'_() in workflow.zcml is deprecated. '
-                          u'Support will be removed in Kotti 2.0.0.',
+            warnings.warn('_() in workflow.zcml is deprecated. '
+                          'Support will be removed in Kotti 2.0.0.',
                           DeprecationWarning)
         except (NameError, SyntaxError):
             d['title'] = _(d['title']) if 'title' in d else d['name']
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 1616043e1..a9efa938c 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -1,15 +1,11 @@
-# -*- coding: utf-8 -*-
 """
 Action views
 """
-from __future__ import absolute_import, division, print_function
-
 from pyramid.exceptions import Forbidden
 from pyramid.httpexceptions import HTTPFound
 from pyramid.url import resource_url
 from pyramid.view import view_config
 from pyramid.view import view_defaults
-from zope.deprecation import deprecated
 
 from kotti import DBSession
 from kotti import get_settings
@@ -23,7 +19,6 @@
 from kotti.views.edit import _state_info
 from kotti.views.edit import _states
 from kotti.views.form import EditFormView
-from kotti.views.navigation import render_tree_navigation
 from kotti.views.util import nodes_tree
 from kotti.workflow import get_workflow
 
@@ -38,8 +33,7 @@ def __init__(self, context, request):
         self.flash = self.request.session.flash
 
     def _selected_children(self, add_context=True):
-        """
-        Get the selected children of the given context. This are either
+        """ Get the selected children of the given context. These are either
         the selected nodes of the contents view or the context itself.
 
         :result: List with select children.
@@ -51,8 +45,7 @@ def _selected_children(self, add_context=True):
         return ids
 
     def _all_children(self, context, permission='view'):
-        """
-        Get recursive all children of the given context.
+        """ Recursively get all children of the given context.
 
         :result: List with all children of a given context.
         :rtype: list
@@ -63,9 +56,8 @@ def _all_children(self, context, permission='view'):
         return tree.tolist()[1:]
 
     def back(self, view=None):
-        """
-        Redirect to the given view of the context, the referrer of the request
-        or the default_view of the context.
+        """ Redirect to the given view of the context, the referrer of the
+        request or the default_view of the context.
 
         :rtype: pyramid.httpexceptions.HTTPFound
         """
@@ -76,11 +68,9 @@ def back(self, view=None):
             url = self.request.referrer
         return HTTPFound(location=url)
 
-    @view_config(name='workflow-change',
-                 permission='state_change')
+    @view_config(name='workflow-change', permission='state_change')
     def workflow_change(self):
-        """
-        Handle workflow change requests from workflow dropdown.
+        """ Handle workflow change requests from workflow dropdown.
 
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
@@ -93,45 +83,38 @@ def workflow_change(self):
 
     @view_config(name='copy')
     def copy_node(self):
-        """
-        Copy nodes view. Copy the current node or the selected nodes in the
+        """ Copy nodes view. Copy the current node or the selected nodes in the
         contents view and save the result in the session of the request.
 
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
         """
-        ids = self._selected_children()
-        self.request.session['kotti.paste'] = (ids, 'copy')
-        for id in ids:
-            item = DBSession.query(Node).get(id)
-            self.flash(_(u'${title} was copied.',
-                         mapping=dict(title=item.title)), 'success')
-        if not self.request.is_xhr:
-            return self.back()
+        return self._do_copy_or_cut('copy', 'copied')
 
     @view_config(name='cut')
     def cut_nodes(self):
-        """
-        Cut nodes view. Cut the current node or the selected nodes in the
+        """ Cut nodes view. Cut the current node or the selected nodes in the
         contents view and save the result in the session of the request.
 
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
         """
+        return self._do_copy_or_cut('cut', 'cut')
+
+    def _do_copy_or_cut(self, action, action_title):
         ids = self._selected_children()
-        self.request.session['kotti.paste'] = (ids, 'cut')
+        self.request.session['kotti.paste'] = (ids, action)
         for id in ids:
             item = DBSession.query(Node).get(id)
-            self.flash(_(u'${title} was cut.', mapping=dict(title=item.title)),
-                       'success')
+            self.flash(_('${title} was %s.' % action_title,
+                         mapping=dict(title=item.title)), 'success')
         if not self.request.is_xhr:
             return self.back()
 
     @view_config(name='paste')
     def paste_nodes(self):
-        """
-        Paste nodes view. Paste formerly copied or cutted nodes into the
-        current context. Note that a cutted node can not be pasted into itself.
+        """ Paste nodes view.  Paste formerly copied or cutted nodes into the
+        current context.  Note that a cutted node can not be pasted into itself.
 
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
@@ -157,18 +140,17 @@ def paste_nodes(self):
                     name = title_to_name(name, blacklist=self.context.keys())
                     copy.name = name
                     self.context[name] = copy
-                self.flash(_(u'${title} was pasted.',
+                self.flash(_('${title} was pasted.',
                              mapping=dict(title=item.title)), 'success')
             else:
-                self.flash(_(u'Could not paste node. It no longer exists.'),
+                self.flash(_('Could not paste node. It no longer exists.'),
                            'error')
         DBSession.flush()
         if not self.request.is_xhr:
             return self.back()
 
     def move(self, move):
-        """
-        Do the real work to move the selected nodes up or down. Called
+        """ Do the real work to move the selected nodes up or down. Called
         by the up and the down view.
 
         :result: Redirect response to the referrer of the request.
@@ -182,15 +164,14 @@ def move(self, move):
             index = self.context.children.index(child)
             self.context.children.pop(index)
             self.context.children.insert(index + move, child)
-            self.flash(_(u'${title} was moved.',
+            self.flash(_('${title} was moved.',
                          mapping=dict(title=child.title)), 'success')
         if not self.request.is_xhr:
             return self.back()
 
     @view_config(name='up')
     def up(self):
-        """
-        Move up nodes view. Move the selected nodes up by 1 position
+        """ Move up nodes view. Move the selected nodes up by 1 position
         and get back to the referrer of the request.
 
         :result: Redirect response to the referrer of the request.
@@ -200,8 +181,7 @@ def up(self):
 
     @view_config(name='down')
     def down(self):
-        """
-        Move down nodes view. Move the selected nodes down by 1 position
+        """ Move down nodes view. Move the selected nodes down by 1 position
         and get back to the referrer of the request.
 
         :result: Redirect response to the referrer of the request.
@@ -210,8 +190,7 @@ def down(self):
         return self.move(1)
 
     def set_visibility(self, show):
-        """
-        Do the real work to set the visibility of nodes in the menu. Called
+        """ Do the real work to set the visibility of nodes in the menu. Called
         by the show and the hide view.
 
         :result: Redirect response to the referrer of the request.
@@ -224,10 +203,10 @@ def set_visibility(self, show):
                 child.in_navigation = show
                 mapping = dict(title=child.title)
                 if show:
-                    mg = _(u'${title} is now visible in the navigation.',
+                    mg = _('${title} is now visible in the navigation.',
                            mapping=mapping)
                 else:
-                    mg = _(u'${title} is no longer visible in the navigation.',
+                    mg = _('${title} is no longer visible in the navigation.',
                            mapping=mapping)
                 self.flash(mg, 'success')
         if not self.request.is_xhr:
@@ -235,9 +214,8 @@ def set_visibility(self, show):
 
     @view_config(name='show')
     def show(self):
-        """
-        Show nodes view.  Switch the in_navigation attribute of selected nodes
-        to ``True`` and get back to the referrer of the request.
+        """ Show nodes view.  Switch the in_navigation attribute of selected
+        nodes to ``True`` and get back to the referrer of the request.
 
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
@@ -246,9 +224,8 @@ def show(self):
 
     @view_config(name='hide')
     def hide(self):
-        """
-        Hide nodes view. Switch the in_navigation attribute of selected nodes
-        to ``False`` and get back to the referrer of the request.
+        """ Hide nodes view. Switch the in_navigation attribute of selected
+        nodes to ``False`` and get back to the referrer of the request.
 
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
@@ -259,8 +236,7 @@ def hide(self):
                  permission='delete',
                  renderer='kotti:templates/edit/delete.pt')
     def delete_node(self):
-        """
-        Delete node view. Renders either a view to delete the current node
+        """ Delete node view. Renders either a view to delete the current node
         or handle the deletion of the current node and get back to the
         default view of the node.
 
@@ -269,16 +245,16 @@ def delete_node(self):
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
 
-        action = self.request.POST.get(u'delete')
+        action = self.request.POST.get('delete')
         if action is not None:
 
             parent = self.context.__parent__
 
-            if action == u'delete':
+            if action == 'delete':
                 location = resource_url(parent, self.request)
-                self.flash(_(u'${title} was deleted.',
+                self.flash(_('${title} was deleted.',
                              mapping=dict(title=self.context.title)),
-                           u'success')
+                           'success')
                 del parent[self.context.name]
             else:
                 location = resource_url(self.context, self.request)
@@ -291,8 +267,7 @@ def delete_node(self):
                  permission='delete',
                  renderer='kotti:templates/edit/delete-nodes.pt')
     def delete_nodes(self):
-        """
-        Delete nodes view. Renders either a view to delete multiple nodes or
+        """ Delete nodes view. Renders either a view to delete multiple nodes or
         delete the selected nodes and get back to the referrer of the request.
 
         :result: Either a redirect response or a dictionary passed to the
@@ -302,16 +277,16 @@ def delete_nodes(self):
         if 'delete_nodes' in self.request.POST:
             ids = self.request.POST.getall('children-to-delete')
             if not ids:
-                self.flash(_(u"Nothing was deleted."), 'info')
+                self.flash(_("Nothing was deleted."), 'info')
             for id in ids:
                 item = DBSession.query(Node).get(id)
-                self.flash(_(u'${title} was deleted.',
+                self.flash(_('${title} was deleted.',
                              mapping=dict(title=item.title)), 'success')
                 del self.context[item.name]
             return self.back('@@contents')
 
         if 'cancel' in self.request.POST:
-            self.flash(_(u'No changes were made.'), 'info')
+            self.flash(_('No changes were made.'), 'info')
             return self.back('@@contents')
 
         ids = self._selected_children(add_context=False)
@@ -325,8 +300,7 @@ def delete_nodes(self):
     @view_config(name='rename',
                  renderer='kotti:templates/edit/rename.pt')
     def rename_node(self):
-        """
-        Rename node view. Renders either a view to change the title and
+        """ Rename node view. Renders either a view to change the title and
         name for the current node or handle the changes and get back to the
         default view of the node.
 
@@ -338,19 +312,18 @@ def rename_node(self):
             name = self.request.POST['name']
             title = self.request.POST['title']
             if not name or not title:
-                self.flash(_(u'Name and title are required.'), 'error')
+                self.flash(_('Name and title are required.'), 'error')
             else:
                 self.context.name = name.replace('/', '')
                 self.context.title = title
-                self.flash(_(u'Item was renamed.'), 'success')
+                self.flash(_('Item was renamed.'), 'success')
                 return self.back('')
         return {}
 
     @view_config(name='rename_nodes',
                  renderer='kotti:templates/edit/rename-nodes.pt')
     def rename_nodes(self):
-        """
-        Rename nodes view. Renders either a view to change the titles and
+        """ Rename nodes view. Renders either a view to change the titles and
         names for multiple nodes or handle the changes and get back to the
         referrer of the request.
 
@@ -365,7 +338,7 @@ def rename_nodes(self):
                 name = self.request.POST[id + '-name']
                 title = self.request.POST[id + '-title']
                 if not name or not title:
-                    self.flash(_(u'Name and title are required.'), 'error')
+                    self.flash(_('Name and title are required.'), 'error')
                     location = resource_url(self.context, self.request,
                                             '@@rename_nodes')
                     return HTTPFound(location=location)
@@ -373,11 +346,11 @@ def rename_nodes(self):
                     item.name = title_to_name(name,
                                               blacklist=self.context.keys())
                     item.title = title
-            self.flash(_(u'Your changes have been saved.'), 'success')
+            self.flash(_('Your changes have been saved.'), 'success')
             return self.back('@@contents')
 
         if 'cancel' in self.request.POST:
-            self.flash(_(u'No changes were made.'), 'info')
+            self.flash(_('No changes were made.'), 'info')
             return self.back('@@contents')
 
         ids = self._selected_children(add_context=False)
@@ -389,8 +362,7 @@ def rename_nodes(self):
     @view_config(name='change_state',
                  renderer='kotti:templates/edit/change-state.pt')
     def change_state(self):
-        """
-        Change state view. Renders either a view to handle workflow changes
+        """ Change state view. Renders either a view to handle workflow changes
         for multiple nodes or handle the selected workflow changes and get
         back to the referrer of the request.
 
@@ -400,9 +372,9 @@ def change_state(self):
         """
         if 'change_state' in self.request.POST:
             ids = self.request.POST.getall('children-to-change-state')
-            to_state = self.request.POST.get('to-state', u'no-change')
+            to_state = self.request.POST.get('to-state', 'no-change')
             include_children = self.request.POST.get('include-children')
-            if to_state != u'no-change':
+            if to_state != 'no-change':
                 items = DBSession.query(Node).filter(Node.id.in_(ids)).all()
                 for item in items:
                     wf = get_workflow(item)
@@ -417,13 +389,13 @@ def change_state(self):
                                 wf.transition_to_state(child,
                                                        self.request,
                                                        to_state, )
-                self.flash(_(u'Your changes have been saved.'), 'success')
+                self.flash(_('Your changes have been saved.'), 'success')
             else:
-                self.flash(_(u'No changes were made.'), 'info')
+                self.flash(_('No changes were made.'), 'info')
             return self.back('@@contents')
 
         if 'cancel' in self.request.POST:
-            self.flash(_(u'No changes were made.'), 'info')
+            self.flash(_('No changes were made.'), 'info')
             return self.back('@@contents')
 
         ids = self._selected_children(add_context=False)
@@ -443,8 +415,7 @@ def change_state(self):
 
 
 def contents_buttons(context, request):
-    """
-    Build the action buttons for the contents view based on the current
+    """ Build the action buttons for the contents view based on the current
     state and the persmissions of the user.
 
     :result: List of ActionButtons.
@@ -452,30 +423,29 @@ def contents_buttons(context, request):
     """
     buttons = []
     if get_paste_items(context, request):
-        buttons.append(ActionButton('paste', title=_(u'Paste'),
+        buttons.append(ActionButton('paste', title=_('Paste'),
                                     no_children=True))
     if context.children:
-        buttons.append(ActionButton('copy', title=_(u'Copy')))
-        buttons.append(ActionButton('cut', title=_(u'Cut')))
-        buttons.append(ActionButton('rename_nodes', title=_(u'Rename'),
-                                    css_class=u'btn btn-warning'))
-        buttons.append(ActionButton('delete_nodes', title=_(u'Delete'),
-                                    css_class=u'btn btn-danger'))
+        buttons.append(ActionButton('copy', title=_('Copy')))
+        buttons.append(ActionButton('cut', title=_('Cut')))
+        buttons.append(ActionButton('rename_nodes', title=_('Rename'),
+                                    css_class='btn btn-warning'))
+        buttons.append(ActionButton('delete_nodes', title=_('Delete'),
+                                    css_class='btn btn-danger'))
         if get_workflow(context) is not None:
             buttons.append(ActionButton('change_state',
-                                        title=_(u'Change State')))
-        buttons.append(ActionButton('up', title=_(u'Move up')))
-        buttons.append(ActionButton('down', title=_(u'Move down')))
-        buttons.append(ActionButton('show', title=_(u'Show')))
-        buttons.append(ActionButton('hide', title=_(u'Hide')))
+                                        title=_('Change State')))
+        buttons.append(ActionButton('up', title=_('Move up')))
+        buttons.append(ActionButton('down', title=_('Move down')))
+        buttons.append(ActionButton('show', title=_('Show')))
+        buttons.append(ActionButton('hide', title=_('Hide')))
     return [button for button in buttons if button.permitted(context, request)]
 
 
 @view_config(name='add-dropdown',
              renderer='kotti:templates/add-dropdown.pt')
 def content_type_factories(context, request):
-    """
-    Renders the drop down menu for Add button in editor bar.
+    """ Renders the drop down menu for Add button in editor bar.
 
     :result: Dictionary passed to the template for rendering.
     :rtype: pyramid.httpexceptions.HTTPFound or dict
@@ -491,8 +461,7 @@ def content_type_factories(context, request):
 @view_config(context=IContent, name='contents', permission='view',
              renderer='kotti:templates/edit/contents.pt')
 def contents(context, request):
-    """
-    Contents view. Renders either the contents view or handle the action
+    """ Contents view. Renders either the contents view or handle the action
     button actions of the view.
 
     :result: Either a redirect response or a dictionary passed to the
@@ -504,9 +473,9 @@ def contents(context, request):
     for button in buttons:
         if button.name in request.POST:
             children = request.POST.getall('children')
-            if not children and button.name != u'paste':
+            if not children and button.name != 'paste':
                 request.session.flash(
-                    _(u'You have to select items to perform an action.'),
+                    _('You have to select items to perform an action.'),
                     'info')
                 location = resource_url(context, request) + '@@contents'
                 return HTTPFound(location=location)
@@ -565,8 +534,7 @@ def move_child_position(context, request):
 @view_config(name='workflow-dropdown', permission='view',
              renderer='kotti:templates/workflow-dropdown.pt')
 def workflow(context, request):
-    """
-    Renders the drop down menu for workflow actions.
+    """ Renders the drop down menu for workflow actions.
 
     :result: Dictionary passed to the template for rendering.
     :rtype: dict
@@ -592,8 +560,7 @@ def workflow(context, request):
 @view_config(name='actions-dropdown', permission='edit',
              renderer='kotti:templates/actions-dropdown.pt')
 def actions(context, request):
-    """
-    Renders the drop down menu for Actions button in editor bar.
+    """ Renders the drop down menu for Actions button in editor bar.
 
     :result: Dictionary passed to the template for rendering.
     :rtype: dict
@@ -616,14 +583,3 @@ def includeme(config):
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
         config.scan(__name__)
-
-
-# BBB starts here --- --- --- --- --- ---
-
-render_tree_navigation = render_tree_navigation
-
-deprecated(
-    'render_tree_navigation',
-    'render_tree_navigation has been moved to kotti.views.navigation as of '
-    'Kotti 0.9.  Import from there instead.'
-)
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 6818cbcff..268c65ba7 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -1,11 +1,4 @@
-# -*- coding: utf-8 -*-
-"""
-Content edit views
-"""
-from __future__ import absolute_import, division, print_function
-
 import random
-from StringIO import StringIO
 
 import colander
 from colander import SchemaNode
@@ -32,7 +25,7 @@
 class ContentSchema(colander.MappingSchema):
     title = colander.SchemaNode(
         colander.String(),
-        title=_(u'Title'),
+        title=_('Title'),
         validator=colander.Length(
             max=Node.title.property.columns[0].type.length),
         )
@@ -40,7 +33,7 @@ class ContentSchema(colander.MappingSchema):
         colander.String(),
         title=_('Description'),
         widget=TextAreaWidget(cols=40, rows=5),
-        missing=u"",
+        missing='',
         )
     tags = colander.SchemaNode(
         ObjectType(),
@@ -53,21 +46,31 @@ class ContentSchema(colander.MappingSchema):
 class DocumentSchema(ContentSchema):
     body = colander.SchemaNode(
         colander.String(),
-        title=_(u'Body'),
+        title=_('Body'),
         widget=RichTextWidget(
             # theme='advanced', width=790, height=500
             height=500,
         ),
-        missing=u"",
+        missing="",
         )
 
 
+class DocumentAddForm(AddFormView):
+    schema_factory = DocumentSchema
+    add = Document
+    item_type = _("Document")
+
+
+class DocumentEditForm(EditFormView):
+    schema_factory = DocumentSchema
+
+
 # noinspection PyPep8Naming
 def FileSchema(tmpstore, title_missing=None):
     class FileSchema(ContentSchema):
         file = SchemaNode(
             FileData(),
-            title=_(u'File'),
+            title=_('File'),
             widget=FileUploadWidget(tmpstore),
             validator=validate_file_size_limit,
             )
@@ -80,14 +83,28 @@ def set_title_missing(node, kw):
     return FileSchema(after_bind=set_title_missing)
 
 
-class DocumentEditForm(EditFormView):
-    schema_factory = DocumentSchema
+class FileAddForm(AddFormView):
+    item_type = _("File")
+    item_class = File  # specific to this class
+
+    def schema_factory(self):
+        tmpstore = FileUploadTempStore(self.request)
+        return FileSchema(tmpstore, title_missing=null)
 
+    def save_success(self, appstruct):
+        if not appstruct['title']:
+            appstruct['title'] = appstruct['file']['filename']
+        return super(FileAddForm, self).save_success(appstruct)
 
-class DocumentAddForm(AddFormView):
-    schema_factory = DocumentSchema
-    add = Document
-    item_type = _(u"Document")
+    def add(self, **appstruct):
+        filename = appstruct['file']['filename']
+        item = self.item_class(
+            title=appstruct['title'] or filename,
+            description=appstruct['description'],
+            tags=appstruct['tags'],
+            data=_to_fieldstorage(**appstruct['file']),
+        )
+        return item
 
 
 class FileEditForm(EditFormView):
@@ -117,30 +134,6 @@ def edit(self, **appstruct):
             self.context.data = _to_fieldstorage(**appstruct['file'])
 
 
-class FileAddForm(AddFormView):
-    item_type = _(u"File")
-    item_class = File  # specific to this class
-
-    def schema_factory(self):
-        tmpstore = FileUploadTempStore(self.request)
-        return FileSchema(tmpstore, title_missing=null)
-
-    def save_success(self, appstruct):
-        if not appstruct['title']:
-            appstruct['title'] = appstruct['file']['filename']
-        return super(FileAddForm, self).save_success(appstruct)
-
-    def add(self, **appstruct):
-        filename = appstruct['file']['filename']
-        item = self.item_class(
-            title=appstruct['title'] or filename,
-            description=appstruct['description'],
-            tags=appstruct['tags'],
-            data=_to_fieldstorage(**appstruct['file']),
-        )
-        return item
-
-
 def includeme(config):
     """ Pyramid includeme hook.
 
@@ -177,17 +170,3 @@ def includeme(config):
         permission=File.type_info.add_permission,
         renderer='kotti:templates/edit/node.pt',
         )
-
-# DEPRECATED
-
-# noinspection PyPep8
-from zope.deprecation import deprecated
-# noinspection PyPep8
-from kotti_image.views.edit import ImageAddForm
-# noinspection PyPep8
-from kotti_image.views.edit import ImageEditForm
-__ = ImageAddForm, ImageEditForm   # pyflakes
-
-deprecated(('ImageAddForm', 'ImageEditForm'),
-           'Image was outfactored to the kotti_image package.  '
-           'Please import from there.')
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index a4a47cfbe..ce09c7fe9 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
 """
 :summary: Default view selctor views
 """
-from __future__ import absolute_import, division, print_function
-
 import warnings
 
 from pyramid.compat import map_
@@ -79,7 +76,7 @@ def default_view_selector(self):
                 })
             else:
                 warnings.warn(
-                    u"No view called '{0}' is registered for {1!r}.".format(
+                    "No view called '{0}' is registered for {1!r}.".format(
                         name, self.context))
 
         return {
diff --git a/kotti/views/edit/upload.py b/kotti/views/edit/upload.py
index 7270d8869..84520fffc 100644
--- a/kotti/views/edit/upload.py
+++ b/kotti/views/edit/upload.py
@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
 """
 Created on 2013-02-23
 """
-from __future__ import absolute_import, division, print_function
-
 import json
 from cgi import FieldStorage
 from logging import getLogger
diff --git a/kotti/views/file.py b/kotti/views/file.py
index a41315095..cd22f7a63 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from pyramid.view import view_config
 
 from kotti.interfaces import IFile
@@ -30,26 +27,3 @@ def includeme(config):
     """
 
     config.scan(__name__)
-
-
-# DEPRECATED
-
-# noinspection PyPep8
-from zope.deprecation.deprecation import deprecated
-# noinspection PyPep8
-from kotti.filedepot import StoredFileResponse
-
-
-class UploadedFileResponse(StoredFileResponse):
-    def __init__(self, data, request, disposition='attachment',
-                 cache_max_age=None, content_type=None,
-                 content_encoding=None):
-        super(UploadedFileResponse, self).__init__(
-            data.file, request, disposition=disposition,
-            cache_max_age=cache_max_age, content_type=content_type,
-            content_encoding=content_encoding)
-
-deprecated('UploadedFileResponse',
-           'UploadedFileResponse is deprecated and will be removed in '
-           'Kotti 2.0.0.  Use "request.uploaded_file_response(context.data)" '
-           'instead.')
diff --git a/kotti/views/form.py b/kotti/views/form.py
index b24d4ca3d..008e9ad8e 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Form related base views from which you can inherit.
 
@@ -7,10 +6,9 @@
 
 .. inheritance-diagram:: kotti.views.form
 """
-from __future__ import absolute_import, division, print_function
 
-from StringIO import StringIO
-from UserDict import DictMixin
+from collections import MutableMapping
+from io import BytesIO
 
 import colander
 import deform.widget
@@ -39,8 +37,7 @@ def get_appstruct(context, schema):
 
 
 class ObjectType(colander.SchemaType):
-    """ A type leaving the value untouched.
-    """
+    """ A type leaving the value untouched. """
 
     @staticmethod
     def serialize(node, value):
@@ -62,9 +59,7 @@ def deferred_tag_it_widget(node, kw):
 
 
 class Form(deform.Form):
-    """
-    A deform Form that allows 'appstruct' to be set on the instance.
-    """
+    """ A deform Form that allows 'appstruct' to be set on the instance. """
 
     def render(self, appstruct=None, readonly=False):
         if appstruct is None:
@@ -73,15 +68,13 @@ def render(self, appstruct=None, readonly=False):
 
 
 class BaseFormView(FormView):
-    """
-    A basic view for forms with save and cancel buttons.
-    """
+    """ A basic view for forms with save and cancel buttons. """
 
     form_class = Form
     buttons = (
-        deform.Button('save', _(u'Save')),
-        deform.Button('cancel', _(u'Cancel')))
-    success_message = _(u"Your changes have been saved.")
+        deform.Button('save', _('Save')),
+        deform.Button('cancel', _('Cancel')))
+    success_message = _("Your changes have been saved.")
     success_url = None
     schema_factory = None
     use_csrf_token = True
@@ -115,8 +108,7 @@ def more_template_vars(self):
 
 
 class EditFormView(BaseFormView):
-    """
-    A base form for content editing purposes.
+    """ A base form for content editing purposes.
 
     Set `self.schema_factory` to the context's schema.  Values of
     fields in this schema will be set as attributes on the context.
@@ -131,9 +123,9 @@ class EditFormView(BaseFormView):
         class DocumentSchema(ContentSchema):
             body = colander.SchemaNode(
                 colander.String(),
-                title=u'Body',
+                title='Body',
                 widget=RichTextWidget(),
-                missing=u'',
+                missing='',
                 )
 
         class DocumentEditForm(EditFormView):
@@ -158,14 +150,13 @@ def edit(self, **appstruct):
 
     @reify
     def first_heading(self):
-        return _(u'Edit ${title}',
+        return _('Edit ${title}',
                  mapping=dict(title=self.context.title)
                  )
 
 
 class AddFormView(BaseFormView):
-    """
-    A base form for content adding purposes.
+    """ A base form for content adding purposes.
 
     Set `self.schema_factory` as with EditFormView.  Also set
     `item_type` to your model class.  An example::
@@ -173,10 +164,10 @@ class AddFormView(BaseFormView):
         class DocumentAddForm(AddFormView):
             schema_factory = DocumentSchema
             add = Document
-            item_type = u'Document'
+            item_type = 'Document'
     """
 
-    success_message = _(u"Item was added.")
+    success_message = _("Item was added.")
     item_type = None
     add_template_vars = ('first_heading',)
 
@@ -200,11 +191,11 @@ def first_heading(self):
         context_title = getattr(self.request.context, 'title', None)
         type_title = self.item_type or self.add.type_info.title
         if context_title:
-            return _(u'Add ${type} to ${title}.',
+            return _('Add ${type} to ${title}.',
                      mapping=dict(type=translate(type_title),
                                   title=context_title))
         else:
-            return _(u'Add ${type}.', mapping=dict(type=translate(type_title)))
+            return _('Add ${type}.', mapping=dict(type=translate(type_title)))
 
 
 class CommaSeparatedListWidget(deform.widget.Widget):
@@ -226,42 +217,45 @@ def deserialize(field, pstruct):
         return [item.strip() for item in pstruct.split(',') if item]
 
 
-class FileUploadTempStore(DictMixin):
-    """
-    A temporary storage for file file uploads
+class FileUploadTempStore(MutableMapping):
+    """ A temporary storage for file file uploads
 
-    File uploads are stored in the session so that you don't need
-    to upload your file again if validation of another schema node
-    fails.
-    """
+    File uploads are stored in the session so that you don't need to upload
+    your file again if validation of another schema node fails. """
 
     def __init__(self, request):
         self.session = request.session
 
+    def __iter__(self):
+        return iter(self.session)
+
+    def __len__(self):
+        return len(self.session)
+
     def keys(self):
         return [k for k in self.session.keys() if not k.startswith('_')]
 
-    def __setitem__(self, name, value):
+    def __setitem__(self, key, value):
         value = value.copy()
         fp = value.pop('fp')
         if fp is not None:
             value['file_contents'] = fp.read()
             fp.seek(0)
         else:
-            value['file_contents'] = ''
-        self.session[name] = value
+            value['file_contents'] = b''
+        self.session[key] = value
 
-    def __getitem__(self, name):
-        value = self.session[name].copy()
+    def __getitem__(self, key):
+        value = self.session[key].copy()
         content = value.pop('file_contents')
         if content:
-            value['fp'] = StringIO(content)
+            value['fp'] = BytesIO(content)
         else:
             value['fp'] = None
         return value
 
-    def __delitem__(self, name):
-        del self.session[name]
+    def __delitem__(self, key):
+        del self.session[key]
 
     @staticmethod
     def preview_url(name):
@@ -269,19 +263,24 @@ def preview_url(name):
 
 
 def validate_file_size_limit(node, value):
-    """
-    File size limit validator.
+    """ File size limit validator.
 
     You can configure the maximum size by setting the kotti.max_file_size
     option to the maximum number of bytes that you want to allow.
     """
-    if not value['fp']:
+    try:
+        fp = value.get('fp', None)
+    except AttributeError:
+        fp = getattr(value, 'fp', None)
+    if not fp:
         return
 
-    value['fp'].seek(0, 2)
-    size = value['fp'].tell()
-    value['fp'].seek(0)
-    max_size = get_settings()['kotti.max_file_size']
-    if size > int(max_size) * 1024 * 1024:
-        msg = _('Maximum file size: ${size}MB', mapping={'size': max_size})
+    fp.seek(0, 2)
+    size = fp.tell()
+    fp.seek(0)
+    # unit for ``kotti.max_file_size`` is MB
+    max_mb = get_settings()['kotti.max_file_size']
+    max_size = int(max_mb) * 1024 * 1024
+    if size > max_size:
+        msg = _('Maximum file size: ${size}MB', mapping={'size': max_mb})
         raise colander.Invalid(node, msg)
diff --git a/kotti/views/image.py b/kotti/views/image.py
deleted file mode 100644
index 99497aaba..000000000
--- a/kotti/views/image.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Views for image content objects.
-"""
-from __future__ import absolute_import, division, print_function
-
-from zope.deprecation import deprecated
-
-from kotti_image.views import ImageView
-from kotti_image.views import _load_image_scales
-from kotti_image.views import image_scales
-from kotti_image.views import includeme
-
-__ = _load_image_scales, image_scales, ImageView, includeme  # pyflakes
-
-deprecated(('_load_image_scales', 'image_scales', 'ImageView', 'includeme'),
-           'Image was outfactored to the kotti_image package.  '
-           'Please import from there.')
diff --git a/kotti/views/login.py b/kotti/views/login.py
index 297cf6ddf..aef1af322 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
 """
 Login / logout and forbidden views and forms.
 """
-from __future__ import absolute_import, division, print_function
-
 from datetime import datetime
 
 import colander
@@ -53,25 +50,26 @@ def _find_user(login):
 
 
 class UserSelfRegistered(ObjectEvent):
-    """ This event is emitted just after user self registered. Intended use
-        is to allow addons to do some preparation for such user - create custom
-        contents, nodes etc.
-        Event handler object parameter is a Principal object
-    """
+    """ This event is emitted just after user self registered.
+
+    Intended use is to allow addons to do some preparation for such a user
+    (create custom contents, nodes etc.
+
+    Event handler object parameter is a Principal object. """
 
 
 class RegisterSchema(colander.Schema):
     title = colander.SchemaNode(
         colander.String(),
-        title=_(u'Full name'))
+        title=_('Full name'))
     name = colander.SchemaNode(
         colander.String(),
-        title=_(u'Username'),
+        title=_('Username'),
         validator=colander.All(name_pattern_validator, name_new_validator)
     )
     email = colander.SchemaNode(
         colander.String(),
-        title=_(u'Email'),
+        title=_('Email'),
         validator=deferred_email_validator,
     )
 
@@ -80,20 +78,20 @@ class RegisterSchema(colander.Schema):
              if_setting_has_value=('kotti.register', True))
 def register(context, request):
     schema = RegisterSchema().bind(request=request)
-    form = Form(schema, buttons=(Button('register', _(u'Register')),))
+    form = Form(schema, buttons=(Button('register', _('Register')),))
     rendered_form = None
 
     if 'register' in request.POST:
         try:
             appstruct = form.validate(request.POST.items())
         except ValidationFailure as e:
-            request.session.flash(_(u"There was an error."), 'error')
+            request.session.flash(_("There was an error."), 'error')
             rendered_form = e.render()
         else:
             settings = get_settings()
 
-            appstruct['groups'] = u''
-            appstruct['roles'] = u''
+            appstruct['groups'] = ''
+            appstruct['roles'] = ''
 
             register_groups = settings['kotti.register.group']
             if register_groups:
@@ -121,7 +119,7 @@ def register(context, request):
 
     api = template_api(
         context, request,
-        page_title=_(u"Register - ${title}",
+        page_title=_("Register - ${title}",
                      mapping=dict(title=context.title)),
     )
 
@@ -152,7 +150,7 @@ def login_success_callback(request, user, came_from):
 
     headers = remember(request, user.name)
     request.session.flash(
-        _(u"Welcome, ${user}!",
+        _("Welcome, ${user}!",
           mapping=dict(user=user.title or user.name)), 'success')
     user.last_login_date = datetime.now()
     return HTTPFound(location=came_from, headers=headers)
@@ -178,17 +176,16 @@ def reset_password_callback(request, user):
         user, request,
         template_name='kotti:templates/email-reset-password.pt')
     request.session.flash(_(
-        u"You should be receiving an email with a link to reset your "
-        u"password. Doing so will activate your account."), 'success')
+        "You should be receiving an email with a link to reset your "
+        "password. Doing so will activate your account."), 'success')
 
     return HTTPFound(location=request.url)
 
 
 @view_config(name='login', renderer='kotti:templates/login.pt')
 def login(context, request):
-    """
-    Login view.  Renders either the login or password forgot form templates or
-    handles their form submission and redirects to came_from on success.
+    """ Login view.  Renders either the login or password forgot form templates
+    or handles their form submission and redirects to came_from on success.
 
     :result: Either a redirect response or a dictionary passed to the template
              for rendering
@@ -199,7 +196,7 @@ def login(context, request):
 
     came_from = request.params.get(
         'came_from', request.resource_url(context))
-    login, password = u'', u''
+    login, password = '', ''
 
     if 'submit' in request.POST:
         login = request.params['login'].lower()
@@ -210,7 +207,7 @@ def login(context, request):
                 principals.validate_password(password, user.password)):
             return get_settings()['kotti.login_success_callback'][0](
                 request, user, came_from)
-        request.session.flash(_(u"Login failed."), 'error')
+        request.session.flash(_("Login failed."), 'error')
 
     if 'reset-password' in request.POST:
         login = request.params['login']
@@ -220,7 +217,7 @@ def login(context, request):
                 request, user)
         else:
             request.session.flash(
-                _(u"That username or email is not known by this system."),
+                _("That username or email is not known by this system."),
                 'error')
 
     return {
@@ -234,28 +231,25 @@ def login(context, request):
 
 @view_config(name='logout')
 def logout(context, request):
-    """
-    Logout view.  Always redirects the user to where he came from.
+    """ Logout view.  Always redirects the user to where he came from.
 
     :result: Redirect to came_from
     :rtype: pyramid.httpexceptions.HTTPFound
     """
 
     headers = forget(request)
-    request.session.flash(_(u"You have been logged out."), 'info')
+    request.session.flash(_("You have been logged out."), 'info')
     location = request.params.get('came_from', request.application_url)
     return HTTPFound(location=location, headers=headers)
 
 
 class SetPasswordSchema(colander.MappingSchema):
-    """
-    Schema for the set password form
-    """
+    """ Schema for the set password form """
 
     #: colander.String
     password = colander.SchemaNode(
         colander.String(),
-        title=_(u'Password'),
+        title=_('Password'),
         validator=colander.Length(min=5),
         widget=CheckedPasswordWidget(),
         )
@@ -267,7 +261,7 @@ class SetPasswordSchema(colander.MappingSchema):
     #: colander.String
     email = colander.SchemaNode(
         colander.String(),
-        title=_(u'Email'),
+        title=_('Email'),
         widget=HiddenWidget(),
         )
     #: colander.String
@@ -280,7 +274,7 @@ class SetPasswordSchema(colander.MappingSchema):
 
 @view_config(name='set-password', renderer='kotti:templates/edit/simpleform.pt')
 def set_password(context, request,
-                 success_msg=_(u"You have reset your password.")):
+                 success_msg=_("You have reset your password.")):
     """ Set password view.  Displays the set password form and handles its form
     submission.
 
@@ -299,7 +293,7 @@ def set_password(context, request,
     """
 
     form = Form(SetPasswordSchema(),
-                buttons=(Button('submit', _(u'Set password')),))
+                buttons=(Button('submit', _('Set password')),))
     rendered_form = None
 
     if 'submit' in request.POST:
@@ -327,14 +321,14 @@ def set_password(context, request,
                 return HTTPFound(location=location, headers=headers)
             else:
                 request.session.flash(
-                    _(u"Your password reset token may have expired."), 'error')
+                    _("Your password reset token may have expired."), 'error')
 
     if rendered_form is None:
         rendered_form = form.render(request.params)
 
     api = template_api(
         context, request,
-        page_title=_(u"Reset your password - ${title}.",
+        page_title=_("Reset your password - ${title}.",
                      mapping=dict(title=context.title)),
         )
 
@@ -362,9 +356,8 @@ def forbidden_redirect(context, request):
 
 @view_config(context=HTTPForbidden)
 def forbidden_view(request):
-    """
-    Forbidden view.  Raises 403 for requests not originating from a web browser
-    like device.
+    """ Forbidden view.  Raises 403 for requests not originating from a web
+    browser like device.
 
     :result: 403
     :rtype: pyramid.httpexceptions.HTTPForbidden
@@ -375,8 +368,7 @@ def forbidden_view(request):
 
 @view_config(name='forbidden', renderer='kotti:templates/forbidden.pt')
 def forbidden_view_html(request):
-    """
-    Forbidden view for browsers.
+    """ Forbidden view for browsers.
 
     :result: empty dictionary passed to the template for rendering
     :rtype: dict
diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index 1a90f5f5f..8d2123bd6 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -1,9 +1,4 @@
-# -*- coding: utf-8 -*-
-"""
-This module contains navigation related views.
-"""
-from __future__ import absolute_import, division, print_function
-
+""" This module contains navigation related views. """
 from pyramid.view import view_config
 
 from kotti.interfaces import INavigationRoot
@@ -30,8 +25,7 @@ def render_tree_navigation(context, request):
     }
 
 
-@view_config(name='local-navigation',
-             context=INode,
+@view_config(name='local-navigation', context=INode,
              renderer='kotti:templates/view/nav-local.pt')
 def local_navigation(context, request):
 
diff --git a/kotti/views/site_setup.py b/kotti/views/site_setup.py
index d71a23ead..6c50793c2 100644
--- a/kotti/views/site_setup.py
+++ b/kotti/views/site_setup.py
@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 from kotti.util import Link
 from kotti.util import _
 
 CONTROL_PANEL_LINKS = [
-    Link('setup-users', title=_(u'User Management')),
+    Link('setup-users', title=_('User Management')),
     ]
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index 5746ae316..c68518cad 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This module allows add-ons to assign views to slots defined in
 the overall page.  In other systems, these are called portlets or
 viewlets.
@@ -38,14 +37,12 @@ def view(request, context):
 users of your package to include your slot assignments through the
 ``pyramid.includes`` configuration setting.
 """
-from __future__ import absolute_import, division, print_function
 
-import urllib
+from urllib.parse import urlencode
 
 from pyramid.exceptions import PredicateMismatch
 from pyramid.httpexceptions import HTTPException
 from pyramid.httpexceptions import HTTPForbidden
-from pyramid.request import Request
 from pyramid.view import render_view
 
 from kotti.events import ObjectEvent
@@ -56,8 +53,8 @@ def view(request, context):
 
 def _encode(params):
     if not params:
-        return u''
-    return urllib.urlencode(
+        return ''
+    return urlencode(
         dict((k, v.encode('utf-8')) for k, v in params.items()))
 
 
@@ -111,31 +108,32 @@ def assign_slot(view_name, slot, params=None):
 
 
 class RenderLeftSlot(ObjectEvent):
-    name = u'left'
+    name = 'left'
 
 
 class RenderRightSlot(ObjectEvent):
-    name = u'right'
+    name = 'right'
 
 
 class RenderAboveContent(ObjectEvent):
-    name = u'abovecontent'
+    name = 'abovecontent'
 
 
 class RenderBelowContent(ObjectEvent):
-    name = u'belowcontent'
+    name = 'belowcontent'
 
 
 class RenderInHead(ObjectEvent):
-    name = u'inhead'
+    name = 'inhead'
 
 
 class RenderBeforeBodyEnd(ObjectEvent):
-    name = u'beforebodyend'
+    name = 'beforebodyend'
 
 
 class RenderEditInHead(ObjectEvent):
-    name = u'edit_inhead'
+    name = 'edit_inhead'
+
 
 slot_events = [
     RenderLeftSlot, RenderRightSlot, RenderAboveContent, RenderBelowContent,
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 0bf5e03e6..ce667c74d 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -1,11 +1,6 @@
-# -*- coding: utf-8 -*-
-"""
-User management screens
-"""
-from __future__ import absolute_import, division, print_function
-
+""" User management screens """
 import re
-from urllib import urlencode
+from urllib.parse import urlencode
 
 import colander
 from deform import Button
@@ -47,11 +42,11 @@ def roles_form_handler(context, request, available_role_names, groups_lister):
             if name.startswith('orig-role::'):
                 # orig-role::* is hidden checkboxes that allow us to
                 # see what checkboxes were in the form originally
-                token, principal_name, role_name = unicode(name).split(u'::')
+                token, principal_name, role_name = name.split('::')
                 if role_name not in available_role_names:
                     raise Forbidden()
                 new_value = bool(request.params.get(
-                    u'role::{0}::{1}'.format(principal_name, role_name)))
+                    'role::{0}::{1}'.format(principal_name, role_name)))
                 if principal_name not in p_to_r:
                     p_to_r[principal_name] = set()
                 if new_value:
@@ -70,9 +65,9 @@ def roles_form_handler(context, request, available_role_names, groups_lister):
 
         if changed:
             request.session.flash(
-                _(u'Your changes have been saved.'), 'success')
+                _('Your changes have been saved.'), 'success')
         else:
-            request.session.flash(_(u'No changes were made.'), 'info')
+            request.session.flash(_('No changes were made.'), 'info')
 
     return changed
 
@@ -96,16 +91,16 @@ def search_principals(request, context=None, ignore=None, extra=()):
         postdata = request.json
     if 'search' in postdata:
         if request.is_xhr:
-            query = u'*{0}*'.format(postdata['query'])
+            query = '*{0}*'.format(postdata['query'])
         else:
-            query = u'*{0}*'.format(request.params['query'])
+            query = '*{0}*'.format(request.params['query'])
         found = False
         for p in principals.search(name=query, title=query, email=query):
             found = True
             if p.name not in ignore:
                 entries.append((p, list_groups_ext(p.name, context)))
         if not found:
-            flash(_(u'No users or groups were found.'), 'info')
+            flash(_('No users or groups were found.'), 'info')
 
     return entries
 
@@ -125,13 +120,13 @@ def share_node(context, request):
 
     def with_roles(entry):
         all_groups = entry[1][0]
-        return [g for g in all_groups if g.startswith('role:')]
+        return len([g for g in all_groups if g.startswith('role:')]) > 0
 
-    existing = filter(with_roles, existing)
+    existing = [e for e in filter(with_roles, existing)]
     seen = set([entry[0].name for entry in existing])
 
     # Allow search to take place and add some entries:
-    entries = existing + search_principals(request, context, ignore=seen)
+    entries = list(existing) + search_principals(request, context, ignore=seen)
     available_roles = [ROLES[role_name] for role_name in SHARING_ROLES]
 
     return {
@@ -142,30 +137,31 @@ def with_roles(entry):
 
 def name_pattern_validator(node, value):
     """
-        >>> name_pattern_validator(None, u'bob')
-        >>> name_pattern_validator(None, u'b ob')
+        >>> name_pattern_validator(None, 'bob')
+        >>> name_pattern_validator(None, 'b ob')
         Traceback (most recent call last):
-        Invalid: <unprintable Invalid object>
-        >>> name_pattern_validator(None, u'b:ob')
+         ...
+        colander.Invalid: <unprintable Invalid object>
+        >>> name_pattern_validator(None, 'b:ob')
         Traceback (most recent call last):
-        Invalid: <unprintable Invalid object>
+        colander.Invalid: <unprintable Invalid object>
     """
     valid_pattern = re.compile(r"^[a-zA-Z0-9_\-\.]+$")
     if not valid_pattern.match(value):
-        raise colander.Invalid(node, _(u"Invalid value"))
+        raise colander.Invalid(node, _("Invalid value"))
 
 
 def name_new_validator(node, value):
     if get_principals().get(value.lower()) is not None:
         raise colander.Invalid(
-            node, _(u"A user with that name already exists."))
+            node, _("A user with that name already exists."))
 
 
 @colander.deferred
 def deferred_email_validator(node, kw):
     def raise_invalid_email(node, value):
         raise colander.Invalid(
-            node, _(u"A user with that email already exists."))
+            node, _("A user with that email already exists."))
     request = kw['request']
     if request.POST:
         email = request.params.get('email')
@@ -188,14 +184,14 @@ def roleset_validator(node, value):
 def group_validator(node, value):
     principals = get_principals()
     if principals.get('group:' + value) is None:
-        raise colander.Invalid(node, _(u"No such group: ${group}",
+        raise colander.Invalid(node, _("No such group: ${group}",
                                        mapping=dict(group=value)))
 
 
 class Groups(colander.SequenceSchema):
     group = colander.SchemaNode(
         colander.String(),
-        title=_(u'Group'),
+        title=_('Group'),
         validator=group_validator,
         missing=None,
         widget=AutocompleteInputWidget(),
@@ -203,10 +199,10 @@ class Groups(colander.SequenceSchema):
 
 
 class PrincipalBasic(colander.MappingSchema):
-    title = colander.SchemaNode(colander.String(), title=_(u'Title'))
+    title = colander.SchemaNode(colander.String(), title=_('Title'))
     email = colander.SchemaNode(
         colander.String(),
-        title=_(u'Email'),
+        title=_('Email'),
         validator=deferred_email_validator,
     )
 
@@ -214,30 +210,30 @@ class PrincipalBasic(colander.MappingSchema):
 class PrincipalFull(PrincipalBasic):
     name = colander.SchemaNode(
         colander.String(),
-        title=_(u'Name'),
+        title=_('Name'),
         validator=colander.All(name_pattern_validator, name_new_validator),
         )
     password = colander.SchemaNode(
         colander.String(),
-        title=_(u'Password'),
+        title=_('Password'),
         validator=colander.Length(min=5),
         missing=None,
         widget=CheckedPasswordWidget(),
         )
     active = colander.SchemaNode(
         colander.Boolean(),
-        title=_(u'Active'),
-        description=_(u"Untick this to deactivate the account."),
+        title=_('Active'),
+        description=_("Untick this to deactivate the account."),
         )
     roles = colander.SchemaNode(
         colander.Set(),
         validator=roleset_validator,
         missing=[],
-        title=_(u"Global roles"),
+        title=_("Global roles"),
         widget=CheckboxChoiceWidget(),
         )
     groups = Groups(
-        title=_(u'Groups'),
+        title=_('Groups'),
         missing=[],
         # XXX min_len doesn't really do what we want here.  We'd like
         # the close buttons to appear nevertheless (maybe the now
@@ -256,9 +252,9 @@ def principal_schema(base=PrincipalFull()):
         has_groups = False
     if has_groups:
         all_groups = []
-        for p in principals.search(name=u'group:*'):
-            value = p.name.split(u'group:')[1]
-            label = u"{0}, {1}".format(p.title, value)
+        for p in principals.search(name='group:*'):
+            value = p.name.split('group:')[1]
+            label = "{0}, {1}".format(p.title, value)
             all_groups.append(dict(value=value, label=label))
         schema['groups']['group'].widget.values = all_groups
         schema['roles'].widget.values = [
@@ -275,9 +271,9 @@ def user_schema(base=PrincipalFull()):
         has_password = False
     if has_password:
         schema['password'].description = _(
-            u"Leave this empty and tick the 'Send password registration' "
-            u"box below to have the user set their own password.")
-    schema['title'].title = _(u"Full name")
+            "Leave this empty and tick the 'Send password registration' "
+            "box below to have the user set their own password.")
+    schema['title'].title = _("Full name")
     return schema
 
 
@@ -300,7 +296,7 @@ def _massage_groups_in(appstruct):
     """
     groups = appstruct.get('groups', [])
     all_groups = list(appstruct.get('roles', [])) + [
-        u'group:{0}'.format(g) for g in groups if g]
+        'group:{0}'.format(g) for g in groups if g]
     if 'roles' in appstruct:
         del appstruct['roles']
     appstruct['groups'] = all_groups
@@ -311,19 +307,19 @@ def _massage_groups_out(appstruct):
     split 'groups' into 'roles' and 'groups'.
     """
     d = appstruct
-    groups = [g.split(u'group:')[1] for g in d.get('groups', u'')
-              if g and g.startswith(u'group:')]
-    roles = [r for r in d.get('groups', u'') if r and r.startswith(u'role:')]
+    groups = [g.split('group:')[1] for g in d.get('groups', '')
+              if g and g.startswith('group:')]
+    roles = [r for r in d.get('groups', '') if r and r.startswith('role:')]
     d['groups'] = groups
     d['roles'] = roles
     return d
 
 
 class UserAddFormView(AddFormView):
-    item_type = _(u'User')
+    item_type = _('User')
     form_options = (('formid', 'deform_user_add'), )
-    buttons = (Button('add_user', _(u'Add User')),
-               Button('cancel', _(u'Cancel')))
+    buttons = (Button('add_user', _('Add User')),
+               Button('cancel', _('Cancel')))
 
     @staticmethod
     def schema_factory():
@@ -331,8 +327,8 @@ def schema_factory():
         del schema['active']
         schema.add(colander.SchemaNode(
             colander.Boolean(),
-            name=u'send_email',
-            title=_(u'Send password registration link.'),
+            name='send_email',
+            title=_('Send password registration link.'),
             default=True,
             ))
         return schema
@@ -347,7 +343,7 @@ def add_user_success(self, appstruct):
         if send_email:
             email_set_password(get_principals()[name], self.request)
         self.request.session.flash(
-            _(u'${title} was added.',
+            _('${title} was added.',
               mapping=dict(title=appstruct['title'])), 'success')
         location = self.request.url.split('?')[0] + '?' + urlencode(
             {'extra': name})
@@ -355,10 +351,10 @@ def add_user_success(self, appstruct):
 
 
 class GroupAddFormView(UserAddFormView):
-    item_type = _(u"Group")
+    item_type = _("Group")
     form_options = (('formid', 'deform_group_add'), )
-    buttons = (Button('add_group', _(u'Add Group')),
-               Button('cancel', _(u'Cancel')))
+    buttons = (Button('add_group', _('Add Group')),
+               Button('cancel', _('Cancel')))
 
     @staticmethod
     def schema_factory():
@@ -367,7 +363,7 @@ def schema_factory():
         return schema
 
     def add_group_success(self, appstruct):
-        appstruct['name'] = u'group:{0}'.format(appstruct['name'].lower())
+        appstruct['name'] = 'group:{0}'.format(appstruct['name'].lower())
         return self.add_user_success(appstruct)
 
 
@@ -387,7 +383,7 @@ def __call__(self):
         api = template_api(self.context, self.request,
                            cp_links=CONTROL_PANEL_LINKS)
 
-        api.page_title = _(u"User Management")
+        api.page_title = _("User Management")
 
         principals = get_principals()
 
@@ -451,9 +447,9 @@ def schema_factory():
 
 class UserManageFormView(UserEditFormView):
 
-    buttons = (Button('save', _(u'Save')),
-               Button('cancel', _(u'Cancel')),
-               Button('delete', _(u'Delete'), css_class='btn btn-danger'))
+    buttons = (Button('save', _('Save')),
+               Button('cancel', _('Cancel')),
+               Button('delete', _('Delete'), css_class='btn btn-danger'))
 
     @staticmethod
     def schema_factory():
@@ -463,7 +459,7 @@ def schema_factory():
 
     def before(self, form):
         context = self.context.__dict__.copy()
-        context['password'] = u''
+        context['password'] = ''
         form.appstruct = _massage_groups_out(context)
 
     def save_success(self, appstruct):
@@ -476,13 +472,13 @@ def save_success(self, appstruct):
         return super(UserManageFormView, self).save_success(appstruct)
 
     def cancel_success(self, appstruct):
-        self.request.session.flash(_(u'No changes were made.'), 'info')
-        location = u'{0}/@@setup-users'.format(self.request.application_url)
+        self.request.session.flash(_('No changes were made.'), 'info')
+        location = '{0}/@@setup-users'.format(self.request.application_url)
         return HTTPFound(location=location)
     cancel_failure = cancel_success
 
     def delete_success(self, appstruct):
-        location = u'{0}/@@delete-user?name={1}'.format(
+        location = '{0}/@@delete-user?name={1}'.format(
             self.request.application_url, self.request.params['name'])
         return HTTPFound(location=location)
 
@@ -514,11 +510,11 @@ def __call__(self):
         principal = get_principals()[user_or_group]
 
         is_group = user_or_group.startswith("group:")
-        principal_type = _(u"Group") if is_group else _(u"User")
+        principal_type = _("Group") if is_group else _("User")
 
         api = template_api(
             self.context, self.request,
-            page_title=_(u"Edit ${principal_type} ${title}",
+            page_title=_("Edit ${principal_type} ${title}",
                          mapping=dict(principal_type=principal_type,
                                       title=self.context.title)),
             cp_links=CONTROL_PANEL_LINKS,
@@ -546,32 +542,32 @@ def user_delete(context, request):
         user_or_group = request.params['name']
         principal = principals.search(name=user_or_group).first()
         if principal is None:
-            request.session.flash(_(u'User was not found.'), 'error')
+            request.session.flash(_('User was not found.'), 'error')
         else:
             is_group = user_or_group.startswith("group:")
-            principal_type = _(u"Group") if is_group else _(u"User")
+            principal_type = _("Group") if is_group else _("User")
 
             # We already coming from the confirmation page.
             if 'delete' in request.POST:
                 principals.__delitem__(principal.name)
                 notify(UserDeleted(principal, request))
                 request.session.flash(
-                    _(u'${principal_type} ${title} was deleted.',
+                    _('${principal_type} ${title} was deleted.',
                       mapping=dict(principal_type=principal_type,
                                    title=principal.title)), 'info')
-                location = u'{0}/@@setup-users'.format(request.application_url)
+                location = '{0}/@@setup-users'.format(request.application_url)
                 return HTTPFound(location=location)
 
             api = template_api(
                 context, request,
-                page_title=_(u"Delete ${principal_type} ${title}",
+                page_title=_("Delete ${principal_type} ${title}",
                              mapping=dict(principal_type=principal_type,
                                           title=principal.title)),
                 principal_type=principal_type,
                 principal=principal)
             return {'api': api, }
     else:
-        request.session.flash(_(u'No name was given.'), 'error')
+        request.session.flash(_('No name was given.'), 'error')
 
     return {'api': template_api(context, request), }
 
@@ -600,7 +596,7 @@ def __call__(self):
             raise Forbidden()
 
         api = template_api(self.context, self.request)
-        api.page_title = _(u"My preferences - ${title}",
+        api.page_title = _("My preferences - ${title}",
                            mapping=dict(title=api.site_title))
 
         form = self.PreferencesFormView(user, self.request)()
diff --git a/kotti/views/util.py b/kotti/views/util.py
index bd090cca1..27aca8341 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -1,10 +1,7 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import hashlib
-import urllib
 from collections import defaultdict
 from datetime import datetime
+from urllib.parse import urlencode
 
 from babel.dates import format_date
 from babel.dates import format_datetime
@@ -21,13 +18,12 @@
 from sqlalchemy import and_
 from sqlalchemy import not_
 from sqlalchemy import or_
-from zope.deprecation import deprecated
 
 from kotti import DBSession
 from kotti import get_settings
 from kotti.events import objectevent_listeners
 from kotti.interfaces import INavigationRoot
-from kotti.resources import Content
+from kotti.resources import Content, Node
 from kotti.resources import Document
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
@@ -47,7 +43,7 @@ def __init__(self, val, config):
             raise ValueError("Only boolean values supported")
 
     def text(self):
-        return u'if_setting_has_value = {0} == {1}'.format(
+        return 'if_setting_has_value = {0} == {1}'.format(
             self.name, self.value)
 
     phash = text
@@ -61,7 +57,7 @@ def __init__(self, val, config):
         self.val = val
 
     def text(self):
-        return u'root_only = {0}'.format(self.val)
+        return 'root_only = {0}'.format(self.val)
 
     phash = text
 
@@ -83,13 +79,6 @@ def add_renderer_globals(event):
         event['api'] = api
 
 
-def is_root(context, request):
-    return context is request.root
-deprecated('is_root', "'is_root' is deprecated as of Kotti 1.0.0. "
-           "Use the 'root_only=True' if you were using this as a "
-           "'custom_predicates' predicate.")
-
-
 class Slots(object):
     def __init__(self, context, request):
         self.context = context
@@ -175,7 +164,7 @@ def site_title(self):
 
         :result: Value of the ``kotti.site_title`` setting (if specified) or
                  the root item's ``title`` attribute.
-        :rtype: unicode
+        :rtype: str
         """
         value = get_settings().get('kotti.site_title')
         if not value:
@@ -190,14 +179,14 @@ def page_title(self):
 
         :result: '[Human readable view title ]``context.title`` -
                  :meth:`~TemplateAPI.site_title`''
-        :rtype: unicode
+        :rtype: str
         """
 
         view_title = self.request.view_name.replace('_', ' ').title()
         if view_title:
-            view_title += u' '
+            view_title += ' '
         view_title += self.context.title
-        return u'{0} - {1}'.format(view_title, self.site_title)
+        return '{0} - {1}'.format(view_title, self.site_title)
 
     def url(self, context=None, *elements, **kwargs):
         """
@@ -293,15 +282,18 @@ def render_template(self, renderer, **kwargs):
         return TemplateStructure(render(renderer, kwargs, self.request))
 
     def list_children(self, context=None, permission='view'):
+
         if context is None:
             context = self.context
-        children = []
-        if hasattr(context, 'values'):
-            for child in context.values():
+
+        if isinstance(context, Node):
+            if permission is None:
+                return context.children
+            return context.children_with_permission(self.request, permission)
+
+        return [c for c in getattr(context, 'values', lambda: [])()
                 if (not permission or
-                        self.request.has_permission(permission, child)):
-                    children.append(child)
-        return children
+                    self.request.has_permission(permission, c))]
 
     inside = staticmethod(inside)
 
@@ -311,10 +303,10 @@ def avatar_url(self, user=None, size="14", default_image='identicon'):
         email = user.email
         if not email:
             email = user.name
-        h = hashlib.md5(email).hexdigest()
+        h = hashlib.md5(email.encode('utf8')).hexdigest()
         query = {'default': default_image, 'size': str(size)}
-        url = u'https://secure.gravatar.com/avatar/{0}?{1}'.format(
-            h, urllib.urlencode(query))
+        url = 'https://secure.gravatar.com/avatar/{0}?{1}'.format(
+            h, urlencode(query))
         return url
 
     @reify
@@ -351,9 +343,9 @@ def get_type(name):
     def find_edit_view(self, item):
         view_name = self.request.view_name
         if not view_permitted(item, self.request, view_name):
-            view_name = u'edit'
+            view_name = 'edit'
         if not view_permitted(item, self.request, view_name):
-            view_name = u''
+            view_name = ''
         return view_name
 
     @reify
@@ -373,13 +365,13 @@ def sanitize(html, sanitizer='default'):
         """ Convenience wrapper for :func:`kotti.sanitizers.sanitize`.
 
         :param html: HTML to be sanitized
-        :type html: unicode
+        :type html: str
 
         :param sanitizer: name of the sanitizer to use.
         :type sanitizer: str
 
         :result: sanitized HTML
-        :rtype: unicode
+        :rtype: str
         """
 
         return sanitize(html, sanitizer)
@@ -459,7 +451,7 @@ def search_content(search_term, request=None):
 def default_search_content(search_term, request=None):
 
     # noinspection PyUnresolvedReferences
-    searchstring = u'%{0}%'.format(search_term)
+    searchstring = '%{0}%'.format(search_term)
 
     # generic_filter can be applied to all Node (and subclassed) objects
     generic_filter = or_(Content.name.like(searchstring),
@@ -514,13 +506,12 @@ def search_content_for_tags(tags, request=None):
     return result_dicts
 
 
-from kotti.util import get_localizer_for_locale_name  # noqa
-from kotti.util import translate  # noqa
+def includeme(config):
+    """ Pyramid includeme hook.
+
+    :param config: app config
+    :type config: :class:`pyramid.config.Configurator`
+    """
 
-for obj in (render_view, get_localizer_for_locale_name, translate,
-            TemplateStructure):
-    name = obj.__name__
-    deprecated(
-        name,
-        "kotti.views.util.{0} has been moved to the kotti.util module "
-        "as of Kotti 1.0.0.  Use kotti.util.{0} instead".format(name))
+    config.add_view_predicate('root_only', RootOnlyPredicate)
+    config.add_view_predicate('if_setting_has_value', SettingHasValuePredicate)
diff --git a/kotti/views/view.py b/kotti/views/view.py
index fff87d363..c4c1e2c03 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import warnings
 
 from pyramid.httpexceptions import HTTPNotFound
@@ -27,7 +24,7 @@ def view_content_default(context, request):
     response = render_view_to_response(context, request, name=view_name)
     if response is None:  # pragma: no cover
         warnings.warn(
-            u'Failed to look up default view called {0!r} for {1!r}.'.format(
+            'Failed to look up default view called {0!r} for {1!r}.'.format(
                 view_name, context))
         raise HTTPNotFound()
     return response
@@ -43,8 +40,8 @@ def view_node(context, request):  # pragma: no cover
              renderer='kotti:templates/view/search-results.pt')
 def search_results(context, request):
     results = []
-    if u'search-term' in request.POST:
-        search_term = request.POST[u'search-term']
+    if 'search-term' in request.POST:
+        search_term = request.POST['search-term']
         results = search_content(search_term, request)
     return {'results': results}
 
@@ -54,11 +51,11 @@ def search_results(context, request):
              renderer='kotti:templates/view/search-results.pt')
 def search_results_for_tag(context, request):
     results = []
-    if u'tag' in request.GET:
+    if 'tag' in request.GET:
         # Single tag searching only, is allowed in default Kotti. Add-ons can
         # utilize search_content_for_tags(tags) to enable multiple tags
         # searching, but here it is called with a single tag.
-        tags = [request.GET[u'tag'].strip()]
+        tags = [request.GET['tag'].strip()]
         results = search_content_for_tags(tags, request)
     return {'results': results}
 
diff --git a/kotti/workflow.py b/kotti/workflow.py
index 99f7ba7fc..81c968749 100644
--- a/kotti/workflow.py
+++ b/kotti/workflow.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
-
 import transaction
 from pyramid.security import DENY_ALL
 from repoze.workflow import get_workflow as base_get_workflow
diff --git a/kotti/workflow.zcml b/kotti/workflow.zcml
index 78f4cd68d..9b46a4046 100644
--- a/kotti/workflow.zcml
+++ b/kotti/workflow.zcml
@@ -15,7 +15,7 @@
   <workflow name="simple" initial_state="private"
             type="security" state_attr="state"
             content_types="kotti.interfaces.IDefaultWorkflow"
-            permission_checker="pyramid.security.has_permission">
+            permission_checker="kotti.security.has_permission">
 
     <state name="private" title="Private" i18n:attributes="title"
            callback="kotti.workflow.workflow_callback">
diff --git a/pytest.ini b/pytest.ini
index f137d6db9..a278f3ffd 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,16 +1,19 @@
 [pytest]
+# if you use PyCharm / IDEA and want to debug the tests,
+# you have to remove ``--cov`` and ``--cov-report`` from ``addopts``,
+# otherwise your breakpoints won't be hit.
+# See: https://stackoverflow.com/questions/40718760/unable-to-debug-in-pycharm-with-pytest
 addopts =
-    --doctest-modules
-    --doctest-glob='*.txt'
     --ignore=kotti/templates/
     --capture=no
     --strict
-    --pep8
     --tb=native
+    --travis-fold=auto
+    --doctest-glob='*.txt'
+    --doctest-modules
+    --pep8
     --cov=kotti
     --cov-report=term-missing
-    --travis-fold=auto
-
     kotti/
 python_files = test_*.py
 pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
diff --git a/requirements.txt b/requirements.txt
index a99fbb45a..38e5a3132 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,19 +6,18 @@ bleach==2.1.2
 bleach-whitelist==0.0.8
 Chameleon==3.2
 colander==1.4
-deform==2.0.4
+deform==2.0.5
 docopt==0.6.2
 fanstatic==1.0.0
 filedepot==0.5.0
-FormEncode==1.3.1
-funcsigs==1.0.2
+FormEncode==2.0.0a1
 html2text==2018.1.9
 html5lib==1.0.1
 hupper==1.0
-iso8601==0.1.12
+iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
-js.deform==2.0.3
+js.deform==2.0.5.dev0
 js.fineuploader==5.14.0
 js.html5shiv==3.7.3
 js.jquery==1.9.1
@@ -33,17 +32,14 @@ js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==4.0.4.post1
 js.tinymce==4.5.4
-kotti-image==1.0.0
 LEPL==5.1.3
 lingua==4.13
 Mako==1.0.7
 MarkupSafe==1.0
 PasteDeploy==1.5.2
 peppercorn==0.5
-Pillow==5.0.0
 plaster==1.0
 plaster-pastedeploy==0.4.2
-plone.scale==3.0
 polib==1.1.0
 py-bcrypt==0.4
 pyramid==1.9.1
@@ -60,7 +56,6 @@ repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.0b1
 repoze.zcml==1.0b1
-rfc6266==0.0.4
 rfc6266-parser==0.0.5.post2
 shutilwhich==1.1.0
 six==1.11.0
diff --git a/rtd.txt b/rtd.txt
index 35b59e5fc..a65b2c974 100644
--- a/rtd.txt
+++ b/rtd.txt
@@ -1,3 +1,4 @@
+.[docs]
 repoze.sphinx.autointerface
 setuptools-git  # needed to make "python setup.py install" on rtd.
 pytest  # needed for kotti.testing apidocs
diff --git a/setup.py b/setup.py
index 612ec4755..88ae70575 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
-
 import codecs
 import os
 
 from setuptools import find_packages
 from setuptools import setup
 
-
-version = '1.3.2.dev0'
+version = '2.0.0.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."
@@ -22,40 +19,40 @@
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'alembic>=0.8.0',
-    'bleach',
+    'bleach>=2.1.2',  # html5lib 1.0 support
     'bleach-whitelist',
     'colander>=1.3.2',
-    'deform>=2.0.3',  # >=2.0a1 to support Bootstrap 2
+    'deform>=2.0.5',  # fixes file upload on py3 - uncomment after 2.0.5 is released  # noqa
     'docopt',
     'fanstatic>=1.0.0',
     'filedepot',
-    'formencode',
+    'formencode>=2.0.0a',
     'html2text',
+    'iso8601==0.1.11',  # deform requirement.  isn't picked up automatically for some reason # noqa
     'js.angular',
     'js.bootstrap>=3.0.0',
     'js.deform>=2.0a2-2',
     'js.fineuploader',
     'js.html5shiv',
-    'js.jquery',
+    'js.jquery<2.0.0.dev',
     'js.jquery_form',
     'js.jquery_tablednd',
     'js.jquery_timepicker_addon',
     'js.jqueryui>=1.8.24',
     'js.jqueryui_tagit',
-    'kotti_image',
     'lingua>=1.3',
     'py_bcrypt',
-    'pyramid>=1.8',  # needed for ``request.has_permission``,
+    'pyramid>=1.9',
     'pyramid_beaker',
     'pyramid_chameleon',
     'pyramid_deform>=0.2a3',  # language and template path config includeme
     'pyramid_mailer',
     'pyramid_tm',
-    'pyramid_zcml>=1.1.0',
+    'pyramid_zcml>=1.1.0',  # py3 compat
     'repoze.lru',
     'repoze.workflow>=1.0b1',
     'repoze.zcml>=1.0b1',
-    'rfc6266',
+    'rfc6266-parser',
     'sqlalchemy>=1.0.0',
     'sqlalchemy-utils',
     'transaction>=1.1.0',
@@ -70,6 +67,7 @@
 tests_require = [
     'WebTest',
     'mock',
+    'Pillow',  # thumbnail filter in depot tween tests
     'py>=1.4.29',
     'pyquery',
     'pytest>=3.0.0',
@@ -79,7 +77,6 @@
     'pytest-virtualenv',
     'pytest-xdist',
     'tox',
-    'virtualenv',  # needed for scaffolding tests
     'zope.testbrowser>=5.0.0',
     ]
 
@@ -94,6 +91,8 @@
     'docutils',
     'repoze.sphinx.autointerface',
     'sphinx_rtd_theme',
+    'setuptools-git',  # needed to make "python setup.py install" on rtd.
+    'pytest',  # needed for kotti.testing apidocs
     ]
 
 setup_requires = [
@@ -103,6 +102,7 @@
 
 here = os.path.abspath(os.path.dirname(__file__))
 
+
 def read(*parts):
     """ Build an absolute path from *parts* and and return the contents of the
     resulting file.  Assume UTF-8 encoding.
@@ -118,11 +118,10 @@ def read(*parts):
 setup(name='Kotti',
       version=version,
       description=description,
-      long_description='\n\n'.join([read('README.rst'), read('AUTHORS.txt'),
+      long_description='\n\n'.join([read('README.rst'),
+                                    read('AUTHORS.txt'),
                                     read('CHANGES.txt'), ]),
       classifiers=[
-          # 'Development Status :: 3 - Alpha',
-          # 'Development Status :: 4 - Beta',
           'Development Status :: 5 - Production/Stable',
           'Environment :: Web Environment',
           'Framework :: Pylons',
@@ -141,13 +140,13 @@ def read(*parts):
           'Operating System :: Unix',
           # 'Programming Language :: JavaScript',
           'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
-          # 'Programming Language :: Python :: 3',
-          # 'Programming Language :: Python :: 3.3',
-          # 'Programming Language :: Python :: 3.4',
-          # 'Programming Language :: Python :: 3.5',
-          # 'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3 :: Only',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: Implementation',
+          'Programming Language :: Python :: Implementation :: CPython',
+          # 'Programming Language :: Python :: Implementation :: PyPy',
           'Programming Language :: SQL',
           'Topic :: Internet',
           'Topic :: Internet :: WWW/HTTP',
@@ -169,7 +168,6 @@ def read(*parts):
       install_requires=install_requires,
       setup_requires=setup_requires,
       tests_require=tests_require,
-      dependency_links=[],
       entry_points={
           'paste.app_factory': [
               'main = kotti:main',
@@ -185,9 +183,6 @@ def read(*parts):
           'pytest11': [
               'kotti = kotti.tests',
           ],
-          'pyramid.scaffold': [
-              'kotti=kotti.scaffolds:KottiPackageTemplate',
-          ],
       },
       extras_require={
           'testing': tests_require,
diff --git a/tox.ini b/tox.ini
index 14a4ddb53..0f586fb72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,33 +1,27 @@
 [tox]
-envlist = py26,py27
+envlist = {py35,py36}-{postgresql,sqlite,mysql}
 
 [testenv]
-commands =
-    py.test --junitxml=junit-{envname}.xml []
 deps =
-    WebTest
-    mock
-    pytest
-    pytest-cov
-    pytest-pep8
-    pytest-xdist
-    wsgi-intercept
-    zope.testbrowser
-
-[testenv:py27postgres]
-basepython =
-    python2.7
+    postgresql: psycopg2
+    mysql: mysqlclient
+envdir:
+    py35: {toxworkdir}/3.5
+    py36: {toxworkdir}/3.6
+setenv:
+    sqlite: KOTTI_TEST_DB_STRING=sqlite://
+    py35-mysql: KOTTI_TEST_DB_STRING=mysql://root@localhost:3306/kotti_testing
+    py36-mysql: KOTTI_TEST_DB_STRING=mysql://root@localhost:3306/kotti_testing
+    py35-postgresql: KOTTI_TEST_DB_STRING=postgresql://127.0.0.1:5432/kotti_testing
+    py36-postgresql: KOTTI_TEST_DB_STRING=postgresql://127.0.0.1:5432/kotti_testing
+install_command: pip install {opts} {packages}
+whitelist_externals =
+    mysql
+    psql
 commands =
-    py.test --junitxml=junit-{envname}.xml []
-deps =
-    psycopg2
-    WebTest
-    mock
+    postgresql: psql -U postgres -c 'CREATE DATABASE kotti_testing;'
+    mysql: mysql -u root -e 'CREATE DATABASE kotti_testing CHARACTER SET utf8 COLLATE utf8_general_ci;'
+    pip install -e .[testing]
     pytest
-    pytest-cov
-    pytest-pep8
-    pytest-xdist
-    wsgi-intercept
-    zope.testbrowser
-setenv =
-    KOTTI_TEST_DB_STRING=postgresql://jenkins:jenkins@localhost:5432/kotti-testing
+    postgresql: psql -U postgres -c 'DROP DATABASE kotti_testing;'
+    mysql: mysql -u root -e 'DROP DATABASE kotti_testing;'

From 6acbd6a973495728c957101334fc29cca6d0a9b5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 22 Feb 2018 13:22:29 +0100
Subject: [PATCH 496/600] Remove outdated badges, add more badges, tag
 requirements with filters for requires.io.

---
 Makefile         |  2 +-
 README.rst       | 18 +++++++-----------
 requirements.txt | 16 ++++++++--------
 setup.py         |  4 ++--
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 834382ebb..4c41de47e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ bin/pytest: .pip.log *.py *.cfg
 	bin/pip install -e ".[development]" --log .pip.log
 
 bin/python:
-	virtualenv --clear .
+	python -m venv .
 	@touch $@
 
 clean:
diff --git a/README.rst b/README.rst
index 3323f8daf..b617f134d 100644
--- a/README.rst
+++ b/README.rst
@@ -98,13 +98,9 @@ Development
 |coveralls|_
 |codacy|_
 |codeclimate|_
-|quantifiedcode|_
-|landscape|_
-
-
-
-.. requirements need to be upgraded before we shoff off
-   |requires.io|_
+|circleci|_
+|scrutinizer|_
+|requires.io|_
 
 |gh_forks|_
 |gh_stars|_
@@ -138,11 +134,11 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. |codeclimate| image:: https://img.shields.io/codeclimate/github/Kotti/Kotti.svg?style=flat-square
 .. _codeclimate: https://codeclimate.com/github/Kotti/Kotti
 
-.. |quantifiedcode| image:: http://www.quantifiedcode.com/api/v1/project/f2a648c15f8e42788aaa4fa12a82df93/badge.svg
-.. _quantifiedcode: http://www.quantifiedcode.com/app/project/f2a648c15f8e42788aaa4fa12a82df93
+.. |circleci| image:: https://circleci.com/gh/Kotti/Kotti/tree/master.svg?style=svg
+.. _circleci: https://circleci.com/gh/Kotti/Kotti/tree/master
 
-.. |landscape| image:: https://landscape.io/github/Kotti/Kotti/master/landscape.svg?style=flat-square
-.. _landscape: https://landscape.io/github/Kotti/Kotti
+.. |scrutinizer| image:: https://scrutinizer-ci.com/g/Kotti/Kotti/badges/quality-score.png?b=master
+.. _scrutinizer: https://scrutinizer-ci.com/g/Kotti/Kotti/
 
 .. _contribution guidelines: https://kotti.readthedocs.io/en/latest/contributing.html
 .. _Github repository: https://github.com/Kotti/Kotti
diff --git a/requirements.txt b/requirements.txt
index 38e5a3132..5ce6ffbbf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-alembic==0.9.7
+alembic==0.9.8
 appdirs==1.4.3
 Babel==2.5.3
 Beaker==1.9.0
@@ -9,18 +9,18 @@ colander==1.4
 deform==2.0.5
 docopt==0.6.2
 fanstatic==1.0.0
-filedepot==0.5.0
+filedepot==0.5.2
 FormEncode==2.0.0a1
 html2text==2018.1.9
 html5lib==1.0.1
 hupper==1.0
-iso8601==0.1.11
+iso8601==0.1.11  # rq.filter: !=0.1.12
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.5.dev0
 js.fineuploader==5.14.0
 js.html5shiv==3.7.3
-js.jquery==1.9.1
+js.jquery==1.9.1  # rq.filter: <2.0
 js.jquery-form==3.9
 js.jquery-maskedinput==1.4.1
 js.jquery-maskmoney==3.0.2
@@ -51,7 +51,7 @@ pyramid-tm==2.2
 pyramid-zcml==1.1.0
 python-dateutil==2.6.1
 python-editor==1.0.3
-pytz==2017.3
+pytz==2018.3
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.0b1
@@ -59,8 +59,8 @@ repoze.zcml==1.0b1
 rfc6266-parser==0.0.5.post2
 shutilwhich==1.1.0
 six==1.11.0
-SQLAlchemy==1.2.1
-SQLAlchemy-Utils==0.32.21
+SQLAlchemy==1.2.3
+SQLAlchemy-Utils==0.33.0
 transaction==2.1.2
 translationstring==1.3
 Unidecode==1.0.22
@@ -76,4 +76,4 @@ zope.event==4.3.0
 zope.i18nmessageid==4.1.0
 zope.interface==4.4.3
 zope.schema==4.5.0
-zope.sqlalchemy==0.7.7
+zope.sqlalchemy==1.0
diff --git a/setup.py b/setup.py
index 88ae70575..f2ae5258a 100644
--- a/setup.py
+++ b/setup.py
@@ -28,13 +28,13 @@
     'filedepot',
     'formencode>=2.0.0a',
     'html2text',
-    'iso8601==0.1.11',  # deform requirement.  isn't picked up automatically for some reason # noqa
+    'iso8601==0.1.11',  # rq.filter: !=0.1.12
     'js.angular',
     'js.bootstrap>=3.0.0',
     'js.deform>=2.0a2-2',
     'js.fineuploader',
     'js.html5shiv',
-    'js.jquery<2.0.0.dev',
+    'js.jquery<2.0.0.dev',  # rq.filter: <2.0
     'js.jquery_form',
     'js.jquery_tablednd',
     'js.jquery_timepicker_addon',

From bb4e835647c57370087101ddf5f5c1c037bda51a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 22 Feb 2018 14:49:25 +0100
Subject: [PATCH 497/600] Update Code Climate badge. [ci skip]

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index b617f134d..b9a7f013f 100644
--- a/README.rst
+++ b/README.rst
@@ -131,8 +131,8 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. _codacy: https://www.codacy.com/public/disko/Kotti
 .. _high quality coding standards: https://www.codacy.com/public/disko/Kotti
 
-.. |codeclimate| image:: https://img.shields.io/codeclimate/github/Kotti/Kotti.svg?style=flat-square
-.. _codeclimate: https://codeclimate.com/github/Kotti/Kotti
+.. |codeclimate| image:: https://api.codeclimate.com/v1/badges/3a4a61548fcc195e4ba1/maintainability
+.. _codeclimate: https://codeclimate.com/github/Kotti/Kotti/maintainability
 
 .. |circleci| image:: https://circleci.com/gh/Kotti/Kotti/tree/master.svg?style=svg
 .. _circleci: https://circleci.com/gh/Kotti/Kotti/tree/master

From fb279a0568c4673bb86667ac84799ffd36c7889e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 22 Feb 2018 15:18:44 +0100
Subject: [PATCH 498/600] Bump version.

---
 CHANGES.txt | 6 ++++--
 setup.py    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a6d587b13..b34b74d53 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,10 @@
 Change History
 ==============
 
-2.0.0.dev0 - unreleased
------------------------
+2.0.0a1 - 2018-02-22
+--------------------
+
+**This is a alpha release.  Blindly upgrading your production environments will make the universe collapse!**
 
 Backward Incompatibilities
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/setup.py b/setup.py
index f2ae5258a..0ba64071d 100644
--- a/setup.py
+++ b/setup.py
@@ -4,11 +4,11 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0.dev0'
+version = '2.0.0a1'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."
-author = 'Kotti developers'
+author = 'Kotti Developers'
 author_email = 'kotti@googlegroups.com'
 url = 'http://kotti.pylonsproject.org/'
 keywords = 'kotti web cms wcms pylons pyramid sqlalchemy bootstrap'

From 7a3d5c5c86e70d1ac10d5abd7dcbdbfa6dc7f069 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 22 Feb 2018 15:22:24 +0100
Subject: [PATCH 499/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b34b74d53..eeb277ab5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.1.0a2.dev0 - unreleased
+-------------------------
+
+- No changes yet.
+
 2.0.0a1 - 2018-02-22
 --------------------
 
diff --git a/setup.py b/setup.py
index 0ba64071d..dff6cd46d 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0a1'
+version = '2.1.0a2.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From b6d6639d664f2f1f5100bf3e04d6f3cf58f0c9de Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 19 Mar 2018 10:19:44 +0100
Subject: [PATCH 500/600] Remove links to the demo site, which has been down
 for too long.

---
 .gitignore                    | 3 +++
 CHANGES.txt                   | 2 +-
 README.rst                    | 2 +-
 docs/first_steps/overview.rst | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d2c7f73f..3365e5d53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ filestore
 share
 .eggs
 .python-version
+.long-description.html
+pyvenv.cfg
+.pytest_cache/v/pep8/mtimes
diff --git a/CHANGES.txt b/CHANGES.txt
index eeb277ab5..c16a60568 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Change History
 2.1.0a2.dev0 - unreleased
 -------------------------
 
-- No changes yet.
+- Remove links to the demo site, which has been down for too long.
 
 2.0.0a1 - 2018-02-22
 --------------------
diff --git a/README.rst b/README.rst
index b9a7f013f..bb3664bb9 100644
--- a/README.rst
+++ b/README.rst
@@ -40,7 +40,7 @@ thus hopefully keeping the learning curve flat for the developer.
 Kotti CMS
 =========
 
-You can **try out the Kotti CMS** on `Kotti's demo page`_.
+.. You can **try out the Kotti CMS** on `Kotti's demo page`_.
 
 Kotti CMS is a content management system that's heavily inspired by Plone_.
 Its **main features** are:
diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index 1f86f3764..602d021df 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -17,7 +17,7 @@ Built on top of a number of *best-of-breed* software components, most notably Py
 Features
 --------
 
-You can **try out the default installation** on `Kotti's demo page`_.
+.. You can **try out the default installation** on `Kotti's demo page`_.
 
 The Kotti CMS is a content management system that's heavily inspired by Plone_.
 Its **main features** are:

From b0bbaa77d6ef1312bdfd856fd1ded0c5b1811bd8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 19 Mar 2018 11:00:59 +0100
Subject: [PATCH 501/600] Bump version.

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c16a60568..edea9a0a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-2.1.0a2.dev0 - unreleased
--------------------------
+2.0.0b1 - 2018-03-19
+--------------------
 
 - Remove links to the demo site, which has been down for too long.
 
diff --git a/setup.py b/setup.py
index dff6cd46d..b69397663 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0a2.dev0'
+version = '2.0.0b1'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 389df4fa6f0139a378752aa9748a0d6b53288104 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 19 Mar 2018 11:02:07 +0100
Subject: [PATCH 502/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index edea9a0a1..5ab0a68ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.0b2.dev0 - unreleased
+-------------------------
+
+- No changes yet.
+
 2.0.0b1 - 2018-03-19
 --------------------
 
diff --git a/setup.py b/setup.py
index b69397663..77fcc67ff 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0b1'
+version = '2.0.0b2.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From b1c245fd8c5cad8789ca8a592ba043edf99e705c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 20 Mar 2018 15:37:33 +0100
Subject: [PATCH 503/600] Upgrade requirements.  [ci skip]

---
 requirements.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 5ce6ffbbf..91fe7f261 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ alembic==0.9.8
 appdirs==1.4.3
 Babel==2.5.3
 Beaker==1.9.0
-bleach==2.1.2
+bleach==2.1.3
 bleach-whitelist==0.0.8
 Chameleon==3.2
 colander==1.4
@@ -49,7 +49,7 @@ pyramid-deform==0.2
 pyramid-mailer==0.15.1
 pyramid-tm==2.2
 pyramid-zcml==1.1.0
-python-dateutil==2.6.1
+python-dateutil==2.7.0
 python-editor==1.0.3
 pytz==2018.3
 repoze.lru==0.7
@@ -59,9 +59,9 @@ repoze.zcml==1.0b1
 rfc6266-parser==0.0.5.post2
 shutilwhich==1.1.0
 six==1.11.0
-SQLAlchemy==1.2.3
-SQLAlchemy-Utils==0.33.0
-transaction==2.1.2
+SQLAlchemy==1.2.5
+SQLAlchemy-Utils==0.33.1
+transaction==2.2.0
 translationstring==1.3
 Unidecode==1.0.22
 usersettings==1.0.7

From de16d2bc3c6e39909dc5a3e9bac1174c2a9813bc Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 3 Apr 2018 13:05:33 +0200
Subject: [PATCH 504/600] Update requirements.

---
 requirements.txt | 16 ++++++++--------
 setup.py         |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 5ce6ffbbf..34ef13c70 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
-alembic==0.9.8
+alembic==0.9.9
 appdirs==1.4.3
 Babel==2.5.3
 Beaker==1.9.0
-bleach==2.1.2
+bleach==2.1.3
 bleach-whitelist==0.0.8
 Chameleon==3.2
 colander==1.4
@@ -13,11 +13,11 @@ filedepot==0.5.2
 FormEncode==2.0.0a1
 html2text==2018.1.9
 html5lib==1.0.1
-hupper==1.0
+hupper==1.1
 iso8601==0.1.11  # rq.filter: !=0.1.12
 js.angular==1.1.4
 js.bootstrap==3.3.4
-js.deform==2.0.5.dev0
+#js.deform==2.0.5.dev0
 js.fineuploader==5.14.0
 js.html5shiv==3.7.3
 js.jquery==1.9.1  # rq.filter: <2.0
@@ -39,7 +39,7 @@ MarkupSafe==1.0
 PasteDeploy==1.5.2
 peppercorn==0.5
 plaster==1.0
-plaster-pastedeploy==0.4.2
+plaster-pastedeploy==0.5
 polib==1.1.0
 py-bcrypt==0.4
 pyramid==1.9.1
@@ -59,9 +59,9 @@ repoze.zcml==1.0b1
 rfc6266-parser==0.0.5.post2
 shutilwhich==1.1.0
 six==1.11.0
-SQLAlchemy==1.2.3
-SQLAlchemy-Utils==0.33.0
-transaction==2.1.2
+SQLAlchemy==1.2.6
+SQLAlchemy-Utils==0.33.2
+transaction==2.2.1
 translationstring==1.3
 Unidecode==1.0.22
 usersettings==1.0.7
diff --git a/setup.py b/setup.py
index b69397663..ec55720d4 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@
     'iso8601==0.1.11',  # rq.filter: !=0.1.12
     'js.angular',
     'js.bootstrap>=3.0.0',
-    'js.deform>=2.0a2-2',
+    'js.deform>=2.0.3',
     'js.fineuploader',
     'js.html5shiv',
     'js.jquery<2.0.0.dev',  # rq.filter: <2.0
@@ -84,6 +84,7 @@
     'check-manifest',
     'pipdeptree',
     'pyramid_debugtoolbar',
+    'kotti-tinymce>=0.7.0',
 ]
 
 docs_require = [

From c99116eaf204d319f9ea091fa0951a149c69d19e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 3 Apr 2018 13:06:51 +0200
Subject: [PATCH 505/600] Move workflow action related stuff to separate test
 to prevent random test failures.

---
 kotti/tests/test_functional.py | 113 +++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 28 deletions(-)

diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 21333bbf3..0d7a4de80 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -562,22 +562,83 @@ def test_content_management(self, webtest):
         assert '<i class="glyphicon glyphicon-folder-open"></i>' in resp.text
         assert '<i class="glyphicon glyphicon-folder-close"></i>' not in resp.text  # noqa
 
+        # Navigation
+        resp = resp.click("Navigate")
+        resp = resp.click("Second Child", index=0)
+        assert resp.request.path == '/second-child-1/'
+
+    @pytest.mark.user('admin')
+    def test_workflow_actions(self, webtest):
+
+        app = webtest.app
+
+        # Add a document
+        resp = app.get('/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Child One"
+        resp = form.submit('save').maybe_follow()
+        assert "Item was added" in resp.text
+        assert resp.request.path == '/child-one/'
+
+        # Add more documents
+        resp = app.get('/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Second Child"
+        resp = form.submit('save').maybe_follow()
+        assert resp.request.path == '/second-child/'
+
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Third Child"
+        resp = form.submit('save').maybe_follow()
+        assert resp.request.path == '/second-child/third-child/'
+
+        resp = app.get('/second-child/third-child/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Grandchild 1"
+        resp = form.submit('save').maybe_follow()
+        assert resp.request.path == '/second-child/third-child/grandchild-1/'
+
+        resp = app.get('/second-child/third-child/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Grandchild 2"
+        resp = form.submit('save').maybe_follow()
+        assert resp.request.path == '/second-child/third-child/grandchild-2/'
+
+        resp = app.get('/second-child/third-child/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Grandchild 3"
+        resp = form.submit('save').maybe_follow()
+        assert resp.request.path == '/second-child/third-child/grandchild-3/'
+
+        resp = app.get('/second-child/third-child/')
+        resp = resp.click('Document', index=0)
+        form = resp.forms['deform']
+        form['title'] = "Child One"
+        resp = form.submit('save').maybe_follow()
+        assert resp.request.path == '/second-child/third-child/child-one/'
+
         # Contents view change state actions (workflow)
-        resp = resp.click("Second Child")
+        resp = resp.click("Second Child", index=0)
         resp = resp.click("Contents")
-        assert '/second-child-1/third-child/@@workflow-change?new_state=public' in resp.text  # noqa
+        assert '/second-child/third-child/@@workflow-change?new_state=public' in resp.text  # noqa
 
-        resp = app.get('/second-child-1/third-child/@@workflow-change?new_state=public').maybe_follow()  # noqa
-        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.text  # noqa
+        resp = app.get('/second-child/third-child/@@workflow-change?new_state=public').maybe_follow()  # noqa
+        assert '/second-child/third-child/@@workflow-change?new_state=private' in resp.text  # noqa
 
-        resp = app.get('/second-child-1/third-child/@@contents')
+        resp = app.get('/second-child/third-child/@@contents')
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('change_state').maybe_follow()
         assert 'Change workflow state' in resp.text
 
         resp = resp.forms['form-change-state'].submit('cancel').maybe_follow()
         assert 'No changes were made.' in resp.text
-        assert resp.request.path == '/second-child-1/third-child/@@contents'
+        assert resp.request.path == '/second-child/third-child/@@contents'
 
         form = self._select_children(resp, 0, 1, 2)
         resp = form.submit('change_state').maybe_follow()
@@ -592,42 +653,38 @@ def test_content_management(self, webtest):
         form['to-state'] = 'public'
         resp = form.submit('change_state').maybe_follow()
         assert 'Your changes have been saved.' in resp.text
-        assert '/second-child-1/third-child/grandchild-1/@@workflow-change?new_state=private' in resp.text  # noqa
-        assert '/second-child-1/third-child/grandchild-2/@@workflow-change?new_state=private' in resp.text  # noqa
-        assert '/second-child-1/third-child/grandchild-3/@@workflow-change?new_state=private' in resp.text  # noqa
+        assert '/second-child/third-child/grandchild-1/@@workflow-change?new_state=private' in resp.text  # noqa
+        assert '/second-child/third-child/grandchild-2/@@workflow-change?new_state=private' in resp.text  # noqa
+        assert '/second-child/third-child/grandchild-3/@@workflow-change?new_state=private' in resp.text  # noqa
 
-        resp = resp.click('My Third Child')
-        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=public' in resp.text  # noqa
+        resp = resp.click('Child One', index=1)
+        assert '/second-child/third-child/child-one/@@workflow-change?new_state=public' in resp.text  # noqa
 
-        app.get('/second-child-1/third-child/child-one/@@workflow-change?new_state=public')  # noqa
-        resp = app.get('/second-child-1/third-child/@@contents')
-        assert '/second-child-1/third-child/child-one/@@workflow-change?new_state=private' in resp.text  # noqa
+        app.get('/second-child/third-child/child-one/@@workflow-change?new_state=public')  # noqa
+        resp = app.get('/second-child/third-child/@@contents')
+        assert '/second-child/third-child/child-one/@@workflow-change?new_state=private' in resp.text  # noqa
 
-        resp = resp.click('First Child', index=1)
+        resp = resp.click('Child One', index=1)
         resp = resp.click('Document', index=0)
         form = resp.forms['deform']
         form['title'] = 'Sub child'
         resp = form.submit('save').maybe_follow()
-        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.text  # noqa
+        assert '/second-child/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.text  # noqa
 
-        resp = resp.click("Second Child", index=0)
-        resp = resp.click("Contents")
-        form = self._select_children(resp, 0, 1, 2)
+        resp = resp.click('Second Child', index=0)
+        resp = resp.click('Contents')
+
+        form = self._select_children(resp, 0)
         resp = form.submit('change_state').maybe_follow()
         form = resp.forms['form-change-state']
         form['include-children'] = 'include-children'
-        form['to-state'] = 'public'
+        form['to-state'] = 'private'
         resp = form.submit('change_state').maybe_follow()
         assert 'Your changes have been saved.' in resp.text
-        assert '/second-child-1/third-child/@@workflow-change?new_state=private' in resp.text  # noqa
+        assert '/second-child/third-child/@@workflow-change?new_state=public' in resp.text  # noqa
 
-        resp = app.get('/second-child-1/third-child/child-one/sub-child/')
-        assert '/second-child-1/third-child/child-one/sub-child/@@workflow-change?new_state=private' in resp.text  # noqa
-
-        # Navigation
-        resp = resp.click("Navigate")
-        resp = resp.click("Second Child", index=0)
-        assert resp.request.path == '/second-child-1/'
+        resp = app.get('/second-child/third-child/child-one/sub-child/')
+        assert '/second-child/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.text  # noqa
 
     def test_user_management(self, webtest, settings, dummy_mailer):
         from kotti import get_settings

From 00b56681fa9fb8587869a5e00dcd56503081d3b9 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 3 Apr 2018 13:07:34 +0200
Subject: [PATCH 506/600] Fix #551.

---
 kotti/templates/edit/share.pt  |  1 +
 kotti/templates/login.pt       |  8 ++++----
 kotti/tests/test_node_views.py | 18 ++++++++++++++++++
 kotti/views/users.py           |  6 +++++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/kotti/templates/edit/share.pt b/kotti/templates/edit/share.pt
index ff0d845c7..2627e7920 100644
--- a/kotti/templates/edit/share.pt
+++ b/kotti/templates/edit/share.pt
@@ -39,6 +39,7 @@
 
     <form action="${request.url}" method="post" tal:condition="entries"
           id="form-share-assign">
+      <input type="hidden" name="csrf_token" value="${csrf_token}">
 
       <fieldset>
         <legend i18n:translate="">Assign local roles</legend>
diff --git a/kotti/templates/login.pt b/kotti/templates/login.pt
index e70c029d6..ed9a0ddcb 100644
--- a/kotti/templates/login.pt
+++ b/kotti/templates/login.pt
@@ -17,9 +17,9 @@
           </div>
           <div class="panel-body">
             <div class="control-group">
-              <label class="control-label" for="form-login"
+              <label class="control-label" for="form-login-login"
                      i18n:translate="">Username or email</label>
-              <input type="text" name="login" id="form-login"
+              <input type="text" name="login" id="form-login-login"
                      class="form-control" value="${login}" />
             </div>
             <div class="control-group">
@@ -55,9 +55,9 @@
               below to receive an email with a link to reset your password.
             </div>
             <div class="control-group">
-              <label class="control-label" for="form-login"
+              <label class="control-label" for="form-forgot-password-login"
                      i18n:translate="">Username or email</label>
-              <input type="text" name="login" id="form-login"
+              <input type="text" name="login" id="form-forgot-password-login"
                      class="form-control" value="${login}" />
             </div>
           </div>
diff --git a/kotti/tests/test_node_views.py b/kotti/tests/test_node_views.py
index bceab28dc..575a94f29 100644
--- a/kotti/tests/test_node_views.py
+++ b/kotti/tests/test_node_views.py
@@ -1,4 +1,5 @@
 from pyramid.exceptions import Forbidden
+from pyramid.httpexceptions import HTTPBadRequest
 from pytest import raises
 from webob.multidict import MultiDict
 
@@ -432,6 +433,7 @@ def test_apply(self, extra_principals, root):
         request = DummyRequest()
 
         request.params['apply'] = ''
+        request.params['csrf_token'] = request.session.get_csrf_token()
         share_node(root, request)
         assert (request.session.pop_flash('info') == ['No changes were made.'])
         assert list_groups('bob', root) == []
@@ -460,3 +462,19 @@ def test_apply(self, extra_principals, root):
             set(list_groups('bob', root)) ==
             {'role:owner', 'role:editor', 'role:special'}
             )
+
+    def test_csrf(self, extra_principals, root, dummy_request):
+        """ Test if a CSRF token is present and checked on submission """
+        from kotti.views.users import share_node
+
+        result = share_node(root, dummy_request)
+        assert 'csrf_token' in result
+
+        dummy_request.params['apply'] = ''
+
+        with raises(HTTPBadRequest):
+            share_node(root, dummy_request)
+
+        dummy_request.params['csrf_token'] = dummy_request.session.get_csrf_token()  # noqa
+        result = share_node(root, dummy_request)
+        assert result['csrf_token'] == dummy_request.session.get_csrf_token()
diff --git a/kotti/views/users.py b/kotti/views/users.py
index ce667c74d..8a83ce787 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -9,7 +9,7 @@
 from deform.widget import CheckedPasswordWidget
 from deform.widget import SequenceWidget
 from pyramid.exceptions import Forbidden
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPFound, HTTPBadRequest
 from pyramid.view import view_config
 from pyramid_deform import FormView
 from six import string_types
@@ -109,6 +109,9 @@ def search_principals(request, context=None, ignore=None, extra=()):
              renderer='kotti:templates/edit/share.pt')
 def share_node(context, request):
     # Allow roles_form_handler to do processing on 'apply':
+    if 'apply' in request.POST:
+        if request.params.get('csrf_token') != request.session.get_csrf_token():
+            raise HTTPBadRequest('Invalid CSRF token')
     changed = roles_form_handler(
         context, request, SHARING_ROLES, list_groups_raw)
     if changed:
@@ -132,6 +135,7 @@ def with_roles(entry):
     return {
         'entries': entries,
         'available_roles': available_roles,
+        'csrf_token': request.session.get_csrf_token()
         }
 
 

From 9c99ba3f9b4a9e10cd31317d7d467409f9f98805 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 3 Apr 2018 13:08:55 +0200
Subject: [PATCH 507/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index edea9a0a1..35a265fae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.0b2 - 2018-04-03
+--------------------
+
+- Fix CSRF issue in ``@@share`` view (#551).
+
 2.0.0b1 - 2018-03-19
 --------------------
 
diff --git a/setup.py b/setup.py
index ec55720d4..e86bf442b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0b1'
+version = '2.0.0b2'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From e4f8b70fa0a63ac11d240be50bfd1317e89be6e8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 3 Apr 2018 16:23:17 +0200
Subject: [PATCH 508/600] Remove erroneous fixture scope.

---
 kotti/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index b8879d789..e2ad39a85 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -153,7 +153,7 @@ def connection(custom_settings):
     return connection
 
 
-@fixture(scope='session')
+@fixture
 def content(connection, settings):
     """ sets up some default content using Kotti's testing populator.
     """

From 236eaa8f5112a611d8e5c90fa0217429bc35631c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 4 Apr 2018 10:57:32 +0200
Subject: [PATCH 509/600] Abort transactions and explicitly close ``DBSession``
 in ``content`` fixture to prevent hanging test suite when using PostgreSQL or
 MySQL. Install psycopg2-binary on CI services.

---
 .circleci/config.yml    |  2 +-
 .travis.yml             |  2 +-
 kotti/tests/__init__.py | 10 ++++++++--
 setup.py                |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e780dcf4b..3806a278e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
             python3 -m venv venv
             . venv/bin/activate
             pip install -U pip wheel setuptools setuptools-git
-            pip install psycopg2 mysqlclient python-coveralls codecov
+            pip install psycopg2-binary mysqlclient python-coveralls codecov
             pip install -e .[testing]
       - save_cache:
           paths:
diff --git a/.travis.yml b/.travis.yml
index 8afde245a..aa0deabd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
   - KOTTI_TEST_DB_STRING=sqlite://
 install:
   - travis_retry pip install -U pip wheel setuptools
-  - travis_retry pip install psycopg2 mysqlclient python-coveralls codecov
+  - travis_retry pip install psycopg2-binary mysqlclient python-coveralls codecov
   - travis_retry pip install -e ".[testing]"
 before_script:
   - psql -c 'create database kotti_testing;' -U postgres
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index e2ad39a85..605faae37 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -157,9 +157,15 @@ def connection(custom_settings):
 def content(connection, settings):
     """ sets up some default content using Kotti's testing populator.
     """
-    from transaction import commit
+    import transaction
+    from kotti import DBSession
     from kotti import metadata
     from kotti.resources import get_root
+
+    if connection.in_transaction():
+        transaction.abort()
+    DBSession().close()
+
     metadata.drop_all(connection.engine)
     metadata.create_all(connection.engine)
     # to create the default content with the correct workflow state
@@ -176,7 +182,7 @@ def content(connection, settings):
     # 'event' and therefore the event handlers aren't fired for root
     # otherwise:
     get_root().path = '/'
-    commit()
+    transaction.commit()
 
 
 @yield_fixture
diff --git a/setup.py b/setup.py
index f2dd1a271..d7b7b9938 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0b3.dev0'
+version = '2.0.0b3.dev1'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 1136d756b037ad7c5b6fb7cd82a3f0818116c6c5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 4 Apr 2018 11:35:55 +0200
Subject: [PATCH 510/600] Always begin a new transaction.

---
 kotti/tests/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 605faae37..39d4f25f8 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -167,6 +167,7 @@ def content(connection, settings):
     DBSession().close()
 
     metadata.drop_all(connection.engine)
+    transaction.begin()
     metadata.create_all(connection.engine)
     # to create the default content with the correct workflow state
     # the workflow must be initialized first;  please note that these

From 668431056e293a7c9a1562fb42d3eb2af8b4b144 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 4 Apr 2018 11:45:30 +0200
Subject: [PATCH 511/600] Fix sorting issue on mysql.

---
 README.rst               | 4 ----
 kotti/tests/test_tags.py | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index bb3664bb9..1a870055b 100644
--- a/README.rst
+++ b/README.rst
@@ -3,16 +3,12 @@ Kotti
 =====
 
 |pypi|_
-|downloads_month|_
 |license|_
 |build_status_stable|_
 
 .. |pypi| image:: https://img.shields.io/pypi/v/Kotti.svg?style=flat-square
 .. _pypi: https://pypi.python.org/pypi/Kotti/
 
-.. |downloads_month| image:: https://img.shields.io/pypi/dm/Kotti.svg?style=flat-square
-.. _downloads_month: https://pypi.python.org/pypi/Kotti/
-
 .. |license| image:: https://img.shields.io/pypi/l/Kotti.svg?style=flat-square
 .. _license: http://www.repoze.org/LICENSE.txt
 
diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index 8f63abd07..8fcd23a55 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -206,7 +206,7 @@ def test_get_content_items_for_tag_title(self, root):
         assert [res.name for res in result] == ['folder_1']
         result = Content.query.join(TagsToContents).join(Tag).filter(
             Tag.title == 'third tag').all()
-        assert [res.name for res in result] == ['content_1', 'content_2']
+        assert sorted(res.name for res in result) == sorted(['content_1', 'content_2'])
 
         # The same tests again, using content_with_tags():
         #

From eb3e0d9f28e86e8812e3216a85d25490e1d6872b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 4 Apr 2018 11:51:32 +0200
Subject: [PATCH 512/600] Fix sorting issue on mysql.

---
 kotti/tests/test_tags.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index 8fcd23a55..e447dae91 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -222,11 +222,11 @@ def test_get_content_items_for_tag_title(self, root):
         # part to avoid establishing a specification.
         #
         result = content_with_tags(['first tag'])
-        assert [res.name for res in result] == ['folder_1', 'content_2']
+        assert sorted([res.name for res in result]) == sorted(['folder_1', 'content_2'])
         result = content_with_tags(['second tag'])
-        assert [res.name for res in result] == ['folder_1']
+        assert sorted([res.name for res in result]) == sorted(['folder_1'])
         result = content_with_tags(['third tag'])
-        assert [res.name for res in result] == ['content_1', 'content_2']
+        assert sorted([res.name for res in result]) == sorted(['content_1', 'content_2'])
 
 
 class TestCommaSeparatedListWidget:

From ee1888b79579c46e11a97bbfb042ad20c52aedb2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 4 Apr 2018 14:34:14 +0200
Subject: [PATCH 513/600] Add changenote for release 1.3.2.

---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 84a259291..9963c7b0b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -47,6 +47,11 @@ Fixes
 
 - Avoid deprecation warning ``pyramid.security.has_permission``
 
+1.3.2 - 2018-04-04
+------------------
+
+**This release fixes a CSRF (Cross Site Request Forgery) security vulnerablity which was reported in #551. You should upgrade your installations ASAP.**
+
 1.3.1 - 2018-01-17
 ------------------
 

From 2ab79c9ef68341bd9c742d6187ee1b326b972223 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 4 Apr 2018 14:47:22 +0200
Subject: [PATCH 514/600] Bump version.

---
 CHANGES.txt | 7 +------
 setup.py    | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9963c7b0b..7cf22ccee 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,7 @@
 Change History
 ==============
 
-2.0.0b3.dev0 - unreleased
--------------------------
-
-- No changes yet.
-
-2.0.0b2 - 2018-04-03
+2.0.0b2 - 2018-04-04
 --------------------
 
 - Fix CSRF issue in ``@@share`` view (#551).
diff --git a/setup.py b/setup.py
index d7b7b9938..e86bf442b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0b3.dev1'
+version = '2.0.0b2'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From ae48d1d6e7332a544dd1ef75372e0a1ddbde0de4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 4 Apr 2018 14:48:31 +0200
Subject: [PATCH 515/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7cf22ccee..cd257e362 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.0b3.dev0 - unreleased
+-------------------------
+
+- No changes yet.
+
 2.0.0b2 - 2018-04-04
 --------------------
 
diff --git a/setup.py b/setup.py
index e86bf442b..f2dd1a271 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0b2'
+version = '2.0.0b3.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 879a5e967cc1951357e418a99d1d9b6edfe2206e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 9 Apr 2018 09:06:08 +0200
Subject: [PATCH 516/600] Fix #552.

---
 app.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app.ini b/app.ini
index 0198c4065..f6c0b22fb 100644
--- a/app.ini
+++ b/app.ini
@@ -20,7 +20,8 @@ mail.default_sender = yourname@yourhost
 # kotti.configurators: another hook for add-ons
 # kotti_tinymce should always be present (unless you don't want WYSIWYG editing)
 kotti.configurators =
-  kotti_tinymce.kotti_configure
+# kotti_tinymce is optional in Kotti 2.x
+#  kotti_tinymce.kotti_configure
 # kotti_image was part of kotti in 1.x.
 # install with pip and add it to kotti.configurators:
 #  kotti_image.kotti_configure

From 808c32c9345b1e2effe94c5b1007dba49c6d091c Mon Sep 17 00:00:00 2001
From: Davide Moro <davide.moro@gmail.com>
Date: Wed, 16 May 2018 09:22:22 +0200
Subject: [PATCH 517/600] update documentation (kotti-cookiecutter scaffolding)
 (#555)

---
 CHANGES.txt                |  3 ++-
 docs/first_steps/tut-1.rst | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cd257e362..588706453 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Change History
 2.0.0b3.dev0 - unreleased
 -------------------------
 
-- No changes yet.
+- Update documentation (kotti-cookiecutter is the new scaffolding template).
+  See https://github.com/Kotti/kotti-cookiecutter
 
 2.0.0b2 - 2018-04-04
 --------------------
diff --git a/docs/first_steps/tut-1.rst b/docs/first_steps/tut-1.rst
index c141b3225..9df59b311 100644
--- a/docs/first_steps/tut-1.rst
+++ b/docs/first_steps/tut-1.rst
@@ -28,17 +28,22 @@ We will create the add-on as ``mysite/kotti_mysite``.
 Creating the Add-On Package
 ---------------------------
 
-To create our add-on, we use the standard Pyramid tool ``pcreate``, with
-``kotti_addon``, a scaffold that was installed as part of Kotti.
+To create our add-on, we use the standard Python tool called
+cookiecutter_, using the ``kotti-cookiecutter`` scaffolding.
 
 .. code-block:: bash
 
-  bin/pcreate -s kotti kotti_mysite
+  pip install cookiecutter
+  cookiecutter https://github.com/Kotti/kotti-cookiecutter
 
-The script will ask a number of questions.
-It is safe to accept the defaults.
+The script will ask a number of questions: provide a project name (e.g., ``Kotti mysite``) and accept the defaults.
 When finished, observe that a new directory called ``kotti_mysite`` was added to the current working directory, as ``mysite/kotti_mysite``.
 
+See kotti-cookiecutter_ for further info about scaffolding options.
+
+.. _cookiecutter: https://github.com/audreyr/cookiecutter
+.. _kotti-cookiecutter: https://github.com/Kotti/kotti-cookiecutter
+
 Installing Our New Add-On
 -------------------------
 

From 07f8973843bd5c776ee92e02bb43765b2df7b8be Mon Sep 17 00:00:00 2001
From: castaf <castaf@users.noreply.github.com>
Date: Tue, 18 Sep 2018 08:31:55 +0200
Subject: [PATCH 518/600] Fixes fr_FR translation (#556)

---
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 13169 -> 18577 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po |  14 +++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index 914633a70fa632870e7786bbf17f0a0e0b6f3d7a..ba196bba64b6987f703a70529ab02e68d7b5e13e 100644
GIT binary patch
literal 18577
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

delta 3765
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

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 50584d1de..17d0b1933 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -3,6 +3,13 @@ msgstr ""
 "POT-Creation-Date: 2018-01-17 13:51+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: castaf <fabien.castarede@free.fr>\n"
+"Language-Team: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_FR\n"
+"X-Generator: Poedit 2.1.1\n"
 
 #: kotti/security.py:173
 msgid "Viewer"
@@ -84,7 +91,7 @@ msgid "Congratulations! You have successfully installed Kotti."
 msgstr "Félicitations! Vous avez installé Kotti avec succès."
 
 #: kotti/populate.py:69
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<h2>Log in</h2>\n"
@@ -203,7 +210,6 @@ msgid "Our company is the leading manufacturer of foo widgets used in a wide var
 msgstr "Notre société est spécialisée dans la conception de pièces foo utilisées dans une grande variétée de produits."
 
 #: kotti/populate.py:128
-#, fuzzy
 msgid ""
 "\n"
 "<p>\n"
@@ -253,7 +259,7 @@ msgstr ""
 "</address>\n"
 "\n"
 "<p><small style=\"font-size: smaller\">\n"
-"  <em>Crédit de la photot:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
+"  <em>Crédit de la photo:</em> \"Northern Lights Formation\" by FlugKerl2.\n"
 "  <a href=\"http://commons.wikimedia.org/wiki/File:Northern_Lights_Formation.jpg\">\n"
 "  Copyright info</a>.\n"
 "  Originalement publié sur\n"
@@ -421,7 +427,6 @@ msgid "Gravatar"
 msgstr "Gravatar"
 
 #: kotti/templates/edit/share.pt:70 kotti/templates/site-setup/users.pt:91
-#, fuzzy
 msgid "Assign role"
 msgstr "Assigner des rôles locaux"
 
@@ -833,7 +838,6 @@ msgid "You have reset your password."
 msgstr "Vous avez réinitialisé votre mot de passe."
 
 #: kotti/views/login.py:299
-#, fuzzy
 msgid "Set password"
 msgstr "Réinitialiser le mot de passe"
 

From 835542bc879f09a63d2ef0cc29e167cbd3d158fc Mon Sep 17 00:00:00 2001
From: castaf <castaf@users.noreply.github.com>
Date: Mon, 26 Nov 2018 09:08:16 +0100
Subject: [PATCH 519/600] Updates .gitignore (#560)

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3365e5d53..e8d2fdd2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /.installed.cfg
 /.pip.log
 /.tox
+.pytest_cache
 /Kotti.db*
 /Kotti.egg-info/
 /bin/
@@ -33,3 +34,5 @@ share
 .long-description.html
 pyvenv.cfg
 .pytest_cache/v/pep8/mtimes
+
+*.DS_Store

From c72d49bb54d26b73bd1f474d0821cc53ab2b5068 Mon Sep 17 00:00:00 2001
From: castaf <castaf@users.noreply.github.com>
Date: Mon, 26 Nov 2018 09:10:40 +0100
Subject: [PATCH 520/600] Fixes fr_FR translation (#561)

Thanks!
---
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo | Bin 18577 -> 18632 bytes
 kotti/locale/fr_FR/LC_MESSAGES/Kotti.po |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.mo
index ba196bba64b6987f703a70529ab02e68d7b5e13e..b1a68d8b7cb22b1713ef19e92ed6eea1bae1d03b 100644
GIT binary patch
delta 3630
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
G4fqH8e16dY

delta 3588
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
VdR0~XAq}cRvwPI38r)}5*nebIX<+~W

diff --git a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
index 17d0b1933..a8b81ad0c 100644
--- a/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
+++ b/kotti/locale/fr_FR/LC_MESSAGES/Kotti.po
@@ -9,7 +9,7 @@ msgstr ""
 "Language-Team: \n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr_FR\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2\n"
 
 #: kotti/security.py:173
 msgid "Viewer"
@@ -335,7 +335,7 @@ msgstr "Indiquez votre identifiant ou votre adresse e-mail ci-dessous et cliquez
 
 #: kotti/templates/login.pt:78
 msgid "Not registered yet?"
-msgstr ""
+msgstr "Pas de compte ?"
 
 #: kotti/templates/login.pt:85
 msgid "Register for an account on this site."
@@ -368,7 +368,7 @@ msgstr "Bonjour, ${user_title} !"
 
 #: kotti/templates/email-reset-password.pt:5
 msgid "Click this link to reset your password at ${site_title}: ${url}"
-msgstr "Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${title} : ${url}"
+msgstr "Cliquez sur ce lien afin de réinitialiser votre mot de passe sur ${site_title} : ${url}"
 
 #: kotti/templates/email-set-password.pt:2
 msgid "Your registration for ${site_title}"

From f24c3bd39840c12847a778d4325ff0c9545ce6d4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Fri, 4 Jan 2019 15:34:10 +0100
Subject: [PATCH 521/600] Update year in copyright.  # noqa

---
 COPYRIGHT.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 592b39c9f..5ab7bc3ea 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
-Copyright (c) 2010-2018 Daniel Nouri, Andreas Kaiser and Contributors.
+Copyright (c) 2010-2019 Daniel Nouri, Andreas Kaiser and Contributors.
 All Rights Reserved

From cab28a51f2efa7be5a61a956041d812b27ce5bf6 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 7 Jan 2019 10:45:11 +0100
Subject: [PATCH 522/600] Require pytest >= 4.1.0, use
 ``request.node.get_closest_marker`` instead of deprecated
 ``request.keywords``. Bump version.

---
 CHANGES.txt             |  7 +++++--
 Makefile                |  2 +-
 kotti/tests/__init__.py | 15 +++++++++------
 setup.py                |  6 +++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 588706453..c8435e1e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,15 @@
 Change History
 ==============
 
-2.0.0b3.dev0 - unreleased
--------------------------
+2.0.0 - 2019-01-07
+------------------
 
 - Update documentation (kotti-cookiecutter is the new scaffolding template).
   See https://github.com/Kotti/kotti-cookiecutter
 
+- Require pytest >= 4.1.0, use ``request.node.get_closest_marker`` instead of
+  deprecated ``request.keywords``.
+  
 2.0.0b2 - 2018-04-04
 --------------------
 
diff --git a/Makefile b/Makefile
index 4c41de47e..81267aada 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 test: bin/pytest
-	bin/pytest -q -n4
+	bin/pytest
 
 bin/pytest: .pip.log *.py *.cfg
 	bin/pip install -e ".[testing]"
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 39d4f25f8..78592c313 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -209,11 +209,12 @@ def dummy_request(config, request, monkeypatch):
 
     from kotti.testing import DummyRequest
 
-    if 'user' in request.keywords:
+    marker = request.node.get_closest_marker("user")
+    if marker:
         monkeypatch.setattr(
             DummyRequest,
             "authenticated_userid",
-            request.keywords['user'].args[0])
+            marker.args[0])
 
     config.manager.get()['request'] = dummy_request = DummyRequest()
 
@@ -262,11 +263,12 @@ def browser(db_session, request, setup_app):
     host, port = BASE_URL.split(':')[-2:]
     browser = Browser('http://{}:{}/'.format(host[2:], int(port)),
                       wsgi_app=setup_app)
-    if 'user' in request.keywords:
+    marker = request.node.get_closest_marker("user")
+    if marker:
         # set auth cookie directly on the browser instance...
         from pyramid.security import remember
         from pyramid.testing import DummyRequest
-        login = request.keywords['user'].args[0]
+        login = marker.args[0]
         environ = dict(HTTP_HOST=host[2:])
         for _, value in remember(DummyRequest(environ=environ), login):
             cookie, _ = value.split(';', 1)
@@ -288,8 +290,9 @@ def root(db_session):
 @fixture
 def webtest(app, monkeypatch, request, filedepot, dummy_mailer):
     from webtest import TestApp
-    if 'user' in request.keywords:
-        login = request.keywords['user'].args[0]
+    marker = request.node.get_closest_marker("user")
+    if marker:
+        login = marker.args[0]
         monkeypatch.setattr(
             "pyramid.authentication."
             "AuthTktAuthenticationPolicy.unauthenticated_userid",
diff --git a/setup.py b/setup.py
index f2dd1a271..f80ad551a 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0b3.dev0'
+version = '2.0.0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."
@@ -70,9 +70,9 @@
     'Pillow',  # thumbnail filter in depot tween tests
     'py>=1.4.29',
     'pyquery',
-    'pytest>=3.0.0',
+    'pytest>=4.1.0',
     'pytest-cov',
-    'pytest-pep8!=1.0.3',
+    'pytest-pep8>=1.0.8',
     'pytest-travis-fold',
     'pytest-virtualenv',
     'pytest-xdist',

From b7565a7f3afc3c1c38eea11d2560f59f58c073f3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 7 Jan 2019 10:49:45 +0100
Subject: [PATCH 523/600] Fix typo in pytest-pep8 version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f80ad551a..19aab181e 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@
     'pyquery',
     'pytest>=4.1.0',
     'pytest-cov',
-    'pytest-pep8>=1.0.8',
+    'pytest-pep8>=1.0.6',
     'pytest-travis-fold',
     'pytest-virtualenv',
     'pytest-xdist',

From 54c5e72ea085da404beba0e75dd040f8c05c9539 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 7 Jan 2019 11:01:15 +0100
Subject: [PATCH 524/600] Bump version.

---
 CHANGES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c8435e1e1..7f33ba511 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,8 +8,8 @@ Change History
   See https://github.com/Kotti/kotti-cookiecutter
 
 - Require pytest >= 4.1.0, use ``request.node.get_closest_marker`` instead of
-  deprecated ``request.keywords``.
-  
+  deprecated ``request.keywords``. 
+
 2.0.0b2 - 2018-04-04
 --------------------
 

From ca0f242c58de32ba98f59729c6c508d6f8675389 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 7 Jan 2019 12:41:53 +0100
Subject: [PATCH 525/600] Require newer bleach (without security issue).

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 19aab181e..de79b88cd 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'alembic>=0.8.0',
-    'bleach>=2.1.2',  # html5lib 1.0 support
+    'bleach>=2.1.4',  # https://nvd.nist.gov/vuln/detail/CVE-2018-7753
     'bleach-whitelist',
     'colander>=1.3.2',
     'deform>=2.0.5',  # fixes file upload on py3 - uncomment after 2.0.5 is released  # noqa

From 7f54a2affe7aa3479b51fefe15405249843a562a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 8 Jan 2019 08:51:01 +0100
Subject: [PATCH 526/600] Reformat all Python files with black.

---
 README.rst                                 |    6 +-
 kotti/__init__.py                          |  256 ++---
 kotti/events.py                            |  125 +--
 kotti/fanstatic.py                         |   54 +-
 kotti/filedepot.py                         |  262 ++---
 kotti/message.py                           |   67 +-
 kotti/migrate.py                           |   82 +-
 kotti/populate.py                          |   50 +-
 kotti/request.py                           |    6 +-
 kotti/resources.py                         |  342 +++----
 kotti/sanitizers.py                        |   49 +-
 kotti/security.py                          |  182 ++--
 kotti/sqla.py                              |   88 +-
 kotti/testing.py                           |  136 +--
 kotti/tests/__init__.py                    |   83 +-
 kotti/tests/conftest.py                    |   17 +-
 kotti/tests/test_app.py                    |  155 ++-
 kotti/tests/test_cache.py                  |  112 +--
 kotti/tests/test_default_view_selection.py |   40 +-
 kotti/tests/test_deprecated.py             |    9 +-
 kotti/tests/test_events.py                 |   42 +-
 kotti/tests/test_file.py                   |  228 ++---
 kotti/tests/test_filedepot.py              |  137 +--
 kotti/tests/test_functional.py             | 1031 ++++++++++----------
 kotti/tests/test_httpexceptions.py         |   10 +-
 kotti/tests/test_message.py                |  104 +-
 kotti/tests/test_migrate.py                |   22 +-
 kotti/tests/test_node.py                   |  387 ++++----
 kotti/tests/test_node_views.py             |  409 ++++----
 kotti/tests/test_principals.py             |   24 +-
 kotti/tests/test_register.py               |  113 ++-
 kotti/tests/test_request.py                |    5 +-
 kotti/tests/test_sanitizers.py             |   68 +-
 kotti/tests/test_search.py                 |  122 +--
 kotti/tests/test_security.py               |  503 +++++-----
 kotti/tests/test_security_views.py         |  258 ++---
 kotti/tests/test_sqla.py                   |  130 +--
 kotti/tests/test_static.py                 |    4 +-
 kotti/tests/test_tags.py                   |  246 ++---
 kotti/tests/test_upload.py                 |   26 +-
 kotti/tests/test_url_normalizer.py         |   33 +-
 kotti/tests/test_util.py                   |   91 +-
 kotti/tests/test_util_views.py             |  358 ++++---
 kotti/tests/test_views_form.py             |   82 +-
 kotti/tests/test_workflow.py               |   94 +-
 kotti/traversal.py                         |   66 +-
 kotti/url_normalizer.py                    |   23 +-
 kotti/util.py                              |   63 +-
 kotti/views/__init__.py                    |    8 +-
 kotti/views/cache.py                       |   62 +-
 kotti/views/edit/__init__.py               |   14 +-
 kotti/views/edit/actions.py                |  367 +++----
 kotti/views/edit/content.py                |   96 +-
 kotti/views/edit/default_views.py          |   57 +-
 kotti/views/edit/upload.py                 |   48 +-
 kotti/views/file.py                        |   14 +-
 kotti/views/form.py                        |   73 +-
 kotti/views/login.py                       |  221 +++--
 kotti/views/navigation.py                  |   40 +-
 kotti/views/site_setup.py                  |    4 +-
 kotti/views/slots.py                       |   42 +-
 kotti/views/users.py                       |  399 ++++----
 kotti/views/util.py                        |  189 ++--
 kotti/views/view.py                        |   57 +-
 kotti/workflow.py                          |   15 +-
 pip-selfcheck.json                         |    1 +
 pytest.ini                                 |    3 +-
 requirements.txt                           |   70 +-
 setup.py                                   |    2 +-
 69 files changed, 4433 insertions(+), 4149 deletions(-)
 create mode 100644 pip-selfcheck.json

diff --git a/README.rst b/README.rst
index 1a870055b..c78262999 100644
--- a/README.rst
+++ b/README.rst
@@ -123,9 +123,9 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. _coveralls: https://coveralls.io/r/Kotti/Kotti
 .. _high coverage: https://coveralls.io/r/Kotti/Kotti
 
-.. |codacy| image:: https://img.shields.io/codacy/ad44331fcd904d338c074f2ca3e6a810.svg?style=flat-square
-.. _codacy: https://www.codacy.com/public/disko/Kotti
-.. _high quality coding standards: https://www.codacy.com/public/disko/Kotti
+.. |codacy| image:: https://api.codacy.com/project/badge/Grade/fb10cbc3497148d2945d61ce6ad2e4f5
+.. _codacy: https://www.codacy.com/app/disko/Kotti?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Kotti/Kotti&amp;utm_campaign=Badge_Grade
+.. _high quality coding standards: https://www.codacy.com/app/disko/Kotti?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Kotti/Kotti&amp;utm_campaign=Badge_Grade
 
 .. |codeclimate| image:: https://api.codeclimate.com/v1/badges/3a4a61548fcc195e4ba1/maintainability
 .. _codeclimate: https://codeclimate.com/github/Kotti/Kotti/maintainability
diff --git a/kotti/__init__.py b/kotti/__init__.py
index 2a3890272..a4c3bd5a4 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -22,22 +22,23 @@
 Base = declarative_base(cls=KottiBase)
 Base.metadata = metadata
 Base.query = DBSession.query_property()
-TRUE_VALUES = ('1', 'y', 'yes', 't', 'true')
-FALSE_VALUES = ('0', 'n', 'no', 'f', 'false', 'none')
+TRUE_VALUES = ("1", "y", "yes", "t", "true")
+FALSE_VALUES = ("0", "n", "no", "f", "false", "none")
 
 
 def authtkt_factory(**settings):
     from kotti.security import list_groups_callback
+
     kwargs = dict(
-        secret=settings['kotti.secret2'],
-        hashalg='sha512',
+        secret=settings["kotti.secret2"],
+        hashalg="sha512",
         callback=list_groups_callback,
-        )
+    )
     try:
         return AuthTktAuthenticationPolicy(**kwargs)
     except TypeError:
         # BBB with Pyramid < 1.4
-        kwargs.pop('hashalg')
+        kwargs.pop("hashalg")
         return AuthTktAuthenticationPolicy(**kwargs)
 
 
@@ -55,103 +56,106 @@ def none_factory(**kwargs):  # pragma: no cover
 
 # All of these can be set by passing them in the Paste Deploy settings:
 conf_defaults = {
-    'kotti.alembic_dirs': 'kotti:alembic',
-    'kotti.asset_overrides': '',
-    'kotti.authn_policy_factory': 'kotti.authtkt_factory',
-    'kotti.authz_policy_factory': 'kotti.acl_factory',
-    'kotti.available_types': ' '.join([
-        'kotti.resources.Document',
-        'kotti.resources.File',
-        ]),
-    'kotti.base_includes': ' '.join([
-        'kotti',
-        'kotti.traversal',
-        'kotti.filedepot',
-        'kotti.events',
-        'kotti.sanitizers',
-        'kotti.views',
-        'kotti.views.cache',
-        'kotti.views.view',
-        'kotti.views.edit',
-        'kotti.views.edit.actions',
-        'kotti.views.edit.content',
-        'kotti.views.edit.default_views',
-        'kotti.views.edit.upload',
-        'kotti.views.file',
-        'kotti.views.login',
-        'kotti.views.navigation',
-        'kotti.views.users',
-        ]),
-    'kotti.caching_policy_chooser': (
-        'kotti.views.cache.default_caching_policy_chooser'),
-    'kotti.configurators': '',
-    'kotti.date_format': 'medium',
-    'kotti.datetime_format': 'medium',
-    'kotti.depot_mountpoint': '/depot',
-    'kotti.depot_replace_wsgi_file_wrapper': False,
-    'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
-    'kotti.depot.0.name': 'dbfiles',
-    'kotti.fanstatic.edit_needed': 'kotti.fanstatic.edit_needed',
-    'kotti.fanstatic.view_needed': 'kotti.fanstatic.view_needed',
-    'kotti.login_success_callback': 'kotti.views.login.login_success_callback',
-    'kotti.max_file_size': '10',
-    'kotti.modification_date_excludes': ' '.join([
-        'kotti.resources.Node.position',
-    ]),
-    'kotti.populators': 'kotti.populate.populate',
-    'kotti.principals_factory': 'kotti.security.principals_factory',
-    'kotti.register': 'False',
-    'kotti.register.group': '',
-    'kotti.register.role': '',
-    'kotti.request_factory': 'kotti.request.Request',
-    'kotti.reset_password_callback': 'kotti.views.login.reset_password_callback',  # noqa
-    'kotti.root_factory': 'kotti.resources.default_get_root',
-    'kotti.sanitizers': ' '.join([
-        'xss_protection:kotti.sanitizers.xss_protection',
-        'minimal_html:kotti.sanitizers.minimal_html',
-        'no_html:kotti.sanitizers.no_html',
-        ]),
-    'kotti.sanitize_on_write': ' '.join([
-        'kotti.resources.Document.body:xss_protection',
-        'kotti.resources.Content.title:no_html',
-        'kotti.resources.Content.description:no_html',
-        ]),
-    'kotti.search_content': 'kotti.views.util.default_search_content',
-    'kotti.session_factory': 'kotti.beaker_session_factory',
-    'kotti.static.edit_needed': '',  # BBB
-    'kotti.static.view_needed': '',  # BBB
-    'kotti.templates.api': 'kotti.views.util.TemplateAPI',
-    'kotti.time_format': 'medium',
-    'kotti.url_normalizer': 'kotti.url_normalizer.url_normalizer',
-    'kotti.url_normalizer.map_non_ascii_characters': True,
-    'kotti.use_tables': '',
-    'kotti.use_workflow': 'kotti:workflow.zcml',
-    'kotti.zcml_includes': ' '.join([
-        ]),
-    'pyramid.includes': '',
-    'pyramid_deform.template_search_path': 'kotti:templates/deform',
-    }
+    "kotti.alembic_dirs": "kotti:alembic",
+    "kotti.asset_overrides": "",
+    "kotti.authn_policy_factory": "kotti.authtkt_factory",
+    "kotti.authz_policy_factory": "kotti.acl_factory",
+    "kotti.available_types": " ".join(
+        ["kotti.resources.Document", "kotti.resources.File"]
+    ),
+    "kotti.base_includes": " ".join(
+        [
+            "kotti",
+            "kotti.traversal",
+            "kotti.filedepot",
+            "kotti.events",
+            "kotti.sanitizers",
+            "kotti.views",
+            "kotti.views.cache",
+            "kotti.views.view",
+            "kotti.views.edit",
+            "kotti.views.edit.actions",
+            "kotti.views.edit.content",
+            "kotti.views.edit.default_views",
+            "kotti.views.edit.upload",
+            "kotti.views.file",
+            "kotti.views.login",
+            "kotti.views.navigation",
+            "kotti.views.users",
+        ]
+    ),
+    "kotti.caching_policy_chooser": (
+        "kotti.views.cache.default_caching_policy_chooser"
+    ),
+    "kotti.configurators": "",
+    "kotti.date_format": "medium",
+    "kotti.datetime_format": "medium",
+    "kotti.depot_mountpoint": "/depot",
+    "kotti.depot_replace_wsgi_file_wrapper": False,
+    "kotti.depot.0.backend": "kotti.filedepot.DBFileStorage",
+    "kotti.depot.0.name": "dbfiles",
+    "kotti.fanstatic.edit_needed": "kotti.fanstatic.edit_needed",
+    "kotti.fanstatic.view_needed": "kotti.fanstatic.view_needed",
+    "kotti.login_success_callback": "kotti.views.login.login_success_callback",
+    "kotti.max_file_size": "10",
+    "kotti.modification_date_excludes": " ".join(["kotti.resources.Node.position"]),
+    "kotti.populators": "kotti.populate.populate",
+    "kotti.principals_factory": "kotti.security.principals_factory",
+    "kotti.register": "False",
+    "kotti.register.group": "",
+    "kotti.register.role": "",
+    "kotti.request_factory": "kotti.request.Request",
+    "kotti.reset_password_callback": "kotti.views.login.reset_password_callback",  # noqa
+    "kotti.root_factory": "kotti.resources.default_get_root",
+    "kotti.sanitizers": " ".join(
+        [
+            "xss_protection:kotti.sanitizers.xss_protection",
+            "minimal_html:kotti.sanitizers.minimal_html",
+            "no_html:kotti.sanitizers.no_html",
+        ]
+    ),
+    "kotti.sanitize_on_write": " ".join(
+        [
+            "kotti.resources.Document.body:xss_protection",
+            "kotti.resources.Content.title:no_html",
+            "kotti.resources.Content.description:no_html",
+        ]
+    ),
+    "kotti.search_content": "kotti.views.util.default_search_content",
+    "kotti.session_factory": "kotti.beaker_session_factory",
+    "kotti.static.edit_needed": "",  # BBB
+    "kotti.static.view_needed": "",  # BBB
+    "kotti.templates.api": "kotti.views.util.TemplateAPI",
+    "kotti.time_format": "medium",
+    "kotti.url_normalizer": "kotti.url_normalizer.url_normalizer",
+    "kotti.url_normalizer.map_non_ascii_characters": True,
+    "kotti.use_tables": "",
+    "kotti.use_workflow": "kotti:workflow.zcml",
+    "kotti.zcml_includes": " ".join([]),
+    "pyramid.includes": "",
+    "pyramid_deform.template_search_path": "kotti:templates/deform",
+}
 
 conf_dotted = {
-    'kotti.authn_policy_factory',
-    'kotti.authz_policy_factory',
-    'kotti.available_types',
-    'kotti.base_includes',
-    'kotti.caching_policy_chooser',
-    'kotti.configurators',
-    'kotti.fanstatic.edit_needed',
-    'kotti.fanstatic.view_needed',
-    'kotti.login_success_callback',
-    'kotti.modification_date_excludes',
-    'kotti.populators',
-    'kotti.principals_factory',
-    'kotti.request_factory',
-    'kotti.reset_password_callback',
-    'kotti.root_factory',
-    'kotti.search_content',
-    'kotti.session_factory',
-    'kotti.templates.api',
-    'kotti.url_normalizer',
+    "kotti.authn_policy_factory",
+    "kotti.authz_policy_factory",
+    "kotti.available_types",
+    "kotti.base_includes",
+    "kotti.caching_policy_chooser",
+    "kotti.configurators",
+    "kotti.fanstatic.edit_needed",
+    "kotti.fanstatic.view_needed",
+    "kotti.login_success_callback",
+    "kotti.modification_date_excludes",
+    "kotti.populators",
+    "kotti.principals_factory",
+    "kotti.request_factory",
+    "kotti.reset_password_callback",
+    "kotti.root_factory",
+    "kotti.search_content",
+    "kotti.session_factory",
+    "kotti.templates.api",
+    "kotti.url_normalizer",
 }
 
 
@@ -184,6 +188,7 @@ def main(global_config, **settings):
     # application.
 
     from kotti.resources import initialize_sql
+
     config = base_configure(global_config, **settings)
     engine = engine_from_config(config.registry.settings)
     initialize_sql(engine)
@@ -200,37 +205,37 @@ def base_configure(global_config, **settings):
         settings.setdefault(key, value)
 
     for key, value in settings.items():
-        if key.startswith('kotti') and isinstance(value, binary_type):
-            settings[key] = value.decode('utf8')
+        if key.startswith("kotti") and isinstance(value, binary_type):
+            settings[key] = value.decode("utf8")
 
     # Allow extending packages to change 'settings' w/ Python:
-    k = 'kotti.configurators'
+    k = "kotti.configurators"
     for func in _resolve_dotted(settings, keys=(k,))[k]:
         func(settings)
 
     settings = _resolve_dotted(settings)
-    secret1 = settings['kotti.secret']
-    settings.setdefault('kotti.secret2', secret1)
+    secret1 = settings["kotti.secret"]
+    settings.setdefault("kotti.secret2", secret1)
 
     # We'll process ``pyramid_includes`` later by hand, to allow
     # overrides of configuration from ``kotti.base_includes``:
-    pyramid_includes = settings.pop('pyramid.includes', '')
+    pyramid_includes = settings.pop("pyramid.includes", "")
 
     config = Configurator(
-        request_factory=settings['kotti.request_factory'][0],
-        settings=settings)
+        request_factory=settings["kotti.request_factory"][0], settings=settings
+    )
     config.begin()
 
     config.hook_zca()
-    config.include('pyramid_zcml')
+    config.include("pyramid_zcml")
 
     # Chameleon bindings were removed from Pyramid core since pyramid>=1.5a2
-    config.include('pyramid_chameleon')
+    config.include("pyramid_chameleon")
 
-    config.registry.settings['pyramid.includes'] = pyramid_includes
+    config.registry.settings["pyramid.includes"] = pyramid_includes
 
     # Include modules listed in 'kotti.base_includes':
-    for module in settings['kotti.base_includes']:
+    for module in settings["kotti.base_includes"]:
         config.include(module)
     config.commit()
 
@@ -240,7 +245,7 @@ def base_configure(global_config, **settings):
         for module in pyramid_includes.split():
             config.include(module)
 
-    for name in settings['kotti.zcml_includes'].strip().split():
+    for name in settings["kotti.zcml_includes"].strip().split():
         config.load_zcml(name)
 
     config.commit()
@@ -261,28 +266,25 @@ def includeme(config):
 
     settings = config.get_settings()
 
-    authentication_policy = settings[
-        'kotti.authn_policy_factory'][0](**settings)
-    authorization_policy = settings[
-        'kotti.authz_policy_factory'][0](**settings)
-    session_factory = settings['kotti.session_factory'][0](**settings)
+    authentication_policy = settings["kotti.authn_policy_factory"][0](**settings)
+    authorization_policy = settings["kotti.authz_policy_factory"][0](**settings)
+    session_factory = settings["kotti.session_factory"][0](**settings)
     if authentication_policy:
         config.set_authentication_policy(authentication_policy)
     if authorization_policy:
         config.set_authorization_policy(authorization_policy)
     config.set_session_factory(session_factory)
 
-    config.add_subscriber(
-        kotti.views.util.add_renderer_globals, BeforeRender)
+    config.add_subscriber(kotti.views.util.add_renderer_globals, BeforeRender)
 
-    for override in [a.strip()
-                     for a in settings['kotti.asset_overrides'].split()
-                     if a.strip()]:
-        config.override_asset(to_override='kotti', override_with=override)
+    for override in [
+        a.strip() for a in settings["kotti.asset_overrides"].split() if a.strip()
+    ]:
+        config.override_asset(to_override="kotti", override_with=override)
 
-    config.add_translation_dirs('kotti:locale')
+    config.add_translation_dirs("kotti:locale")
 
-    workflow = settings['kotti.use_workflow']
+    workflow = settings["kotti.use_workflow"]
     if workflow.lower() not in FALSE_VALUES:
         config.load_zcml(workflow)
 
diff --git a/kotti/events.py b/kotti/events.py
index 1b8577e7f..18f995c6b 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -77,9 +77,11 @@ class ObjectAfterDelete(ObjectEvent):
     """
 
 
-deprecated('ObjectAfterDelete',
-           "The ObjectAfterDelete event is deprecated and will be no longer "
-           "available starting with Kotti 0.10.")
+deprecated(
+    "ObjectAfterDelete",
+    "The ObjectAfterDelete event is deprecated and will be no longer "
+    "available starting with Kotti 0.10.",
+)
 
 
 class UserDeleted(ObjectEvent):
@@ -108,7 +110,7 @@ def __reduce__(self):
         if self.default_factory is None:
             args = tuple()
         else:
-            args = self.default_factory,
+            args = (self.default_factory,)
         return type(self), args, None, None, self.items()
 
     def copy(self):
@@ -119,12 +121,14 @@ def __copy__(self):
 
     def __deepcopy__(self, memo):
         import copy
-        return type(self)(self.default_factory,
-                          copy.deepcopy(self.items()))
+
+        return type(self)(self.default_factory, copy.deepcopy(self.items()))
 
     def __repr__(self):
-        return 'OrderedDefaultDict(%s, %s)' % (self.default_factory,
-                                               OrderedDict.__repr__(self))
+        return "OrderedDefaultDict(%s, %s)" % (
+            self.default_factory,
+            OrderedDict.__repr__(self),
+        )
 
 
 class Dispatcher(DispatcherDict):
@@ -157,6 +161,7 @@ class Dispatcher(DispatcherDict):
       Called unrelated listener
       [1]
     """
+
     def __call__(self, event):
         results = []
         for event_type, handlers in self.items():
@@ -192,11 +197,13 @@ class ObjectEventDispatcher(DispatcherDict):
       >>> dispatcher(ObjectInsert(SubObject()))
       ['base', 'sub', 'all']
     """
+
     def __call__(self, event):
         results = []
         for (evtype, objtype), handlers in self.items():
-            if (isinstance(event, evtype) and
-                    (objtype is None or isinstance(event.object, objtype))):
+            if isinstance(event, evtype) and (
+                objtype is None or isinstance(event.object, objtype)
+            ):
                 for handler in handlers:
                     results.append(handler(event))
         return results
@@ -214,6 +221,7 @@ def clear():
 clear()
 
 
+# noinspection PyUnusedLocal,PyShadowingNames
 def _after_delete(mapper, connection, target):
     """ Trigger the Kotti event :class:``ObjectAfterDelete``.
 
@@ -230,6 +238,7 @@ def _after_delete(mapper, connection, target):
     notify(ObjectAfterDelete(target, get_current_request()))
 
 
+# noinspection PyUnusedLocal
 def _before_flush(session, flush_context, instances):
     """Trigger the following Kotti :class:``ObjectEvent`` events in
     this order:
@@ -264,8 +273,8 @@ def set_owner(event):
             if obj.owner is None:
                 obj.owner = userid
             # Add owner role for userid if it's not inherited already:
-            if 'role:owner' not in list_groups(userid, obj):
-                groups = list_groups_raw(userid, obj) | {'role:owner'}
+            if "role:owner" not in list_groups(userid, obj):
+                groups = list_groups_raw(userid, obj) | {"role:owner"}
                 set_groups(userid, obj, groups)
 
 
@@ -290,7 +299,7 @@ def set_modification_date(event):
 
     exclude = []
 
-    for e in get_settings()['kotti.modification_date_excludes']:
+    for e in get_settings()["kotti.modification_date_excludes"]:
         if isinstance(event.object, e.class_):
             exclude.append(e.key)
 
@@ -298,23 +307,26 @@ def set_modification_date(event):
         event.object.modification_date = datetime.now()
 
 
+# noinspection PyUnusedLocal
 def delete_orphaned_tags(event):
     """Delete Tag instances / records when they are not associated with any
     content.
 
-    :param event: event that trigerred this handler.
+    :param event: event that triggered this handler.
     :type event: :class:`ObjectAfterDelete`
     """
 
+    # noinspection PyUnresolvedReferences
     DBSession.query(Tag).filter(~Tag.content_tags.any()).delete(
-        synchronize_session=False)
+        synchronize_session=False
+    )
 
 
 def cleanup_user_groups(event):
     """Remove a deleted group from the groups of a user/group and remove
        all local group entries of it.
 
-       :param event: event that trigerred this handler.
+       :param event: event that triggered this handler.
        :type event: :class:`UserDeleted`
        """
     name = event.object.name
@@ -325,27 +337,28 @@ def cleanup_user_groups(event):
         for user_or_group in users_groups:
             principals[user_or_group].groups.remove(name)
 
-    DBSession.query(LocalGroup).filter(
-        LocalGroup.principal_name == name).delete()
+    DBSession.query(LocalGroup).filter(LocalGroup.principal_name == name).delete()
 
 
 def reset_content_owner(event):
     """Reset the owner of the content from the deleted owner.
 
-    :param event: event that trigerred this handler.
+    :param event: event that triggered this handler.
     :type event: :class:`UserDeleted`
     """
 
-    contents = DBSession.query(Content).filter(
-        Content.owner == event.object.name).all()
+    contents = DBSession.query(Content).filter(Content.owner == event.object.name).all()
     for content in contents:
         content.owner = None
 
 
 def _update_children_paths(old_parent_path, new_parent_path):
-    for child in DBSession.query(Node).options(
-        load_only('path', 'type')).filter(
-            Node.path.startswith(old_parent_path)).order_by(Node.path):
+    for child in (
+        DBSession.query(Node)
+        .options(load_only("path", "type"))
+        .filter(Node.path.startswith(old_parent_path))
+        .order_by(Node.path)
+    ):
         if child.path == new_parent_path:
             # The child is the node itself and has already be renamed.
             # Nothing to do!
@@ -353,6 +366,7 @@ def _update_children_paths(old_parent_path, new_parent_path):
         child.path = new_parent_path + child.path[len(old_parent_path):]
 
 
+# noinspection PyUnusedLocal,SpellCheckingInspection
 @no_autoflush
 def _set_path_for_new_name(target, value, oldvalue, initiator):
     """Triggered whenever the Node's 'name' attribute is set.
@@ -360,7 +374,7 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
     Is called with all kind of weird edge cases, e.g. name is 'None',
     parent is 'None' etc.
     """
-    if getattr(target, '_kotti_set_path_for_new_name', False):
+    if getattr(target, "_kotti_set_path_for_new_name", False):
         # we're being called recursively (see below)
         return
 
@@ -368,19 +382,19 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
         # Our name is about to be set to 'None', so skip.
         return
 
-    if target.__parent__ is None and value != '':
+    if target.__parent__ is None and value != "":
         # Our parent hasn't been set yet.  Skip, unless we're the root
         # object (which always has an empty string as name).
         return
 
     old_path = target.path
     line = tuple(reversed(tuple(lineage(target))))
-    target_path = '/'.join(node.__name__ for node in line[:-1])
-    if target.__parent__ is None and value == '':
+    target_path = "/".join(node.__name__ for node in line[:-1])
+    if target.__parent__ is None and value == "":
         # We're a new root object
-        target_path = '/'
+        target_path = "/"
     else:
-        target_path += '/{0}/'.format(value)
+        target_path += "/{0}/".format(value)
     target.path = target_path
     # We need to set the name to value here so that the subsequent
     # UPDATE in _update_children_paths will include the new 'name'
@@ -391,14 +405,14 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
     try:
         target.name = value
     finally:
+        # noinspection PyProtectedMember
         del target._kotti_set_path_for_new_name
 
     if old_path and target.id is not None:
         _update_children_paths(old_path, target_path)
     else:
         for child in _all_children(target):
-            child.path = '{0}{1}/'.format(child.__parent__.path,
-                                          child.__name__)
+            child.path = "{0}{1}/".format(child.__parent__.path, child.__name__)
 
 
 def _all_children(item, _all=None):
@@ -412,6 +426,7 @@ def _all_children(item, _all=None):
     return _all
 
 
+# noinspection PyUnusedLocal,PyUnusedLocal,SpellCheckingInspection
 @no_autoflush
 def _set_path_for_new_parent(target, value, oldvalue, initiator):
     """Triggered whenever the Node's 'parent' attribute is set.
@@ -424,7 +439,7 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # The object's name is still 'None', so skip.
         return
 
-    if value.__parent__ is None and value.__name__ != '':
+    if value.__parent__ is None and value.__name__ != "":
         # Our parent doesn't have a parent, and it's not root either.
         return
 
@@ -435,8 +450,8 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # If any of our parents don't have a name yet, skip
         return
 
-    target_path = '/'.join(node.__name__ for node in line)
-    target_path += '/{0}/'.format(target.__name__)
+    target_path = "/".join(node.__name__ for node in line)
+    target_path += "/{0}/".format(target.__name__)
     target.path = target_path
 
     if old_path and target.id is not None:
@@ -446,8 +461,7 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # children.  This is the case when we create an object with
         # children before we assign the object itself to a parent.
         for child in _all_children(target):
-            child.path = '{0}{1}/'.format(child.__parent__.path,
-                                          child.__name__)
+            child.path = "{0}{1}/".format(child.__parent__.path, child.__name__)
 
 
 # noinspection PyPep8Naming
@@ -496,6 +510,7 @@ def __init__(self, evttype=object, objtype=None):
         self.evttype = evttype
         self.objtype = objtype
 
+    # noinspection PyUnusedLocal
     def register(self, context, name, obj):
         if issubclass(self.evttype, ObjectEvent):
             objectevent_listeners[(self.evttype, self.objtype)].append(obj)
@@ -504,7 +519,7 @@ def register(self, context, name, obj):
 
     def __call__(self, wrapped):
 
-        self.venusian.attach(wrapped, self.register, category='kotti')
+        self.venusian.attach(wrapped, self.register, category="kotti")
 
         return wrapped
 
@@ -521,16 +536,17 @@ def wire_sqlalchemy():  # pragma: no cover
         return
     else:
         _WIRED_SQLALCHMEY = True
-    sqlalchemy.event.listen(mapper, 'after_delete', _after_delete)
-    sqlalchemy.event.listen(DBSession, 'before_flush', _before_flush)
+    sqlalchemy.event.listen(mapper, "after_delete", _after_delete)
+    sqlalchemy.event.listen(DBSession, "before_flush", _before_flush)
 
     # Update the 'path' attribute on changes to 'name' or 'parent'
+    sqlalchemy.event.listen(Node.name, "set", _set_path_for_new_name, propagate=True)
     sqlalchemy.event.listen(
-        Node.name, 'set', _set_path_for_new_name, propagate=True)
-    sqlalchemy.event.listen(
-        Node.parent, 'set', _set_path_for_new_parent, propagate=True)
+        Node.parent, "set", _set_path_for_new_parent, propagate=True
+    )
 
 
+# noinspection PyUnusedLocal
 def includeme(config):
     """ Pyramid includeme hook.
 
@@ -544,29 +560,24 @@ def includeme(config):
     wire_sqlalchemy()
 
     # Set content owner on content creation
-    objectevent_listeners[
-        (ObjectInsert, Content)].append(set_owner)
+    objectevent_listeners[(ObjectInsert, Content)].append(set_owner)
 
     # Set content creation date on content creation
-    objectevent_listeners[
-        (ObjectInsert, Content)].append(set_creation_date)
+    objectevent_listeners[(ObjectInsert, Content)].append(set_creation_date)
 
     # Set content modification date on content updates
-    objectevent_listeners[
-        (ObjectUpdate, Content)].append(set_modification_date)
+    objectevent_listeners[(ObjectUpdate, Content)].append(set_modification_date)
 
     # Delete orphaned tags after a tag association has ben deleted
-    objectevent_listeners[
-        (ObjectAfterDelete, TagsToContents)].append(delete_orphaned_tags)
+    objectevent_listeners[(ObjectAfterDelete, TagsToContents)].append(
+        delete_orphaned_tags
+    )
 
     # Initialze the workflow on content creation.
-    objectevent_listeners[
-        (ObjectInsert, Content)].append(initialize_workflow)
+    objectevent_listeners[(ObjectInsert, Content)].append(initialize_workflow)
 
     # Perform some cleanup when a user or group is deleted
-    objectevent_listeners[
-        (UserDeleted, Principal)].append(cleanup_user_groups)
+    objectevent_listeners[(UserDeleted, Principal)].append(cleanup_user_groups)
 
     # Remove the owner from content when the corresponding user is deleted
-    objectevent_listeners[
-        (UserDeleted, Principal)].append(reset_content_owner)
+    objectevent_listeners[(UserDeleted, Principal)].append(reset_content_owner)
diff --git a/kotti/fanstatic.py b/kotti/fanstatic.py
index ca6ce942a..16ce0a04f 100644
--- a/kotti/fanstatic.py
+++ b/kotti/fanstatic.py
@@ -26,25 +26,19 @@
 contents_view_js = Resource(
     lib_kotti,
     "contents.js",
-    depends=[jquery_tablednd, ],
+    depends=[jquery_tablednd],
     minified="contents.min.js",
-    bottom=True)
+    bottom=True,
+)
 base_css = Resource(
     lib_kotti,
     "base.css",
     depends=[bootstrap_css],
     minified="base.min.css",
-    dont_bundle=True)
-edit_css = Resource(
-    lib_kotti,
-    "edit.css",
-    depends=[base_css],
-    minified="edit.min.css")
-view_css = Resource(
-    lib_kotti,
-    "view.css",
-    depends=[base_css],
-    minified="view.min.css")
+    dont_bundle=True,
+)
+edit_css = Resource(lib_kotti, "edit.css", depends=[base_css], minified="edit.min.css")
+view_css = Resource(lib_kotti, "view.css", depends=[base_css], minified="view.min.css")
 
 # Resources for content upload views
 upload_js = Resource(
@@ -52,12 +46,11 @@
     "upload.js",
     depends=[angular, fineuploader],
     # minified="upload.min.js", needs special minifying
-    bottom=True)
+    bottom=True,
+)
 upload_css = Resource(
-    lib_kotti,
-    "upload.css",
-    depends=[base_css],
-    minified="upload.min.css")
+    lib_kotti, "upload.css", depends=[base_css], minified="upload.min.css"
+)
 upload = Group([upload_js, upload_css])
 
 
@@ -65,8 +58,9 @@ class NeededGroup(object):
     """A collection of fanstatic resources that supports
        dynamic appending of resources after initialization"""
 
-    def __init__(self,
-                 resources: Optional[List[Union[Resource, 'NeededGroup']]]=None):  # noqa
+    def __init__(
+        self, resources: Optional[List[Union[Resource, "NeededGroup"]]] = None
+    ):  # noqa
 
         if resources is None:
             resources = []
@@ -74,14 +68,15 @@ def __init__(self,
         if not isinstance(resources, list):
             raise ValueError(
                 "resources must be a list of fanstatic.Resource "
-                "and/or fanstatic.Group objects")
+                "and/or fanstatic.Group objects"
+            )
 
         self.resources = []
 
         for resource in resources:
             self.add(resource)
 
-    def add(self, resource: Union['NeededGroup', Resource]):
+    def add(self, resource: Union["NeededGroup", Resource]):
         """resource may be a:
 
             - :class:`fanstatic.Resource` object or
@@ -94,7 +89,8 @@ def add(self, resource: Union['NeededGroup', Resource]):
         else:
             raise ValueError(
                 "resource must be a NeededGroup,"
-                "fanstatic.Resource or fanstatic.Group object")
+                "fanstatic.Resource or fanstatic.Group object"
+            )
 
     def need(self):  # pragma: no cover
         # this is tested in fanstatic itself; we should add browser tests
@@ -102,10 +98,10 @@ def need(self):  # pragma: no cover
         Group(self.resources).need()
 
 
-view_needed_css = NeededGroup([view_css, ])
-view_needed_js = NeededGroup([jquery, bootstrap_js, html5shiv, ])
-view_needed = NeededGroup([view_needed_css, view_needed_js, ])
+view_needed_css = NeededGroup([view_css])
+view_needed_js = NeededGroup([jquery, bootstrap_js, html5shiv])
+view_needed = NeededGroup([view_needed_css, view_needed_js])
 
-edit_needed_css = NeededGroup([edit_css, jqueryui_bootstrap_theme, ])
-edit_needed_js = NeededGroup([jquery, bootstrap_js, html5shiv, jquery_form, ])
-edit_needed = NeededGroup([edit_needed_css, edit_needed_js, ])
+edit_needed_css = NeededGroup([edit_css, jqueryui_bootstrap_theme])
+edit_needed_js = NeededGroup([jquery, bootstrap_js, html5shiv, jquery_form])
+edit_needed = NeededGroup([edit_needed_css, edit_needed_js])
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 804e100cf..1581e8a27 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -82,15 +82,22 @@ class DBStoredFile(Base):
     last_modified = Column(DateTime())
     #: The binary data itself
     #: (:class:`sqlalchemy.types.LargeBinary`)
-    data = deferred(Column('data', LargeBinary()))
+    data = deferred(Column("data", LargeBinary()))
 
     _cursor = 0
     _data = _marker
 
     public_url = None
 
-    def __init__(self, file_id, filename=None, content_type=None,
-                 last_modified=None, content_length=None, **kwds):
+    def __init__(
+        self,
+        file_id,
+        filename=None,
+        content_type=None,
+        last_modified=None,
+        content_length=None,
+        **kwds
+    ):
         self.file_id = file_id
         self.filename = filename
         self.content_type = content_type
@@ -100,8 +107,7 @@ def __init__(self, file_id, filename=None, content_type=None,
         for k, v in kwds.items():
             setattr(self, k, v)
 
-    def read(self,
-             n: int = -1) -> bytes:
+    def read(self, n: int = -1) -> bytes:
         """Reads ``n`` bytes from the file.
 
         If ``n`` is not specified or is ``-1`` the whole
@@ -109,8 +115,9 @@ def read(self,
         """
         if self._data is _marker:
             file_id = DBSession.merge(self).file_id
-            self._data = DBSession.query(DBStoredFile.data).\
-                filter_by(file_id=file_id).scalar()
+            self._data = (
+                DBSession.query(DBStoredFile.data).filter_by(file_id=file_id).scalar()
+            )
 
         if n == -1:
             result = self._data[self._cursor:]
@@ -166,7 +173,7 @@ def seek(self, offset: int, whence: int = 0) -> None:
         elif whence in (1, 2):
             self._cursor = self._cursor + offset
         else:
-            raise ValueError('whence must be 0, 1 or 2')
+            raise ValueError("whence must be 0, 1 or 2")
 
     def tell(self) -> int:
         """ Returns current position of file cursor
@@ -192,13 +199,15 @@ def __declare_last__(cls) -> None:
         When the data changes, we want to reset the cursor position of target
         instance, to allow proper streaming of data.
         """
-        event.listen(DBStoredFile.data, 'set', handle_change_data)
+        event.listen(DBStoredFile.data, "set", handle_change_data)
 
 
-def handle_change_data(target: DBStoredFile,
-                       value: Optional[bytes],
-                       oldvalue: Union[bytes, _symbol],
-                       initiator: Event) -> None:
+def handle_change_data(
+    target: DBStoredFile,
+    value: Optional[bytes],
+    oldvalue: Union[bytes, _symbol],
+    initiator: Event,
+) -> None:
     target._cursor = 0
     target._data = _marker
 
@@ -236,10 +245,12 @@ def get(file_id: str) -> DBStoredFile:
             raise IOError
         return f
 
-    def create(self,
-               content: Union[bytes, FieldStorage],
-               filename: Optional[str] = None,
-               content_type: Optional[str] = None) -> str:
+    def create(
+        self,
+        content: Union[bytes, FieldStorage],
+        filename: Optional[str] = None,
+        content_type: Optional[str] = None,
+    ) -> str:
         """Saves a new file and returns the file id
 
         :param content: can either be ``bytes``, another ``file object``
@@ -257,24 +268,26 @@ def create(self,
         :rtype: string
         """
         new_file_id = str(uuid.uuid1())
-        content, filename, content_type = self.fileinfo(
-            content, filename, content_type)
-        if hasattr(content, 'read'):
+        content, filename, content_type = self.fileinfo(content, filename, content_type)
+        if hasattr(content, "read"):
             content = content.read()
 
-        fstore = DBStoredFile(data=content,
-                              file_id=new_file_id,
-                              filename=filename,
-                              content_type=content_type,
-                              )
+        fstore = DBStoredFile(
+            data=content,
+            file_id=new_file_id,
+            filename=filename,
+            content_type=content_type,
+        )
         DBSession.add(fstore)
         return new_file_id
 
-    def replace(self,
-                file_or_id: Union[DBStoredFile, str],
-                content: bytes,
-                filename: Optional[str] = None,
-                content_type: Optional[str] = None) -> None:
+    def replace(
+        self,
+        file_or_id: Union[DBStoredFile, str],
+        content: bytes,
+        filename: Optional[str] = None,
+        content_type: Optional[str] = None,
+    ) -> None:
         """Replaces an existing file, an ``IOError`` is raised if the file
         didn't already exist.
 
@@ -300,8 +313,7 @@ def replace(self,
 
         file_id = self._get_file_id(file_or_id)
 
-        content, filename, content_type = self.fileinfo(
-            content, filename, content_type)
+        content, filename, content_type = self.fileinfo(content, filename, content_type)
 
         fstore = self.get(file_id)
 
@@ -310,13 +322,12 @@ def replace(self,
         if content_type is not None:
             fstore.content_type = content_type
 
-        if hasattr(content, 'read'):
+        if hasattr(content, "read"):
             content = content.read()
 
         fstore.data = content
 
-    def delete(self,
-               file_or_id: str) -> None:
+    def delete(self, file_or_id: str) -> None:
         """Deletes a file. If the file didn't exist it will just do nothing.
 
         :param file_or_id: can be either ``DBStoredFile`` or a ``file_id``
@@ -326,8 +337,7 @@ def delete(self,
 
         DBSession.query(DBStoredFile).filter_by(file_id=file_id).delete()
 
-    def exists(self,
-               file_or_id: str) -> bool:
+    def exists(self, file_or_id: str) -> bool:
         """Returns if a file or its ID still exist.
 
         :return: Returns if a file or its ID still exist.
@@ -336,8 +346,7 @@ def exists(self,
 
         file_id = self._get_file_id(file_or_id)
 
-        return bool(
-            DBSession.query(DBStoredFile).filter_by(file_id=file_id).count())
+        return bool(DBSession.query(DBStoredFile).filter_by(file_id=file_id).count())
 
     @staticmethod
     def list(*args) -> None:
@@ -345,13 +354,12 @@ def list(*args) -> None:
 
     @staticmethod
     def _get_file_id(file_or_id: Union[DBStoredFile, str]) -> str:
-        if hasattr(file_or_id, 'file_id'):
+        if hasattr(file_or_id, "file_id"):
             return file_or_id.file_id
         return file_or_id
 
 
-def migrate_storage(from_storage: str,
-                    to_storage: str) -> None:
+def migrate_storage(from_storage: str, to_storage: str) -> None:
 
     log = logging.getLogger(__name__)
 
@@ -374,12 +382,14 @@ def migrate_storage(from_storage: str,
                 pk = mapper.primary_key_from_instance(instance)
                 log.info("Migrating %s for %r with pk %r", prop, klass, pk)
 
-                filename = uf['filename']
-                content_type = uf['content_type']
-                data = _to_fieldstorage(fp=uf.file,
-                                        filename=filename,
-                                        mimetype=content_type,
-                                        size=uf.file.content_length)
+                filename = uf["filename"]
+                content_type = uf["content_type"]
+                data = _to_fieldstorage(
+                    fp=uf.file,
+                    filename=filename,
+                    mimetype=content_type,
+                    size=uf.file.content_length,
+                )
                 setattr(instance, prop, data)
 
     DepotManager._default_depot = old_default
@@ -400,8 +410,7 @@ def migrate_storages_command():  # pragma: no cover
     """
     return command(
         lambda args: migrate_storage(
-            from_storage=args['--from-storage'],
-            to_storage=args['--to-storage'],
+            from_storage=args["--from-storage"], to_storage=args["--to-storage"]
         ),
         __doc__,
     )
@@ -413,13 +422,15 @@ class StoredFileResponse(Response):
     Code adapted from :class:`pyramid.response.FileResponse`.
     """
 
-    def __init__(self,
-                 f: MemoryStoredFile,
-                 request: Union[DummyRequest, Request],
-                 disposition: str = 'attachment',
-                 cache_max_age: int = 604800,
-                 content_type: None = None,
-                 content_encoding: None = None) -> None:
+    def __init__(
+        self,
+        f: MemoryStoredFile,
+        request: Union[DummyRequest, Request],
+        disposition: str = "attachment",
+        cache_max_age: int = 604800,
+        content_type: None = None,
+        content_encoding: None = None,
+    ) -> None:
         """
         :param f: the ``UploadedFile`` file field value.
         :type f: :class:`depot.io.interfaces.StoredFile`
@@ -446,19 +457,23 @@ def __init__(self,
             raise HTTPMovedPermanently(f.public_url)
 
         content_encoding, content_type = self._get_type_and_encoding(
-            content_encoding, content_type, f)
+            content_encoding, content_type, f
+        )
 
         super(StoredFileResponse, self).__init__(
             conditional_response=True,
             content_type=content_type,
-            content_encoding=content_encoding)
+            content_encoding=content_encoding,
+        )
 
         app_iter = None
-        if request is not None and \
-                not get_settings()['kotti.depot_replace_wsgi_file_wrapper']:
+        if (
+            request is not None
+            and not get_settings()["kotti.depot_replace_wsgi_file_wrapper"]
+        ):
             environ = request.environ
-            if 'wsgi.file_wrapper' in environ:
-                app_iter = environ['wsgi.file_wrapper'](f, _BLOCK_SIZE)
+            if "wsgi.file_wrapper" in environ:
+                app_iter = environ["wsgi.file_wrapper"](f, _BLOCK_SIZE)
         if app_iter is None:
             app_iter = FileIter(f)
         self.app_iter = app_iter
@@ -474,22 +489,23 @@ def __init__(self,
         self.etag = self.generate_etag(f)
 
         disposition = rfc6266_parser.build_header(
-            f.filename, disposition=disposition,
-            filename_compat=unidecode(f.filename))
+            f.filename, disposition=disposition, filename_compat=unidecode(f.filename)
+        )
         if isinstance(disposition, bytes):
-            disposition = disposition.decode('iso-8859-1')
+            disposition = disposition.decode("iso-8859-1")
         self.content_disposition = disposition
 
     @staticmethod
-    def _get_type_and_encoding(content_encoding: None,
-                               content_type: None,
-                               f: MemoryStoredFile) -> Tuple['NoneType', str]:
-        content_type = content_type or getattr(f, 'content_type', None)
+    def _get_type_and_encoding(
+        content_encoding: None, content_type: None, f: MemoryStoredFile
+    ) -> Tuple["NoneType", str]:
+        content_type = content_type or getattr(f, "content_type", None)
         if content_type is None:
-            content_type, content_encoding = \
-                mimetypes.guess_type(f.filename, strict=False)
+            content_type, content_encoding = mimetypes.guess_type(
+                f.filename, strict=False
+            )
         if content_type is None:
-            content_type = 'application/octet-stream'
+            content_type = "application/octet-stream"
         # str-ifying content_type is a workaround for a bug in Python 2.7.7
         # on Windows where mimetypes.guess_type returns unicode for the
         # content_type.
@@ -501,25 +517,28 @@ def generate_etag(f: MemoryStoredFile) -> str:
         return '"{0}-{1}"'.format(f.last_modified, f.content_length)
 
 
-def uploaded_file_response(self: Union[DummyRequest, Request],
-                           uploaded_file: UploadedFile,
-                           disposition: str = 'inline',
-                           cache_max_age: int = 604800) -> StoredFileResponse:
-    return StoredFileResponse(uploaded_file.file, self,
-                              disposition=disposition,
-                              cache_max_age=cache_max_age)
+def uploaded_file_response(
+    self: Union[DummyRequest, Request],
+    uploaded_file: UploadedFile,
+    disposition: str = "inline",
+    cache_max_age: int = 604800,
+) -> StoredFileResponse:
+    return StoredFileResponse(
+        uploaded_file.file, self, disposition=disposition, cache_max_age=cache_max_age
+    )
 
 
-def uploaded_file_url(self, uploaded_file, disposition='inline'):
-    if disposition == 'attachment':
-        suffix = '/download'
+def uploaded_file_url(self, uploaded_file, disposition="inline"):
+    if disposition == "attachment":
+        suffix = "/download"
     else:
-        suffix = ''
-    url = '{0}/{1}/{2}{3}'.format(
+        suffix = ""
+    url = "{0}/{1}/{2}{3}".format(
         self.application_url,
-        get_settings()['kotti.depot_mountpoint'][1:],
+        get_settings()["kotti.depot_mountpoint"][1:],
         uploaded_file.path,
-        suffix)
+        suffix,
+    )
     return url
 
 
@@ -532,9 +551,7 @@ class TweenFactory(object):
     object instead of the WSGI environment.
     """
 
-    def __init__(self,
-                 handler: Optional[Callable],
-                 registry: Registry) -> None:
+    def __init__(self, handler: Optional[Callable], registry: Registry) -> None:
         """
         :param handler: Downstream tween or main Pyramid request handler (Kotti)
         :type handler: function
@@ -543,17 +560,16 @@ def __init__(self,
         :type registry: :class:`pyramid.registry.Registry`
         """
 
-        self.mountpoint = registry.settings['kotti.depot_mountpoint']
+        self.mountpoint = registry.settings["kotti.depot_mountpoint"]
         self.handler = handler
         self.registry = registry
 
         DepotManager.set_middleware(self)
 
     def url_for(self, path):
-        return '/'.join((self.mountpoint, path))
+        return "/".join((self.mountpoint, path))
 
-    def __call__(self,
-                 request: Request) -> Response:
+    def __call__(self, request: Request) -> Response:
         """
         :param request: Current request
         :type request: :class:`kotti.request.Request`
@@ -564,14 +580,15 @@ def __call__(self,
 
         # Only handle GET and HEAD requests for the mountpoint.
         # All other requests are passed to downstream handlers.
-        if request.method not in ('GET', 'HEAD') \
-                or not request.path.startswith(self.mountpoint):
+        if request.method not in ("GET", "HEAD") or not request.path.startswith(
+            self.mountpoint
+        ):
             response = self.handler(request)
             return response
 
         # paths match this pattern
         # /<mountpoint>/<depot name>/<file id>[/download]
-        path = request.path.split('/')
+        path = request.path.split("/")
         if len(path) and not path[0]:
             path = path[1:]
 
@@ -598,20 +615,20 @@ def __call__(self,
             return response
 
         # file is not directly accessible for user agents, serve it ourselves
-        if path[-1] == 'download':
-            disposition = 'attachment'
+        if path[-1] == "download":
+            disposition = "attachment"
         else:
-            disposition = 'inline'
+            disposition = "inline"
         response = StoredFileResponse(f, request, disposition=disposition)
         return response
 
 
-def adjust_for_engine(conn: Connection,
-                      branch: bool) -> None:
+def adjust_for_engine(conn: Connection, branch: bool) -> None:
     # adjust for engine type
 
-    if conn.engine.dialect.name == 'mysql':  # pragma: no cover
+    if conn.engine.dialect.name == "mysql":  # pragma: no cover
         from sqlalchemy.dialects.mysql.base import LONGBLOB
+
         DBStoredFile.__table__.c.data.type = LONGBLOB()
 
     # sqlite's Unicode columns return a buffer which can't be encoded by
@@ -624,13 +641,15 @@ def patched_processed_result_value(self, value, dialect):
             return None
         return self._upload_type.decode(value)
 
-    if conn.engine.dialect.name == 'sqlite':  # pragma: no cover
+    if conn.engine.dialect.name == "sqlite":  # pragma: no cover
         from depot.fields.sqlalchemy import UploadedFileField
+
         UploadedFileField.process_result_value = patched_processed_result_value
 
 
-def extract_depot_settings(prefix: Optional[str]="kotti.depot.",
-                           settings: Optional[Dict[str, str]]=None) -> List[Dict[str, str]]:  # noqa
+def extract_depot_settings(
+    prefix: Optional[str] = "kotti.depot.", settings: Optional[Dict[str, str]] = None
+) -> List[Dict[str, str]]:  # noqa
     """ Merges items from a dictionary that have keys that start with `prefix`
     to a list of dictionaries.
 
@@ -658,7 +677,7 @@ def extract_depot_settings(prefix: Optional[str]="kotti.depot.",
 
     extracted = {}
     for k, v in extract_from_settings(prefix, settings).items():
-        index, conf = k.split('.', 1)
+        index, conf = k.split(".", 1)
         index = int(index)
         extracted.setdefault(index, {})
         extracted[index][conf] = v
@@ -672,11 +691,11 @@ def extract_depot_settings(prefix: Optional[str]="kotti.depot.",
 
 def configure_filedepot(settings: Dict[str, str]) -> None:
 
-    config = extract_depot_settings('kotti.depot.', settings)
+    config = extract_depot_settings("kotti.depot.", settings)
     for conf in config:
-        name = conf.pop('name')
+        name = conf.pop("name")
         if name not in DepotManager._depots:
-            DepotManager.configure(name, conf, prefix='')
+            DepotManager.configure(name, conf, prefix="")
 
 
 def includeme(config: Configurator) -> None:
@@ -686,12 +705,11 @@ def includeme(config: Configurator) -> None:
     :type config: :class:`pyramid.config.Configurator`
     """
 
-    config.add_tween('kotti.filedepot.TweenFactory',
-                     over=tweens.MAIN,
-                     under=tweens.INGRESS)
-    config.add_request_method(uploaded_file_response,
-                              name='uploaded_file_response')
-    config.add_request_method(uploaded_file_url, name='uploaded_file_url')
+    config.add_tween(
+        "kotti.filedepot.TweenFactory", over=tweens.MAIN, under=tweens.INGRESS
+    )
+    config.add_request_method(uploaded_file_response, name="uploaded_file_response")
+    config.add_request_method(uploaded_file_url, name="uploaded_file_url")
 
     from kotti.events import objectevent_listeners
     from kotti.events import ObjectInsert
@@ -700,19 +718,15 @@ def includeme(config: Configurator) -> None:
     from sqlalchemy.event import listen
     from sqlalchemy.engine import Engine
 
-    listen(Engine, 'engine_connect', adjust_for_engine)
+    listen(Engine, "engine_connect", adjust_for_engine)
 
     configure_filedepot(config.get_settings())
 
     # Update file metadata on change of blob data
-    objectevent_listeners[
-        (ObjectInsert, DBStoredFile)].append(set_metadata)
-    objectevent_listeners[
-        (ObjectUpdate, DBStoredFile)].append(set_metadata)
+    objectevent_listeners[(ObjectInsert, DBStoredFile)].append(set_metadata)
+    objectevent_listeners[(ObjectUpdate, DBStoredFile)].append(set_metadata)
 
     # depot's _SQLAMutationTracker._session_committed is executed on
     # after_commit, that's too late for DBFileStorage to interact with the
     # session
-    event.listen(DBSession,
-                 'before_commit',
-                 _SQLAMutationTracker._session_committed)
+    event.listen(DBSession, "before_commit", _SQLAMutationTracker._session_committed)
diff --git a/kotti/message.py b/kotti/message.py
index 4c7f5d795..9d68349ad 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -24,18 +24,15 @@ def get_mailer():
     return Mailer.from_settings(get_settings())  # pragma: no cover
 
 
-def make_token(user: Principal, seconds: Optional[float]=None) -> str:
-    secret = get_settings()['kotti.secret2']
+def make_token(user: Principal, seconds: Optional[float] = None) -> str:
+    secret = get_settings()["kotti.secret2"]
     if seconds is None:
         seconds = time.time()
-    token = '{}:{}:{}'.format(user.name, secret, seconds)
-    return '{}:{}'.format(hashlib.sha224(token.encode('utf8')).hexdigest(),
-                          seconds)
+    token = "{}:{}:{}".format(user.name, secret, seconds)
+    return "{}:{}".format(hashlib.sha224(token.encode("utf8")).hexdigest(), seconds)
 
 
-def validate_token(user: Principal,
-                   token: str,
-                   valid_hrs: int=24) -> bool:
+def validate_token(user: Principal, token: str, valid_hrs: int = 24) -> bool:
     """
         >>> from kotti.testing import setUp, tearDown
         >>> ignore = setUp()
@@ -60,19 +57,23 @@ def validate_token(user: Principal,
         >>> tearDown()
     """
     try:
-        seconds = float(token.split(':')[1])
+        seconds = float(token.split(":")[1])
     except (IndexError, ValueError):
         return False
-    if token == make_token(user, seconds) \
-            and time.time() - seconds < 60 * 60 * valid_hrs:
+    if (
+        token == make_token(user, seconds)
+        and time.time() - seconds < 60 * 60 * valid_hrs
+    ):
         return True
     return False
 
 
-def send_email(request: Request,
-               recipients: List[str],
-               template_name: str,
-               template_vars: Optional[Dict[str, str]]=None) -> None:
+def send_email(
+    request: Request,
+    recipients: List[str],
+    template_name: str,
+    template_vars: Optional[Dict[str, str]] = None,
+) -> None:
     """ General email sender.
 
     :param request: current request.
@@ -94,38 +95,34 @@ def send_email(request: Request,
         template_vars = {}
 
     text = render(template_name, template_vars, request)
-    subject, htmlbody = text.strip().split('\n', 1)
-    subject = subject.replace('Subject:', '', 1).strip()
+    subject, htmlbody = text.strip().split("\n", 1)
+    subject = subject.replace("Subject:", "", 1).strip()
     html2text = HTML2Text()
     html2text.body_width = 0
     textbody = html2text.handle(htmlbody).strip()
 
     message = Message(
-        recipients=recipients,
-        subject=subject,
-        body=textbody,
-        html=htmlbody,
-        )
+        recipients=recipients, subject=subject, body=textbody, html=htmlbody
+    )
     mailer = get_mailer()
     mailer.send(message)
 
 
-def email_set_password(user: Principal,
-                       request: Request,
-                       template_name: Optional[str]='kotti:templates/email-set-password.pt',  # noqa
-                       add_query: Optional[Dict[str, str]]=None) -> None:
-    site_title = get_settings()['kotti.site_title']
+def email_set_password(
+    user: Principal,
+    request: Request,
+    template_name: Optional[str] = "kotti:templates/email-set-password.pt",  # noqa
+    add_query: Optional[Dict[str, str]] = None,
+) -> None:
+    site_title = get_settings()["kotti.site_title"]
     token = make_token(user)
     user.confirm_token = token
-    set_password_query = {'token': token, 'email': user.email}
+    set_password_query = {"token": token, "email": user.email}
     if add_query:
         set_password_query.update(add_query)
-    url = '{0}/@@set-password?{1}'.format(
-        request.application_url,
-        urlencode(set_password_query))
-    variables = dict(
-        user_title=user.title,
-        site_title=site_title,
-        url=url)
+    url = "{0}/@@set-password?{1}".format(
+        request.application_url, urlencode(set_password_query)
+    )
+    variables = dict(user_title=user.title, site_title=site_title, url=url)
     recipients = ['"{0}" <{1}>'.format(user.title, user.email)]  # XXX naive?
     send_email(request, recipients, template_name, variables)
diff --git a/kotti/migrate.py b/kotti/migrate.py
index a1ea638cd..5d6c9b560 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -53,8 +53,9 @@ def kotti_configure(settings):
 from kotti.util import command
 
 from typing import Callable, List
-KOTTI_SCRIPT_DIR = pkg_resources.resource_filename('kotti', 'alembic')
-DEFAULT_LOCATION = 'kotti:alembic'
+
+KOTTI_SCRIPT_DIR = pkg_resources.resource_filename("kotti", "alembic")
+DEFAULT_LOCATION = "kotti:alembic"
 
 
 class ScriptDirectoryWithDefaultEnvPy(ScriptDirectory):
@@ -62,7 +63,7 @@ class ScriptDirectoryWithDefaultEnvPy(ScriptDirectory):
     def env_py_location(self) -> str:
         loc = super(ScriptDirectoryWithDefaultEnvPy, self).env_py_location
         if not os.path.exists(loc):
-            loc = os.path.join(KOTTI_SCRIPT_DIR, 'env.py')
+            loc = os.path.join(KOTTI_SCRIPT_DIR, "env.py")
         return loc
 
     def run_env(self) -> None:
@@ -71,31 +72,30 @@ def run_env(self) -> None:
 
 
 class PackageEnvironment(object):
-    def __init__(self,
-                 location: str) -> None:
+    def __init__(self, location: str) -> None:
         self.location = location
         self.config = self._make_config(location)
         self.script_dir = self._make_script_dir(self.config)
 
     @property
     def pkg_name(self) -> str:
-        return self.location.split(':')[0]
+        return self.location.split(":")[0]
 
     @property
     def version_table(self) -> str:
-        return '{0}_alembic_version'.format(self.pkg_name)
+        return "{0}_alembic_version".format(self.pkg_name)
 
-    def run_env(self,
-                fn: Callable, **kw) -> None:
-        with EnvironmentContext(self.config, self.script_dir, fn=fn,
-                                version_table=self.version_table, **kw):
+    def run_env(self, fn: Callable, **kw) -> None:
+        with EnvironmentContext(
+            self.config, self.script_dir, fn=fn, version_table=self.version_table, **kw
+        ):
             self.script_dir.run_env()
 
     @staticmethod
     def _make_config(location: str) -> Config:
         cfg = Config()
         cfg.set_main_option("script_location", location)
-        cfg.set_main_option("sqlalchemy.url", get_settings()['sqlalchemy.url'])
+        cfg.set_main_option("sqlalchemy.url", get_settings()["sqlalchemy.url"])
         return cfg
 
     @staticmethod
@@ -106,12 +106,11 @@ def _make_script_dir(alembic_cfg: Config) -> ScriptDirectoryWithDefaultEnvPy:
 
 
 def get_locations() -> List[str]:
-    conf_str = get_settings()['kotti.alembic_dirs']
+    conf_str = get_settings()["kotti.alembic_dirs"]
     return [l.strip() for l in conf_str.split() if l.strip()]
 
 
-def stamp_head(location: str = DEFAULT_LOCATION,
-               revision: None = None) -> None:
+def stamp_head(location: str = DEFAULT_LOCATION, revision: None = None) -> None:
 
     env = PackageEnvironment(location)
 
@@ -119,7 +118,7 @@ def do_stamp(rev, context, revision=revision):
 
         if revision is None:
             revision = context.script.get_current_head()
-        elif revision == 'None':
+        elif revision == "None":
             revision = None
 
         context.stamp(env.script_dir, revision)
@@ -135,18 +134,18 @@ def stamp_heads() -> None:
         stamp_head(location)
 
 
-def upgrade(location=DEFAULT_LOCATION,
-            revision=None):
+def upgrade(location=DEFAULT_LOCATION, revision=None):
     # We don't want to fire any kind of events during a migration,
     # because "migrations are a low-level thing".
     from kotti import events
+
     events.clear()
 
     pkg_env = PackageEnvironment(location)
 
     if revision is None:
         revision = pkg_env.script_dir.get_current_head()
-    print('Upgrading {0}:'.format(pkg_env.location))
+    print("Upgrading {0}:".format(pkg_env.location))
 
     def upgrade(heads, context):
         # alembic supports multiple heads, we don't.
@@ -154,18 +153,14 @@ def upgrade(heads, context):
         rev = heads[0] if heads else None
 
         if rev == revision:
-            print('  - already up to date.')
+            print("  - already up to date.")
             return []
 
-        print('  - upgrading from {0} to {1}...'.format(rev, revision))
+        print("  - upgrading from {0} to {1}...".format(rev, revision))
 
         return context.script._upgrade_revs(revision, rev)
 
-    pkg_env.run_env(
-        upgrade,
-        starting_rev=None,
-        destination_rev=revision,
-        )
+    pkg_env.run_env(upgrade, starting_rev=None, destination_rev=revision)
     print()
 
 
@@ -177,19 +172,20 @@ def upgrade_all():
 def list_all():
     pkg_envs = [PackageEnvironment(l) for l in get_locations()]
     for pkg_env in pkg_envs:
-        print('{0}:'.format(pkg_env.pkg_name))
+        print("{0}:".format(pkg_env.pkg_name))
 
         for script in pkg_env.script_dir.walk_revisions():
-            print("  - {0} -> {1}: {2}".format(
-                script.down_revision,
-                script.revision,
-                script.doc,
-                ))
+            print(
+                "  - {0} -> {1}: {2}".format(
+                    script.down_revision, script.revision, script.doc
+                )
+            )
 
         def current_revision(rev, context):
             rev = rev[0] if rev else None
             print("  - current revision: {0}".format(rev))
             return []
+
         pkg_env.run_env(current_revision)
         print()
 
@@ -235,24 +231,24 @@ def kotti_migrate_command():
     # 'includeme' function).
     save_conf_defaults = conf_defaults.copy()
 
-    os.environ['KOTTI_DISABLE_POPULATORS'] = '1'
-    conf_defaults['kotti.root_factory'] = [lambda req: None]
+    os.environ["KOTTI_DISABLE_POPULATORS"] = "1"
+    conf_defaults["kotti.root_factory"] = [lambda req: None]
 
     def callback(arguments):
         args = ()
-        args_with_location = (arguments['--scripts'] or DEFAULT_LOCATION,)
-        if arguments['list_all']:
+        args_with_location = (arguments["--scripts"] or DEFAULT_LOCATION,)
+        if arguments["list_all"]:
             func = list_all
-        elif arguments['upgrade']:
+        elif arguments["upgrade"]:
             func = upgrade
-            args = args_with_location + (arguments['--rev'],)
-        elif arguments['upgrade_all']:
+            args = args_with_location + (arguments["--rev"],)
+        elif arguments["upgrade_all"]:
             func = upgrade_all
-        elif arguments['stamp_head']:
+        elif arguments["stamp_head"]:
             func = stamp_head
-            args = args_with_location + (arguments['--rev'],)
+            args = args_with_location + (arguments["--rev"],)
         else:
-            raise ValueError('Unknown command')
+            raise ValueError("Unknown command")
         func(*args)
 
     try:
@@ -260,4 +256,4 @@ def callback(arguments):
     finally:
         conf_defaults.clear()
         conf_defaults.update(save_conf_defaults)
-        del os.environ['KOTTI_DISABLE_POPULATORS']
+        del os.environ["KOTTI_DISABLE_POPULATORS"]
diff --git a/kotti/populate.py b/kotti/populate.py
index d82790e40..786a58077 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -24,12 +24,12 @@ def populate_users():
     """
 
     principals = get_principals()
-    if 'admin' not in principals:
-        principals['admin'] = {
-            'name': 'admin',
-            'password': get_settings()['kotti.secret'],
-            'title': 'Administrator',
-            'groups': ['role:admin'],
+    if "admin" not in principals:
+        principals["admin"] = {
+            "name": "admin",
+            "password": get_settings()["kotti.secret"],
+            "title": "Administrator",
+            "groups": ["role:admin"],
         }
 
 
@@ -41,32 +41,35 @@ def populate():
     lrm = LocalizerRequestMixin()
     lrm.registry = get_current_registry()
     # noinspection PyPropertyAccess
-    lrm.locale_name = get_settings()['pyramid.default_locale_name']
+    lrm.locale_name = get_settings()["pyramid.default_locale_name"]
     localizer = lrm.localizer
 
     if DBSession.query(Node.id).count() == 0:
         localized_root_attrs = dict(
-            [(k, localizer.translate(v)) for k, v in iteritems(_ROOT_ATTRS)])
+            [(k, localizer.translate(v)) for k, v in iteritems(_ROOT_ATTRS)]
+        )
         root = Document(**localized_root_attrs)
         root.__acl__ = SITE_ACL
         DBSession.add(root)
         localized_about_attrs = dict(
-            [(k, localizer.translate(v)) for k, v in iteritems(_ABOUT_ATTRS)])
-        root['about'] = Document(**localized_about_attrs)
+            [(k, localizer.translate(v)) for k, v in iteritems(_ABOUT_ATTRS)]
+        )
+        root["about"] = Document(**localized_about_attrs)
 
         wf = get_workflow(root)
         if wf is not None:
             DBSession.flush()  # Initializes workflow
-            wf.transition_to_state(root, None, 'public')
+            wf.transition_to_state(root, None, "public")
 
     populate_users()
 
 
 _ROOT_ATTRS = dict(
-    name='',  # (at the time of writing) root must have empty name!
-    title=_('Welcome to Kotti'),
-    description=_('Congratulations! You have successfully installed Kotti.'),
-    body=_("""
+    name="",  # (at the time of writing) root must have empty name!
+    title=_("Welcome to Kotti"),
+    description=_("Congratulations! You have successfully installed Kotti."),
+    body=_(
+        """
 <h2>Log in</h2>
 <p>
     You can <a class="btn btn-success" href="login">log in</a> to your site
@@ -120,12 +123,17 @@ def populate():
         </p>
     </div>
 </div>
-"""))
+"""
+    ),
+)
 
 _ABOUT_ATTRS = dict(
-    title=_('About'),
-    description=_('Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products.'),  # noqa
-    body=_("""
+    title=_("About"),
+    description=_(
+        "Our company is the leading manufacturer of foo widgets used in a wide variety of aviation and and industrial products."
+    ),  # noqa
+    body=_(
+        """
 <p>
   <img alt="five colorful Extra EA300 airplanes flying in formation"
    src="http://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Northern_Lights_Formation.jpg/640px-Northern_Lights_Formation.jpg"
@@ -152,4 +160,6 @@ def populate():
 <a href="http://en.wikipedia.org/wiki/Extra_EA-300"> Extra EA-300</a>
 article.
 </small></p>
-"""))
+"""
+    ),
+)
diff --git a/kotti/request.py b/kotti/request.py
index 64471b36f..1d475edff 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -32,9 +32,9 @@ def user(self) -> Optional[Principal]:
         """
         return get_user(self)
 
-    def has_permission(self,
-                       permission: str,
-                       context: object = None) -> Union[Allowed, Denied]:
+    def has_permission(
+        self, permission: str, context: object = None
+    ) -> Union[Allowed, Denied]:
         """ Check if the current request has the given permission on the
         current or explicitly passed context.  This is different from
         :meth:`pyramid.request.Request.has_permission`` in that a context other
diff --git a/kotti/resources.py b/kotti/resources.py
index dceba4c22..2e81ce50a 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -99,7 +99,7 @@ def __iter__(self):
     def __len__(self):
         return len(self.keys())
 
-    def __setitem__(self, key: str, node: 'Node') -> None:
+    def __setitem__(self, key: str, node: "Node") -> None:
         node.name = key
         self.children.append(node)
         self.children.reorder()
@@ -120,7 +120,7 @@ def keys(self) -> List[str]:
     def values(self) -> OrderingList:
         return self.children
 
-    def __getitem__(self, path: Union[str, Iterable[str]]) -> 'Node':
+    def __getitem__(self, path: Union[str, Iterable[str]]) -> "Node":
         db_session = DBSession()
         db_session._autoflush()
 
@@ -130,7 +130,7 @@ def __getitem__(self, path: Union[str, Iterable[str]]) -> 'Node':
         path = [p for p in path]
 
         # Optimization: don't query children if self._children already there:
-        if '_children' in self.__dict__:
+        if "_children" in self.__dict__:
             rest = path[1:]
             try:
                 [child] = filter(lambda ch: ch.name == path[0], self._children)
@@ -146,11 +146,14 @@ def __getitem__(self, path: Union[str, Iterable[str]]) -> 'Node':
         if len(path) == 1:
             try:
                 baked_query += lambda q: q.filter(
-                    Node.name == bindparam('name'),
-                    Node.parent_id == bindparam('parent_id')
+                    Node.name == bindparam("name"),
+                    Node.parent_id == bindparam("parent_id"),
+                )
+                return (
+                    baked_query(db_session)
+                    .params(name=path[0], parent_id=self.id)
+                    .one()
                 )
-                return baked_query(db_session).params(
-                    name=path[0], parent_id=self.id).one()
             except NoResultFound:
                 raise KeyError(path)
 
@@ -178,9 +181,9 @@ def children(self):
 
         return self._children
 
-    def children_with_permission(self,
-                                 request: Request,
-                                 permission: str = 'view') -> 'List[Node]':
+    def children_with_permission(
+        self, request: Request, permission: str = "view"
+    ) -> "List[Node]":
         """ Return only those children for which the user initiating the
         request has the asked permission.
 
@@ -195,10 +198,7 @@ def children_with_permission(self,
         :rtype: list
         """
 
-        return [
-            c for c in self.children
-            if request.has_permission(permission, c)
-        ]
+        return [c for c in self.children if request.has_permission(permission, c)]
 
 
 class LocalGroup(Base):
@@ -207,17 +207,15 @@ class LocalGroup(Base):
     content tree).
     """
 
-    __tablename__ = 'local_groups'
-    __table_args__ = (
-        UniqueConstraint('node_id', 'principal_name', 'group_name'),
-        )
+    __tablename__ = "local_groups"
+    __table_args__ = (UniqueConstraint("node_id", "principal_name", "group_name"),)
 
     #: Primary key for the node in the DB
     #: (:class:`sqlalchemy.types.Integer`)
     id = Column(Integer(), primary_key=True)
     #: ID of the node for this assignment
     #: (:class:`sqlalchemy.types.Integer`)
-    node_id = Column(ForeignKey('nodes.id'), index=True)
+    node_id = Column(ForeignKey("nodes.id"), index=True)
     #: Name of the principal (user or group)
     #: (:class:`sqlalchemy.types.Unicode`)
     principal_name = Column(Unicode(100), index=True)
@@ -225,22 +223,25 @@ class LocalGroup(Base):
     #: (:class:`sqlalchemy.types.Unicode`)
     group_name = Column(Unicode(100))
 
-    def __init__(self, node: 'Node', principal_name: str, group_name: str):
+    def __init__(self, node: "Node", principal_name: str, group_name: str):
         self.node = node
         self.principal_name = principal_name
         self.group_name = group_name
 
-    def copy(self, **kwargs) -> 'LocalGroup':
-        kwargs.setdefault('node', self.node)
-        kwargs.setdefault('principal_name', self.principal_name)
-        kwargs.setdefault('group_name', self.group_name)
+    def copy(self, **kwargs) -> "LocalGroup":
+        kwargs.setdefault("node", self.node)
+        kwargs.setdefault("principal_name", self.principal_name)
+        kwargs.setdefault("group_name", self.group_name)
 
         return self.__class__(**kwargs)
 
     def __repr__(self):
-        return '<{0} {1} => {2} at {3}>'.format(
-            self.__class__.__name__, self.principal_name, self.group_name,
-            resource_path(self.node))
+        return "<{0} {1} => {2} at {3}>".format(
+            self.__class__.__name__,
+            self.principal_name,
+            self.group_name,
+            resource_path(self.node),
+        )
 
 
 class NodeMeta(DeclarativeMeta, abc.ABCMeta):
@@ -252,14 +253,10 @@ class Node(Base, ContainerMixin, PersistentACLMixin, metaclass=NodeMeta):
     """Basic node in the persistance hierarchy.
     """
 
-    __table_args__ = (
-        UniqueConstraint('parent_id', 'name'),
-        )
+    __table_args__ = (UniqueConstraint("parent_id", "name"),)
     __mapper_args__ = dict(
-        polymorphic_on='type',
-        polymorphic_identity='node',
-        with_polymorphic='*',
-        )
+        polymorphic_on="type", polymorphic_identity="node", with_polymorphic="*"
+    )
 
     #: Primary key for the node in the DB
     #: (:class:`sqlalchemy.types.Integer`)
@@ -269,7 +266,7 @@ class Node(Base, ContainerMixin, PersistentACLMixin, metaclass=NodeMeta):
     type = Column(String(30), nullable=False)
     #: ID of the node's parent
     #: (:class:`sqlalchemy.types.Integer`)
-    parent_id = Column(ForeignKey('nodes.id'), index=True)
+    parent_id = Column(ForeignKey("nodes.id"), index=True)
     #: Position of the node within its container / parent
     #: (:class:`sqlalchemy.types.Integer`)
     position = Column(Integer())
@@ -288,31 +285,30 @@ class Node(Base, ContainerMixin, PersistentACLMixin, metaclass=NodeMeta):
     path = Column(Unicode(2000), index=True)
 
     parent = relation(
-        'Node',
+        "Node",
         remote_side=[id],
         backref=backref(
-            '_children',
-            collection_class=ordering_list('position', reorder_on_append=True),
+            "_children",
+            collection_class=ordering_list("position", reorder_on_append=True),
             order_by=[position],
-            cascade='all',
-        )
+            cascade="all",
+        ),
     )
 
     local_groups = relation(
-        LocalGroup,
-        backref=backref('node'),
-        cascade='all',
-        lazy='joined',
+        LocalGroup, backref=backref("node"), cascade="all", lazy="joined"
     )
 
     __hash__ = Base.__hash__
 
-    def __init__(self,
-                 name: str = None,
-                 parent: 'Node' = None,
-                 title: str = '',
-                 annotations: dict = None,
-                 **kwargs):
+    def __init__(
+        self,
+        name: str = None,
+        parent: "Node" = None,
+        title: str = "",
+        annotations: dict = None,
+        **kwargs
+    ):
         """Constructor"""
 
         super(Node, self).__init__(**kwargs)
@@ -337,8 +333,9 @@ def __parent__(self, value):
         self.parent = value
 
     def __repr__(self) -> str:
-        return '<{0} {1} at {2}>'.format(
-            self.__class__.__name__, self.id, resource_path(self))
+        return "<{0} {1} at {2}>".format(
+            self.__class__.__name__, self.id, resource_path(self)
+        )
 
     def __eq__(self, other: Any) -> bool:
         return isinstance(other, Node) and self.id == other.id
@@ -347,13 +344,19 @@ def __ne__(self, other: Any) -> bool:
         return not self == other
 
     copy_properties_blacklist = (
-        'id', 'parent', 'parent_id', '_children', 'local_groups', '_tags')
+        "id",
+        "parent",
+        "parent_id",
+        "_children",
+        "local_groups",
+        "_tags",
+    )
 
     def clear(self) -> None:
 
         DBSession.query(Node).filter(Node.parent == self).delete()
 
-    def copy(self, **kwargs) -> 'Node':
+    def copy(self, **kwargs) -> "Node":
         """
         :result: A copy of the current instance
         :rtype: :class:`~kotti.resources.Node`
@@ -395,26 +398,28 @@ class TypeInfo(object):
     action_links = ()  # BBB
 
     def __init__(self, **kwargs) -> None:
-        if 'action_links' in kwargs:
-            msg = ("'action_links' is deprecated as of Kotti 1.0.0.  "
-                   "'edit_links' includes 'action_links' and should "
-                   "be used instead.")
-
-            edit_links = kwargs.get('edit_links')
+        if "action_links" in kwargs:
+            msg = (
+                "'action_links' is deprecated as of Kotti 1.0.0.  "
+                "'edit_links' includes 'action_links' and should "
+                "be used instead."
+            )
+
+            edit_links = kwargs.get("edit_links")
             last_link = edit_links[-1] if edit_links else None
             if isinstance(last_link, LinkParent):
-                last_link.children.extend(kwargs['action_links'])
+                last_link.children.extend(kwargs["action_links"])
                 warnings.warn(msg, DeprecationWarning)
             else:
                 raise ValueError(msg)
 
         # default value for add_permission should be 'add'
-        if 'add_permission' not in kwargs:
-            kwargs['add_permission'] = 'add'
+        if "add_permission" not in kwargs:
+            kwargs["add_permission"] = "add"
 
         self.__dict__.update(kwargs)
 
-    def copy(self, **kwargs) -> 'TypeInfo':
+    def copy(self, **kwargs) -> "TypeInfo":
         """
 
         :result: a copy of the current TypeInfo instance
@@ -422,14 +427,12 @@ def copy(self, **kwargs) -> 'TypeInfo':
         """
 
         d = self.__dict__.copy()
-        d['selectable_default_views'] = copy(self.selectable_default_views)
+        d["selectable_default_views"] = copy(self.selectable_default_views)
         d.update(kwargs)
 
         return TypeInfo(**d)
 
-    def addable(self,
-                context: 'Content',
-                request: Optional[Request]) -> bool:
+    def addable(self, context: "Content", request: Optional[Request]) -> bool:
         """
 
         :param context:
@@ -518,29 +521,28 @@ class TagsToContents(Base):
     """Tags to contents mapping
     """
 
-    __tablename__ = 'tags_to_contents'
+    __tablename__ = "tags_to_contents"
 
     #: Foreign key referencing :attr:`Tag.id`
     #: (:class:`sqlalchemy.types.Integer`)
-    tag_id = Column(ForeignKey('tags.id'), primary_key=True, index=True)
+    tag_id = Column(ForeignKey("tags.id"), primary_key=True, index=True)
     #: Foreign key referencing :attr:`Content.id`
     #: (:class:`sqlalchemy.types.Integer`)
-    content_id = Column(ForeignKey('contents.id'), primary_key=True, index=True)
+    content_id = Column(ForeignKey("contents.id"), primary_key=True, index=True)
     #: Relation that adds a ``content_tags`` :func:`sqlalchemy.orm.backref`
     #: to :class:`~kotti.resources.Tag` instances to allow easy access to all
     #: content tagged with that tag.
     #: (:func:`sqlalchemy.orm.relationship`)
-    tag = relation(Tag, backref=backref('content_tags', cascade='all'),
-                   lazy='joined',)
+    tag = relation(Tag, backref=backref("content_tags", cascade="all"), lazy="joined")
     #: Ordering position of the tag
     #: :class:`sqlalchemy.types.Integer`
     position = Column(Integer, nullable=False)
     #: title of the associated :class:`~kotti.resources.Tag` instance
     #: (:class:`sqlalchemy.ext.associationproxy.association_proxy`)
-    title = association_proxy('tag', 'title')
+    title = association_proxy("tag", "title")
 
     @classmethod
-    def _tag_find_or_create(cls, title: str) -> 'TagsToContents':
+    def _tag_find_or_create(cls, title: str) -> "TagsToContents":
         """
         Find or create a tag with the given title.
 
@@ -563,30 +565,28 @@ def _not_root(context: Node, request: Request) -> bool:
 
 
 default_actions = [
-    Link('copy', title=_('Copy')),
-    Link('cut', title=_('Cut'), predicate=_not_root),
-    Link('paste', title=_('Paste'), predicate=get_paste_items),
-    Link('rename', title=_('Rename'), predicate=_not_root),
-    Link('delete', title=_('Delete'), predicate=_not_root),
-    LinkRenderer('default-view-selector'),
+    Link("copy", title=_("Copy")),
+    Link("cut", title=_("Cut"), predicate=_not_root),
+    Link("paste", title=_("Paste"), predicate=get_paste_items),
+    Link("rename", title=_("Rename"), predicate=_not_root),
+    Link("delete", title=_("Delete"), predicate=_not_root),
+    LinkRenderer("default-view-selector"),
 ]
 
 
 default_type_info = TypeInfo(
-    name='Content',
-    title='type_info title missing',   # BBB
+    name="Content",
+    title="type_info title missing",  # BBB
     add_view=None,
     addable_to=[],
     edit_links=[
-        Link('contents', title=_('Contents')),
-        Link('edit', title=_('Edit')),
-        Link('share', title=_('Share')),
-        LinkParent(title=_('Actions'), children=default_actions),
-        ],
-    selectable_default_views=[
-        ("folder_view", _("Folder view")),
-        ],
-    )
+        Link("contents", title=_("Contents")),
+        Link("edit", title=_("Edit")),
+        Link("share", title=_("Share")),
+        LinkParent(title=_("Actions"), children=default_actions),
+    ],
+    selectable_default_views=[("folder_view", _("Folder view"))],
+)
 
 
 @implementer(IContent)
@@ -631,38 +631,37 @@ def __mapper_args__(cls):
     in_navigation = Column(Boolean())
     _tags = relation(
         TagsToContents,
-        backref=backref('item'),
-        lazy='joined',
+        backref=backref("item"),
+        lazy="joined",
         order_by=[TagsToContents.position],
         collection_class=ordering_list("position"),
-        cascade='all, delete-orphan',
-        )
+        cascade="all, delete-orphan",
+    )
     #: Tags assigned to the content object (list of str)
     tags = association_proxy(
-        '_tags',
-        'title',
-        creator=TagsToContents._tag_find_or_create,
-        )
+        "_tags", "title", creator=TagsToContents._tag_find_or_create
+    )
     #: type_info is a class attribute (:class:`TypeInfo`)
     type_info = default_type_info
 
-    def __init__(self,
-                 name: Optional[str] = None,
-                 parent: Optional[Node] = None,
-                 title: Optional[str] = '',
-                 annotations: Optional[dict] = None,
-                 default_view: Optional[str] = None,
-                 description: Optional[str] = '',
-                 language: Optional[str] = None,
-                 owner: Optional[str] = None,
-                 creation_date: Optional[datetime.datetime] = None,
-                 modification_date: Optional[datetime.datetime] = None,
-                 in_navigation: Optional[bool] = True,
-                 tags: Optional[List[str]] = None,
-                 **kwargs):
-
-        super(Content, self).__init__(
-            name, parent, title, annotations, **kwargs)
+    def __init__(
+        self,
+        name: Optional[str] = None,
+        parent: Optional[Node] = None,
+        title: Optional[str] = "",
+        annotations: Optional[dict] = None,
+        default_view: Optional[str] = None,
+        description: Optional[str] = "",
+        language: Optional[str] = None,
+        owner: Optional[str] = None,
+        creation_date: Optional[datetime.datetime] = None,
+        modification_date: Optional[datetime.datetime] = None,
+        in_navigation: Optional[bool] = True,
+        tags: Optional[List[str]] = None,
+        **kwargs
+    ):
+
+        super(Content, self).__init__(name, parent, title, annotations, **kwargs)
 
         self.default_view = default_view
         self.description = description
@@ -674,9 +673,9 @@ def __init__(self,
         self.modification_date = modification_date
         self.tags = tags or []
 
-    def copy(self, **kwargs) -> 'Content':
+    def copy(self, **kwargs) -> "Content":
         # Same as `Node.copy` with additional tag support.
-        kwargs['tags'] = self.tags
+        kwargs["tags"] = self.tags
         return super(Content, self).copy(**kwargs)
 
 
@@ -702,16 +701,15 @@ class Document(Content):
     #: type_info is a class attribute
     #: (:class:`~kotti.resources.TypeInfo`)
     type_info = Content.type_info.copy(
-        name='Document',
-        title=_('Document'),
-        add_view='add_document',
-        addable_to=['Document'],
-        )
+        name="Document",
+        title=_("Document"),
+        add_view="add_document",
+        addable_to=["Document"],
+    )
 
-    def __init__(self,
-                 body: Optional[str] = '',
-                 mime_type: Optional[str] = 'text/html',
-                 **kwargs):
+    def __init__(
+        self, body: Optional[str] = "", mime_type: Optional[str] = "text/html", **kwargs
+    ):
 
         super(Document, self).__init__(**kwargs)
 
@@ -743,8 +741,8 @@ class SaveDataMixin(object):
     #: (:class:`depot.fileds.sqlalchemy.UploadedFileField`)
     @declared_attr
     def data(cls) -> Column:
-        return cls.__table__.c.get('data',
-                                   Column(UploadedFileField(cls.data_filters)))
+        return cls.__table__.c.get("data", Column(UploadedFileField(cls.data_filters)))
+
     data_filters = ()
 
     @classmethod
@@ -753,19 +751,23 @@ def __declare_last__(cls) -> None:
         we have _save_data """
 
         mapper = cls._sa_class_manager.mapper
-        args = (mapper.attrs['data'], 'set', _SQLAMutationTracker._field_set)
+        args = (mapper.attrs["data"], "set", _SQLAMutationTracker._field_set)
         if event.contains(*args):
             event.remove(*args)
 
         # Declaring the event on the class attribute instead of mapper property
         # enables proper registration on its subclasses
-        event.listen(cls.data, 'set', cls._save_data, retval=True)
+        event.listen(cls.data, "set", cls._save_data, retval=True)
 
     @staticmethod
-    def _save_data(target: 'File',
-                   value: Optional[Union[FieldStorage, bytes, UploadedFile, BufferedReader]],  # noqa
-                   oldvalue: Optional[Union[UploadedFile, _symbol]],
-                   initiator: Event) -> Optional[UploadedFile]:
+    def _save_data(
+        target: "File",
+        value: Optional[
+            Union[FieldStorage, bytes, UploadedFile, BufferedReader]
+        ],  # noqa
+        oldvalue: Optional[Union[UploadedFile, _symbol]],
+        initiator: Event,
+    ) -> Optional[UploadedFile]:
         """ Refresh metadata and save the binary data to the data field.
 
         :param target: The File instance
@@ -777,13 +779,14 @@ def _save_data(target: 'File',
 
         if isinstance(value, bytes):
             fp = BytesIO(value)
-            value = _to_fieldstorage(fp=fp,
-                                     filename=target.filename,
-                                     mimetype=target.mimetype,
-                                     size=len(value))
+            value = _to_fieldstorage(
+                fp=fp,
+                filename=target.filename,
+                mimetype=target.mimetype,
+                size=len(value),
+            )
 
-        newvalue = _SQLAMutationTracker._field_set(
-            target, value, oldvalue, initiator)
+        newvalue = _SQLAMutationTracker._field_set(target, value, oldvalue, initiator)
 
         if newvalue is None:
             return
@@ -812,12 +815,14 @@ def from_field_storage(cls, fs):
 
         return cls(data=fs)
 
-    def __init__(self,
-                 data: Optional[Union[bytes, BufferedReader, FieldStorage]]=None,  # noqa
-                 filename: Optional[str] = None,
-                 mimetype: Optional[str] = None,
-                 size: Optional[int] = None,
-                 **kwargs) -> None:
+    def __init__(
+        self,
+        data: Optional[Union[bytes, BufferedReader, FieldStorage]] = None,  # noqa
+        filename: Optional[str] = None,
+        mimetype: Optional[str] = None,
+        size: Optional[int] = None,
+        **kwargs
+    ) -> None:
 
         super(SaveDataMixin, self).__init__(**kwargs)
 
@@ -826,7 +831,7 @@ def __init__(self,
         self.size = size
         self.data = data
 
-    def copy(self, **kwargs) -> 'File':
+    def copy(self, **kwargs) -> "File":
         """ Same as `Content.copy` with additional data support.  ``data`` needs
         some special attention, because we don't want the same depot file to be
         assigned to multiple content nodes.
@@ -847,13 +852,13 @@ class File(SaveDataMixin, Content):
     id = Column(ForeignKey(Content.id), primary_key=True)
 
     type_info = Content.type_info.copy(
-        name='File',
-        title=_('File'),
-        add_view='add_file',
-        addable_to=['Document'],
+        name="File",
+        title=_("File"),
+        add_view="add_file",
+        addable_to=["Document"],
         selectable_default_views=[],
-        uploadable_mimetypes=['*', ],
-        )
+        uploadable_mimetypes=["*"],
+    )
 
 
 def get_root(request: Optional[Request] = None) -> Node:
@@ -866,11 +871,12 @@ def get_root(request: Optional[Request] = None) -> Node:
     :result: a node in the node tree
     :rtype: :class:`~kotti.resources.Node` or descendant;
     """
-    return get_settings()['kotti.root_factory'][0](request)
+    return get_settings()["kotti.root_factory"][0](request)
 
 
 class DefaultRootCache(object):
     """ Default implementation for :func:`~kotti.resources.get_root` """
+
     _id = None
 
     # noinspection PyComparisonWithNone,PyPep8
@@ -881,9 +887,13 @@ def root_id(self) -> int:
         :rtype: int
         """
 
-        query = bakery(lambda session: session.query(Node)
-                       .with_polymorphic(Node).add_columns(Node.id)
-                       .enable_eagerloads(False).filter(Node.parent_id == None))
+        query = bakery(
+            lambda session: session.query(Node)
+            .with_polymorphic(Node)
+            .add_columns(Node.id)
+            .enable_eagerloads(False)
+            .filter(Node.parent_id == None)
+        )
 
         return query(DBSession()).one().id
 
@@ -914,13 +924,13 @@ def __call__(self, request: Optional[Request] = None) -> Node:
 
 
 def _adjust_for_engine(engine: Engine) -> None:
-    if engine.dialect.name == 'mysql':  # pragma: no cover
+    if engine.dialect.name == "mysql":  # pragma: no cover
         # We disable the Node.path index for Mysql; in some conditions
         # the index can't be created for columns even with 767 bytes,
         # the maximum default size for column indexes
         Node.__table__.indexes = set(
-            index for index in Node.__table__.indexes
-            if index.name != "ix_nodes_path")
+            index for index in Node.__table__.indexes if index.name != "ix_nodes_path"
+        )
 
 
 def initialize_sql(engine: Engine, drop_all: bool = False) -> scoped_session:
@@ -928,13 +938,13 @@ def initialize_sql(engine: Engine, drop_all: bool = False) -> scoped_session:
     DBSession.configure(bind=engine)
     metadata.bind = engine
 
-    if drop_all or os.environ.get('KOTTI_TEST_DB_STRING'):
+    if drop_all or os.environ.get("KOTTI_TEST_DB_STRING"):
         metadata.reflect()
         metadata.drop_all(engine)
 
     # Allow users of Kotti to cherry pick the tables that they want to use:
     settings = _resolve_dotted(get_settings())
-    tables = settings['kotti.use_tables'].strip() or None
+    tables = settings["kotti.use_tables"].strip() or None
     if tables:
         tables = [metadata.tables[name] for name in tables.split()]
 
@@ -946,8 +956,8 @@ def initialize_sql(engine: Engine, drop_all: bool = False) -> scoped_session:
         stamp_heads()
 
     metadata.create_all(engine, tables=tables)
-    if os.environ.get('KOTTI_DISABLE_POPULATORS', '0') not in TRUE_VALUES:
-        for populate in settings['kotti.populators']:
+    if os.environ.get("KOTTI_DISABLE_POPULATORS", "0") not in TRUE_VALUES:
+        for populate in settings["kotti.populators"]:
             populate()
     commit()
 
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index 895a257d3..1deeabb69 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -34,7 +34,7 @@ def sanitize(html: str, sanitizer: str) -> str:
     :rtype: str
     """
 
-    sanitized = get_settings()['kotti.sanitizers'][sanitizer](html)
+    sanitized = get_settings()["kotti.sanitizers"][sanitizer](html)
 
     return sanitized
 
@@ -56,7 +56,8 @@ def xss_protection(html: str) -> str:
         tags=generally_xss_safe,
         attributes=lambda self, key, value: True,
         styles=all_styles,
-        strip=True)
+        strip=True,
+    )
 
     return sanitized
 
@@ -75,16 +76,20 @@ def minimal_html(html: str) -> str:
     :rtype: str
     """
 
-    attributes = dict(zip(
-        list(markdown_attrs.keys()) + list(print_attrs.keys()),
-        list(markdown_attrs.values()) + list(print_attrs.values())))
+    attributes = dict(
+        zip(
+            list(markdown_attrs.keys()) + list(print_attrs.keys()),
+            list(markdown_attrs.values()) + list(print_attrs.values()),
+        )
+    )
 
     sanitized = clean(
         html,
         tags=markdown_tags + print_tags,
         attributes=attributes,
         styles=[],
-        strip=True)
+        strip=True,
+    )
 
     return sanitized
 
@@ -99,12 +104,7 @@ def no_html(html: str) -> str:
     :rtype: str
     """
 
-    sanitized = clean(
-        html,
-        tags=[],
-        attributes={},
-        styles=[],
-        strip=True)
+    sanitized = clean(html, tags=[], attributes={}, styles=[], strip=True)
 
     return sanitized
 
@@ -114,40 +114,43 @@ def _setup_sanitizers(settings: Dict[str, Union[str, bool]]) -> None:
     # step 1: resolve sanitizer functions and make ``kotti.sanitizers`` a
     # dictionary containing resolved functions
 
-    if not isinstance(settings['kotti.sanitizers'], string_types):
+    if not isinstance(settings["kotti.sanitizers"], string_types):
         return
 
     sanitizers = {}
 
-    for s in settings['kotti.sanitizers'].split():
-        name, dottedname = s.split(':')
+    for s in settings["kotti.sanitizers"].split():
+        name, dottedname = s.split(":")
         sanitizers[name.strip()] = DottedNameResolver().resolve(dottedname)
 
-    settings['kotti.sanitizers'] = sanitizers
+    settings["kotti.sanitizers"] = sanitizers
 
 
 def _setup_listeners(settings):
 
     # step 2: setup listeners
 
-    for s in settings['kotti.sanitize_on_write'].split():
-        dotted, sanitizers = s.split(':')
+    for s in settings["kotti.sanitize_on_write"].split():
+        dotted, sanitizers = s.split(":")
 
-        classname, attributename = dotted.rsplit('.', 1)
+        classname, attributename = dotted.rsplit(".", 1)
         _class = DottedNameResolver().resolve(classname)
 
         def _create_handler(attributename, sanitizers):
             def handler(event):
                 value = getattr(event.object, attributename)
-                for sanitizer_name in sanitizers.split(','):
-                    value = settings['kotti.sanitizers'][sanitizer_name](value)
+                for sanitizer_name in sanitizers.split(","):
+                    value = settings["kotti.sanitizers"][sanitizer_name](value)
                 setattr(event.object, attributename, value)
+
             return handler
 
         objectevent_listeners[(ObjectInsert, _class)].append(
-            _create_handler(attributename, sanitizers))
+            _create_handler(attributename, sanitizers)
+        )
         objectevent_listeners[(ObjectUpdate, _class)].append(
-            _create_handler(attributename, sanitizers))
+            _create_handler(attributename, sanitizers)
+        )
 
 
 def includeme(config: Configurator) -> None:
diff --git a/kotti/security.py b/kotti/security.py
index 542f39175..35116fb8a 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -38,19 +38,19 @@
 from kotti.util import request_cache
 
 
-def has_permission(permission: str,
-                   context: 'Node',
-                   request: 'Request') -> PermitsResult:
+def has_permission(
+    permission: str, context: "Node", request: "Request"
+) -> PermitsResult:
     """ Default permission checker """
     return request.has_permission(permission, context=context)
 
 
-def get_principals() -> 'Principals':
-    return get_settings()['kotti.principals_factory'][0]()
+def get_principals() -> "Principals":
+    return get_settings()["kotti.principals_factory"][0]()
 
 
 # @request_cache(lambda request: None)
-def get_user(request: 'Request') -> Optional['Principal']:
+def get_user(request: "Request") -> Optional["Principal"]:
     userid = request.unauthenticated_userid
     return get_principals().get(userid)
 
@@ -86,19 +86,19 @@ class Principal(Base):
     creation_date = Column(DateTime(), nullable=False)
     last_login_date = Column(DateTime())
 
-    __tablename__ = 'principals'
-    __mapper_args__ = dict(
-        order_by=name,
-        )
-
-    def __init__(self,
-                 name: str,
-                 password: Optional[str] = None,
-                 active: Optional[bool] = True,
-                 confirm_token: Optional[str] = None,
-                 title: Optional[str] = '',
-                 email: Optional[str] = None,
-                 groups: Optional[List[str]] = None):
+    __tablename__ = "principals"
+    __mapper_args__ = dict(order_by=name)
+
+    def __init__(
+        self,
+        name: str,
+        password: Optional[str] = None,
+        active: Optional[bool] = True,
+        confirm_token: Optional[str] = None,
+        title: Optional[str] = "",
+        email: Optional[str] = None,
+        groups: Optional[List[str]] = None,
+    ):
         self.name = name
         if password is not None:
             password = get_principals().hash_password(password)
@@ -114,7 +114,7 @@ def __init__(self,
         self.last_login_date = None
 
     def __repr__(self):  # pragma: no cover
-        return '<Principal {0!r}>'.format(self.name)
+        return "<Principal {0!r}>".format(self.name)
 
 
 class AbstractPrincipals(object):
@@ -133,12 +133,12 @@ class AbstractPrincipals(object):
     Use the 'kotti.principals' settings variable to override Kotti's
     default Principals implementation with your own.
     """
+
     def __getitem__(self, name: str):
         """Return the Principal object with the id 'name'.
         """
 
-    def __setitem__(self, name: str,
-                    principal: Union[Principal, dict]):
+    def __setitem__(self, name: str, principal: Union[Principal, dict]):
         """Add a given Principal object to the database.
 
         'name' is expected to the the same as 'principal.name'.
@@ -187,16 +187,16 @@ def validate_password(self, clear: str, hashed: str) -> bool:
 
 
 ROLES = {
-    'role:viewer': Principal('role:viewer', title=_('Viewer')),
-    'role:editor': Principal('role:editor', title=_('Editor')),
-    'role:owner': Principal('role:owner', title=_('Owner')),
-    'role:admin': Principal('role:admin', title=_('Admin')),
-    }
+    "role:viewer": Principal("role:viewer", title=_("Viewer")),
+    "role:editor": Principal("role:editor", title=_("Editor")),
+    "role:owner": Principal("role:owner", title=_("Owner")),
+    "role:admin": Principal("role:admin", title=_("Admin")),
+}
 _DEFAULT_ROLES = ROLES.copy()
 
 # These roles are visible in the sharing tab
-SHARING_ROLES = ['role:viewer', 'role:editor', 'role:owner']
-USER_MANAGEMENT_ROLES = SHARING_ROLES + ['role:admin']
+SHARING_ROLES = ["role:viewer", "role:editor", "role:owner"]
+USER_MANAGEMENT_ROLES = SHARING_ROLES + ["role:admin"]
 _DEFAULT_SHARING_ROLES = SHARING_ROLES[:]
 _DEFAULT_USER_MANAGEMENT_ROLES = USER_MANAGEMENT_ROLES[:]
 
@@ -204,11 +204,11 @@ def validate_password(self, clear: str, hashed: str) -> bool:
 # that this is only really useful if you're _not_ using workflow.  If
 # you are, then you should look at the permissions in workflow.zcml.
 SITE_ACL = [
-    ['Allow', 'system.Everyone', ['view']],
-    ['Allow', 'role:viewer', ['view']],
-    ['Allow', 'role:editor', ['view', 'add', 'edit', 'state_change']],
-    ['Allow', 'role:owner', ['view', 'add', 'edit', 'manage', 'state_change']],
-    ]
+    ["Allow", "system.Everyone", ["view"]],
+    ["Allow", "role:viewer", ["view"]],
+    ["Allow", "role:editor", ["view", "add", "edit", "state_change"]],
+    ["Allow", "role:owner", ["view", "add", "edit", "manage", "state_change"]],
+]
 
 
 def set_roles(roles_dict: Dict[str, Principal]) -> None:
@@ -246,7 +246,7 @@ def reset() -> None:
 class PersistentACLMixin(object):
     def _get_acl(self) -> MutationList:
         if self._acl is None:
-            raise AttributeError('__acl__')
+            raise AttributeError("__acl__")
         return self._acl
 
     def _set_acl(self, value) -> None:
@@ -258,9 +258,10 @@ def _del_acl(self) -> None:
     __acl__ = property(_get_acl, _set_acl, _del_acl)
 
 
-def _cachekey_list_groups_raw(name: str,
-                              context: 'Node') -> Tuple[str, Union[int, 'NoneType']]:  # noqa
-    context_id = context is not None and getattr(context, 'id', id(context))
+def _cachekey_list_groups_raw(
+    name: str, context: "Node"
+) -> Tuple[str, Union[int, "NoneType"]]:  # noqa
+    context_id = context is not None and getattr(context, "id", id(context))
     return name, context_id
 
 
@@ -276,13 +277,12 @@ def list_groups_raw(name, context):
 
     if isinstance(context, Node):
         return set(
-            r.group_name for r in context.local_groups
-            if r.principal_name == name
+            r.group_name for r in context.local_groups if r.principal_name == name
         )
     return set()
 
 
-def list_groups(name: str, context: Optional['Node'] = None) -> List[str]:
+def list_groups(name: str, context: Optional["Node"] = None) -> List[str]:
     """List groups for principal with a given ``name``.
 
     The optional ``context`` argument may be passed to check the list
@@ -291,14 +291,16 @@ def list_groups(name: str, context: Optional['Node'] = None) -> List[str]:
     return list_groups_ext(name, context)[0]
 
 
-def _cachekey_list_groups_ext(name: str,
-                              context: Optional['Node'] = None,
-                              _seen: Optional[Set[str]] = None,
-                              _inherited: Optional[Set[str]] = None) -> Tuple[str, Union[int, 'NoneType']]:  # noqa
+def _cachekey_list_groups_ext(
+    name: str,
+    context: Optional["Node"] = None,
+    _seen: Optional[Set[str]] = None,
+    _inherited: Optional[Set[str]] = None,
+) -> Tuple[str, Union[int, "NoneType"]]:  # noqa
     if _seen is not None or _inherited is not None:
         raise DontCache
     else:
-        context_id = getattr(context, 'id', id(context))
+        context_id = getattr(context, "id", id(context))
         return name, context_id
 
 
@@ -323,8 +325,7 @@ def list_groups_ext(name, context=None, _seen=None, _inherited=None):
     if context is not None:
         items = lineage(context)
         for idx, item in enumerate(items):
-            group_names = [i for i in list_groups_raw(name, item)
-                           if i not in _seen]
+            group_names = [i for i in list_groups_raw(name, item) if i not in _seen]
             groups.update(group_names)
             if recursing or idx != 0:
                 _inherited.update(group_names)
@@ -332,17 +333,14 @@ def list_groups_ext(name, context=None, _seen=None, _inherited=None):
     new_groups = groups - _seen
     _seen.update(new_groups)
     for group_name in new_groups:
-        g, i = list_groups_ext(
-            group_name, context, _seen=_seen, _inherited=_inherited)
+        g, i = list_groups_ext(group_name, context, _seen=_seen, _inherited=_inherited)
         groups.update(g)
         _inherited.update(i)
 
     return list(groups), list(_inherited)
 
 
-def set_groups(name: str,
-               context: 'Node',
-               groups_to_set: Iterable[str] = ()) -> None:
+def set_groups(name: str, context: "Node", groups_to_set: Iterable[str] = ()) -> None:
     """Set the list of groups for principal with given ``name`` and in
     given ``context``.
     """
@@ -351,7 +349,8 @@ def set_groups(name: str,
 
     context.local_groups = [
         # keep groups for "other" principals
-        lg for lg in context.local_groups
+        lg
+        for lg in context.local_groups
         if lg.principal_name != name
     ] + [
         # reset groups for given principal
@@ -360,36 +359,37 @@ def set_groups(name: str,
     ]
 
 
-def list_groups_callback(name: str,
-                         request: 'Request') -> Optional[List[str]]:
+def list_groups_callback(name: str, request: "Request") -> Optional[List[str]]:
     """ List the groups for the principal identified by ``name``.  Consider
     ``authz_context`` to support assignment of local roles to groups. """
     if not is_user(name):
         return None  # Disallow logging in with groups
     if name in get_principals():
         context = request.environ.get(
-            'authz_context', getattr(request, 'context', None))
+            "authz_context", getattr(request, "context", None)
+        )
         if context is None:
             # SA events don't have request.context available
             from kotti.resources import get_root
+
             context = get_root(request)
         return list_groups(name, context)
 
 
 @contextmanager
-def authz_context(context: object, request: 'Request'):
-    before = request.environ.pop('authz_context', None)
-    request.environ['authz_context'] = context
+def authz_context(context: object, request: "Request"):
+    before = request.environ.pop("authz_context", None)
+    request.environ["authz_context"] = context
     try:
         yield
     finally:
-        del request.environ['authz_context']
+        del request.environ["authz_context"]
         if before is not None:
-            request.environ['authz_context'] = before
+            request.environ["authz_context"] = before
 
 
 @contextmanager
-def request_method(request: 'Request', method: str):
+def request_method(request: "Request", method: str):
     before = request.method
     request.method = method
     try:
@@ -398,17 +398,20 @@ def request_method(request: 'Request', method: str):
         request.method = before
 
 
-def view_permitted(context: object,
-                   request: 'Request',
-                   name: Optional[str] = '',
-                   method: Optional[str] = 'GET') -> PermitsResult:
+def view_permitted(
+    context: object,
+    request: "Request",
+    name: Optional[str] = "",
+    method: Optional[str] = "GET",
+) -> PermitsResult:
     with authz_context(context, request):
         with request_method(request, method):
             return view_execution_permitted(context, request, name)
 
 
-def principals_with_local_roles(context: 'Node',
-                                inherit: Optional[bool] = True) -> List[str]:
+def principals_with_local_roles(
+    context: "Node", inherit: Optional[bool] = True
+) -> List[str]:
     """Return a list of principal names that have local roles in the
     context.
     """
@@ -421,14 +424,15 @@ def principals_with_local_roles(context: 'Node',
 
     for item in items:
         principals.update(
-            r.principal_name for r in item.local_groups
-            if not r.principal_name.startswith('role:')
+            r.principal_name
+            for r in item.local_groups
+            if not r.principal_name.startswith("role:")
         )
 
     return list(principals)
 
 
-def map_principals_with_local_roles(context: 'Node'):
+def map_principals_with_local_roles(context: "Node"):
     principals = get_principals()
     value = []
     for principal_name in principals_with_local_roles(context):
@@ -445,7 +449,7 @@ def map_principals_with_local_roles(context: 'Node'):
 def is_user(principal: Union[Principal, str]) -> bool:
     if not isinstance(principal, string_types):
         principal = principal.name
-    return ':' not in principal
+    return ":" not in principal
 
 
 class Principals(MutableMapping):
@@ -456,12 +460,16 @@ class Principals(MutableMapping):
     This is a default implementation that may be replaced by using the
     'kotti.principals' settings variable.
     """
+
     factory = Principal
 
     @classmethod
     def _principal_by_name(cls, name: str) -> Principal:
-        query = bakery(lambda session: session.query(cls.factory).filter(
-            cls.factory.name == bindparam('name')))
+        query = bakery(
+            lambda session: session.query(cls.factory).filter(
+                cls.factory.name == bindparam("name")
+            )
+        )
         return query(DBSession()).params(name=name).one()
 
     @request_cache(lambda self, name: name)
@@ -470,7 +478,7 @@ def __getitem__(self, name):
             raise KeyError(name)
         # avoid calls to the DB for roles
         # (they're not stored in the ``principals`` table)
-        if name.startswith('role:'):
+        if name.startswith("role:"):
             raise KeyError(name)
         try:
             return self._principal_by_name(name)
@@ -479,9 +487,7 @@ def __getitem__(self, name):
         except NoResultFound:
             raise KeyError(name)
 
-    def __setitem__(self,
-                    name: str,
-                    principal: Union[Principal, dict]) -> None:
+    def __setitem__(self, name: str, principal: Union[Principal, dict]) -> None:
         name = name
         if isinstance(principal, dict):
             principal = self.factory(**principal)
@@ -509,9 +515,7 @@ def iterkeys(self) -> Iterator[str]:
     def keys(self) -> List[str]:
         return list(self.iterkeys())
 
-    def search(self,
-               match: Optional[str] = 'any',
-               **kwargs) -> Query:
+    def search(self, match: Optional[str] = "any", **kwargs) -> Query:
         """ Search the principal database.
 
         :param match: ``any`` to return all principals matching any search
@@ -533,17 +537,17 @@ def search(self,
 
         for key, value in kwargs.items():
             col = getattr(self.factory, key)
-            if isinstance(value, string_types) and '*' in value:
-                value = value.replace('*', '%').lower()
+            if isinstance(value, string_types) and "*" in value:
+                value = value.replace("*", "%").lower()
                 filters.append(func.lower(col).like(value))
             else:
                 filters.append(col == value)
 
         query = DBSession.query(self.factory)
 
-        if match == 'any':
+        if match == "any":
             query = query.filter(or_(*filters))
-        elif match == 'all':
+        elif match == "all":
             query = query.filter(and_(*filters))
         else:
             raise ValueError('match must be either "any" or "all".')
@@ -552,12 +556,10 @@ def search(self,
 
     log_rounds = 10
 
-    def hash_password(self,
-                      password: str,
-                      hashed: Optional[str] = None) -> str:
+    def hash_password(self, password: str, hashed: Optional[str] = None) -> str:
         if hashed is None:
             hashed = bcrypt.gensalt(self.log_rounds)
-        return bcrypt.hashpw(password.encode('utf-8'), hashed.encode('utf-8'))
+        return bcrypt.hashpw(password.encode("utf-8"), hashed.encode("utf-8"))
 
     def validate_password(self, clear: str, hashed: str) -> bool:
         try:
diff --git a/kotti/sqla.py b/kotti/sqla.py
index 3c27f53e6..7b9f04594 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -30,12 +30,14 @@ def no_autoflush(func):
     def wrapper(*args, **kwargs):
         with DBSession.no_autoflush:
             return func(*args, **kwargs)
+
     return wrapper
 
 
 class JsonType(TypeDecorator):
     """http://www.sqlalchemy.org/docs/core/types.html#marshal-json-strings
     """
+
     impl = Text
 
     # noinspection PyMethodOverriding
@@ -54,8 +56,8 @@ def process_result_value(value, dialect):
 
 
 class ACLType(JsonType):
-    ALL_PERMISSIONS_SERIALIZED = '__ALL_PERMISSIONS__'
-    DEFAULT_ACE = (Allow, 'role:admin', ALL_PERMISSIONS)
+    ALL_PERMISSIONS_SERIALIZED = "__ALL_PERMISSIONS__"
+    DEFAULT_ACE = (Allow, "role:admin", ALL_PERMISSIONS)
 
     def process_bind_param(self, value, dialect):
         if value is not None:
@@ -77,6 +79,7 @@ def process_result_value(self, value, dialect):
 class MutationDict(Mutable):
     """http://www.sqlalchemy.org/docs/orm/extensions/mutable.html
     """
+
     _wraps = dict
 
     def __init__(self, data):
@@ -93,9 +96,14 @@ def coerce(cls, key, value):
             return value
 
     def __json__(self, request=None):
-        return dict([(key, value.__json__(request))
-                     if hasattr(value, '__json__') else (key, value)
-                     for key, value in self._d.items()])
+        return dict(
+            [
+                (key, value.__json__(request))
+                if hasattr(value, "__json__")
+                else (key, value)
+                for key, value in self._d.items()
+            ]
+        )
 
 
 class MutationList(Mutable):
@@ -119,8 +127,10 @@ def __radd__(self, other):
         return other + self._d
 
     def __json__(self, request=None):
-        return [item.__json__(request) if hasattr(item, '__json__') else item
-                for item in self._d]
+        return [
+            item.__json__(request) if hasattr(item, "__json__") else item
+            for item in self._d
+        ]
 
 
 def _make_mutable_method_wrapper(wrapper_class, methodname, mutates):
@@ -130,49 +140,49 @@ def replacer(self, *args, **kwargs):
         if mutates:
             self.changed()
         return value
+
     replacer.__name__ = methodname
     return replacer
 
 
 for wrapper_class in (MutationDict, MutationList):
     for methodname, mutates in (
-            ('__iter__', False),
-            ('__len__', False),
-            ('__eq__', False),
-            ('__add__', False),
-            ('__getitem__', False),
-            ('__getslice__', False),
-            ('__repr__', False),
-            ('get', False),
-            ('keys', False),
-
-            ('__setitem__', True),
-            ('__delitem__', True),
-            ('__setslice__', True),
-            ('__delslice__', True),
-            ('append', True),
-            ('clear', True),
-            ('extend', True),
-            ('insert', True),
-            ('pop', True),
-            ('setdefault', True),
-            ('update', True),
-            ('remove', True),
-            ):
+        ("__iter__", False),
+        ("__len__", False),
+        ("__eq__", False),
+        ("__add__", False),
+        ("__getitem__", False),
+        ("__getslice__", False),
+        ("__repr__", False),
+        ("get", False),
+        ("keys", False),
+        ("__setitem__", True),
+        ("__delitem__", True),
+        ("__setslice__", True),
+        ("__delslice__", True),
+        ("append", True),
+        ("clear", True),
+        ("extend", True),
+        ("insert", True),
+        ("pop", True),
+        ("setdefault", True),
+        ("update", True),
+        ("remove", True),
+    ):
         # Only wrap methods that do exist on the wrapped type!
         if getattr(wrapper_class._wraps, methodname, False):
             setattr(
-                wrapper_class, methodname,
-                _make_mutable_method_wrapper(
-                    wrapper_class, methodname, mutates),
-                )
+                wrapper_class,
+                methodname,
+                _make_mutable_method_wrapper(wrapper_class, methodname, mutates),
+            )
 
 
 class NestedMixin(object):
     __parent__ = None
 
     def __init__(self, *args, **kwargs):
-        self.__parent__ = kwargs.pop('__parent__', None)
+        self.__parent__ = kwargs.pop("__parent__", None)
         super(NestedMixin, self).__init__(*args, **kwargs)
 
     def __getitem__(self, key):
@@ -209,14 +219,12 @@ class NestedMutationList(NestedMixin, MutationList):
     pass
 
 
-MUTATION_WRAPPERS = {
-    dict: NestedMutationDict,
-    list: NestedMutationList,
-    }
+MUTATION_WRAPPERS = {dict: NestedMutationDict, list: NestedMutationList}
 
 
 class Base(object):
     @declared_attr
     def __tablename__(cls):
         from kotti.util import camel_case_to_name  # prevent circ import
-        return '{0}s'.format(camel_case_to_name(cls.__name__))
+
+        return "{0}s".format(camel_case_to_name(cls.__name__))
diff --git a/kotti/testing.py b/kotti/testing.py
index 26294e5f7..95470554b 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -31,7 +31,7 @@
 user = mark.user
 
 
-BASE_URL = 'http://localhost:6543'
+BASE_URL = "http://localhost:6543"
 
 
 class Dummy(dict):
@@ -48,14 +48,15 @@ class DummyRequest(testing.DummyRequest):
 
     @staticmethod
     def is_response(ob):
-        return (hasattr(ob, 'app_iter') and hasattr(ob, 'headerlist') and
-                hasattr(ob, 'status'))
+        return (
+            hasattr(ob, "app_iter")
+            and hasattr(ob, "headerlist")
+            and hasattr(ob, "status")
+        )
 
     # noinspection PyPep8Naming
     @classmethod
-    def blank(cls,
-              path, environ=None, base_url=None, headers=None, POST=None,
-              **kw):
+    def blank(cls, path, environ=None, base_url=None, headers=None, POST=None, **kw):
         """
         ``request.blank`` is used in Kotti only when assigning slots, where
         the POST parameters are faked as a querystring.
@@ -71,14 +72,16 @@ def _decode(body):
             POST = POST.decode()
         if POST and isinstance(POST, str):
             POST = _decode(POST)
-        req = testing.DummyRequest(path=path, environ=environ, headers=headers,
-                                   cookies=None, post=POST, **kw)
+        req = testing.DummyRequest(
+            path=path, environ=environ, headers=headers, cookies=None, post=POST, **kw
+        )
         return req
 
 
 def asset(name):
     import kotti
-    return open(join(dirname(kotti.__file__), 'tests', name), 'rb')
+
+    return open(join(dirname(kotti.__file__), "tests", name), "rb")
 
 
 def includeme_login(config):
@@ -88,10 +91,7 @@ def includeme_login(config):
     :type config: :class:`pyramid.config.Configurator`
     """
 
-    config.add_view(
-        login_view,
-        name='login',
-        renderer='kotti:templates/login.pt')
+    config.add_view(login_view, name="login", renderer="kotti:templates/login.pt")
 
 
 def includeme_layout(config):
@@ -104,8 +104,9 @@ def includeme_layout(config):
     # override edit master layout with view master layout
 
     config.override_asset(
-        to_override='kotti:templates/edit/master.pt',
-        override_with='kotti:templates/view/master.pt')
+        to_override="kotti:templates/edit/master.pt",
+        override_with="kotti:templates/view/master.pt",
+    )
 
 
 def login_view(request):
@@ -117,7 +118,7 @@ def dummy_search(search_term, request):
 
 
 def testing_db_url():
-    return os.environ.get('KOTTI_TEST_DB_STRING', 'sqlite://')
+    return os.environ.get("KOTTI_TEST_DB_STRING", "sqlite://")
 
 
 def _init_testing_db():
@@ -126,7 +127,7 @@ def _init_testing_db():
     from kotti.resources import initialize_sql
 
     database_url = testing_db_url()
-    get_settings()['sqlalchemy.url'] = database_url
+    get_settings()["sqlalchemy.url"] = database_url
     session = initialize_sql(create_engine(database_url), drop_all=True)
     return session
 
@@ -146,8 +147,10 @@ def _turn_warnings_into_errors():  # pragma: no cover
     # turn all warnings into errors, but let the `ImportWarning`
     # produced by Babel's `localedata.py` vs `localedata/` show up once...
     from babel import localedata
+
     localedata  # make pyflakes happy... :p
     from warnings import filterwarnings
+
     filterwarnings("error")
 
 
@@ -160,13 +163,13 @@ def setUp(init_db=True, **kwargs):
 
     tearDown()
     settings = conf_defaults.copy()
-    settings['kotti.secret'] = 'secret'
-    settings['kotti.secret2'] = 'secret2'
-    settings['kotti.populators'] = 'kotti.testing._populator'
-    settings['pyramid_deform.tempdir'] = '/tmp'
-    settings.update(kwargs.get('settings', {}))
+    settings["kotti.secret"] = "secret"
+    settings["kotti.secret2"] = "secret2"
+    settings["kotti.populators"] = "kotti.testing._populator"
+    settings["pyramid_deform.tempdir"] = "/tmp"
+    settings.update(kwargs.get("settings", {}))
     settings = _resolve_dotted(settings)
-    kwargs['settings'] = settings
+    kwargs["settings"] = settings
     config = testing.setUp(**kwargs)
     config.add_default_renderers()
 
@@ -206,7 +209,8 @@ def tearDown(self):
 class EventTestBase(TestCase):
     def setUp(self, **kwargs):
         super(EventTestBase, self).setUp(**kwargs)
-        self.config.include('kotti.events')
+        self.config.include("kotti.events")
+
 
 # Functional ----
 
@@ -223,8 +227,8 @@ def expire(event):
 
 def _zope_testbrowser_pyquery(self):
     from pyquery import PyQuery
-    return PyQuery(
-        self.contents.replace('xmlns="http://www.w3.org/1999/xhtml', ''))
+
+    return PyQuery(self.contents.replace('xmlns="http://www.w3.org/1999/xhtml', ""))
 
 
 # noinspection PyPep8Naming
@@ -236,28 +240,26 @@ def setUpFunctional(global_config=None, **settings):
     tearDown()
 
     _settings = {
-        'sqlalchemy.url': testing_db_url(),
-        'kotti.secret': 'secret',
-        'kotti.site_title': 'Website des Kottbusser Tors',  # for mailing
-        'kotti.populators': 'kotti.testing._populator',
-        'mail.default_sender': 'kotti@localhost',
-        'pyramid.includes': 'kotti.testing._functional_includeme',
-        }
+        "sqlalchemy.url": testing_db_url(),
+        "kotti.secret": "secret",
+        "kotti.site_title": "Website des Kottbusser Tors",  # for mailing
+        "kotti.populators": "kotti.testing._populator",
+        "mail.default_sender": "kotti@localhost",
+        "pyramid.includes": "kotti.testing._functional_includeme",
+    }
     _settings.update(settings)
 
-    host, port = BASE_URL.split(':')[-2:]
+    host, port = BASE_URL.split(":")[-2:]
     app = main({}, **_settings)
     Browser.pyquery = property(_zope_testbrowser_pyquery)
 
     return dict(
         Browser=lambda: Browser(
-            'http://{}:{}/'.format(host[2:], int(port)),
-            wsgi_app=app),
-        browser=Browser(
-            'http://{}:{}/'.format(host[2:], int(port)),
-            wsgi_app=app),
+            "http://{}:{}/".format(host[2:], int(port)), wsgi_app=app
+        ),
+        browser=Browser("http://{}:{}/".format(host[2:], int(port)), wsgi_app=app),
         test_app=TestApp(app),
-        )
+    )
 
 
 class FunctionalTestBase(TestCase):
@@ -269,19 +271,19 @@ def setUp(self, **kwargs):
     def tearDown(self):
         tearDown()
 
-    def login(self, login='admin', password='secret'):
+    def login(self, login="admin", password="secret"):
         return self.test_app.post(
-            '/@@login',
-            {'login': login, 'password': password, 'submit': 'submit'},
+            "/@@login",
+            {"login": login, "password": password, "submit": "submit"},
             status=302,
-            )
+        )
 
 
 @implementer(ILocation)
 class RootFactory(dict):
-    __name__ = ''  # root is required to have an empty name!
+    __name__ = ""  # root is required to have an empty name!
     __parent__ = None
-    __acl__ = [('Allow', 'role:admin', ALL_PERMISSIONS)]
+    __acl__ = [("Allow", "role:admin", ALL_PERMISSIONS)]
 
     def __init__(self, request):
         super(RootFactory, self).__init__()
@@ -299,33 +301,31 @@ def include_testing_view(config):
     """
 
     config.add_view(
-        dummy_view,
-        context=RootFactory,
-        renderer='kotti:tests/testing_view.pt',
-        )
+        dummy_view, context=RootFactory, renderer="kotti:tests/testing_view.pt"
+    )
 
     config.add_view(
         dummy_view,
-        name='secured',
-        permission='view',
+        name="secured",
+        permission="view",
         context=RootFactory,
-        renderer='kotti:tests/testing_view.pt',
-        )
+        renderer="kotti:tests/testing_view.pt",
+    )
 
 
 # noinspection PyPep8Naming
 def setUpFunctionalStrippedDownApp(global_config=None, **settings):
     # An app that doesn't use Nodes at all
     _settings = {
-        'kotti.base_includes': (
-            'kotti kotti.views kotti.views.login kotti.views.users '
-            'kotti.views.view'),
-        'kotti.use_tables': 'principals',
-        'kotti.populators': 'kotti.populate.populate_users',
-        'pyramid.includes': 'kotti.testing.include_testing_view',
-        'kotti.root_factory': 'kotti.testing.RootFactory',
-        'kotti.site_title': 'My Stripped Down Kotti',
-        }
+        "kotti.base_includes": (
+            "kotti kotti.views kotti.views.login kotti.views.users " "kotti.views.view"
+        ),
+        "kotti.use_tables": "principals",
+        "kotti.populators": "kotti.populate.populate_users",
+        "pyramid.includes": "kotti.testing.include_testing_view",
+        "kotti.root_factory": "kotti.testing.RootFactory",
+        "kotti.site_title": "My Stripped Down Kotti",
+    }
     _settings.update(settings)
 
     return setUpFunctional(global_config, **_settings)
@@ -343,7 +343,11 @@ def registerDummyMailer():
 
 # set up deprecation warnings
 from zope.deprecation.deprecation import deprecated  # noqa
+
 for item in UnitTestBase, EventTestBase, FunctionalTestBase, _init_testing_db:
-    name = getattr(item, '__name__', item)
-    deprecated(name, 'Unittest-style tests are deprecated as of Kotti 0.7. '
-               'Please use pytest function arguments instead.')
+    name = getattr(item, "__name__", item)
+    deprecated(
+        name,
+        "Unittest-style tests are deprecated as of Kotti 0.7. "
+        "Please use pytest function arguments instead.",
+    )
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 78592c313..15d43011b 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -57,14 +57,14 @@
 def image_asset():
     """ Return an image file """
 
-    return testing.asset('sendeschluss.jpg')
+    return testing.asset("sendeschluss.jpg")
 
 
 @fixture
 def image_asset2():
     """ Return another image file """
 
-    return testing.asset('logo.png')
+    return testing.asset("logo.png")
 
 
 @yield_fixture
@@ -75,7 +75,7 @@ def allwarnings(request):
     warnings.filters[:] = save_filters
 
 
-@fixture(scope='session')
+@fixture(scope="session")
 def custom_settings():
     """ This is a dummy fixture meant to be overriden in add on package's
     ``conftest.py``.  It can be used to inject arbitrary settings for third
@@ -93,22 +93,24 @@ def custom_settings():
     return {}
 
 
-@fixture(scope='session')
+@fixture(scope="session")
 def unresolved_settings(custom_settings):
     from kotti import conf_defaults
     from kotti.testing import testing_db_url
+
     settings = conf_defaults.copy()
-    settings['kotti.secret'] = 'secret'
-    settings['kotti.secret2'] = 'secret2'
-    settings['kotti.populators'] = 'kotti.testing._populator'
-    settings['sqlalchemy.url'] = testing_db_url()
+    settings["kotti.secret"] = "secret"
+    settings["kotti.secret2"] = "secret2"
+    settings["kotti.populators"] = "kotti.testing._populator"
+    settings["sqlalchemy.url"] = testing_db_url()
     settings.update(custom_settings)
     return settings
 
 
-@fixture(scope='session')
+@fixture(scope="session")
 def settings(unresolved_settings):
     from kotti import _resolve_dotted
+
     return _resolve_dotted(unresolved_settings)
 
 
@@ -119,15 +121,16 @@ def config(settings):
     """
     from pyramid import testing
     from kotti import security
+
     config = testing.setUp(settings=settings)
-    config.include('pyramid_chameleon')
+    config.include("pyramid_chameleon")
     config.add_default_renderers()
     yield config
     security.reset()
     testing.tearDown()
 
 
-@fixture(scope='session')
+@fixture(scope="session")
 def connection(custom_settings):
     """ sets up a SQLAlchemy engine and returns a connection to the database.
     The connection string used for testing can be specified via the
@@ -144,6 +147,7 @@ def connection(custom_settings):
     from kotti import metadata
     from kotti.resources import _adjust_for_engine
     from kotti.testing import testing_db_url
+
     engine = create_engine(testing_db_url())
     _adjust_for_engine(engine)
     connection = engine.connect()
@@ -174,15 +178,16 @@ def content(connection, settings):
     # settings won't persist, though;  use the `workflow` fixture if needed
     from zope.configuration import xmlconfig
     import kotti
-    xmlconfig.file('workflow.zcml', kotti, execute=True)
-    for populate in settings['kotti.populators']:
+
+    xmlconfig.file("workflow.zcml", kotti, execute=True)
+    for populate in settings["kotti.populators"]:
         populate()
 
     # We set the path here since it's required for some integration
     # tests, and because the 'content' fixture does not depend on
     # 'event' and therefore the event handlers aren't fired for root
     # otherwise:
-    get_root().path = '/'
+    get_root().path = "/"
     transaction.commit()
 
 
@@ -193,8 +198,10 @@ def db_session(config, content, connection):
     """
 
     import transaction
-    trans = connection.begin()          # begin a non-orm transaction
+
+    trans = connection.begin()  # begin a non-orm transaction
     from kotti import DBSession
+
     yield DBSession()
     trans.rollback()
     transaction.abort()
@@ -211,12 +218,9 @@ def dummy_request(config, request, monkeypatch):
 
     marker = request.node.get_closest_marker("user")
     if marker:
-        monkeypatch.setattr(
-            DummyRequest,
-            "authenticated_userid",
-            marker.args[0])
+        monkeypatch.setattr(DummyRequest, "authenticated_userid", marker.args[0])
 
-    config.manager.get()['request'] = dummy_request = DummyRequest()
+    config.manager.get()["request"] = dummy_request = DummyRequest()
 
     return dummy_request
 
@@ -226,7 +230,7 @@ def dummy_mailer(monkeypatch):
     from pyramid_mailer.mailer import DummyMailer
 
     mailer = DummyMailer()
-    monkeypatch.setattr('kotti.message.get_mailer', lambda: mailer)
+    monkeypatch.setattr("kotti.message.get_mailer", lambda: mailer)
     return mailer
 
 
@@ -235,7 +239,8 @@ def events(config):
     """ sets up Kotti's default event handlers.
     """
     from kotti.events import clear
-    config.include('kotti.events')
+
+    config.include("kotti.events")
     yield config
     clear()
 
@@ -243,6 +248,7 @@ def events(config):
 @fixture
 def setup_app(unresolved_settings, filedepot):
     from kotti import base_configure
+
     config = base_configure({}, **unresolved_settings)
     return config.make_wsgi_app()
 
@@ -260,22 +266,23 @@ def browser(db_session, request, setup_app):
     """
     from zope.testbrowser.wsgi import Browser
     from kotti.testing import BASE_URL
-    host, port = BASE_URL.split(':')[-2:]
-    browser = Browser('http://{}:{}/'.format(host[2:], int(port)),
-                      wsgi_app=setup_app)
+
+    host, port = BASE_URL.split(":")[-2:]
+    browser = Browser("http://{}:{}/".format(host[2:], int(port)), wsgi_app=setup_app)
     marker = request.node.get_closest_marker("user")
     if marker:
         # set auth cookie directly on the browser instance...
         from pyramid.security import remember
         from pyramid.testing import DummyRequest
+
         login = marker.args[0]
         environ = dict(HTTP_HOST=host[2:])
         for _, value in remember(DummyRequest(environ=environ), login):
-            cookie, _ = value.split(';', 1)
-            name, value = cookie.split('=')
+            cookie, _ = value.split(";", 1)
+            name, value = cookie.split("=")
             if name in browser.cookies:
                 del browser.cookies[name]
-            browser.cookies.create(name, value.strip('"'), path='/')
+            browser.cookies.create(name, value.strip('"'), path="/")
     return browser
 
 
@@ -284,19 +291,22 @@ def root(db_session):
     """ returns Kotti's 'root' node.
     """
     from kotti.resources import get_root
+
     return get_root()
 
 
 @fixture
 def webtest(app, monkeypatch, request, filedepot, dummy_mailer):
     from webtest import TestApp
+
     marker = request.node.get_closest_marker("user")
     if marker:
         login = marker.args[0]
         monkeypatch.setattr(
             "pyramid.authentication."
             "AuthTktAuthenticationPolicy.unauthenticated_userid",
-            lambda self, req: login)
+            lambda self, req: login,
+        )
     return TestApp(app)
 
 
@@ -306,7 +316,8 @@ def workflow(config):
     """
     from zope.configuration import xmlconfig
     import kotti
-    xmlconfig.file('workflow.zcml', kotti, execute=True)
+
+    xmlconfig.file("workflow.zcml", kotti, execute=True)
 
 
 class TestStorage(MemoryFileStorage):
@@ -353,10 +364,8 @@ def mock_filedepot(depot_tween):
     """
     from depot.manager import DepotManager
 
-    DepotManager._depots = {
-        'mockdepot': MagicMock(wraps=TestStorage())
-    }
-    DepotManager._default_depot = 'mockdepot'
+    DepotManager._depots = {"mockdepot": MagicMock(wraps=TestStorage())}
+    DepotManager._default_depot = "mockdepot"
 
     yield DepotManager
 
@@ -370,10 +379,8 @@ def filedepot(db_session, depot_tween):
     """
     from depot.manager import DepotManager
 
-    DepotManager._depots = {
-        'filedepot': MagicMock(wraps=TestStorage())
-    }
-    DepotManager._default_depot = 'filedepot'
+    DepotManager._depots = {"filedepot": MagicMock(wraps=TestStorage())}
+    DepotManager._default_depot = "filedepot"
 
     yield DepotManager
 
diff --git a/kotti/tests/conftest.py b/kotti/tests/conftest.py
index 55ebf011c..194dbf77a 100644
--- a/kotti/tests/conftest.py
+++ b/kotti/tests/conftest.py
@@ -8,12 +8,12 @@
 
 
 def pytest_addoption(parser):
-    parser.addoption('--runslow', action='store_true', help='run slow tests')
+    parser.addoption("--runslow", action="store_true", help="run slow tests")
 
 
 def pytest_runtest_setup(item):
-    if 'slow' in item.keywords and not item.config.getoption('--runslow'):
-        skip('need --runslow option to run')
+    if "slow" in item.keywords and not item.config.getoption("--runslow"):
+        skip("need --runslow option to run")
 
 
 # non-public test fixtures
@@ -22,6 +22,7 @@ def pytest_runtest_setup(item):
 @fixture
 def app(db_session, setup_app):
     from webtest import TestApp
+
     return TestApp(setup_app)
 
 
@@ -31,10 +32,10 @@ def extra_principals(db_session):
     'franksgroup'.  Return the result of ``get_pricipals()``. """
 
     from kotti.security import get_principals
+
     P = get_principals()
-    P['bob'] = dict(name='bob', title='Bob')
-    P['frank'] = dict(name='frank', title='Frank')
-    P['group:bobsgroup'] = dict(name='group:bobsgroup', title="Bob's Group")
-    P['group:franksgroup'] = dict(name='group:franksgroup',
-                                  title="Frank's Group")
+    P["bob"] = dict(name="bob", title="Bob")
+    P["frank"] = dict(name="frank", title="Frank")
+    P["group:bobsgroup"] = dict(name="group:bobsgroup", title="Bob's Group")
+    P["group:franksgroup"] = dict(name="group:franksgroup", title="Frank's Group")
     return P
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index 722c25b2f..b733b82b7 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -18,14 +18,12 @@
 from kotti.testing import testing_db_url
 
 # filter deprecation warnings for code that is still tested...
-filterwarnings('ignore', "^The 'kotti.includes' setting")
+filterwarnings("ignore", "^The 'kotti.includes' setting")
 
 
 class TestApp:
-
     def required_settings(self):
-        return {'sqlalchemy.url': testing_db_url(),
-                'kotti.secret': 'dude'}
+        return {"sqlalchemy.url": testing_db_url(), "kotti.secret": "dude"}
 
     def test_override_settings(self, db_session):
         from kotti import main
@@ -35,23 +33,23 @@ class MyType(object):
             pass
 
         def my_configurator(conf):
-            conf['kotti.base_includes'] = ''
-            conf['kotti.available_types'] = [MyType]
+            conf["kotti.base_includes"] = ""
+            conf["kotti.available_types"] = [MyType]
 
         settings = self.required_settings()
-        settings['kotti.configurators'] = [my_configurator]
-        with patch('kotti.resources.initialize_sql'):
+        settings["kotti.configurators"] = [my_configurator]
+        with patch("kotti.resources.initialize_sql"):
             main({}, **settings)
 
-        assert get_settings()['kotti.base_includes'] == []
-        assert get_settings()['kotti.available_types'] == [MyType]
+        assert get_settings()["kotti.base_includes"] == []
+        assert get_settings()["kotti.available_types"] == [MyType]
 
     def test_auth_policies_no_override(self, db_session):
         from kotti import main
 
         settings = self.required_settings()
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 main({}, **settings)
 
         registry = get_current_registry()
@@ -62,10 +60,10 @@ def test_auth_policies_override(self, db_session):
         from kotti import main
 
         settings = self.required_settings()
-        settings['kotti.authn_policy_factory'] = 'kotti.none_factory'
-        settings['kotti.authz_policy_factory'] = 'kotti.none_factory'
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        settings["kotti.authn_policy_factory"] = "kotti.none_factory"
+        settings["kotti.authz_policy_factory"] = "kotti.none_factory"
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 main({}, **settings)
 
         registry = get_current_registry()
@@ -76,69 +74,66 @@ def test_asset_overrides(self, db_session):
         from kotti import main
 
         settings = self.required_settings()
-        settings['kotti.asset_overrides'] = 'pyramid:scaffold/'
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        settings["kotti.asset_overrides"] = "pyramid:scaffold/"
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 main({}, **settings)
 
     def test_pyramid_includes_overrides_base_includes(self, root):
         from kotti import main
 
         settings = self.required_settings()
-        settings['pyramid.includes'] = 'kotti.testing.includeme_login'
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        settings["pyramid.includes"] = "kotti.testing.includeme_login"
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 app = main({}, **settings)
 
-        provides = [
-            IViewClassifier,
-            implementedBy(Request),
-            providedBy(root),
-            ]
-        view = app.registry.adapters.lookup(provides, IView, name='login')
-        assert view.__module__ == 'kotti.testing'
+        provides = [IViewClassifier, implementedBy(Request), providedBy(root)]
+        view = app.registry.adapters.lookup(provides, IView, name="login")
+        assert view.__module__ == "kotti.testing"
 
     def test_use_tables(self, db_session):
         from kotti import main
 
         settings = self.required_settings()
-        settings['kotti.populators'] = ''
-        settings['kotti.use_tables'] = 'principals'
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        settings["kotti.populators"] = ""
+        settings["kotti.use_tables"] = "principals"
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 main({}, **settings)
 
     def test_root_factory(self, db_session):
         from kotti import main
+
         # the `root` fixture doesn't work here
         from kotti.resources import get_root
 
         settings = self.required_settings()
-        settings['kotti.root_factory'] = (RootFactory,)
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        settings["kotti.root_factory"] = (RootFactory,)
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 app = main({}, **settings)
         assert isinstance(get_root(), RootFactory)
         assert isinstance(app.root_factory(), RootFactory)
 
-    def test_render_master_edit_template_minimal_root(self, no_filedepots,
-                                                      settings=None):
+    def test_render_master_edit_template_minimal_root(
+        self, no_filedepots, settings=None
+    ):
         from kotti import main
 
         settings = settings or self.required_settings()
-        settings['kotti.root_factory'] = (RootFactory,)
-        settings['kotti.site_title'] = 'My Site'
-        with patch('kotti.resources.initialize_sql'):
+        settings["kotti.root_factory"] = (RootFactory,)
+        settings["kotti.site_title"] = "My Site"
+        with patch("kotti.resources.initialize_sql"):
             app = main({}, **settings)
 
-        request = Request.blank('/@@login')
+        request = Request.blank("/@@login")
         (status, headers, response) = request.call_application(app)
-        assert status == '200 OK'
+        assert status == "200 OK"
 
-    def test_render_master_view_template_minimal_root(self, no_filedepots,
-                                                      db_session):
+    def test_render_master_view_template_minimal_root(self, no_filedepots, db_session):
         settings = self.required_settings()
-        settings['pyramid.includes'] = 'kotti.testing.includeme_layout'
+        settings["pyramid.includes"] = "kotti.testing.includeme_layout"
         return self.test_render_master_edit_template_minimal_root(settings)
 
     def test_setting_values_as_unicode(self, db_session, filedepot):
@@ -146,16 +141,16 @@ def test_setting_values_as_unicode(self, db_session, filedepot):
         from kotti import main
 
         settings = self.required_settings()
-        settings['kotti.site_title'] = b'K\xc3\xb6tti'  # Kötti
-        settings['kotti_foo.site_title'] = b'K\xc3\xb6tti'
-        settings['foo.site_title'] = b'K\xc3\xb6tti'
+        settings["kotti.site_title"] = b"K\xc3\xb6tti"  # Kötti
+        settings["kotti_foo.site_title"] = b"K\xc3\xb6tti"
+        settings["foo.site_title"] = b"K\xc3\xb6tti"
 
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 main({}, **settings)
-        assert get_settings()['kotti.site_title'] == 'Kötti'
-        assert get_settings()['kotti_foo.site_title'] == 'Kötti'
-        assert get_settings()['foo.site_title'] == b'K\xc3\xb6tti'
+        assert get_settings()["kotti.site_title"] == "Kötti"
+        assert get_settings()["kotti_foo.site_title"] == "Kötti"
+        assert get_settings()["foo.site_title"] == b"K\xc3\xb6tti"
 
     def test_default_filedepot(self, db_session):
         from kotti import main
@@ -163,10 +158,10 @@ def test_default_filedepot(self, db_session):
 
         settings = self.required_settings()
 
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 main({}, **settings)
-        assert DepotManager.get().__class__.__name__ == 'DBFileStorage'
+        assert DepotManager.get().__class__.__name__ == "DBFileStorage"
         DepotManager._clear()
 
     def test_configure_filedepot(self, no_filedepots):
@@ -178,22 +173,22 @@ def test_configure_filedepot(self, no_filedepots):
         tests.TFS2 = Mock(return_value=Mock(marker="TFS2"))
 
         settings = {
-            'kotti.depot.0.backend': 'kotti.tests.TFS1',
-            'kotti.depot.0.name': 'localfs',
-            'kotti.depot.0.location': '/tmp',
-            'kotti.depot.1.backend': 'kotti.tests.TFS2',
-            'kotti.depot.1.uri': 'mongo://',
-            'kotti.depot.1.name': 'mongo',
+            "kotti.depot.0.backend": "kotti.tests.TFS1",
+            "kotti.depot.0.name": "localfs",
+            "kotti.depot.0.location": "/tmp",
+            "kotti.depot.1.backend": "kotti.tests.TFS2",
+            "kotti.depot.1.uri": "mongo://",
+            "kotti.depot.1.name": "mongo",
         }
 
         configure_filedepot(settings)
 
-        assert DepotManager.get().marker == 'TFS1'
-        assert DepotManager.get('localfs').marker == 'TFS1'
-        assert DepotManager.get('mongo').marker == 'TFS2'
+        assert DepotManager.get().marker == "TFS1"
+        assert DepotManager.get("localfs").marker == "TFS1"
+        assert DepotManager.get("mongo").marker == "TFS2"
 
-        tests.TFS1.assert_called_with(location='/tmp')
-        tests.TFS2.assert_called_with(uri='mongo://')
+        tests.TFS1.assert_called_with(location="/tmp")
+        tests.TFS2.assert_called_with(uri="mongo://")
 
         del tests.TFS1
         del tests.TFS2
@@ -203,11 +198,11 @@ def test_search_content(self, db_session):
         from kotti.views.util import search_content
 
         settings = self.required_settings()
-        settings['kotti.search_content'] = 'kotti.testing.dummy_search'
-        with patch('kotti.resources.initialize_sql'):
-            with patch('kotti.filedepot.TweenFactory'):
+        settings["kotti.search_content"] = "kotti.testing.dummy_search"
+        with patch("kotti.resources.initialize_sql"):
+            with patch("kotti.filedepot.TweenFactory"):
                 main({}, **settings)
-        assert search_content('Nuno') == 'Not found. Sorry!'
+        assert search_content("Nuno") == "Not found. Sorry!"
 
     def test_stamp_heads(self, db_session, connection):
         from kotti import main
@@ -215,18 +210,22 @@ def test_stamp_heads(self, db_session, connection):
         settings = self.required_settings()
         engine = connection.engine
         engine.table_names = Mock(return_value=[])
-        with patch('kotti.engine_from_config', return_value=engine):
-            with patch('kotti.resources.metadata'):
-                with patch('kotti.filedepot.TweenFactory'):
+        with patch("kotti.engine_from_config", return_value=engine):
+            with patch("kotti.resources.metadata"):
+                with patch("kotti.filedepot.TweenFactory"):
                     main({}, **settings)
 
-        res = db_session.execute(select(
-            columns=[column('version_num')],
-            from_obj=[table('kotti_alembic_version')]))
+        res = db_session.execute(
+            select(
+                columns=[column("version_num")],
+                from_obj=[table("kotti_alembic_version")],
+            )
+        )
         assert tuple(res)  # a version_num should exist
 
 
 class TestGetVersion:
     def test_it(self):
         from kotti import get_version
+
         assert isinstance(get_version(), str)
diff --git a/kotti/tests/test_cache.py b/kotti/tests/test_cache.py
index 5ed59e788..d312e4671 100644
--- a/kotti/tests/test_cache.py
+++ b/kotti/tests/test_cache.py
@@ -12,8 +12,9 @@
 
 
 def parse_expires(date_string):
-    return datetime.datetime(*(
-        time.strptime(date_string, "%a, %d %b %Y %H:%M:%S GMT")[0:6]))
+    return datetime.datetime(
+        *(time.strptime(date_string, "%a, %d %b %Y %H:%M:%S GMT")[0:6])
+    )
 
 
 def delta(date_string):
@@ -24,30 +25,32 @@ def delta(date_string):
 # noinspection PyUnusedLocal
 @pytest.fixture
 def cachetest_content(root, filedepot):
-    image = asset('sendeschluss.jpg')
-    root['textfile'] = File(b"file contents", 'mytext.txt', 'text/plain')
-    root['image'] = File(image.read(), 'sendeschluss.jpg', 'image/jpeg')
+    image = asset("sendeschluss.jpg")
+    root["textfile"] = File(b"file contents", "mytext.txt", "text/plain")
+    root["image"] = File(image.read(), "sendeschluss.jpg", "image/jpeg")
 
 
 class TestSetMaxAge:
     # noinspection PyUnresolvedReferences
     def test_preserve_existing_headers(self):
-        response = Dummy(headers={
-            "cache-control": "max-age=17,s-max-age=42,foo,bar=42"})
+        response = Dummy(
+            headers={"cache-control": "max-age=17,s-max-age=42,foo,bar=42"}
+        )
         delta = datetime.timedelta(days=1)
         set_max_age(response, delta)
 
         assert "cache-control" in response.headers
         assert response.headers["cache-control"] == (
-            "bar=42,foo,max-age=86400,s-max-age=42")
+            "bar=42,foo,max-age=86400,s-max-age=42"
+        )
 
 
 class TestSetCacheHeaders:
     def test_caching_policy_chooser(self):
         from kotti.views.cache import set_cache_headers
 
-        with patch('kotti.views.cache.caching_policy_chooser') as chooser:
-            chooser.return_value = 'Random policy'
+        with patch("kotti.views.cache.caching_policy_chooser") as chooser:
+            chooser.return_value = "Random policy"
 
             event = MagicMock()
             event.response.headers.get.return_value = None
@@ -55,8 +58,7 @@ def test_caching_policy_chooser(self):
             with pytest.raises(KeyError):
                 set_cache_headers(event)
 
-        chooser.assert_called_with(
-            event.request.context, event.request, event.response)
+        chooser.assert_called_with(event.request.context, event.request, event.response)
 
     def test_caching_policy_chooser_raises(self):
         from kotti.views.cache import set_cache_headers
@@ -64,26 +66,25 @@ def test_caching_policy_chooser_raises(self):
         def raiser(*args, **kw):
             raise Exception()
 
-        with patch('kotti.views.cache.caching_policy_chooser') as chooser:
+        with patch("kotti.views.cache.caching_policy_chooser") as chooser:
             chooser.side_effect = raiser
 
             event = MagicMock()
             event.response.headers.get.return_value = None
 
-            with patch('kotti.views.cache.logger'):
+            with patch("kotti.views.cache.logger"):
                 set_cache_headers(event)
 
-        chooser.assert_called_with(
-            event.request.context, event.request, event.response)
+        chooser.assert_called_with(event.request.context, event.request, event.response)
 
     def test_header_set_before(self):
         from kotti.views.cache import CACHE_POLICY_HEADER
         from kotti.views.cache import set_cache_headers
 
         event = MagicMock()
-        event.response.headers = {CACHE_POLICY_HEADER: 'Random policy'}
+        event.response.headers = {CACHE_POLICY_HEADER: "Random policy"}
 
-        with patch('kotti.views.cache.caching_policy_chooser') as chooser:
+        with patch("kotti.views.cache.caching_policy_chooser") as chooser:
             with pytest.raises(KeyError):
                 set_cache_headers(event)
 
@@ -92,7 +93,7 @@ def test_header_set_before(self):
     def test_request_has_no_context(self):
         from kotti.views.cache import set_cache_headers
 
-        with patch('kotti.views.cache.caching_policy_chooser') as chooser:
+        with patch("kotti.views.cache.caching_policy_chooser") as chooser:
             event = MagicMock()
             event.request = {}
             set_cache_headers(event)
@@ -101,67 +102,66 @@ def test_request_has_no_context(self):
 
 
 class TestBrowser:
-
     def test_cache_unauth(self, webtest, cachetest_content):
 
         # html
-        resp = webtest.app.get('/')
-        assert resp.headers.get('X-Caching-Policy') == 'Cache HTML'
-        assert resp.headers.get('Cache-Control') == 'max-age=0,s-maxage=3600'
-        d = delta(resp.headers.get('Expires'))
+        resp = webtest.app.get("/")
+        assert resp.headers.get("X-Caching-Policy") == "Cache HTML"
+        assert resp.headers.get("Cache-Control") == "max-age=0,s-maxage=3600"
+        d = delta(resp.headers.get("Expires"))
         assert (d.days, d.seconds) < (0, 0)
 
         # resources
-        resp = webtest.app.get('/static-kotti/base.css')
-        assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
-        assert resp.headers.get('Cache-Control') == 'max-age=2764800,public'
-        d = delta(resp.headers.get('Expires'))
+        resp = webtest.app.get("/static-kotti/base.css")
+        assert resp.headers.get("X-Caching-Policy") == "Cache Resource"
+        assert resp.headers.get("Cache-Control") == "max-age=2764800,public"
+        d = delta(resp.headers.get("Expires"))
         assert (d.days, d.seconds) > (30, 0)
-        assert 'Last-Modified' in resp.headers
+        assert "Last-Modified" in resp.headers
 
         # post
-        resp = webtest.app.post('/', '')
-        assert 'X-Caching-Policy' not in resp.headers
+        resp = webtest.app.post("/", "")
+        assert "X-Caching-Policy" not in resp.headers
 
         # 404
-        resp = webtest.app.get('/this-isnt-here', status=404)
-        assert 'X-Caching-Policy' not in resp.headers
+        resp = webtest.app.get("/this-isnt-here", status=404)
+        assert "X-Caching-Policy" not in resp.headers
 
         # media content
-        resp = webtest.app.get('/textfile/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
-        assert resp.headers.get('Cache-Control') == 'max-age=14400,public'
-        d = delta(resp.headers.get('Expires'))
+        resp = webtest.app.get("/textfile/inline-view")
+        assert resp.headers.get("X-Caching-Policy") == "Cache Media Content"
+        assert resp.headers.get("Cache-Control") == "max-age=14400,public"
+        d = delta(resp.headers.get("Expires"))
         assert (d.days, d.seconds) > (0, 14000)
-        resp = webtest.app.get('/image/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'Cache Media Content'
-        assert resp.headers.get('Cache-Control') == 'max-age=14400,public'
-        d = delta(resp.headers.get('Expires'))
+        resp = webtest.app.get("/image/inline-view")
+        assert resp.headers.get("X-Caching-Policy") == "Cache Media Content"
+        assert resp.headers.get("Cache-Control") == "max-age=14400,public"
+        d = delta(resp.headers.get("Expires"))
         assert (d.days, d.seconds) > (0, 14000)
 
-    @pytest.mark.user('admin')
+    @pytest.mark.user("admin")
     def test_cache_auth(self, webtest, cachetest_content):
 
         # html
-        resp = webtest.app.get('/')
-        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
+        resp = webtest.app.get("/")
+        assert resp.headers.get("X-Caching-Policy") == "No Cache"
 
         # resources
-        resp = webtest.app.get('/static-kotti/base.css')
-        assert resp.headers.get('X-Caching-Policy') == 'Cache Resource'
+        resp = webtest.app.get("/static-kotti/base.css")
+        assert resp.headers.get("X-Caching-Policy") == "Cache Resource"
 
         # 404
-        resp = webtest.app.get('/this-isnt-here', status=404)
-        assert 'X-Caching-Policy' not in resp.headers
+        resp = webtest.app.get("/this-isnt-here", status=404)
+        assert "X-Caching-Policy" not in resp.headers
 
         # media content
-        resp = webtest.app.get('/textfile/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
-        assert resp.headers.get('Cache-Control') == 'max-age=0,public'
-        d = delta(resp.headers.get('Expires'))
+        resp = webtest.app.get("/textfile/inline-view")
+        assert resp.headers.get("X-Caching-Policy") == "No Cache"
+        assert resp.headers.get("Cache-Control") == "max-age=0,public"
+        d = delta(resp.headers.get("Expires"))
         assert (d.days, d.seconds) <= (0, 0)
-        resp = webtest.app.get('/image/inline-view')
-        assert resp.headers.get('X-Caching-Policy') == 'No Cache'
-        assert resp.headers.get('Cache-Control') == 'max-age=0,public'
-        d = delta(resp.headers.get('Expires'))
+        resp = webtest.app.get("/image/inline-view")
+        assert resp.headers.get("X-Caching-Policy") == "No Cache"
+        assert resp.headers.get("Cache-Control") == "max-age=0,public"
+        d = delta(resp.headers.get("Expires"))
         assert (d.days, d.seconds) <= (0, 0)
diff --git a/kotti/tests/test_default_view_selection.py b/kotti/tests/test_default_view_selection.py
index 6a2eff467..762c28588 100644
--- a/kotti/tests/test_default_view_selection.py
+++ b/kotti/tests/test_default_view_selection.py
@@ -8,14 +8,13 @@
 
 
 class TestDefaultViewSelection:
-
     def test__is_valid_view(self, root, config):
 
         config.add_view(
             context=IContent,
-            name='folder_view',
-            permission='view',
-            renderer='kotti:templates/view/folder.pt',
+            name="folder_view",
+            permission="view",
+            renderer="kotti:templates/view/folder.pt",
         )
 
         context = root
@@ -29,10 +28,10 @@ def test__is_valid_view(self, root, config):
     def test_default_views(self, root, config):
         config.add_view(
             context=IContent,
-            name='folder_view',
-            permission='view',
-            renderer='kotti:templates/view/folder.pt',
-            )
+            name="folder_view",
+            permission="view",
+            renderer="kotti:templates/view/folder.pt",
+        )
 
         context = root
         request = DummyRequest()
@@ -41,34 +40,34 @@ def test_default_views(self, root, config):
 
         sviews = view.default_view_selector()
 
-        assert 'selectable_default_views' in sviews
+        assert "selectable_default_views" in sviews
 
         # the root should have at least the default view and the folder_view
-        assert len(sviews['selectable_default_views']) > 1
+        assert len(sviews["selectable_default_views"]) > 1
 
         # the first view is always the default view
-        assert sviews['selectable_default_views'][0]['is_current'] is True
-        assert sviews['selectable_default_views'][0]['name'] == 'default'
-        assert sviews['selectable_default_views'][0]['title'] == 'Default view'
+        assert sviews["selectable_default_views"][0]["is_current"] is True
+        assert sviews["selectable_default_views"][0]["name"] == "default"
+        assert sviews["selectable_default_views"][0]["title"] == "Default view"
 
-        assert sviews['selectable_default_views'][1]['is_current'] is False
+        assert sviews["selectable_default_views"][1]["is_current"] is False
 
         # set the default view to folder_view view
-        request = DummyRequest(GET={'view_name': 'folder_view'})
+        request = DummyRequest(GET={"view_name": "folder_view"})
         view = DefaultViewSelection(context, request)
 
         assert type(view.set_default_view()) == HTTPFound
-        assert context.default_view == 'folder_view'
+        assert context.default_view == "folder_view"
 
         # set back to default
-        request = DummyRequest(GET={'view_name': 'default'})
+        request = DummyRequest(GET={"view_name": "default"})
         view = DefaultViewSelection(context, request)
 
         assert type(view.set_default_view()) == HTTPFound
         assert context.default_view is None
 
         # try to set non existing view
-        request = DummyRequest(GET={'view_name': 'nonexisting'})
+        request = DummyRequest(GET={"view_name": "nonexisting"})
         view = DefaultViewSelection(context, request)
 
         assert type(view.set_default_view()) == HTTPFound
@@ -82,4 +81,7 @@ def test_warning_for_non_registered_views(self, root):
 
             assert len(w) == 1
             assert issubclass(w[-1].category, UserWarning)
-            assert str(w[-1].message) == "No view called 'folder_view' is registered for <Document 1 at />."  # noqa
+            assert (
+                str(w[-1].message)
+                == "No view called 'folder_view' is registered for <Document 1 at />."
+            )  # noqa
diff --git a/kotti/tests/test_deprecated.py b/kotti/tests/test_deprecated.py
index 44e548dab..58f744a08 100644
--- a/kotti/tests/test_deprecated.py
+++ b/kotti/tests/test_deprecated.py
@@ -13,7 +13,6 @@ def assert_deprecations(w, *msgs):
 
 
 class TestToBeRemovedIn20:
-
     def test_type_info_action_links_deprecated(self, allwarnings):
         from kotti.resources import TypeInfo
         from kotti.util import LinkParent
@@ -22,8 +21,7 @@ def test_type_info_action_links_deprecated(self, allwarnings):
         with warnings.catch_warnings(record=True) as wngs:
             # If there's a last LinkParent item, we'll assume that is
             # the action menu.
-            TypeInfo(edit_links=[LinkParent('foo', [])],
-                     action_links=[my_item])
+            TypeInfo(edit_links=[LinkParent("foo", [])], action_links=[my_item])
             assert wngs[0].category == DeprecationWarning
 
         with raises(ValueError):
@@ -34,6 +32,7 @@ def test_type_info_action_links_deprecated(self, allwarnings):
     def test_object_after_delete(self, allwarnings):
         with warnings.catch_warnings(record=True) as w:
             from kotti.events import ObjectAfterDelete
+
             __ = ObjectAfterDelete  # pyflakes
             assert_deprecations(w, "Kotti 0.10")
 
@@ -42,8 +41,8 @@ def test_translate_titles_deprecated(self, allwarnings):
 
         with warnings.catch_warnings(record=True) as w:
             info = [
-                {'data': {'title': "_('Private')"}, 'title': "_('Private')", },
-                {'data': {'title': "_('Public')"}, 'title': "_('Public')", },
+                {"data": {"title": "_('Private')"}, "title": "_('Private')"},
+                {"data": {"title": "_('Public')"}, "title": "_('Public')"},
             ]
             _translate_titles(info)
             assert_deprecations(w, "removed in Kotti 2.0.0")
diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 4524349cb..9be36db37 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -12,26 +12,26 @@ def attach(self, wrapped, fn, category=None):
 
 
 class TestEvents:
-    @mark.user('bob')
+    @mark.user("bob")
     def test_owner(self, root, db_session, events, dummy_request):
         from kotti.resources import Content
         from kotti.security import list_groups
         from kotti.security import list_groups_raw
         from kotti.util import clear_cache
 
-        child = root['child'] = Content()
+        child = root["child"] = Content()
         db_session.flush()
-        assert child.owner == 'bob'
-        assert list_groups('bob', child) == ['role:owner']
+        assert child.owner == "bob"
+        assert list_groups("bob", child) == ["role:owner"]
 
         clear_cache()
 
         # The event listener does not set the role again for subitems:
-        grandchild = child['grandchild'] = Content()
+        grandchild = child["grandchild"] = Content()
         db_session.flush()
-        assert grandchild.owner == 'bob'
-        assert list_groups('bob', grandchild) == ['role:owner']
-        assert len(list_groups_raw('bob', grandchild)) == 0
+        assert grandchild.owner == "bob"
+        assert list_groups("bob", grandchild) == ["role:owner"]
+        assert len(list_groups_raw("bob", grandchild)) == 0
 
     def test_sqlalchemy_events(self, root, db_session, events):
         from kotti import events
@@ -58,8 +58,12 @@ def after_delete(event):
             after_delete_events.append(event)
 
         def lengths():
-            return (len(insert_events), len(update_events),
-                    len(delete_events), len(after_delete_events))
+            return (
+                len(insert_events),
+                len(update_events),
+                len(delete_events),
+                len(after_delete_events),
+            )
 
         lis = events.objectevent_listeners
         lis[(events.ObjectInsert, None)].append(insert)
@@ -68,12 +72,12 @@ def lengths():
         with warnings.catch_warnings(record=True):
             lis[(events.ObjectAfterDelete, None)].append(after_delete)
 
-        child = root['child'] = Content()
+        child = root["child"] = Content()
         db_session.flush()
         assert lengths() == (1, 0, 0, 0)
         assert insert_events[0].object == child
 
-        child.title = 'Bar'
+        child.title = "Bar"
         db_session.flush()
         assert lengths() == (1, 1, 0, 0)
         assert update_events[0].object == child
@@ -103,7 +107,7 @@ def handler(event):
         assert dec.evttype is object
         assert dec.objtype is None
         assert decorated == handler
-        assert (handler, dec.register, 'kotti') in dec.venusian.attached
+        assert (handler, dec.register, "kotti") in dec.venusian.attached
         assert handler in listeners[object]
         assert handler not in objectevent_listeners[object]
 
@@ -116,7 +120,7 @@ def handler(event):
         assert dec.evttype is ObjectEvent
         assert dec.objtype is None
         assert decorated == handler
-        assert (handler, dec.register, 'kotti') in dec.venusian.attached
+        assert (handler, dec.register, "kotti") in dec.venusian.attached
         assert handler not in listeners[ObjectEvent]
         assert handler in objectevent_listeners[(ObjectEvent, None)]
 
@@ -129,7 +133,7 @@ def handler(event):
         assert dec.evttype is ObjectEvent
         assert dec.objtype is Document
         assert decorated == handler
-        assert (handler, dec.register, 'kotti') in dec.venusian.attached
+        assert (handler, dec.register, "kotti") in dec.venusian.attached
         assert handler not in listeners[ObjectEvent]
         assert handler in objectevent_listeners[(ObjectEvent, Document)]
 
@@ -139,8 +143,8 @@ def test_set_modification_date(self, root, db_session, events):
         from kotti.resources import Document
 
         # create 2 documents
-        d1 = root['d1'] = Document(title='One')
-        d2 = root['d2'] = Document(title='Two')
+        d1 = root["d1"] = Document(title="One")
+        d2 = root["d2"] = Document(title="Two")
         assert d1.position == 0
         assert d2.position == 1
         db_session.flush()
@@ -158,8 +162,8 @@ def test_set_modification_date(self, root, db_session, events):
         assert d2.modification_date == md2
 
         # changing anything else should update modification_date
-        d1.title = 'Eins'
-        d2.title = 'Zwei'
+        d1.title = "Eins"
+        d2.title = "Zwei"
         db_session.flush()
         assert d1.modification_date != md1
         assert d2.modification_date != md2
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 497b6681e..4f4f254b9 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -16,19 +16,19 @@
 class TestFileViews:
     def _create_file(self, config):
         from kotti.resources import File
-        self.file = File(asset('logo.png').read(), 'myfüle.png', 'image/png')
+
+        self.file = File(asset("logo.png").read(), "myfüle.png", "image/png")
 
     def _test_common_headers(self, headers):
-        for name in ('Content-Disposition', 'Content-Length', 'Content-Type'):
+        for name in ("Content-Disposition", "Content-Length", "Content-Type"):
             assert isinstance(headers[name], str)
-        assert headers["Content-Length"] == '55715'
-        assert headers["Content-Type"] == 'image/png'
-
-    @pytest.mark.parametrize("params",
-                             [(inline_view, 'inline'),
-                              (attachment_view, 'attachment')])
-    def test_file_views(self, params, config, filedepot, dummy_request,
-                        depot_tween):
+        assert headers["Content-Length"] == "55715"
+        assert headers["Content-Type"] == "image/png"
+
+    @pytest.mark.parametrize(
+        "params", [(inline_view, "inline"), (attachment_view, "attachment")]
+    )
+    def test_file_views(self, params, config, filedepot, dummy_request, depot_tween):
         view, disposition = params
         self._create_file(config)
 
@@ -37,11 +37,12 @@ def test_file_views(self, params, config, filedepot, dummy_request,
         self._test_common_headers(res.headers)
 
         assert res.content_disposition.startswith(
-            '{0}; filename=my'.format(disposition))
+            "{0}; filename=my".format(disposition)
+        )
 
-        data = asset('logo.png').read()
+        data = asset("logo.png").read()
         assert res.body == data
-        assert b''.join(res.app_iter) == data
+        assert b"".join(res.app_iter) == data
 
 
 class TestFileEditForm:
@@ -54,123 +55,124 @@ def make_one(self):
     def test_edit_with_file(self, db_session, filedepot):
         view = self.make_one()
         view.edit(
-            title='A title', description='A description',
-            tags=['A tag'],
+            title="A title",
+            description="A description",
+            tags=["A tag"],
             file=dict(
-                fp=BytesIO(b'filecontents'),
-                filename='myfile.png',
-                mimetype='image/png',
+                fp=BytesIO(b"filecontents"),
+                filename="myfile.png",
+                mimetype="image/png",
                 size=10,
-                uid='randomabc',
-                ),
-            )
-        assert view.context.title == 'A title'
-        assert view.context.description == 'A description'
-        assert view.context.data.file.read() == b'filecontents'
-        assert view.context.filename == 'myfile.png'
-        assert view.context.mimetype == 'image/png'
-        assert view.context.size == len(b'filecontents')
+                uid="randomabc",
+            ),
+        )
+        assert view.context.title == "A title"
+        assert view.context.description == "A description"
+        assert view.context.data.file.read() == b"filecontents"
+        assert view.context.filename == "myfile.png"
+        assert view.context.mimetype == "image/png"
+        assert view.context.size == len(b"filecontents")
         assert view.context.tags == ["A tag"]
 
     def test_edit_without_file(self, filedepot):
         view = self.make_one()
-        view.context.data = b'filecontents'
-        view.context.filename = 'myfile.png'
-        view.context.mimetype = 'image/png'
+        view.context.data = b"filecontents"
+        view.context.filename = "myfile.png"
+        view.context.mimetype = "image/png"
         view.context.size = 777
         with patch("kotti.views.edit.content._to_fieldstorage") as tfs:
-            view.edit(title='A title',
-                      description='A description',
-                      tags=[],
-                      file=null)
+            view.edit(title="A title", description="A description", tags=[], file=null)
             assert tfs.call_count == 0
-            assert view.context.title == 'A title'
-            assert view.context.description == 'A description'
-            assert view.context.data.file.read() == b'filecontents'
-            assert view.context.filename == 'myfile.png'
-            assert view.context.mimetype == 'image/png'
+            assert view.context.title == "A title"
+            assert view.context.description == "A description"
+            assert view.context.data.file.read() == b"filecontents"
+            assert view.context.filename == "myfile.png"
+            assert view.context.mimetype == "image/png"
             assert view.context.size == 777
 
 
 class TestFileAddForm:
     def make_one(self):
         from kotti.views.edit.content import FileAddForm
+
         return FileAddForm(MagicMock(), DummyRequest())
 
     def test_add(self, config, filedepot):
         view = self.make_one()
         file = view.add(
-            title='A title',
-            description='A description',
+            title="A title",
+            description="A description",
             tags=[],
             file=dict(
-                fp=BytesIO(b'filecontents'),
-                filename='myfile.png',
-                mimetype='image/png',
+                fp=BytesIO(b"filecontents"),
+                filename="myfile.png",
+                mimetype="image/png",
                 size=None,
                 uid="randomabc",
-                ),
-            )
+            ),
+        )
 
-        assert file.title == 'A title'
-        assert file.description == 'A description'
+        assert file.title == "A title"
+        assert file.description == "A description"
         assert file.tags == []
-        assert file.data.file.read() == b'filecontents'
-        assert file.filename == 'myfile.png'
-        assert file.mimetype == 'image/png'
-        assert file.size == len(b'filecontents')
+        assert file.data.file.read() == b"filecontents"
+        assert file.filename == "myfile.png"
+        assert file.mimetype == "image/png"
+        assert file.size == len(b"filecontents")
 
 
 class TestFileUploadTempStore:
     def make_one(self):
         from kotti.views.form import FileUploadTempStore
+
         return FileUploadTempStore(DummyRequest())
 
     def test_keys(self):
         tmpstore = self.make_one()
-        tmpstore.session['important'] = 3
-        tmpstore.session['_secret'] = 4
-        assert tmpstore.keys() == ['important']
+        tmpstore.session["important"] = 3
+        tmpstore.session["_secret"] = 4
+        assert tmpstore.keys() == ["important"]
 
     def test_delitem(self):
         tmpstore = self.make_one()
-        tmpstore.session['important'] = 3
-        del tmpstore['important']
-        assert 'important' not in tmpstore.session
+        tmpstore.session["important"] = 3
+        del tmpstore["important"]
+        assert "important" not in tmpstore.session
 
     def test_setitem_with_stream(self):
         ts = self.make_one()
-        ts['a'] = {'fp': BytesIO(b'test'), 'marker': 'yes'}
-        assert ts.session['a'] == {'file_contents': b'test', 'marker': 'yes'}
-        v = ts['a']
-        assert 'fp' in v.keys()
-        assert v['marker'] == 'yes'
-        assert v['fp'].read() == b'test'
+        ts["a"] = {"fp": BytesIO(b"test"), "marker": "yes"}
+        assert ts.session["a"] == {"file_contents": b"test", "marker": "yes"}
+        v = ts["a"]
+        assert "fp" in v.keys()
+        assert v["marker"] == "yes"
+        assert v["fp"].read() == b"test"
 
     def test_setitem_with_empty(self):
         ts = self.make_one()
-        ts['a'] = {'fp': None, 'marker': 'yes'}
-        assert ts.session['a'] == {'file_contents': b'', 'marker': 'yes'}
-        assert ts['a'] == {'fp': None, 'marker': 'yes'}
+        ts["a"] = {"fp": None, "marker": "yes"}
+        assert ts.session["a"] == {"file_contents": b"", "marker": "yes"}
+        assert ts["a"] == {"fp": None, "marker": "yes"}
 
 
 class TestDepotStore:
 
     from kotti.resources import File
 
-    @pytest.mark.parametrize("factory", [File, ])
+    @pytest.mark.parametrize("factory", [File])
     def test_create(self, factory, filedepot, image_asset, app):
         data = image_asset.read()
         f = factory(data)
-        if factory.__class__.__name__ == 'File':
-            assert len(f.data['files']) == 1
-        elif factory.__class__.__name__ == 'Image':
-            assert len(f.data['files']) == 4
+        if factory.__class__.__name__ == "File":
+            assert len(f.data["files"]) == 1
+        elif factory.__class__.__name__ == "Image":
+            assert len(f.data["files"]) == 4
         assert f.data.file.read() == data
 
-    @pytest.mark.parametrize("factory", [File, ])
-    def test_edit_content(self, factory, filedepot, image_asset, image_asset2,
-                          app, db_session):
+    @pytest.mark.parametrize("factory", [File])
+    def test_edit_content(
+        self, factory, filedepot, image_asset, image_asset2, app, db_session
+    ):
         data = image_asset.read()
         f = factory(data)
         assert f.data.file.read() == data
@@ -181,13 +183,12 @@ def test_edit_content(self, factory, filedepot, image_asset, image_asset2,
 
         assert f.data.file.read() == data2
 
-    @pytest.mark.parametrize("factory", [File, ])
-    def test_session_rollback(self, factory, db_session, filedepot, image_asset,
-                              app):
+    @pytest.mark.parametrize("factory", [File])
+    def test_session_rollback(self, factory, db_session, filedepot, image_asset, app):
         storage = filedepot.get()
 
-        f = factory(data=image_asset.read(), name='content', title='content')
-        id = f.data['file_id']
+        f = factory(data=image_asset.read(), name="content", title="content")
+        id = f.data["file_id"]
 
         db_session.add(f)
         db_session.flush()
@@ -198,14 +199,13 @@ def test_session_rollback(self, factory, db_session, filedepot, image_asset,
             storage.get(id)
         assert storage.delete.called
 
-    @pytest.mark.parametrize("factory", [File, ])
-    def test_delete(self, factory, db_session, root, filedepot, image_asset,
-                    app):
+    @pytest.mark.parametrize("factory", [File])
+    def test_delete(self, factory, db_session, root, filedepot, image_asset, app):
 
         storage = filedepot.get()
 
-        f = factory(data=image_asset, name='content', title='content')
-        id = f.data['file_id']
+        f = factory(data=image_asset, name="content", title="content")
+        id = f.data["file_id"]
         root[str(id)] = f
         db_session.flush()
 
@@ -213,6 +213,7 @@ def test_delete(self, factory, db_session, root, filedepot, image_asset,
 
         del root[str(id)]
         import transaction
+
         transaction.commit()
 
         with pytest.raises(IOError):
@@ -221,11 +222,11 @@ def test_delete(self, factory, db_session, root, filedepot, image_asset,
 
 
 class TestUploadedFileResponse:
-    def _create_file(self,
-                     data=b'file contents',
-                     filename='myfüle.png',
-                     mimetype='image/png'):
+    def _create_file(
+        self, data=b"file contents", filename="myfüle.png", mimetype="image/png"
+    ):
         from kotti.resources import File
+
         return File(data, filename, mimetype)
 
     def test_as_body(self, filedepot, image_asset, dummy_request):
@@ -237,24 +238,25 @@ def test_as_body(self, filedepot, image_asset, dummy_request):
 
     def test_as_app_iter(self, filedepot, image_asset, dummy_request):
         from pyramid.response import FileIter
+
         data = image_asset.read()
         f = self._create_file(data)
         # resp = UploadedFileResponse(f.data, DummyRequest())
         resp = dummy_request.uploaded_file_response(f.data)
         assert isinstance(resp.app_iter, FileIter)
-        assert b''.join(resp.app_iter) == data
+        assert b"".join(resp.app_iter) == data
 
     def test_unknown_filename(self, filedepot, image_asset2, dummy_request):
-        f = self._create_file(b'foo', "file.bar", None)
+        f = self._create_file(b"foo", "file.bar", None)
         # resp = UploadedFileResponse(f.data, DummyRequest())
         resp = dummy_request.uploaded_file_response(f.data)
-        assert resp.headers['Content-Type'] == 'application/octet-stream'
+        assert resp.headers["Content-Type"] == "application/octet-stream"
 
     def test_guess_content_type(self, filedepot, image_asset, dummy_request):
         f = self._create_file(image_asset.read(), "file.png", None)
         # resp = UploadedFileResponse(f.data, DummyRequest())
         resp = dummy_request.uploaded_file_response(f.data)
-        assert resp.headers['Content-Type'] == 'image/png'
+        assert resp.headers["Content-Type"] == "image/png"
 
     def test_caching(self, filedepot, monkeypatch, dummy_request):
         import datetime
@@ -268,19 +270,18 @@ class mockdatetime:
             def utcnow():
                 return d
 
-        monkeypatch.setattr(webob.response, 'datetime', mockdatetime)
+        monkeypatch.setattr(webob.response, "datetime", mockdatetime)
 
         # resp = UploadedFileResponse(f.data, DummyRequest(), cache_max_age=10)
         resp = dummy_request.uploaded_file_response(f.data, cache_max_age=10)
 
         # this is set by filedepot fixture
-        assert resp.headers['Last-Modified'] == 'Sun, 30 Dec 2012 00:00:00 GMT'
-        assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
+        assert resp.headers["Last-Modified"] == "Sun, 30 Dec 2012 00:00:00 GMT"
+        assert resp.headers["Expires"] == "Mon, 31 Dec 2012 13:00:10 GMT"
 
     def test_redirect(self, filedepot, dummy_request):
-
         class PublicFile(object):
-            public_url = 'http://example.com'
+            public_url = "http://example.com"
 
         class PublicData(object):
             file = PublicFile()
@@ -290,15 +291,15 @@ class PublicData(object):
             dummy_request.uploaded_file_response(PublicData())
 
         response = e.value
-        assert response.headers['Location'] == 'http://example.com'
+        assert response.headers["Location"] == "http://example.com"
 
 
 class TestStoredFileResponse:
-    def _create_file(self,
-                     data=b"file contents",
-                     filename="myfüle.png",
-                     mimetype="image/png"):
+    def _create_file(
+        self, data=b"file contents", filename="myfüle.png", mimetype="image/png"
+    ):
         from kotti.resources import File
+
         return File(data, filename, mimetype)
 
     def test_as_body(self, filedepot, image_asset, dummy_request):
@@ -309,21 +310,22 @@ def test_as_body(self, filedepot, image_asset, dummy_request):
 
     def test_as_app_iter(self, filedepot, image_asset, dummy_request):
         from pyramid.response import FileIter
+
         data = image_asset.read()
         f = self._create_file(data)
         resp = StoredFileResponse(f.data.file, dummy_request)
         assert isinstance(resp.app_iter, FileIter)
-        assert b''.join(resp.app_iter) == data
+        assert b"".join(resp.app_iter) == data
 
     def test_unknown_filename(self, filedepot, image_asset2, dummy_request):
-        f = self._create_file(b'foo', "file.bar", None)
+        f = self._create_file(b"foo", "file.bar", None)
         resp = StoredFileResponse(f.data.file, dummy_request)
-        assert resp.headers['Content-Type'] == 'application/octet-stream'
+        assert resp.headers["Content-Type"] == "application/octet-stream"
 
     def test_guess_content_type(self, filedepot, image_asset, dummy_request):
         f = self._create_file(image_asset.read(), "file.png", None)
         resp = StoredFileResponse(f.data.file, dummy_request)
-        assert resp.headers['Content-Type'] == 'image/png'
+        assert resp.headers["Content-Type"] == "image/png"
 
     def test_caching(self, filedepot, monkeypatch, dummy_request):
         import datetime
@@ -337,23 +339,23 @@ class mockdatetime:
             def utcnow():
                 return d
 
-        monkeypatch.setattr(webob.response, 'datetime', mockdatetime)
+        monkeypatch.setattr(webob.response, "datetime", mockdatetime)
 
         resp = dummy_request.uploaded_file_response(f.data)
-        assert resp.headers['Expires'] == 'Mon, 07 Jan 2013 13:00:00 GMT'
+        assert resp.headers["Expires"] == "Mon, 07 Jan 2013 13:00:00 GMT"
 
         resp = dummy_request.uploaded_file_response(f.data, cache_max_age=10)
-        assert resp.headers['Expires'] == 'Mon, 31 Dec 2012 13:00:10 GMT'
+        assert resp.headers["Expires"] == "Mon, 31 Dec 2012 13:00:10 GMT"
 
         # this is set by filedepot fixture
-        assert resp.headers['Last-Modified'] == 'Sun, 30 Dec 2012 00:00:00 GMT'
+        assert resp.headers["Last-Modified"] == "Sun, 30 Dec 2012 00:00:00 GMT"
 
     def test_redirect(self, filedepot, dummy_request):
         class PublicFile(object):
-            public_url = 'http://example.com'
+            public_url = "http://example.com"
 
         with pytest.raises(HTTPMovedPermanently) as e:
             StoredFileResponse(PublicFile(), dummy_request)
 
         response = e.value
-        assert response.headers['Location'] == 'http://example.com'
+        assert response.headers["Location"] == "http://example.com"
diff --git a/kotti/tests/test_filedepot.py b/kotti/tests/test_filedepot.py
index c15a230d1..033e42c37 100644
--- a/kotti/tests/test_filedepot.py
+++ b/kotti/tests/test_filedepot.py
@@ -8,35 +8,39 @@
 
 
 class TestDBStoredFile:
-
     def test_storedfile_interface(self, db_session, events, setup_app):
-        f = DBStoredFile('fileid', filename='f.jpg', content_type='image/jpeg',
-                         content_length=1000, data=b'content')
+        f = DBStoredFile(
+            "fileid",
+            filename="f.jpg",
+            content_type="image/jpeg",
+            content_length=1000,
+            data=b"content",
+        )
 
         assert f.close() is None
         assert f.closed() is False
         assert f.seekable() is True
         assert f.writable() is False
 
-        assert f.read() == b'content'
-        assert f.read() == b''
+        assert f.read() == b"content"
+        assert f.read() == b""
         f.seek(0)
-        assert f.read() == b'content'
+        assert f.read() == b"content"
         f.seek(0)
-        assert f.read(-1) == b'content'
+        assert f.read(-1) == b"content"
         f.seek(0)
-        assert f.read(2) == b'co'
-        assert f.read(4) == b'nten'
+        assert f.read(2) == b"co"
+        assert f.read(4) == b"nten"
         assert f.tell() == 6
         f.seek(0)
         f.seek(100)
         assert f.tell() == 100
-        assert f.read() == b''
+        assert f.read() == b""
 
         assert f.content_length == 1000
-        assert f.content_type == 'image/jpeg'
-        assert f.file_id == 'fileid'
-        assert f.filename == 'f.jpg'
+        assert f.content_type == "image/jpeg"
+        assert f.file_id == "fileid"
+        assert f.filename == "f.jpg"
         assert f.name == "f.jpg"
         assert f.public_url is None
 
@@ -46,16 +50,16 @@ def test_storedfile_interface(self, db_session, events, setup_app):
         assert f.content_length == 0
 
     def test_content_length(self, db_session, events, setup_app):
-        f = DBStoredFile('fileid', data=b"content")
+        f = DBStoredFile("fileid", data=b"content")
         db_session.add(f)
         db_session.flush()
 
         assert f.content_length == 7
 
-        f.data = b'content changed'
+        f.data = b"content changed"
         db_session.flush()
 
-        assert f.content_length == len(b'content changed')
+        assert f.content_length == len(b"content changed")
 
     def test_last_modified(self, monkeypatch, db_session, events, setup_app):
         from kotti import filedepot
@@ -67,30 +71,29 @@ class mockdatetime:
             def now():
                 return now
 
-        monkeypatch.setattr(filedepot, 'datetime', mockdatetime)
+        monkeypatch.setattr(filedepot, "datetime", mockdatetime)
 
-        f = DBStoredFile('fileid', data=b"content")
+        f = DBStoredFile("fileid", data=b"content")
         db_session.add(f)
         db_session.flush()
 
         assert f.last_modified == now
 
         f.last_modified = None
-        f.data = b'content changed'
+        f.data = b"content changed"
         db_session.flush()
 
         assert f.last_modified == now
 
 
 class TestDBFileStorage:
-
-    def make_one(self,
-                 content=b'content here',
-                 filename='f.jpg',
-                 content_type='image/jpg'):
+    def make_one(
+        self, content=b"content here", filename="f.jpg", content_type="image/jpg"
+    ):
 
         file_id = DBFileStorage().create(
-            content=content, filename=filename, content_type=content_type)
+            content=content, filename=filename, content_type=content_type
+        )
         return file_id
 
     def test_create(self, db_session):
@@ -117,7 +120,7 @@ def test_get(self, db_session):
         assert DBFileStorage().get(file_id).data == b"content here"
 
     def test_delete(self, db_session):
-        file_id = DBFileStorage().create(b'content here', 'f.jpg', 'image/jpg')
+        file_id = DBFileStorage().create(b"content here", "f.jpg", "image/jpg")
         fs = DBFileStorage().get(file_id)
 
         db_session.add(fs)
@@ -131,29 +134,29 @@ def test_delete(self, db_session):
     def test_replace(self, db_session):
         file_id = self.make_one()
 
-        DBFileStorage().replace(file_id, b'second content', 'f2.jpg', 'doc')
+        DBFileStorage().replace(file_id, b"second content", "f2.jpg", "doc")
         fs = DBFileStorage().get(file_id)
-        assert fs.filename == 'f2.jpg'
-        assert fs.content_type == 'doc'
-        assert fs.read() == b'second content'
+        assert fs.filename == "f2.jpg"
+        assert fs.content_type == "doc"
+        assert fs.read() == b"second content"
 
-        DBFileStorage().replace(fs, b'third content', 'f3.jpg', 'xls')
-        assert fs.filename == 'f3.jpg'
-        assert fs.content_type == 'xls'
-        assert fs.read() == b'third content'
+        DBFileStorage().replace(fs, b"third content", "f3.jpg", "xls")
+        assert fs.filename == "f3.jpg"
+        assert fs.content_type == "xls"
+        assert fs.read() == b"third content"
 
     def test_session_integration(self, db_session):
         from depot.manager import DepotManager
 
-        DepotManager._default_depot = 'default'
-        DepotManager._depots = {'default': DBFileStorage()}
+        DepotManager._default_depot = "default"
+        DepotManager._depots = {"default": DBFileStorage()}
 
-        file_id = DepotManager.get().create(
-            b'content here', 'f.jpg', 'image/jpg')
+        file_id = DepotManager.get().create(b"content here", "f.jpg", "image/jpg")
         fs = DepotManager.get().get(file_id)
 
         db_session.add(fs)
         import transaction
+
         transaction.commit()
 
         transaction.begin()
@@ -165,19 +168,18 @@ def test_session_integration(self, db_session):
 
 
 class TestMigrateBetweenStorage:
-
     def _create_content(self, db_session, root, image1, image2):
         data = [
-            (b'f1...', 'file1.jpg', 'image/jpeg'),
-            (b'f2...', 'file2.png', 'image/png'),
+            (b"f1...", "file1.jpg", "image/jpeg"),
+            (b"f2...", "file2.png", "image/png"),
         ]
         for row in data:
             f = File(data=row[0], filename=row[1], mimetype=row[2])
             root[row[1]] = f
 
         data = [
-            (image2, 'image1.jpg', 'image/jpeg'),
-            (image1, 'image2.png', 'image/png'),
+            (image2, "image1.jpg", "image/jpeg"),
+            (image1, "image2.png", "image/png"),
         ]
         for row in data:
             f = File(data=row[0], filename=row[1], mimetype=row[2])
@@ -185,8 +187,9 @@ def _create_content(self, db_session, root, image1, image2):
 
         db_session.flush()
 
-    def test_migrate_between_storages(self, db_session, root, no_filedepots,
-                                      image_asset, image_asset2):
+    def test_migrate_between_storages(
+        self, db_session, root, no_filedepots, image_asset, image_asset2
+    ):
         from kotti.filedepot import configure_filedepot
         from kotti.filedepot import migrate_storage
         from kotti.resources import Node
@@ -196,19 +199,18 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots,
         import tempfile
         import shutil
 
-        event.listen(db_session,
-                     'before_commit',
-                     _SQLAMutationTracker._session_committed)
+        event.listen(
+            db_session, "before_commit", _SQLAMutationTracker._session_committed
+        )
 
         tmp_location = tempfile.mkdtemp()
 
         settings = {
-            'kotti.depot.0.backend': 'kotti.filedepot.DBFileStorage',
-            'kotti.depot.0.name': 'dbfiles',
-
-            'kotti.depot.1.backend': 'depot.io.local.LocalFileStorage',
-            'kotti.depot.1.name': 'localfs',
-            'kotti.depot.1.storage_path': tmp_location,
+            "kotti.depot.0.backend": "kotti.filedepot.DBFileStorage",
+            "kotti.depot.0.name": "dbfiles",
+            "kotti.depot.1.backend": "depot.io.local.LocalFileStorage",
+            "kotti.depot.1.name": "localfs",
+            "kotti.depot.1.storage_path": tmp_location,
         }
 
         configure_filedepot(settings)
@@ -218,7 +220,7 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots,
 
         assert db_session.query(DBStoredFile).count() == 4
 
-        migrate_storage('dbfiles', 'localfs')
+        migrate_storage("dbfiles", "localfs")
 
         folders = os.listdir(tmp_location)
         assert len(folders) == 4
@@ -230,20 +232,20 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots,
         _SQLAMutationTracker._session_committed(db_session)
 
         root = db_session.query(Node).filter_by(parent=None).one()
-        f1 = root['file1.jpg']
+        f1 = root["file1.jpg"]
         assert f1.data.file_id in folders
-        assert f1.data.file.read() == b'f1...'
+        assert f1.data.file.read() == b"f1..."
 
-        f2 = root['file2.png']
+        f2 = root["file2.png"]
         assert f2.data.file_id in folders
-        assert f2.data.file.read() == b'f2...'
+        assert f2.data.file.read() == b"f2..."
 
-        i1 = root['image1.jpg']
+        i1 = root["image1.jpg"]
         assert i1.data.file_id in folders
         i1data = i1.data.file.read()
         assert i1data == image2
 
-        i2 = root['image2.png']
+        i2 = root["image2.png"]
         assert i2.data.file_id in folders
         i2data = i2.data.file.read()
         assert i2data == image1
@@ -254,26 +256,25 @@ def test_migrate_between_storages(self, db_session, root, no_filedepots,
 
 
 class TestTween:
-
-    @pytest.mark.user('admin')
+    @pytest.mark.user("admin")
     def test_tween(self, webtest, filedepot, root, image_asset, db_session):
 
         from kotti.resources import File
         from kotti.resources import get_root
 
         # create an image resource
-        root['img'] = File(data=image_asset.read(), title='Image')
+        root["img"] = File(data=image_asset.read(), title="Image")
         db_session.flush()
         root = get_root()
-        img = root['img']
+        img = root["img"]
 
         # the image resource itself is served by the full Kotti stack
-        resp = webtest.app.get('/img')
-        assert resp.content_type == 'text/html'
+        resp = webtest.app.get("/img")
+        assert resp.content_type == "text/html"
         assert resp.etag is None
         assert resp.cache_control.max_age == 0
         assert '<a href="http://localhost/img/@@attachment-view">' in resp.text
 
         # test 404
-        resp = webtest.app.get('/depot/non_existing/fileid', status=404)
+        resp = webtest.app.get("/depot/non_existing/fileid", status=404)
         assert resp.status_code == 404
diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 0d7a4de80..67ae05c18 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -9,129 +9,132 @@
 class TestLogin:
     def test_it(self, app):
         res = app.post(
-            '/@@login', dict(login='admin', password='secret', submit='submit'))
-        assert res.status == '302 Found'
+            "/@@login", dict(login="admin", password="secret", submit="submit")
+        )
+        assert res.status == "302 Found"
         res = res.maybe_follow()
-        assert res.status == '200 OK'
+        assert res.status == "200 OK"
 
 
 class TestForbidden:
     def test_forbidden(self, app):
-        app.get('/@@edit', headers={'Accept': '*/json'}, status=403)
+        app.get("/@@edit", headers={"Accept": "*/json"}, status=403)
 
     def test_forbidden_redirect(self, app):
-        res = app.get('/@@edit', headers={'Accept': 'text/html'}, status=302)
-        assert res.location.startswith('http://localhost/@@login?came_from=')
+        res = app.get("/@@edit", headers={"Accept": "text/html"}, status=302)
+        assert res.location.startswith("http://localhost/@@login?came_from=")
 
     def test_forbidden_redirect_when_authenticated(self, app):
-        with patch('pyramid.request.Request.authenticated_userid', 'foo'):
-            res = app.get('/@@edit', status=302)
-        assert res.location == 'http://localhost/@@forbidden'
+        with patch("pyramid.request.Request.authenticated_userid", "foo"):
+            res = app.get("/@@edit", status=302)
+        assert res.location == "http://localhost/@@forbidden"
 
 
 # noinspection PyUnusedLocal
 class TestUploadFile:
-
-    def add_file(self, browser, contents=b'ABC'):
+    def add_file(self, browser, contents=b"ABC"):
         file_ctrl = browser.getControl("File")
-        file_ctrl.add_file(contents, 'image/gif', 'my_image.gif')
-        browser.getControl('save').click()
+        file_ctrl.add_file(contents, "image/gif", "my_image.gif")
+        browser.getControl("save").click()
 
-    def add_file2(self, resp, contents=b'ABC'):
-        form = resp.forms['deform']
-        form['upload'] = Upload('my_image.gif', contents, 'image/gif')
+    def add_file2(self, resp, contents=b"ABC"):
+        form = resp.forms["deform"]
+        form["upload"] = Upload("my_image.gif", contents, "image/gif")
         return form.submit().maybe_follow()
 
-    @user('admin')
+    @user("admin")
     def test_it(self, browser, filedepot):
-        browser.open(BASE_URL + '/@@add_file')
+        browser.open(BASE_URL + "/@@add_file")
         self.add_file(browser)
         assert "Item was added" in browser.contents
 
-    @user('admin')
+    @user("admin")
     def test_view_uploaded_file(self, browser, filedepot):
-        browser.open(BASE_URL + '/@@add_file')
+        browser.open(BASE_URL + "/@@add_file")
         self.add_file(browser)
         browser.getLink("View").click()
         browser.getLink("Download file").click()
-        assert browser.contents == b'ABC'
+        assert browser.contents == b"ABC"
 
-    @user('admin')
+    @user("admin")
     def test_tempstorage(self, app, filedepot, browser):
 
         # 1. upload a file
-        browser.open(BASE_URL + '/@@add_file')
-        self.add_file(browser, contents=b'DEF')
+        browser.open(BASE_URL + "/@@add_file")
+        self.add_file(browser, contents=b"DEF")
 
         # 2. edit the uploaded file, blanking out the title field
         browser.getLink("Edit").click()
-        browser.getControl("Title").value = ''  # the error
-        browser.getControl('save').click()
+        browser.getControl("Title").value = ""  # the error
+        browser.getControl("save").click()
         assert "Your changes have been saved" not in browser.contents
 
         # 3. fill out the title field again
-        browser.getControl("Title").value = 'A title'
-        browser.getControl('save').click()
+        browser.getControl("Title").value = "A title"
+        browser.getControl("save").click()
         assert "Your changes have been saved" in browser.contents
 
         # 4. view / download the file
         browser.getLink("View").click()
         browser.getLink("Download file").click()
-        assert browser.contents == b'DEF'
+        assert browser.contents == b"DEF"
 
-    @user('admin')
+    @user("admin")
     def test_edit_uploaded_file(self, browser, filedepot):
         # 1. upload a file
-        browser.open(BASE_URL + '/@@add_file')
-        self.add_file(browser, contents=b'GHI')
+        browser.open(BASE_URL + "/@@add_file")
+        self.add_file(browser, contents=b"GHI")
         # 2. edit without making changes
         browser.getLink("Edit").click()
-        browser.getControl('save').click()
+        browser.getControl("save").click()
         # 3. download
         browser.getLink("Download file").click()
-        assert browser.contents == b'GHI'
+        assert browser.contents == b"GHI"
 
 
 class TestValidatorMaxLength:
-
-    @user('admin')
+    @user("admin")
     def test_title_max_length_document_ko(self, browser, filedepot):
-        browser.open(BASE_URL + '/@@add_document')
+        browser.open(BASE_URL + "/@@add_document")
         from kotti.resources import Node
+
         max_length = Node.name.property.columns[0].type.length
-        browser.getControl("Title").value = '1' * (max_length + 1)  # the error
-        browser.getControl('save').click()
+        browser.getControl("Title").value = "1" * (max_length + 1)  # the error
+        browser.getControl("save").click()
         assert "Item was added" not in browser.contents
 
-    @user('admin')
+    @user("admin")
     def test_title_max_length_document_ok(self, browser):
-        browser.open(BASE_URL + '/@@add_document')
+        browser.open(BASE_URL + "/@@add_document")
         from kotti.resources import Node
+
         max_length = Node.name.property.columns[0].type.length
-        browser.getControl("Title").value = '1' * max_length
-        browser.getControl('save').click()
+        browser.getControl("Title").value = "1" * max_length
+        browser.getControl("save").click()
         assert "Item was added" in browser.contents
 
-    @user('admin')
+    @user("admin")
     def test_title_max_length_file_ok(self, browser):
-        browser.open(BASE_URL + '/@@add_file')
+        browser.open(BASE_URL + "/@@add_file")
         from kotti.resources import Node
+
         max_length = Node.name.property.columns[0].type.length
-        browser.getControl("Title").value = '1' * max_length
+        browser.getControl("Title").value = "1" * max_length
         file_ctrl = browser.getControl("File")
-        file_ctrl.add_file(b"abc", 'image/gif', 'my_image.gif')
-        browser.getControl('save').click()
+        file_ctrl.add_file(b"abc", "image/gif", "my_image.gif")
+        browser.getControl("save").click()
         assert "Item was added" in browser.contents
 
-    @user('admin')
+    @user("admin")
     def test_title_max_length_file_ko(self, browser):
-        browser.open(BASE_URL + '/@@add_file')
+        browser.open(BASE_URL + "/@@add_file")
         from kotti.resources import Node
+
         max_length = Node.name.property.columns[0].type.length
-        browser.getControl("Title").value = '1' * (max_length + 1)  # the error
+        browser.getControl("Title").value = "1" * (max_length + 1)  # the error
         file_ctrl = browser.getControl("File")
-        file_ctrl.add_file(b"abc", 'image/gif', 'my_image.gif')
-        browser.getControl('save').click()
+        file_ctrl.add_file(b"abc", "image/gif", "my_image.gif")
+        browser.getControl("save").click()
         assert "Item was added" not in browser.contents
 
 
@@ -143,11 +146,11 @@ class TestBrowser:
 
     @staticmethod
     def _login(app, login, password):
-        resp = app.get('/@@login')
-        form = resp.forms['login-form']
-        form['login'] = login
-        form['password'] = password
-        resp = form.submit('submit')
+        resp = app.get("/@@login")
+        form = resp.forms["login-form"]
+        form["login"] = login
+        form["password"] = password
+        resp = form.submit("submit")
         return resp
 
     @staticmethod
@@ -165,61 +168,61 @@ def _select_children(resp, *child_idx):
         :rtype: :class:`webtest.forms.Form`
         """
 
-        form = resp.forms['form-contents']
-        form['children'] = [
-            cb._value for cb in [
-                form.fields['children'][idx] for idx in child_idx]]
+        form = resp.forms["form-contents"]
+        form["children"] = [
+            cb._value for cb in [form.fields["children"][idx] for idx in child_idx]
+        ]
 
         return form
 
     def test_login(self, webtest):
 
         # get the frontpage
-        resp = webtest.app.get('/')
+        resp = webtest.app.get("/")
         assert "You have successfully installed Kotti." in resp.text
 
         # access a protected URL
-        resp = webtest.app.get('/edit').maybe_follow()
+        resp = webtest.app.get("/edit").maybe_follow()
         assert "Log in" in resp.text
 
         # submit the login form
-        form = resp.forms['login-form']
-        assert form['came_from'].value == 'http://localhost/edit'
-        form['login'] = 'admin'
-        form['password'] = 'secret'
+        form = resp.forms["login-form"]
+        assert form["came_from"].value == "http://localhost/edit"
+        form["login"] = "admin"
+        form["password"] = "secret"
 
-        resp = form.submit('submit').maybe_follow()
+        resp = form.submit("submit").maybe_follow()
         assert "Welcome, Administrator" in resp.text
 
         # log out
-        resp = resp.click('Logout').maybe_follow()
+        resp = resp.click("Logout").maybe_follow()
         assert "You have been logged out" in resp.text
 
         # attempt to login with wrong credentials
-        form = resp.forms['login-form']
-        assert form['came_from'].value == 'http://localhost/edit'
-        form['login'] = 'admin'
-        form['password'] = 'funny'
+        form = resp.forms["login-form"]
+        assert form["came_from"].value == "http://localhost/edit"
+        form["login"] = "admin"
+        form["password"] = "funny"
 
-        resp = form.submit('submit')
+        resp = form.submit("submit")
         assert "Welcome, Adminstrator" not in resp.text
         assert "Login failed" in resp.text
 
         # and again, this time with correct credentials
-        form = resp.forms['login-form']
-        assert form['came_from'].value == 'http://localhost/edit'
-        form['login'] = 'admin'
-        form['password'] = 'secret'
-        resp = form.submit('submit').maybe_follow()
+        form = resp.forms["login-form"]
+        assert form["came_from"].value == "http://localhost/edit"
+        form["login"] = "admin"
+        form["password"] = "secret"
+        resp = form.submit("submit").maybe_follow()
         assert "Welcome, Administrator" in resp.text
 
-    @pytest.mark.user('admin')
+    @pytest.mark.user("admin")
     def test_exception_views(self, webtest):
         app = webtest.app
-        resp = app.get('/this-does-not-exist', status=404)
+        resp = app.get("/this-does-not-exist", status=404)
         assert "<h1>Not Found</h1>" in resp.text
 
-    @pytest.mark.user('admin')
+    @pytest.mark.user("admin")
     def test_content_management(self, webtest):
 
         from kotti.resources import Document
@@ -229,498 +232,536 @@ def test_content_management(self, webtest):
         save_addable_file = File.type_info.addable_to
 
         app = webtest.app
-        resp = app.get('/')
+        resp = app.get("/")
 
         # Add a document
-        resp = resp.click('Document', index=0)
+        resp = resp.click("Document", index=0)
         assert "Add Document to Welcome to Kotti" in resp.text
-        form = resp.forms['deform']
-        form['title'] = "Child One"
-        resp = form.submit('save').maybe_follow()
+        form = resp.forms["deform"]
+        form["title"] = "Child One"
+        resp = form.submit("save").maybe_follow()
         assert "Item was added" in resp.text
-        assert resp.request.path == '/child-one/'
+        assert resp.request.path == "/child-one/"
 
         # Edit the document
-        resp = resp.click('Edit')
+        resp = resp.click("Edit")
         assert "Edit Child One" in resp.text
-        form = resp.forms['deform']
-        form['title'] = "First Child"
-        resp = form.submit('save').maybe_follow()
+        form = resp.forms["deform"]
+        form["title"] = "First Child"
+        resp = form.submit("save").maybe_follow()
         assert "Your changes have been saved" in resp.text
 
-        resp = resp.click('Edit')
-        form = resp.forms['deform']
-        assert form['title'].value == "First Child"
-        resp = resp.click('Edit')
+        resp = resp.click("Edit")
+        form = resp.forms["deform"]
+        assert form["title"].value == "First Child"
+        resp = resp.click("Edit")
         assert "First Child" in resp.text
 
         # And now force a validation error:
-        resp = resp.click('Edit')
-        form = resp.forms['deform']
-        form['title'] = ""
-        resp = form.submit('save')
+        resp = resp.click("Edit")
+        form = resp.forms["deform"]
+        form["title"] = ""
+        resp = form.submit("save")
         assert "There was a problem" in resp.text
-        assert form['title'].value == ''
+        assert form["title"].value == ""
 
         # And now click the 'Cancel' button:
-        resp = resp.click('Edit')
-        form = resp.forms['deform']
-        form['title'] = "Firstborn"
-        resp = form.submit('cancel').maybe_follow()
-        assert 'deform' not in resp.forms
+        resp = resp.click("Edit")
+        form = resp.forms["deform"]
+        form["title"] = "Firstborn"
+        resp = form.submit("cancel").maybe_follow()
+        assert "deform" not in resp.forms
         assert "Firstborn" not in resp.text
 
         # Now click the 'Cancel' button for an invalid form entry:
-        resp = resp.click('Edit')
-        form = resp.forms['deform']
-        form['title'] = ""
-        resp = form.submit('cancel').maybe_follow()
-        assert 'deform' not in resp.forms
+        resp = resp.click("Edit")
+        form = resp.forms["deform"]
+        form["title"] = ""
+        resp = form.submit("cancel").maybe_follow()
+        assert "deform" not in resp.forms
         assert "Firstborn" not in resp.text
 
         # Add two more documents, at different levels
-        resp = app.get('/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Second Child"
-        resp = form.submit('save').maybe_follow()
+        resp = app.get("/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Second Child"
+        resp = form.submit("save").maybe_follow()
         assert "Item was added" in resp.text
-        assert resp.request.path == '/second-child/'
+        assert resp.request.path == "/second-child/"
 
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Grandchild"
-        resp = form.submit('save').maybe_follow()
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Grandchild"
+        resp = form.submit("save").maybe_follow()
         assert "Item was added" in resp.text
-        assert resp.request.path == '/second-child/grandchild/'
+        assert resp.request.path == "/second-child/grandchild/"
 
         # Add another grandchild with the same name:
-        resp = app.get('/second-child/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Grandchild"
-        resp = form.submit('save').maybe_follow()
+        resp = app.get("/second-child/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Grandchild"
+        resp = form.submit("save").maybe_follow()
         assert "Item was added" in resp.text
-        assert resp.request.path == '/second-child/grandchild-1/'
+        assert resp.request.path == "/second-child/grandchild-1/"
 
         # There's no Add link if nothing can be added:
-        resp = app.get('/second-child/grandchild-1/')
+        resp = app.get("/second-child/grandchild-1/")
         try:
             Document.type_info.addable_to = ()
             File.type_info.addable_to = ()
             with pytest.raises(IndexError):
-                resp.click(href='add_')
+                resp.click(href="add_")
         finally:
             Document.type_info.addable_to = save_addable_document
             File.type_info.addable_to = save_addable_file
 
         # Add a file
-        resp = app.get('/')
-        resp = resp.click('File', index=0)
-        form = resp.forms['deform']
-        form['description'] = "A tiny file"
-        form['upload'] = Upload('tiny.txt', b'tiny', 'text/plain')
-        resp = form.submit('save').maybe_follow()
+        resp = app.get("/")
+        resp = resp.click("File", index=0)
+        form = resp.forms["deform"]
+        form["description"] = "A tiny file"
+        form["upload"] = Upload("tiny.txt", b"tiny", "text/plain")
+        resp = form.submit("save").maybe_follow()
         assert "Item was added" in resp.text
-        assert resp.request.path == '/tiny.txt/'
+        assert resp.request.path == "/tiny.txt/"
 
         # Add a file larger than maximum file size
-        resp = app.get('/')
-        resp = resp.click('File', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Huge file"
-        form['description'] = "A huge file"
-        form['upload'] = Upload('huge.txt',
-                                b'*' * (1024 * 1024 * 1024), 'text/plain')
-        resp = form.submit('save')
+        resp = app.get("/")
+        resp = resp.click("File", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Huge file"
+        form["description"] = "A huge file"
+        form["upload"] = Upload("huge.txt", b"*" * (1024 * 1024 * 1024), "text/plain")
+        resp = form.submit("save")
         assert "There was a problem" in resp.text
         assert "Maximum file size" in resp.text
 
         # Add tags to a document:
-        resp = app.get('/second-child/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Grandchild"
-        form['tags'] = ''
-        form.submit('save').maybe_follow()
-        resp = app.get('/second-child/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Grandchild"
-        form['tags'] = 'tag 1, tag 2,tag 3'
-        form.submit('save').maybe_follow()
-        resp = app.get('/second-child/grandchild-2/@@edit')
-        form = resp.forms['deform']
-        assert 'tag 1' in resp.text
-        assert 'tag 2' in resp.text
-        assert 'tag 3' in resp.text
-        form['tags'] = 'tag 1, tag 4, tag 5,tag 6, tag 7, übertag'
-        form.submit('save').maybe_follow()
-        resp = app.get('/second-child/grandchild-2/@@edit')
+        resp = app.get("/second-child/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Grandchild"
+        form["tags"] = ""
+        form.submit("save").maybe_follow()
+        resp = app.get("/second-child/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Grandchild"
+        form["tags"] = "tag 1, tag 2,tag 3"
+        form.submit("save").maybe_follow()
+        resp = app.get("/second-child/grandchild-2/@@edit")
+        form = resp.forms["deform"]
+        assert "tag 1" in resp.text
+        assert "tag 2" in resp.text
+        assert "tag 3" in resp.text
+        form["tags"] = "tag 1, tag 4, tag 5,tag 6, tag 7, übertag"
+        form.submit("save").maybe_follow()
+        resp = app.get("/second-child/grandchild-2/@@edit")
         assert 'value="tag 1,tag 4,tag 5,tag 6,tag 7,übertag"' in resp.text
 
         # Delete a document
-        resp = app.get('/second-child/grandchild/')
-        resp = resp.click('Delete', index=0)
-        form = resp.forms['form-delete']
-        resp = form.submit('cancel')
+        resp = app.get("/second-child/grandchild/")
+        resp = resp.click("Delete", index=0)
+        form = resp.forms["form-delete"]
+        resp = form.submit("cancel")
         assert "Grandchild was deleted" not in resp.text
-        resp = app.get('/second-child/grandchild/')
-        resp = resp.click('Delete', index=0)
-        form = resp.forms['form-delete']
-        resp = form.submit('delete', value='delete').maybe_follow()
+        resp = app.get("/second-child/grandchild/")
+        resp = resp.click("Delete", index=0)
+        form = resp.forms["form-delete"]
+        resp = form.submit("delete", value="delete").maybe_follow()
         assert "Grandchild was deleted" in resp.text
-        assert resp.request.path == '/second-child/'
+        assert resp.request.path == "/second-child/"
 
         # Copy and paste
-        resp = app.get('/second-child/')
-        resp = resp.click('Cut', index=0).maybe_follow()
+        resp = app.get("/second-child/")
+        resp = resp.click("Cut", index=0).maybe_follow()
         assert "Second Child was cut" in resp.text
-        resp = app.get('/child-one/')
-        resp = resp.click('Paste', index=0).maybe_follow()
+        resp = app.get("/child-one/")
+        resp = resp.click("Paste", index=0).maybe_follow()
         assert "Second Child was pasted" in resp.text
-        app.get('/second-child/', status=404)
-        resp = app.get('/child-one/second-child/')
-        resp = resp.click('Copy', index=0).maybe_follow()
+        app.get("/second-child/", status=404)
+        resp = app.get("/child-one/second-child/")
+        resp = resp.click("Copy", index=0).maybe_follow()
         assert "Second Child was copied" in resp.text
-        resp = app.get('/')
-        resp = resp.click('Paste', index=0).maybe_follow()
+        resp = app.get("/")
+        resp = resp.click("Paste", index=0).maybe_follow()
         assert "Second Child was pasted" in resp.text
 
         # We can paste twice since we copied:
-        resp = app.get('/')
-        resp = resp.click('Paste', index=0).maybe_follow()
+        resp = app.get("/")
+        resp = resp.click("Paste", index=0).maybe_follow()
         assert "Second Child was pasted" in resp.text
-        resp = app.get('/second-child/')
+        resp = app.get("/second-child/")
         assert "Second Child" in resp.text
-        resp = app.get('/second-child-1/')
+        resp = app.get("/second-child-1/")
         assert "Second Child" in resp.text
 
         # We can also copy and paste items that contain children,
         # like the whole site:
-        resp = app.get('/')
-        resp = resp.click('Copy', index=0).maybe_follow()
+        resp = app.get("/")
+        resp = resp.click("Copy", index=0).maybe_follow()
         assert "Welcome to Kotti was copied" in resp.text
-        resp = app.get('/second-child/')
-        resp = resp.click('Paste', index=0).maybe_follow()
+        resp = app.get("/second-child/")
+        resp = resp.click("Paste", index=0).maybe_follow()
         assert "Welcome to Kotti was pasted" in resp.text
-        resp = app.get('/second-child/welcome-to-kotti/')
+        resp = app.get("/second-child/welcome-to-kotti/")
         assert resp.status_code == 200
-        resp = app.get('/second-child/welcome-to-kotti/second-child/')
+        resp = app.get("/second-child/welcome-to-kotti/second-child/")
         assert resp.status_code == 200
 
         # And finally cut and paste a tree:
-        resp = app.get('/second-child/')
-        resp.click('Cut', index=0).maybe_follow()
-        resp = app.get('/child-one/second-child/')
-        resp = resp.click('Paste', index=0).maybe_follow()
+        resp = app.get("/second-child/")
+        resp.click("Cut", index=0).maybe_follow()
+        resp = app.get("/child-one/second-child/")
+        resp = resp.click("Paste", index=0).maybe_follow()
         assert "Second Child was pasted" in resp.text
-        app.get('/second-child/', status=404)
+        app.get("/second-child/", status=404)
 
         # Note how we can't cut and paste an item into itself:
-        resp = app.get('/child-one/')
-        resp.click('Cut', index=0).maybe_follow()
+        resp = app.get("/child-one/")
+        resp.click("Cut", index=0).maybe_follow()
         with pytest.raises(IndexError):
-            resp.click('Paste', index=0).maybe_follow()
-        resp = app.get('/child-one/second-child/')
+            resp.click("Paste", index=0).maybe_follow()
+        resp = app.get("/child-one/second-child/")
         with pytest.raises(IndexError):
-            resp.click('Paste', index=0).maybe_follow()
+            resp.click("Paste", index=0).maybe_follow()
 
         # Whether we can paste or not also depends on the
         # ``type_info.addable`` property:
-        resp = app.get('/child-one/')
-        resp.click('Copy', index=0).maybe_follow()
-        resp = app.get('/child-one/second-child/')
-        resp.click('Paste', index=0).maybe_follow()
+        resp = app.get("/child-one/")
+        resp.click("Copy", index=0).maybe_follow()
+        resp = app.get("/child-one/second-child/")
+        resp.click("Paste", index=0).maybe_follow()
         try:
             Document.type_info.addable_to = ()
-            resp = app.get('/child-one/second-child/')
+            resp = app.get("/child-one/second-child/")
             with pytest.raises(IndexError):
-                resp.click('Paste', index=0).maybe_follow()
+                resp.click("Paste", index=0).maybe_follow()
         finally:
             Document.type_info.addable_to = save_addable_document
 
         # You can't cut the root of a site:
-        resp = app.get('/child-one/')
-        resp.click('Cut', index=0)
-        resp = app.get('/')
+        resp = app.get("/child-one/")
+        resp.click("Cut", index=0)
+        resp = app.get("/")
         with pytest.raises(IndexError):
-            resp.click('Cut', index=0)
+            resp.click("Cut", index=0)
 
         # We can rename an item. Slashes will be stripped out.:
-        resp = app.get('/child-one/second-child/')
-        resp = resp.click('Rename', index=0)
-        form = resp.forms['form-rename']
-        assert form['name'].value == 'second-child'
-        assert form['title'].value == 'Second Child'
-        form['name'] = 'thi/rd-ch/ild'
-        form['title'] = 'My Third Child'
-        resp = form.submit('rename').maybe_follow()
+        resp = app.get("/child-one/second-child/")
+        resp = resp.click("Rename", index=0)
+        form = resp.forms["form-rename"]
+        assert form["name"].value == "second-child"
+        assert form["title"].value == "Second Child"
+        form["name"] = "thi/rd-ch/ild"
+        form["title"] = "My Third Child"
+        resp = form.submit("rename").maybe_follow()
         assert "Item was renamed" in resp.text
-        assert resp.request.path == '/child-one/third-child/'
+        assert resp.request.path == "/child-one/third-child/"
 
         # We cannot rename the root:
-        resp = app.get('/')
+        resp = app.get("/")
         with pytest.raises(IndexError):
-            resp.click('Rename', index=0)
+            resp.click("Rename", index=0)
 
         # On setup pages we can't use the actions:
-        resp = app.get('/')
-        resp = resp.click('User Management', index=0)
+        resp = app.get("/")
+        resp = resp.click("User Management", index=0)
         with pytest.raises(IndexError):
-            resp.click('Copy', index=0)
-        resp = resp.click('Preferences', index=0)
+            resp.click("Copy", index=0)
+        resp = resp.click("Preferences", index=0)
         with pytest.raises(IndexError):
-            resp.click('Copy', index=0)
+            resp.click("Copy", index=0)
 
         # Contents view actions
-        resp = app.get('/child-one')
-        resp = resp.click('Contents', index=0)
-        assert resp.request.path == '/child-one/@@contents'
-        resp = resp.forms['form-contents'].submit('copy').maybe_follow()
-        assert 'You have to select items' in resp.text
+        resp = app.get("/child-one")
+        resp = resp.click("Contents", index=0)
+        assert resp.request.path == "/child-one/@@contents"
+        resp = resp.forms["form-contents"].submit("copy").maybe_follow()
+        assert "You have to select items" in resp.text
         form = self._select_children(resp, 0)
-        resp = form.submit('copy').maybe_follow()
-        assert 'My Third Child was copied.' in resp.text
-        resp = app.get('/second-child-1/@@contents')
-        assert 'My Third Child' not in resp.text
-        resp = resp.forms['form-contents'].submit('paste').maybe_follow()
-        assert 'My Third Child' in resp.text
-        resp = app.get('/second-child-1/@@contents')
+        resp = form.submit("copy").maybe_follow()
+        assert "My Third Child was copied." in resp.text
+        resp = app.get("/second-child-1/@@contents")
+        assert "My Third Child" not in resp.text
+        resp = resp.forms["form-contents"].submit("paste").maybe_follow()
+        assert "My Third Child" in resp.text
+        resp = app.get("/second-child-1/@@contents")
         form = self._select_children(resp, 0)
-        resp = form.submit('cut').maybe_follow()
-        assert 'cut.' in resp.text
-        resp = app.get('/child-one/@@contents')
+        resp = form.submit("cut").maybe_follow()
+        assert "cut." in resp.text
+        resp = app.get("/child-one/@@contents")
         assert "Grandchild" not in resp.text
-        resp = resp.forms['form-contents'].submit('paste').maybe_follow()
+        resp = resp.forms["form-contents"].submit("paste").maybe_follow()
         assert "Grandchild" in resp.text
         with pytest.raises(IndexError):
-            resp.click('Paste')
-        resp = app.get('/child-one/@@contents')
+            resp.click("Paste")
+        resp = app.get("/child-one/@@contents")
         form = self._select_children(resp, 0, 1)
-        form.submit('cut').maybe_follow()
-        resp = app.get('/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = 'Forth child'
-        form.submit('save').maybe_follow()
-        resp = app.get('/forth-child/@@contents')
+        form.submit("cut").maybe_follow()
+        resp = app.get("/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Forth child"
+        form.submit("save").maybe_follow()
+        resp = app.get("/forth-child/@@contents")
         assert "Grandchild" not in resp.text
         assert "My Third Child" not in resp.text
-        resp.forms['form-contents'].submit('paste').maybe_follow()
-        resp = app.get('/forth-child/@@contents')
+        resp.forms["form-contents"].submit("paste").maybe_follow()
+        resp = app.get("/forth-child/@@contents")
         assert "Grandchild" in resp.text
         assert "My Third Child" in resp.text
-        resp = app.get('/child-one/@@contents')
+        resp = app.get("/child-one/@@contents")
         assert "Grandchild" not in resp.text
-        resp = app.get('/forth-child/@@contents')
-        assert 'third-child' in resp.text
-        assert 'Grandchild' in resp.text
-        assert 'child-the-third' not in resp.text
-        assert 'Hello Bob' not in resp.text
+        resp = app.get("/forth-child/@@contents")
+        assert "third-child" in resp.text
+        assert "Grandchild" in resp.text
+        assert "child-the-third" not in resp.text
+        assert "Hello Bob" not in resp.text
         form = self._select_children(resp, 0, 1)
-        resp = form.submit('rename_nodes').maybe_follow()
-        resp = resp.forms['form-rename-nodes'].submit('cancel').maybe_follow()
-        assert 'No changes were made.' in resp.text
-        assert resp.request.path == '/forth-child/@@contents'
+        resp = form.submit("rename_nodes").maybe_follow()
+        resp = resp.forms["form-rename-nodes"].submit("cancel").maybe_follow()
+        assert "No changes were made." in resp.text
+        assert resp.request.path == "/forth-child/@@contents"
         form = self._select_children(resp, 0, 1)
-        resp = form.submit('rename_nodes').maybe_follow()
-        form = resp.forms['form-rename-nodes']
-        form[form.submit_fields()[1][0]] = 'child-the-third'
-        form[form.submit_fields()[2][0]] = 'child, the third'
-        form[form.submit_fields()[4][0]] = 'hello-bob'
-        form[form.submit_fields()[5][0]] = 'Hello Bob'
-        resp = form.submit('rename_nodes').maybe_follow()
-        assert resp.request.path == '/forth-child/@@contents'
-        assert 'third-child' not in resp.text
-        assert 'Grandchild' not in resp.text
-        assert 'child-the-third' in resp.text
-        assert 'Hello Bob' in resp.text
-
-        resp = resp.click('File', index=0)
-        form = resp.forms['deform']
-        form['description'] = 'A file'
-        form['upload'] = Upload('some.txt', b'something', 'text/plain')
-        form.submit('save').maybe_follow()
-        resp = app.get('/forth-child/@@contents')
+        resp = form.submit("rename_nodes").maybe_follow()
+        form = resp.forms["form-rename-nodes"]
+        form[form.submit_fields()[1][0]] = "child-the-third"
+        form[form.submit_fields()[2][0]] = "child, the third"
+        form[form.submit_fields()[4][0]] = "hello-bob"
+        form[form.submit_fields()[5][0]] = "Hello Bob"
+        resp = form.submit("rename_nodes").maybe_follow()
+        assert resp.request.path == "/forth-child/@@contents"
+        assert "third-child" not in resp.text
+        assert "Grandchild" not in resp.text
+        assert "child-the-third" in resp.text
+        assert "Hello Bob" in resp.text
+
+        resp = resp.click("File", index=0)
+        form = resp.forms["deform"]
+        form["description"] = "A file"
+        form["upload"] = Upload("some.txt", b"something", "text/plain")
+        form.submit("save").maybe_follow()
+        resp = app.get("/forth-child/@@contents")
         form = self._select_children(resp, 0, 1, 2)
-        resp = form.submit('delete_nodes').maybe_follow()
-        resp = resp.forms['form-delete-nodes'].submit('cancel').maybe_follow()
-        assert 'No changes were made.' in resp.text
-        assert resp.request.path == '/forth-child/@@contents'
+        resp = form.submit("delete_nodes").maybe_follow()
+        resp = resp.forms["form-delete-nodes"].submit("cancel").maybe_follow()
+        assert "No changes were made." in resp.text
+        assert resp.request.path == "/forth-child/@@contents"
         form = self._select_children(resp, 0, 1, 2)
-        resp = form.submit('delete_nodes').maybe_follow()
+        resp = form.submit("delete_nodes").maybe_follow()
         assert "Are you sure" in resp.text
-        resp = resp.forms['form-delete-nodes'].submit('delete_nodes',
-                                                      status=302).maybe_follow()
+        resp = (
+            resp.forms["form-delete-nodes"]
+            .submit("delete_nodes", status=302)
+            .maybe_follow()
+        )
         assert "child, the third was deleted." in resp.text
         assert "Hello Bob was deleted." in resp.text
         assert "some.txt was deleted." in resp.text
-        resp = app.get('/forth-child/@@contents')
+        resp = app.get("/forth-child/@@contents")
         assert "Welcome to Kotti" in resp.text
         assert '<i class="glyphicon glyphicon-home"></i>' in resp.text
         assert '<i class="glyphicon glyphicon-folder-open"></i>' in resp.text
-        assert '<i class="glyphicon glyphicon-folder-close"></i>' not in resp.text  # noqa
+        assert (
+            '<i class="glyphicon glyphicon-folder-close"></i>' not in resp.text
+        )  # noqa
 
         # Navigation
         resp = resp.click("Navigate")
         resp = resp.click("Second Child", index=0)
-        assert resp.request.path == '/second-child-1/'
+        assert resp.request.path == "/second-child-1/"
 
-    @pytest.mark.user('admin')
+    @pytest.mark.user("admin")
     def test_workflow_actions(self, webtest):
 
         app = webtest.app
 
         # Add a document
-        resp = app.get('/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Child One"
-        resp = form.submit('save').maybe_follow()
+        resp = app.get("/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Child One"
+        resp = form.submit("save").maybe_follow()
         assert "Item was added" in resp.text
-        assert resp.request.path == '/child-one/'
+        assert resp.request.path == "/child-one/"
 
         # Add more documents
-        resp = app.get('/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Second Child"
-        resp = form.submit('save').maybe_follow()
-        assert resp.request.path == '/second-child/'
-
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Third Child"
-        resp = form.submit('save').maybe_follow()
-        assert resp.request.path == '/second-child/third-child/'
-
-        resp = app.get('/second-child/third-child/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Grandchild 1"
-        resp = form.submit('save').maybe_follow()
-        assert resp.request.path == '/second-child/third-child/grandchild-1/'
-
-        resp = app.get('/second-child/third-child/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Grandchild 2"
-        resp = form.submit('save').maybe_follow()
-        assert resp.request.path == '/second-child/third-child/grandchild-2/'
-
-        resp = app.get('/second-child/third-child/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Grandchild 3"
-        resp = form.submit('save').maybe_follow()
-        assert resp.request.path == '/second-child/third-child/grandchild-3/'
-
-        resp = app.get('/second-child/third-child/')
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = "Child One"
-        resp = form.submit('save').maybe_follow()
-        assert resp.request.path == '/second-child/third-child/child-one/'
+        resp = app.get("/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Second Child"
+        resp = form.submit("save").maybe_follow()
+        assert resp.request.path == "/second-child/"
+
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Third Child"
+        resp = form.submit("save").maybe_follow()
+        assert resp.request.path == "/second-child/third-child/"
+
+        resp = app.get("/second-child/third-child/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Grandchild 1"
+        resp = form.submit("save").maybe_follow()
+        assert resp.request.path == "/second-child/third-child/grandchild-1/"
+
+        resp = app.get("/second-child/third-child/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Grandchild 2"
+        resp = form.submit("save").maybe_follow()
+        assert resp.request.path == "/second-child/third-child/grandchild-2/"
+
+        resp = app.get("/second-child/third-child/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Grandchild 3"
+        resp = form.submit("save").maybe_follow()
+        assert resp.request.path == "/second-child/third-child/grandchild-3/"
+
+        resp = app.get("/second-child/third-child/")
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Child One"
+        resp = form.submit("save").maybe_follow()
+        assert resp.request.path == "/second-child/third-child/child-one/"
 
         # Contents view change state actions (workflow)
         resp = resp.click("Second Child", index=0)
         resp = resp.click("Contents")
-        assert '/second-child/third-child/@@workflow-change?new_state=public' in resp.text  # noqa
-
-        resp = app.get('/second-child/third-child/@@workflow-change?new_state=public').maybe_follow()  # noqa
-        assert '/second-child/third-child/@@workflow-change?new_state=private' in resp.text  # noqa
-
-        resp = app.get('/second-child/third-child/@@contents')
+        assert (
+            "/second-child/third-child/@@workflow-change?new_state=public" in resp.text
+        )  # noqa
+
+        resp = app.get(
+            "/second-child/third-child/@@workflow-change?new_state=public"
+        ).maybe_follow()  # noqa
+        assert (
+            "/second-child/third-child/@@workflow-change?new_state=private" in resp.text
+        )  # noqa
+
+        resp = app.get("/second-child/third-child/@@contents")
         form = self._select_children(resp, 0, 1, 2)
-        resp = form.submit('change_state').maybe_follow()
-        assert 'Change workflow state' in resp.text
+        resp = form.submit("change_state").maybe_follow()
+        assert "Change workflow state" in resp.text
 
-        resp = resp.forms['form-change-state'].submit('cancel').maybe_follow()
-        assert 'No changes were made.' in resp.text
-        assert resp.request.path == '/second-child/third-child/@@contents'
+        resp = resp.forms["form-change-state"].submit("cancel").maybe_follow()
+        assert "No changes were made." in resp.text
+        assert resp.request.path == "/second-child/third-child/@@contents"
 
         form = self._select_children(resp, 0, 1, 2)
-        resp = form.submit('change_state').maybe_follow()
-        form = resp.forms['form-change-state']
-        form['children-to-change-state'] = []
-        resp = form.submit('change_state').maybe_follow()
-        assert 'No changes were made.' in resp.text
+        resp = form.submit("change_state").maybe_follow()
+        form = resp.forms["form-change-state"]
+        form["children-to-change-state"] = []
+        resp = form.submit("change_state").maybe_follow()
+        assert "No changes were made." in resp.text
 
         form = self._select_children(resp, 0, 1, 2)
-        resp = form.submit('change_state').maybe_follow()
-        form = resp.forms['form-change-state']
-        form['to-state'] = 'public'
-        resp = form.submit('change_state').maybe_follow()
-        assert 'Your changes have been saved.' in resp.text
-        assert '/second-child/third-child/grandchild-1/@@workflow-change?new_state=private' in resp.text  # noqa
-        assert '/second-child/third-child/grandchild-2/@@workflow-change?new_state=private' in resp.text  # noqa
-        assert '/second-child/third-child/grandchild-3/@@workflow-change?new_state=private' in resp.text  # noqa
-
-        resp = resp.click('Child One', index=1)
-        assert '/second-child/third-child/child-one/@@workflow-change?new_state=public' in resp.text  # noqa
-
-        app.get('/second-child/third-child/child-one/@@workflow-change?new_state=public')  # noqa
-        resp = app.get('/second-child/third-child/@@contents')
-        assert '/second-child/third-child/child-one/@@workflow-change?new_state=private' in resp.text  # noqa
-
-        resp = resp.click('Child One', index=1)
-        resp = resp.click('Document', index=0)
-        form = resp.forms['deform']
-        form['title'] = 'Sub child'
-        resp = form.submit('save').maybe_follow()
-        assert '/second-child/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.text  # noqa
-
-        resp = resp.click('Second Child', index=0)
-        resp = resp.click('Contents')
+        resp = form.submit("change_state").maybe_follow()
+        form = resp.forms["form-change-state"]
+        form["to-state"] = "public"
+        resp = form.submit("change_state").maybe_follow()
+        assert "Your changes have been saved." in resp.text
+        assert (
+            "/second-child/third-child/grandchild-1/@@workflow-change?new_state=private"
+            in resp.text
+        )  # noqa
+        assert (
+            "/second-child/third-child/grandchild-2/@@workflow-change?new_state=private"
+            in resp.text
+        )  # noqa
+        assert (
+            "/second-child/third-child/grandchild-3/@@workflow-change?new_state=private"
+            in resp.text
+        )  # noqa
+
+        resp = resp.click("Child One", index=1)
+        assert (
+            "/second-child/third-child/child-one/@@workflow-change?new_state=public"
+            in resp.text
+        )  # noqa
+
+        app.get(
+            "/second-child/third-child/child-one/@@workflow-change?new_state=public"
+        )  # noqa
+        resp = app.get("/second-child/third-child/@@contents")
+        assert (
+            "/second-child/third-child/child-one/@@workflow-change?new_state=private"
+            in resp.text
+        )  # noqa
+
+        resp = resp.click("Child One", index=1)
+        resp = resp.click("Document", index=0)
+        form = resp.forms["deform"]
+        form["title"] = "Sub child"
+        resp = form.submit("save").maybe_follow()
+        assert (
+            "/second-child/third-child/child-one/sub-child/@@workflow-change?new_state=public"
+            in resp.text
+        )  # noqa
 
-        form = self._select_children(resp, 0)
-        resp = form.submit('change_state').maybe_follow()
-        form = resp.forms['form-change-state']
-        form['include-children'] = 'include-children'
-        form['to-state'] = 'private'
-        resp = form.submit('change_state').maybe_follow()
-        assert 'Your changes have been saved.' in resp.text
-        assert '/second-child/third-child/@@workflow-change?new_state=public' in resp.text  # noqa
+        resp = resp.click("Second Child", index=0)
+        resp = resp.click("Contents")
 
-        resp = app.get('/second-child/third-child/child-one/sub-child/')
-        assert '/second-child/third-child/child-one/sub-child/@@workflow-change?new_state=public' in resp.text  # noqa
+        form = self._select_children(resp, 0)
+        resp = form.submit("change_state").maybe_follow()
+        form = resp.forms["form-change-state"]
+        form["include-children"] = "include-children"
+        form["to-state"] = "private"
+        resp = form.submit("change_state").maybe_follow()
+        assert "Your changes have been saved." in resp.text
+        assert (
+            "/second-child/third-child/@@workflow-change?new_state=public" in resp.text
+        )  # noqa
+
+        resp = app.get("/second-child/third-child/child-one/sub-child/")
+        assert (
+            "/second-child/third-child/child-one/sub-child/@@workflow-change?new_state=public"
+            in resp.text
+        )  # noqa
 
     def test_user_management(self, webtest, settings, dummy_mailer):
         from kotti import get_settings
-        get_settings()['kotti.site_title'] = 'Website des Kottbusser Tors'
+
+        get_settings()["kotti.site_title"] = "Website des Kottbusser Tors"
 
         app = webtest.app
-        resp = self._login(app, 'admin', 'secret').maybe_follow()
+        resp = self._login(app, "admin", "secret").maybe_follow()
 
         # The user management screen is available through
         # the "Site Setup" submenu
-        resp = resp.click('User Management')
+        resp = resp.click("User Management")
 
         # Add Bob's Group and assign the ``viewer`` role
-        form = resp.forms['deform_group_add']
-        form['name'] = 'bobsgroup'
-        form['title'] = "Bob's Group"
-        form.get('checkbox', index=0).checked = True
-        resp = form.submit('add_group').maybe_follow()
+        form = resp.forms["deform_group_add"]
+        form["name"] = "bobsgroup"
+        form["title"] = "Bob's Group"
+        form.get("checkbox", index=0).checked = True
+        resp = form.submit("add_group").maybe_follow()
         assert "Bob's Group was added" in resp.text
-        assert resp.forms['form-global-roles'][
-            'role::group:bobsgroup::role:viewer'].value == 'on'
+        assert (
+            resp.forms["form-global-roles"]["role::group:bobsgroup::role:viewer"].value
+            == "on"
+        )
 
         # And a Bob.
         # Only alphanumeric characters are allowed for the name
-        form = resp.forms['deform_user_add']
+        form = resp.forms["deform_user_add"]
         form["name"] = "bob:"
         form["title"] = "Bob Dabolina"
         form["password"] = "secret"
-        form['password-confirm'] = "secret"
+        form["password-confirm"] = "secret"
         form["email"] = "bob@DABOLINA.com"
         resp = form.submit("add_user")
         assert "There was a problem" in resp.text
 
         # Use a valid username now.  Note how the checkbox to send a password
         # registration link is ticked:
-        form = resp.forms['deform_user_add']
+        form = resp.forms["deform_user_add"]
         form["name"] = "Bob"
         form["email"] = "bob@DABOLINA.com"
         form["send_email"].checked = True
@@ -728,7 +769,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         assert "Bob Dabolina was added" in resp.text
 
         # We cannot add Bob twice:
-        form = resp.forms['deform_user_add']
+        form = resp.forms["deform_user_add"]
         form["name"] = "bob"
         form["title"] = "Bobby Brown"
         form["password"] = "secret"
@@ -737,26 +778,26 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         assert "A user with that name already exists" in resp.text
 
         # We cannot add Bob Dabolina's email twice:
-        form = resp.forms['deform_user_add']
+        form = resp.forms["deform_user_add"]
         form["name"] = "bob2"
         form["title"] = "Bobby Brown"
         form["email"] = "bob@dabolina.com"
         form["password"] = "secret"
-        form['password-confirm'] = "secret"
+        form["password-confirm"] = "secret"
         resp = form.submit("add_user")
         assert "A user with that email already exists" in resp.text
-        form = resp.forms['deform_user_add']
+        form = resp.forms["deform_user_add"]
         form["email"] = "bob@gmail.com"
         resp = form.submit("add_user").maybe_follow()
         assert "Bobby Brown was added" in resp.text
 
         # Searching for Bob will return both Bob and Bob's Group:
-        form = resp.forms['form-principal-search']
+        form = resp.forms["form-principal-search"]
         form["query"] = "Bob"
         resp = form.submit("search")
         assert "Bob Dabolina" in resp.text
         assert "Bob's Group" in resp.text
-        form = resp.forms['form-global-roles']
+        form = resp.forms["form-global-roles"]
         assert form["role::group:bobsgroup::role:viewer"].checked
         assert not form["role::group:bobsgroup::role:editor"].checked
         assert not form["role::bob::role:editor"].checked
@@ -764,44 +805,43 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         # We can click on the Bob's entry to edit the list of groups
         # he belongs to:
         resp = resp.click("Bob Dabolina")
-        form = resp.forms['deform']
+        form = resp.forms["deform"]
         form["group"] = "bobsgroup"
         resp = form.submit("save").maybe_follow()
         assert "Your changes have been saved" in resp.text
 
         # We cannot update on the Bobby Brown's entry with duplicated email:
         resp = resp.click("Back to User Management")
-        form = resp.forms['form-principal-search']
+        form = resp.forms["form-principal-search"]
         form["query"] = "Bobby"
         resp = form.submit("search")
         resp = resp.click("Bobby Brown")
-        form = resp.forms['deform']
+        form = resp.forms["deform"]
         form["email"] = "bob@dabolina.com"
         resp = form.submit("save")
         assert "A user with that email already exists" in resp.text
 
         # If we cancel the edit of the user, we are redirected to the
         # user management screen:
-        resp = resp.forms['deform'].submit("cancel").maybe_follow()
+        resp = resp.forms["deform"].submit("cancel").maybe_follow()
         assert "No changes were made." in resp.text
-        assert resp.request.path == '/@@setup-users'
+        assert resp.request.path == "/@@setup-users"
 
         # Back in user management we can see how Bob's inherited the
         # viewer role from Bob's Group:
-        form = resp.forms['form-principal-search']
+        form = resp.forms["form-principal-search"]
         form["query"] = "Bob"
         resp = form.submit("search")
-        form = resp.forms['form-global-roles']
+        form = resp.forms["form-global-roles"]
         assert form["role::group:bobsgroup::role:viewer"].checked
-        assert 'disabled' not in form[
-            "role::group:bobsgroup::role:viewer"].attrs
+        assert "disabled" not in form["role::group:bobsgroup::role:viewer"].attrs
         assert form["role::bob::role:viewer"].checked
-        assert 'disabled' in form["role::bob::role:viewer"].attrs
+        assert "disabled" in form["role::bob::role:viewer"].attrs
 
         # We can click on the Bob's Group entry to edit an email address:
         resp = resp.click("Bob's Group")
-        form = resp.forms['deform']
-        form["email"] = 'bogsgroup@gmail.com'
+        form = resp.forms["deform"]
+        form["email"] = "bogsgroup@gmail.com"
         resp = form.submit("save").maybe_follow()
         assert "Your changes have been saved" in resp.text
 
@@ -812,8 +852,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         # He can use it to set his own password:
         [email, email2] = dummy_mailer.outbox
         assert email.recipients == ['"Bob Dabolina" <bob@dabolina.com>']
-        assert email.subject == "Your registration for Website des " \
-                                "Kottbusser Tors"
+        assert email.subject == "Your registration for Website des " "Kottbusser Tors"
         assert "Hello, Bob Dabolina!" in email.body
         assert "You are joining Website des Kottbusser Tors." in email.body
         assert "Click here to set your password and log in:" in email.body
@@ -822,80 +861,82 @@ def test_user_management(self, webtest, settings, dummy_mailer):
 
         # We'll use that link to set our password:
         resp.click("Logout").maybe_follow()
-        path = email.body[email.body.index('http://localhost'):].split()[0][16:]
+        path = email.body[email.body.index("http://localhost") :].split()[0][16:]
         resp = app.get(path)
-        form = resp.forms['deform']
-        form['password'] = "newpassword"
-        form['password-confirm'] = "newpasswoops"  # a silly error
+        form = resp.forms["deform"]
+        form["password"] = "newpassword"
+        form["password-confirm"] = "newpasswoops"  # a silly error
         resp = form.submit("submit")
         assert "There was a problem with your submission" in resp.text
-        form = resp.forms['deform']
-        form['password'] = "newpassword"
-        form['password-confirm'] = "newpassword"
+        form = resp.forms["deform"]
+        form["password"] = "newpassword"
+        form["password-confirm"] = "newpassword"
         resp = form.submit("submit").maybe_follow()
         assert "You have reset your password" in resp.text
 
         # We cannot use that link again:
         resp = app.get(path)
-        form = resp.forms['deform']
-        form['password'] = "won't work"
-        form['password-confirm'] = "won't work"
+        form = resp.forms["deform"]
+        form["password"] = "won't work"
+        form["password-confirm"] = "won't work"
         resp = form.submit("submit")
         assert "Your password reset token may have expired" in resp.text
 
         # Log in as Bob with the new password:
-        resp = self._login(app, 'bOB', 'newpassword').maybe_follow()
+        resp = self._login(app, "bOB", "newpassword").maybe_follow()
         assert "Welcome, Bob Dabolina" in resp.text
-        app.get('/@@edit')
+        app.get("/@@edit")
         resp = resp.click("Logout").maybe_follow()
 
         # The login form has a "Reset password" button.  Let's try it:
         resp = self._login(app, "bobby", "")
         assert "Login failed." in resp.text
-        form = resp.forms['forgot-password-form']
-        form['login'] = "bob"
-        resp = form.submit('reset-password').maybe_follow()
+        form = resp.forms["forgot-password-form"]
+        form["login"] = "bob"
+        resp = form.submit("reset-password").maybe_follow()
         assert "You should be receiving an email" in resp.text
         [email1, email2, email3] = dummy_mailer.outbox
-        assert 'Hello, Bob Dabolina!' in email3.body
-        assert 'Click this link to reset your password at Website des ' \
-               'Kottbusser Tors:' in email3.body
+        assert "Hello, Bob Dabolina!" in email3.body
+        assert (
+            "Click this link to reset your password at Website des "
+            "Kottbusser Tors:" in email3.body
+        )
 
         # User preferences
         # ----------------
 
         # The "Preferences" link leads us to a form where the user can change
         # their preferences so the user need to be authenticated:
-        resp = self._login(app, 'admin', 'secret').maybe_follow()
+        resp = self._login(app, "admin", "secret").maybe_follow()
         assert "Welcome, Administrator" in resp.text
-        resp = app.get('/@@prefs')
-        form = resp.forms['deform']
-        form['title'] = "Mr. Administrator"
-        form['email'] = 'admin@minad.com'
+        resp = app.get("/@@prefs")
+        form = resp.forms["deform"]
+        form["title"] = "Mr. Administrator"
+        form["email"] = "admin@minad.com"
         resp = form.submit("save").maybe_follow()
         assert "Your changes have been saved" in resp.text
 
         # The email could not be used if already a users with that email exists:
-        form = resp.forms['deform']
-        form['email'] = 'bob@dabolina.com'
+        form = resp.forms["deform"]
+        form["email"] = "bob@dabolina.com"
         resp = form.submit("save")
 
         # If the user cancel the process he will be redirected to the site root:
-        form = resp.forms['deform']
+        form = resp.forms["deform"]
         resp = form.submit("cancel").maybe_follow()
-        assert 'Welcome to Kotti' in resp.text
+        assert "Welcome to Kotti" in resp.text
 
         # Share
         # -----
 
         # The Share tab allows us to assign users and groups to roles:
-        resp = app.get('/')
+        resp = app.get("/")
         resp = resp.click("Edit")
         resp = resp.click("Share")
 
         # We can search for users:
-        form = resp.forms['form-share-search']
-        form['query'] = "Bob"
+        form = resp.forms["form-share-search"]
+        form["query"] = "Bob"
         resp = form.submit("search")
 
         # Bob and Bob's Group are listed now:
@@ -904,34 +945,34 @@ def test_user_management(self, webtest, settings, dummy_mailer):
 
         # We add Bob's Group to Owners and Editors before taking away Owners
         # again:
-        form = resp.forms['form-share-assign']
+        form = resp.forms["form-share-assign"]
         form["role::group:bobsgroup::role:owner"].checked = True
         form["role::group:bobsgroup::role:editor"].checked = True
         resp = form.submit("apply").maybe_follow()
         assert "Your changes have been saved" in resp.text
         resp = app.get(resp.request.path)  # >>> browser.reload()
-        form = resp.forms['form-share-assign']
+        form = resp.forms["form-share-assign"]
         assert form["role::group:bobsgroup::role:owner"].checked
         assert form["role::group:bobsgroup::role:editor"].checked
         form["role::group:bobsgroup::role:owner"].checked = False
         resp = form.submit("apply").maybe_follow()
         assert "Your changes have been saved" in resp.text
-        form = resp.forms['form-share-assign']
+        form = resp.forms["form-share-assign"]
         assert not form["role::group:bobsgroup::role:owner"].checked
 
         # Not making any changes will give us a different feedback message:
         resp = form.submit("apply")
         assert "Your changes have been saved" not in resp.text
-        form = resp.forms['form-share-assign']
+        form = resp.forms["form-share-assign"]
         assert not form["role::group:bobsgroup::role:owner"].checked
         assert form["role::group:bobsgroup::role:editor"].checked
 
         # Bob should now have an inherited Editor role, because he's part of
         # Bob's Group:
-        form = resp.forms['form-share-search']
+        form = resp.forms["form-share-search"]
         form["query"] = "Bob Dabolina"
         resp = form.submit("search")
-        form = resp.forms['form-share-assign']
+        form = resp.forms["form-share-assign"]
         assert form["role::bob::role:editor"].checked
         # TODO assert 'disabled' in form["role::bob::role:editor"].attrs
         # TODO assert not form["role::bob::role:owner"].checked
@@ -943,75 +984,77 @@ def test_user_management(self, webtest, settings, dummy_mailer):
         resp = form.submit("apply").maybe_follow()
         assert "Your changes have been saved" in resp.text
         # TODO assert "Bob's Group" not in resp.text
-        form = resp.forms['form-share-assign']
+        form = resp.forms["form-share-assign"]
         assert not form["role::group:bobsgroup::role:editor"].checked
 
         # Delete users
         # ------------
 
-        resp = app.get('/')
+        resp = app.get("/")
         resp = resp.click("User Management")
 
         # We add a group and assign the ``Manager`` role to one:
-        form = resp.forms['deform_group_add']
-        form['name'] = "pelayogroup"
-        form['title'] = "Pelayo Group"
-        form.get('checkbox', index=3).checked = True
+        form = resp.forms["deform_group_add"]
+        form["name"] = "pelayogroup"
+        form["title"] = "Pelayo Group"
+        form.get("checkbox", index=3).checked = True
         resp = form.submit("add_group").maybe_follow()
         assert "Pelayo Group was added" in resp.text
-        form = resp.forms['form-global-roles']
+        form = resp.forms["form-global-roles"]
         assert form["role::group:pelayogroup::role:admin"].checked
 
         # And add some users to this group.
-        form = resp.forms['deform_user_add']
-        form['name'] = "Bruce"
-        form['title'] = "Bruce Pelayo"
-        form['password'] = "secret"
-        form['password-confirm'] = "secret"
-        form['email'] = "bruce@pelayno.com"
+        form = resp.forms["deform_user_add"]
+        form["name"] = "Bruce"
+        form["title"] = "Bruce Pelayo"
+        form["password"] = "secret"
+        form["password-confirm"] = "secret"
+        form["email"] = "bruce@pelayno.com"
         form["group"] = "pelayogroup"
         resp = form.submit("add_user").maybe_follow()
         assert "Bruce Pelayo was added" in resp.text
 
-        form = resp.forms['deform_user_add']
-        form['name'] = "Brian"
-        form['title'] = "Brian Pelayo"
-        form['password'] = "secret"
-        form['password-confirm'] = "secret"
-        form['email'] = "brian@pelayno.com"
+        form = resp.forms["deform_user_add"]
+        form["name"] = "Brian"
+        form["title"] = "Brian Pelayo"
+        form["password"] = "secret"
+        form["password-confirm"] = "secret"
+        form["email"] = "brian@pelayno.com"
         form["group"] = "pelayogroup"
         resp = form.submit("add_user").maybe_follow()
         assert "Brian Pelayo was added" in resp.text
 
         # Lets login as Bruce and add some content:
         resp.click("Logout").maybe_follow()
-        resp = self._login(app, 'bruce', 'secret').maybe_follow()
+        resp = self._login(app, "bruce", "secret").maybe_follow()
         assert "Welcome, Bruce Pelayo!" in resp.text
         resp = resp.click("Document", index=0)
-        form = resp.forms['deform']
+        form = resp.forms["deform"]
         form["title"] = "Bruce one"
         form.submit("save").maybe_follow()
-        resp = app.get('/')
+        resp = app.get("/")
         resp = resp.click("Document", index=0)
-        form = resp.forms['deform']
+        form = resp.forms["deform"]
         form["title"] = "Bruce two"
         form.submit("save").maybe_follow()
 
         # Now let's delete Bruce::
-        resp.click('Logout').maybe_follow()
-        resp = self._login(app, 'admin', 'secret').maybe_follow()
+        resp.click("Logout").maybe_follow()
+        resp = self._login(app, "admin", "secret").maybe_follow()
         resp = resp.click("User Management")
-        form = resp.forms['form-principal-search']
+        form = resp.forms["form-principal-search"]
         form["query"] = "Bruce"
         resp = form.submit("search").maybe_follow()
         resp = resp.click("Bruce Pelayo")
-        resp = resp.forms['deform'].submit('delete').maybe_follow()
+        resp = resp.forms["deform"].submit("delete").maybe_follow()
         assert "Delete <em>Bruce Pelayo</em>" in resp.text
-        assert "Are you sure you want to delete <span>User</span> " \
-               "<em>Bruce Pelayo</em>?" in resp.text
-        resp = resp.forms['form-delete-user'].submit('delete').maybe_follow()
+        assert (
+            "Are you sure you want to delete <span>User</span> "
+            "<em>Bruce Pelayo</em>?" in resp.text
+        )
+        resp = resp.forms["form-delete-user"].submit("delete").maybe_follow()
         assert "User Bruce Pelayo was deleted." in resp.text
-        form = resp.forms['form-principal-search']
+        form = resp.forms["form-principal-search"]
         form["query"] = "Bruce"
         resp = form.submit("search").maybe_follow()
         assert "No users or groups were found." in resp.text
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
index bf55d15d6..a60df127e 100644
--- a/kotti/tests/test_httpexceptions.py
+++ b/kotti/tests/test_httpexceptions.py
@@ -3,15 +3,15 @@
 
 def test_404_anon(webtest, root):
 
-    resp = webtest.app.get('/non-existent', status=404)
-    assert 'Not Found' in resp.text
+    resp = webtest.app.get("/non-existent", status=404)
+    assert "Not Found" in resp.text
 
 
-@pytest.mark.user('admin')
+@pytest.mark.user("admin")
 def test_404_anon(webtest, root):
 
-    resp = webtest.app.get('/non-existent', status=404)
-    assert 'Not Found' in resp.text
+    resp = webtest.app.get("/non-existent", status=404)
+    assert "Not Found" in resp.text
 
 
 def test_404_api_root(db_session, dummy_request):
diff --git a/kotti/tests/test_message.py b/kotti/tests/test_message.py
index 0353b3124..cb2efdf15 100644
--- a/kotti/tests/test_message.py
+++ b/kotti/tests/test_message.py
@@ -7,17 +7,17 @@
 from kotti.testing import DummyRequest
 
 # filter deprecation warnings for code that is still tested...
-filterwarnings('ignore', '^send_set_password is deprecated')
+filterwarnings("ignore", "^send_set_password is deprecated")
 
 
 # noinspection PyAttributeOutsideInit
 class TestSendEmail:
     def setup_method(self, method):
-        get_mailer_patcher = patch('kotti.message.get_mailer')
+        get_mailer_patcher = patch("kotti.message.get_mailer")
         get_mailer = get_mailer_patcher.start()
         self.mailer = get_mailer.return_value
 
-        self.patchers = (get_mailer_patcher, )
+        self.patchers = (get_mailer_patcher,)
 
     def teardown_method(self, method):
         for patcher in self.patchers:
@@ -26,37 +26,43 @@ def teardown_method(self, method):
     def test_send_email(self, dummy_request):
         from kotti.message import send_email
 
-        send_email(dummy_request,
-                   ['"John Doe" <joedoe@foo.com>'],
-                   'kotti:templates/email-reset-password.pt',
-                   {'site_title': 'My site',
-                    'user_title': 'John Doe',
-                    'url': 'http://foo.com'}
-                   )
+        send_email(
+            dummy_request,
+            ['"John Doe" <joedoe@foo.com>'],
+            "kotti:templates/email-reset-password.pt",
+            {
+                "site_title": "My site",
+                "user_title": "John Doe",
+                "url": "http://foo.com",
+            },
+        )
 
         assert self.mailer.send.called
         message = self.mailer.send.call_args[0][0]
         assert ['"John Doe" <joedoe@foo.com>'] == message.recipients
-        assert 'Reset your password' in message.subject
+        assert "Reset your password" in message.subject
 
     def test_send_email_without_template_vars(self, dummy_request):
         from kotti.message import send_email
+
         with raises(NameError):
-            send_email(dummy_request,
-                       ['"John Doe" <joedoe@foo.com>'],
-                       'kotti:templates/email-reset-password.pt')
+            send_email(
+                dummy_request,
+                ['"John Doe" <joedoe@foo.com>'],
+                "kotti:templates/email-reset-password.pt",
+            )
 
 
 class TestSendSetPassword:
     def setup_method(self, method):
-        get_settings_patcher = patch('kotti.message.get_settings')
+        get_settings_patcher = patch("kotti.message.get_settings")
         self.get_settings = get_settings_patcher.start()
         self.get_settings.return_value = {
-            'kotti.site_title': 'Awesome site',
-            'kotti.secret2': '123',
-            }
+            "kotti.site_title": "Awesome site",
+            "kotti.secret2": "123",
+        }
 
-        get_mailer_patcher = patch('kotti.message.get_mailer')
+        get_mailer_patcher = patch("kotti.message.get_mailer")
         get_mailer = get_mailer_patcher.start()
         self.mailer = get_mailer.return_value
 
@@ -69,38 +75,37 @@ def teardown_method(self, method):
     def test_email_set_password_basic(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
+        user = Dummy(name="joe", email="joe@bar.com", title="Joe")
         email_set_password(user, DummyRequest())
 
-        assert hasattr(user, 'confirm_token')
+        assert hasattr(user, "confirm_token")
         assert self.mailer.send.called
         message = self.mailer.send.call_args[0][0]
-        assert 'Your registration' in message.subject
-        assert 'Joe' in message.body
-        assert 'Awesome site' in message.body
+        assert "Your registration" in message.subject
+        assert "Joe" in message.body
+        assert "Awesome site" in message.body
 
     def test_email_set_password_add_query(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
-        email_set_password(
-            user, DummyRequest(), add_query={'another': 'param'})
+        user = Dummy(name="joe", email="joe@bar.com", title="Joe")
+        email_set_password(user, DummyRequest(), add_query={"another": "param"})
 
         assert self.mailer.send.called
         message = self.mailer.send.call_args[0][0]
-        assert 'another=param' in message.body
+        assert "another=param" in message.body
 
 
 class TestEmailSetPassword:
     def setup_method(self, method):
-        get_settings_patcher = patch('kotti.message.get_settings')
+        get_settings_patcher = patch("kotti.message.get_settings")
         self.get_settings = get_settings_patcher.start()
         self.get_settings.return_value = {
-            'kotti.site_title': 'Awesome site',
-            'kotti.secret2': '123',
-            }
+            "kotti.site_title": "Awesome site",
+            "kotti.secret2": "123",
+        }
 
-        get_mailer_patcher = patch('kotti.message.get_mailer')
+        get_mailer_patcher = patch("kotti.message.get_mailer")
         get_mailer = get_mailer_patcher.start()
         self.mailer = get_mailer.return_value
 
@@ -113,38 +118,39 @@ def teardown_method(self, method):
     def test_email_set_password_basic(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
+        user = Dummy(name="joe", email="joe@bar.com", title="Joe")
         email_set_password(user, DummyRequest())
 
-        assert hasattr(user, 'confirm_token')
+        assert hasattr(user, "confirm_token")
         assert self.mailer.send.called
         message = self.mailer.send.call_args[0][0]
-        assert message.subject.startswith('Your registration')
-        assert 'Joe' in message.body
-        assert 'Joe' in message.html
-        assert '<p' not in message.body
-        assert '<p' in message.html
-        assert 'Awesome site' in message.body
+        assert message.subject.startswith("Your registration")
+        assert "Joe" in message.body
+        assert "Joe" in message.html
+        assert "<p" not in message.body
+        assert "<p" in message.html
+        assert "Awesome site" in message.body
 
     def test_email_set_password_other_template(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
+        user = Dummy(name="joe", email="joe@bar.com", title="Joe")
         email_set_password(
-            user, DummyRequest(),
-            template_name='kotti:templates/email-reset-password.pt')
+            user,
+            DummyRequest(),
+            template_name="kotti:templates/email-reset-password.pt",
+        )
 
         assert self.mailer.send.called
         message = self.mailer.send.call_args[0][0]
-        assert message.subject.startswith('Reset your password')
+        assert message.subject.startswith("Reset your password")
 
     def test_email_set_password_add_query(self, db_session):
         from kotti.message import email_set_password
 
-        user = Dummy(name='joe', email='joe@bar.com', title='Joe')
-        email_set_password(
-            user, DummyRequest(), add_query={'another': 'param'})
+        user = Dummy(name="joe", email="joe@bar.com", title="Joe")
+        email_set_password(user, DummyRequest(), add_query={"another": "param"})
 
         assert self.mailer.send.called
         message = self.mailer.send.call_args[0][0]
-        assert 'another=param' in message.body
+        assert "another=param" in message.body
diff --git a/kotti/tests/test_migrate.py b/kotti/tests/test_migrate.py
index c545bdf69..63061aab7 100644
--- a/kotti/tests/test_migrate.py
+++ b/kotti/tests/test_migrate.py
@@ -11,22 +11,22 @@ def make(self):
 
     def test_env_py_location(self):
         scripts = self.make()
-        assert scripts.env_py_location.endswith('kotti/alembic/env.py')
+        assert scripts.env_py_location.endswith("kotti/alembic/env.py")
 
     def test_env_py_location_default(self):
         # We allow add-ons to use Kotti's version of 'env.py' if they
         # don't come with their own.
         scripts = self.make()
-        with patch('kotti.migrate.os.path.exists') as exists:
+        with patch("kotti.migrate.os.path.exists") as exists:
             exists.return_value = False
-            assert scripts.env_py_location.endswith('kotti/alembic/env.py')
+            assert scripts.env_py_location.endswith("kotti/alembic/env.py")
 
     def test_run_env(self):
-        with patch('kotti.migrate.load_python_file') as lpf:
+        with patch("kotti.migrate.load_python_file") as lpf:
             self.make().run_env()
             assert lpf.call_count == 1
-            assert lpf.call_args[0][0].endswith('kotti/alembic')
-            assert lpf.call_args[0][1] == 'env.py'
+            assert lpf.call_args[0][0].endswith("kotti/alembic")
+            assert lpf.call_args[0][1] == "env.py"
 
 
 class TestPackageEnvironment:
@@ -34,15 +34,17 @@ def make(self):
         from kotti.migrate import PackageEnvironment
         from kotti.migrate import DEFAULT_LOCATION
 
-        with patch('kotti.migrate.get_settings',
-                   return_value={'sqlalchemy.url': 'database_url'}):
+        with patch(
+            "kotti.migrate.get_settings",
+            return_value={"sqlalchemy.url": "database_url"},
+        ):
             return PackageEnvironment(DEFAULT_LOCATION)
 
     def test_pkg_name(self, db_session, events):
-        assert self.make().pkg_name == 'kotti'
+        assert self.make().pkg_name == "kotti"
 
     def test_version_table(self):
-        assert self.make().version_table == 'kotti_alembic_version'
+        assert self.make().version_table == "kotti_alembic_version"
 
     def test_run_env(self):
         pkg_env = self.make()
diff --git a/kotti/tests/test_node.py b/kotti/tests/test_node.py
index a3b0cfb39..e2996c005 100644
--- a/kotti/tests/test_node.py
+++ b/kotti/tests/test_node.py
@@ -15,32 +15,27 @@ def test_root_acl(self, db_session, root):
 
         # The root object has a persistent ACL set:
         for ace in (
-            (Allow, 'role:owner', 'view'),
-            (Allow, 'role:owner', 'add'),
-            (Allow, 'role:owner', 'edit'),
-            (Allow, 'role:owner', 'delete'),
-            (Allow, 'role:owner', 'manage'),
-            (Allow, 'role:owner', 'state_change'),
-            (Allow, 'role:viewer', 'view'),
-            (Allow, 'role:editor', 'view'),
-            (Allow, 'role:editor', 'add'),
-            (Allow, 'role:editor', 'edit'),
-            (Allow, 'role:editor', 'delete'),
-            (Allow, 'role:editor', 'state_change'),
-            (Allow, Everyone, 'view'),
+            (Allow, "role:owner", "view"),
+            (Allow, "role:owner", "add"),
+            (Allow, "role:owner", "edit"),
+            (Allow, "role:owner", "delete"),
+            (Allow, "role:owner", "manage"),
+            (Allow, "role:owner", "state_change"),
+            (Allow, "role:viewer", "view"),
+            (Allow, "role:editor", "view"),
+            (Allow, "role:editor", "add"),
+            (Allow, "role:editor", "edit"),
+            (Allow, "role:editor", "delete"),
+            (Allow, "role:editor", "state_change"),
+            (Allow, Everyone, "view"),
         ):
             assert ace in root.__acl__[1:-1]
 
         # The first ACE is here to prevent lock-out:
-        assert (
-            root.__acl__[0] ==
-            (Allow, 'role:admin', ALL_PERMISSIONS))
+        assert root.__acl__[0] == (Allow, "role:admin", ALL_PERMISSIONS)
 
         # The last ACE denies everything for everyone
-        assert (
-            root.__acl__[-1] ==
-            (Deny, Everyone, ALL_PERMISSIONS)
-        )
+        assert root.__acl__[-1] == (Deny, Everyone, ALL_PERMISSIONS)
 
     def test_set_and_get_acl(self, db_session, root):
 
@@ -50,65 +45,61 @@ def test_set_and_get_acl(self, db_session, root):
         with raises(AttributeError):
             root._get_acl()
 
-        root.__acl__ = [('Allow', 'system.Authenticated', ['edit'])]
-        assert (
-            root.__acl__ == [('Allow', 'system.Authenticated', ['edit'])])
+        root.__acl__ = [("Allow", "system.Authenticated", ["edit"])]
+        assert root.__acl__ == [("Allow", "system.Authenticated", ["edit"])]
 
         root.__acl__ = [
-            ('Allow', 'system.Authenticated', ['view']),
-            ('Deny', 'system.Authenticated', ALL_PERMISSIONS),
-            ]
+            ("Allow", "system.Authenticated", ["view"]),
+            ("Deny", "system.Authenticated", ALL_PERMISSIONS),
+        ]
 
-        assert (
-            root.__acl__ == [
-                ('Allow', 'system.Authenticated', ['view']),
-                ('Deny', 'system.Authenticated', ALL_PERMISSIONS),
-                ])
+        assert root.__acl__ == [
+            ("Allow", "system.Authenticated", ["view"]),
+            ("Deny", "system.Authenticated", ALL_PERMISSIONS),
+        ]
 
         # We can append to the ACL, and it'll be persisted fine:
-        root.__acl__.append(('Allow', 'system.Authenticated', ['edit']))
-        assert (
-            root.__acl__ == [
-                ('Allow', 'system.Authenticated', ['view']),
-                ('Deny', 'system.Authenticated', ALL_PERMISSIONS),
-                ('Allow', 'system.Authenticated', ['edit']),
-                ])
+        root.__acl__.append(("Allow", "system.Authenticated", ["edit"]))
+        assert root.__acl__ == [
+            ("Allow", "system.Authenticated", ["view"]),
+            ("Deny", "system.Authenticated", ALL_PERMISSIONS),
+            ("Allow", "system.Authenticated", ["edit"]),
+        ]
 
         db_session.flush()
         db_session.expire_all()
 
-        assert (
-            root.__acl__ == [
-                ('Allow', 'role:admin', ALL_PERMISSIONS),
-                ('Allow', 'system.Authenticated', ['view']),
-                ('Deny', 'system.Authenticated', ALL_PERMISSIONS),
-                ('Allow', 'system.Authenticated', ['edit']),
-                ])
+        assert root.__acl__ == [
+            ("Allow", "role:admin", ALL_PERMISSIONS),
+            ("Allow", "system.Authenticated", ["view"]),
+            ("Deny", "system.Authenticated", ALL_PERMISSIONS),
+            ("Allow", "system.Authenticated", ["edit"]),
+        ]
 
     def test_append_to_empty_acl(self, db_session, root):
         from kotti.resources import Node
 
-        node = root['child'] = Node()
+        node = root["child"] = Node()
         node.__acl__ = []
 
         db_session.flush()
         db_session.expire_all()
 
-        node.__acl__.append(('Allow', 'system.Authenticated', ['edit']))
+        node.__acl__.append(("Allow", "system.Authenticated", ["edit"]))
         db_session.flush()
         db_session.expire_all()
 
         assert node.__acl__ == [
-            ('Allow', 'role:admin', ALL_PERMISSIONS),
-            ('Allow', 'system.Authenticated', ['edit']),
-            ]
+            ("Allow", "role:admin", ALL_PERMISSIONS),
+            ("Allow", "system.Authenticated", ["edit"]),
+        ]
 
     def test_unique_constraint(self, db_session, root):
         from kotti.resources import Node
 
         # Try to add two children with the same name to the root node:
-        db_session.add(Node(name='child1', parent=root))
-        db_session.add(Node(name='child1', parent=root))
+        db_session.add(Node(name="child1", parent=root))
+        db_session.add(Node(name="child1", parent=root))
         with raises(IntegrityError):
             db_session.flush()
 
@@ -118,90 +109,89 @@ def test_container_methods(self, db_session, root):
         # Test some of Node's container methods:
         assert root.keys() == []
 
-        child1 = Node(name='child1', parent=root)
+        child1 = Node(name="child1", parent=root)
         db_session.add(child1)
-        assert root.keys() == ['child1']
-        assert root['child1'] == child1
+        assert root.keys() == ["child1"]
+        assert root["child1"] == child1
 
-        del root['child1']
+        del root["child1"]
         assert root.keys() == []
 
         # When we delete a parent node, all its child nodes will be
         # released as well:
-        root['child2'] = Node()
-        root['child2']['subchild'] = Node()
-        assert (
-            db_session.query(Node).filter(
-                Node.name == 'subchild').count() == 1)
-        del root['child2']
-        assert (
-            db_session.query(Node).filter(
-                Node.name == 'subchild').count() == 0)
+        root["child2"] = Node()
+        root["child2"]["subchild"] = Node()
+        assert db_session.query(Node).filter(Node.name == "subchild").count() == 1
+        del root["child2"]
+        assert db_session.query(Node).filter(Node.name == "subchild").count() == 0
 
         # We can pass a tuple as the key to more efficiently reach
         # down to child objects:
-        root['child3'] = Node()
-        subchild33 = Node(name='subchild33', parent=root['child3'])
+        root["child3"] = Node()
+        subchild33 = Node(name="subchild33", parent=root["child3"])
         db_session.add(subchild33)
-        del root.__dict__['_children']  # force a different code path
-        assert root['child3', 'subchild33'] is root['child3']['subchild33']
-        assert root[('child3', 'subchild33')] is subchild33
-        assert root[('child3', 'subchild33')] is subchild33
+        del root.__dict__["_children"]  # force a different code path
+        assert root["child3", "subchild33"] is root["child3"]["subchild33"]
+        assert root[("child3", "subchild33")] is subchild33
+        assert root[("child3", "subchild33")] is subchild33
         with raises(KeyError):
             # noinspection PyStatementEffect
-            root['child3', 'bad-name']
+            root["child3", "bad-name"]
         # noinspection PyStatementEffect
         root.children  # force a different code path
         with raises(KeyError):
             # noinspection PyStatementEffect
-            root['child3', 'bad-name']
-        del root['child3']
+            root["child3", "bad-name"]
+        del root["child3"]
 
         # Overwriting an existing Node is an error; first delete manually!
-        child4 = Node(name='child4', parent=root)
+        child4 = Node(name="child4", parent=root)
         db_session.add(child4)
-        assert root.keys() == ['child4']
+        assert root.keys() == ["child4"]
 
-        child44 = Node(name='child4')
+        child44 = Node(name="child4")
         db_session.add(child44)
 
         with raises(SQLAlchemyError):
-            root['child4'] = child44
+            root["child4"] = child44
             db_session.flush()
 
     def test_node_copy_name(self, db_session, root):
 
-        copy_of_root = root.copy(name='copy_of_root')
-        assert copy_of_root.name == 'copy_of_root'
-        assert root.name == ''
+        copy_of_root = root.copy(name="copy_of_root")
+        assert copy_of_root.name == "copy_of_root"
+        assert root.name == ""
 
     def test_node_copy_variants(self, db_session, root):
         from kotti.resources import Node
 
-        child1 = root['child1'] = Node()
-        child1['grandchild'] = Node()
-        child2 = root['child2'] = Node()
+        child1 = root["child1"] = Node()
+        child1["grandchild"] = Node()
+        child2 = root["child2"] = Node()
 
         # first way; circumventing the Container API
         child2.children.append(child1.copy())
 
         # second way; canonical way
-        child2['child2'] = child1.copy()
+        child2["child2"] = child1.copy()
 
         # third way; this is necessary in cases when copy() will
         # attempt to put the new node into the db already, e.g. when
         # the copy is already being back-referenced by some other
         # object in the db.
-        child1.copy(parent=child2, name='child3')
+        child1.copy(parent=child2, name="child3")
 
         assert [child.name for child in child2.children] == [
-            'child1', 'child2', 'child3']
+            "child1",
+            "child2",
+            "child3",
+        ]
 
     def test_node_copy_parent_id(self, db_session, root):
         from kotti.resources import Node
 
-        child1 = root['child1'] = Node()
-        grandchild1 = child1['grandchild1'] = Node()
+        child1 = root["child1"] = Node()
+        grandchild1 = child1["grandchild1"] = Node()
         db_session.flush()
         grandchild2 = grandchild1.copy()
         assert grandchild2.parent_id is None
@@ -211,42 +201,41 @@ def test_node_copy_with_local_groups(self, db_session, root):
         from kotti.resources import Node
         from kotti.resources import LocalGroup
 
-        child1 = root['child1'] = Node()
-        local_group1 = LocalGroup(child1, 'joe', 'role:admin')
+        child1 = root["child1"] = Node()
+        local_group1 = LocalGroup(child1, "joe", "role:admin")
         db_session.add(local_group1)
         db_session.flush()
 
-        child2 = root['child2'] = child1.copy()
+        child2 = root["child2"] = child1.copy()
         db_session.flush()
         assert child2.local_groups == []
 
     def test_clear(self, db_session, root):
         from kotti.resources import Node
 
-        child = root['child'] = Node()
-        assert db_session.query(Node).filter(Node.name == 'child').all() == [
-            child]
+        child = root["child"] = Node()
+        assert db_session.query(Node).filter(Node.name == "child").all() == [child]
         root.clear()
-        assert db_session.query(Node).filter(Node.name == 'child').all() == []
+        assert db_session.query(Node).filter(Node.name == "child").all() == []
 
     def test_annotations_mutable(self, db_session, root):
 
-        root.annotations['foo'] = 'bar'
+        root.annotations["foo"] = "bar"
         assert root in db_session.dirty
-        del root.annotations['foo']
+        del root.annotations["foo"]
 
     def test_nested_annotations_mutable(self, db_session, root):
 
-        root.annotations['foo'] = {}
+        root.annotations["foo"] = {}
         db_session.flush()
         db_session.expire_all()
 
-        root.annotations['foo']['bar'] = 'baz'
+        root.annotations["foo"]["bar"] = "baz"
         assert root in db_session.dirty
         db_session.flush()
         db_session.expire_all()
 
-        assert root.annotations['foo']['bar'] == 'baz'
+        assert root.annotations["foo"]["bar"] == "baz"
 
     def test_annotations_coerce_fail(self, db_session, root):
 
@@ -259,153 +248,168 @@ def test_attribute(self, db_session, root, events):
         from kotti.resources import Node
 
         assert root.path == "/"
-        child = root['child-1'] = Node()
-        assert child.path == '/child-1/'
-        subchild = root['child-1']['subchild'] = Node()
-        assert subchild.path == '/child-1/subchild/'
+        child = root["child-1"] = Node()
+        assert child.path == "/child-1/"
+        subchild = root["child-1"]["subchild"] = Node()
+        assert subchild.path == "/child-1/subchild/"
 
     def test_object_moved(self, db_session, root, events):
         from kotti.resources import Node
-        child = root['child-1'] = Node()
-        subchild = child['subchild'] = Node()
+
+        child = root["child-1"] = Node()
+        subchild = child["subchild"] = Node()
         subchild.parent = root
-        assert subchild.path == '/subchild/'
+        assert subchild.path == "/subchild/"
 
     @mark.parametrize("flush", [True, False])
     def test_parent_moved(self, db_session, root, events, flush):
         from kotti.resources import Node
-        child1 = root['child-1'] = Node()
-        child2 = child1['child-2'] = Node()
-        subchild = child2['subchild'] = Node()
+
+        child1 = root["child-1"] = Node()
+        child2 = child1["child-2"] = Node()
+        subchild = child2["subchild"] = Node()
 
         if flush:
             db_session.flush()
 
-        assert subchild.path == '/child-1/child-2/subchild/'
+        assert subchild.path == "/child-1/child-2/subchild/"
         child2.parent = root
-        assert subchild.path == '/child-2/subchild/'
+        assert subchild.path == "/child-2/subchild/"
 
     def test_object_renamed(self, db_session, root, events):
         from kotti.resources import Node
-        child = root['child-1'] = Node()
-        subchild = child['subchild'] = Node()
 
-        subchild.name = 'renamed'
-        assert subchild.path == '/child-1/renamed/'
+        child = root["child-1"] = Node()
+        subchild = child["subchild"] = Node()
+
+        subchild.name = "renamed"
+        assert subchild.path == "/child-1/renamed/"
 
     @mark.parametrize("flush", [True, False])
     def test_parent_renamed(self, db_session, root, events, flush):
         from kotti.resources import Node
-        child1 = root['child-1'] = Node()
-        child2 = child1['child-2'] = Node()
-        subchild = child2['subchild'] = Node()
+
+        child1 = root["child-1"] = Node()
+        child2 = child1["child-2"] = Node()
+        subchild = child2["subchild"] = Node()
 
         if flush:
             db_session.flush()
 
-        child2.name = 'renamed'
-        assert subchild.path == '/child-1/renamed/subchild/'
-        child1.name = 'renamed-1'
-        assert child2.path == '/renamed-1/renamed/'
-        assert subchild.path == '/renamed-1/renamed/subchild/'
-        assert child1.path == '/renamed-1/'
+        child2.name = "renamed"
+        assert subchild.path == "/child-1/renamed/subchild/"
+        child1.name = "renamed-1"
+        assert child2.path == "/renamed-1/renamed/"
+        assert subchild.path == "/renamed-1/renamed/subchild/"
+        assert child1.path == "/renamed-1/"
 
     @mark.parametrize("flush", [True, False])
     def test_parent_copied(self, db_session, root, events, flush):
         from kotti.resources import Node
-        c1 = root['c1'] = Node()
-        c2 = c1['c2'] = Node()
-        c2['c3'] = Node()
+
+        c1 = root["c1"] = Node()
+        c2 = c1["c2"] = Node()
+        c2["c3"] = Node()
 
         if flush:
             db_session.flush()
 
-        c1copy = root['c1copy'] = c1.copy()
+        c1copy = root["c1copy"] = c1.copy()
 
-        assert c1copy.path == '/c1copy/'
-        assert c1copy['c2'].path == '/c1copy/c2/'
-        assert c1copy['c2']['c3'].path == '/c1copy/c2/c3/'
+        assert c1copy.path == "/c1copy/"
+        assert c1copy["c2"].path == "/c1copy/c2/"
+        assert c1copy["c2"]["c3"].path == "/c1copy/c2/c3/"
 
-        c2copy = c2['c2copy'] = c2.copy()
+        c2copy = c2["c2copy"] = c2.copy()
 
-        assert c2copy.path == '/c1/c2/c2copy/'
-        assert c2copy['c3'].path == '/c1/c2/c2copy/c3/'
+        assert c2copy.path == "/c1/c2/c2copy/"
+        assert c2copy["c3"].path == "/c1/c2/c2copy/c3/"
 
     def test_children_append(self, db_session, root, events):
         from kotti.resources import Node
 
-        child = Node('child-1')
+        child = Node("child-1")
         root.children.append(child)
-        assert child.path == '/child-1/'
+        assert child.path == "/child-1/"
 
-        child2 = Node('child-2')
+        child2 = Node("child-2")
         child.children.append(child2)
-        assert child2.path == '/child-1/child-2/'
+        assert child2.path == "/child-1/child-2/"
 
     def test_replace_root(self, db_session, root, events):
         from kotti.resources import Node
+
         db_session.delete(root)
-        new_root = Node('')
+        new_root = Node("")
         db_session.add(new_root)
-        assert new_root.path == '/'
+        assert new_root.path == "/"
 
     def test_query_api(self, db_session, root, events):
         from kotti.resources import Node
-        child1 = root['child-1'] = Node()
-        child2 = child1['child-2'] = Node()
-        subchild = child2['subchild'] = Node()
 
-        assert db_session.query(Node).filter(
-            Node.path.startswith('/')).count() == 4
+        child1 = root["child-1"] = Node()
+        child2 = child1["child-2"] = Node()
+        subchild = child2["subchild"] = Node()
 
-        assert db_session.query(Node).filter(
-            Node.path.startswith('/child-1/')).count() == 3
+        assert db_session.query(Node).filter(Node.path.startswith("/")).count() == 4
 
-        objs = db_session.query(Node).filter(
-            Node.path.startswith('/child-1/child-2/')).all()
+        assert (
+            db_session.query(Node).filter(Node.path.startswith("/child-1/")).count()
+            == 3
+        )
+
+        objs = (
+            db_session.query(Node)
+            .filter(Node.path.startswith("/child-1/child-2/"))
+            .all()
+        )
 
         assert len(objs) == 2
         assert subchild in objs
         assert child2 in objs
 
         db_session.query(Node).filter(
-            Node.path.startswith('/child-1/child-3/')).count() == 0
+            Node.path.startswith("/child-1/child-3/")
+        ).count() == 0
 
     def test_add_child_to_unnamed_parent(self, db_session, root, events):
         from kotti.resources import Node
+
         parent = Node()
-        child1 = parent['child-1'] = Node()
-        child2 = child1['child-2'] = Node()
+        child1 = parent["child-1"] = Node()
+        child2 = child1["child-2"] = Node()
         assert child2.__parent__.__parent__ is parent
-        root['parent'] = parent
-        assert parent.path == '/parent/'
-        assert child1.path == '/parent/child-1/'
-        assert child2.path == '/parent/child-1/child-2/'
+        root["parent"] = parent
+        assert parent.path == "/parent/"
+        assert child1.path == "/parent/child-1/"
+        assert child2.path == "/parent/child-1/child-2/"
 
     def test_add_child_to_unrooted_parent(self, db_session, root, events):
         from kotti.resources import Node
-        parent = Node('parent')
-        child1 = parent['child-1'] = Node()
-        child2 = child1['child-2'] = Node()
-        root['parent'] = parent
-        assert parent.path == '/parent/'
-        assert child1.path == '/parent/child-1/'
-        assert child2.path == '/parent/child-1/child-2/'
+
+        parent = Node("parent")
+        child1 = parent["child-1"] = Node()
+        child2 = child1["child-2"] = Node()
+        root["parent"] = parent
+        assert parent.path == "/parent/"
+        assert child1.path == "/parent/child-1/"
+        assert child2.path == "/parent/child-1/child-2/"
 
     def test_node_lineage_not_loaded_new_name(self, db_session, root, events):
 
         from kotti.resources import Node
-        parent = root['parent'] = Node()
-        child1 = parent['child-1'] = Node()
-        child2 = child1['child-2'] = Node()
+
+        parent = root["parent"] = Node()
+        child1 = parent["child-1"] = Node()
+        child2 = child1["child-2"] = Node()
 
         db_session.flush()
         child2_id = child2.id
-        db_session.expunge_all()    # empty the identity map
+        db_session.expunge_all()  # empty the identity map
 
         child2 = db_session.query(Node).get(child2_id)
-        child3 = Node('child-3', parent=child2)
-        assert child3.path == '/parent/child-1/child-2/child-3/'
+        child3 = Node("child-3", parent=child2)
+        assert child3.path == "/parent/child-1/child-2/child-3/"
 
     def test_node_lineage_not_loaded_new_parent(self, db_session, root, events):
 
@@ -417,18 +421,17 @@ def test_node_lineage_not_loaded_new_parent(self, db_session, root, events):
         # We want to guarantee that an object event handler can call
         # get_root(), which is only possible if our event handler
         # avoids flushing:
-        objectevent_listeners[(ObjectEvent, Node)].append(
-            lambda event: get_root())
+        objectevent_listeners[(ObjectEvent, Node)].append(lambda event: get_root())
 
-        parent = root['parent'] = Node()
-        child1 = parent['child-1'] = Node()
+        parent = root["parent"] = Node()
+        child1 = parent["child-1"] = Node()
 
         db_session.flush()
         child1_id = child1.id
         db_session.expunge_all()
 
-        child2 = Node(name='child-2')
-        child3 = Node(name='child-3')
+        child2 = Node(name="child-2")
+        child3 = Node(name="child-3")
 
         child1 = db_session.query(Node).get(child1_id)
         child3.parent = child2
@@ -441,7 +444,7 @@ class TestLocalGroup:
     def test_copy(self, db_session, root):
         from kotti.resources import LocalGroup
 
-        node, principal_name, group_name = root, 'p', 'g'
+        node, principal_name, group_name = root, "p", "g"
         lg = LocalGroup(node, principal_name, group_name)
         lg2 = lg.copy()
         assert lg2 is not lg
@@ -451,7 +454,6 @@ def test_copy(self, db_session, root):
 
 
 class TestTypeInfo:
-
     def test_add_selectable_default_view(self):
 
         from kotti.resources import Content
@@ -459,30 +461,31 @@ def test_add_selectable_default_view(self):
         from kotti.resources import TypeInfo
 
         type_info = TypeInfo(selectable_default_views=[])
-        type_info.add_selectable_default_view('foo', 'Fannick')
-        assert type_info.selectable_default_views == [
-            ('foo', 'Fannick'),
-            ]
+        type_info.add_selectable_default_view("foo", "Fannick")
+        assert type_info.selectable_default_views == [("foo", "Fannick")]
 
-        Document.type_info.add_selectable_default_view('one', 'two')
-        assert ('one', 'two') in Document.type_info.selectable_default_views
-        assert ('one', 'two') not in Content.type_info.selectable_default_views
+        Document.type_info.add_selectable_default_view("one", "two")
+        assert ("one", "two") in Document.type_info.selectable_default_views
+        assert ("one", "two") not in Content.type_info.selectable_default_views
 
     def test_type_info_add_permission_default(self):
         from kotti.resources import TypeInfo
+
         type_info = TypeInfo()
-        assert type_info.add_permission == 'add'
+        assert type_info.add_permission == "add"
 
     def test_type_info_add_permission_custom(self):
         from kotti.resources import TypeInfo
-        type_info = TypeInfo(add_permission='customadd')
-        assert type_info.add_permission == 'customadd'
+
+        type_info = TypeInfo(add_permission="customadd")
+        assert type_info.add_permission == "customadd"
 
     def test_type_info_unaddable(self):
         from kotti.resources import TypeInfo
-        type_info = TypeInfo(add_view=None, addable_to=['Document'])
+
+        type_info = TypeInfo(add_view=None, addable_to=["Document"])
         context = Mock(type_info=Mock())
-        context.type_info.name = 'Document'
-        with patch('kotti.resources.view_permitted') as vp:
+        context.type_info.name = "Document"
+        with patch("kotti.resources.view_permitted") as vp:
             res = type_info.addable(context, None)
             assert vp.call_count == 0
diff --git a/kotti/tests/test_node_views.py b/kotti/tests/test_node_views.py
index 575a94f29..c27197954 100644
--- a/kotti/tests/test_node_views.py
+++ b/kotti/tests/test_node_views.py
@@ -11,7 +11,7 @@ def test_view_permitted_yes(self, config, root):
         from kotti.resources import Document
 
         config.testing_securitypolicy(permissive=True)
-        config.include('kotti.views.edit.content')
+        config.include("kotti.views.edit.content")
         request = DummyRequest()
         assert Document.type_info.addable(root, request) is True
 
@@ -19,7 +19,7 @@ def test_view_permitted_no(self, config, root):
         from kotti.resources import Document
 
         config.testing_securitypolicy(permissive=False)
-        config.include('kotti.views.edit.content')
+        config.include("kotti.views.edit.content")
         request = DummyRequest()
         assert Document.type_info.addable(root, request) is False
 
@@ -28,14 +28,14 @@ def test_addable_views_registered_to_some_context(self, config, root):
         from kotti.resources import Document, File
 
         _saved = Document.type_info.addable_to
-        Document.type_info.addable_to = ['File']
+        Document.type_info.addable_to = ["File"]
 
         config.testing_securitypolicy(permissive=True)
         config.add_view(
             lambda context, request: {},
             name=Document.type_info.add_view,
-            permission='add',
-            renderer='kotti:templates/edit/node.pt',
+            permission="add",
+            renderer="kotti:templates/edit/node.pt",
             context=File,
         )
         request = DummyRequest()
@@ -51,7 +51,7 @@ def test_get_non_existing_paste_item(self, root):
         from kotti.util import get_paste_items
 
         request = DummyRequest()
-        request.session['kotti.paste'] = ([1701], 'copy')
+        request.session["kotti.paste"] = ([1701], "copy")
         item = get_paste_items(root, request)
         assert item == []
 
@@ -60,114 +60,112 @@ def test_paste_non_existing_node(self, root):
 
         request = DummyRequest()
 
-        for index, action in enumerate(['copy', 'cut']):
-            request.session['kotti.paste'] = ([1701], 'copy')
+        for index, action in enumerate(["copy", "cut"]):
+            request.session["kotti.paste"] = ([1701], "copy")
             response = NodeActions(root, request).paste_nodes()
-            assert response.status == '302 Found'
-            assert len(request.session['_f_error']) == index + 1
+            assert response.status == "302 Found"
+            assert len(request.session["_f_error"]) == index + 1
 
     def test_paste_without_edit_permission(self, config, root):
         from kotti.views.edit.actions import NodeActions
 
         request = DummyRequest()
-        request.params['paste'] = 'on'
+        request.params["paste"] = "on"
         config.testing_securitypolicy(permissive=False)
 
         # We need to have the 'edit' permission on the original object
         # to be able to cut and paste:
-        request.session['kotti.paste'] = ([1], 'cut')
+        request.session["kotti.paste"] = ([1], "cut")
         view = NodeActions(root, request)
         with raises(Forbidden):
             view.paste_nodes()
 
         # We don't need 'edit' permission if we're just copying:
-        request.session['kotti.paste'] = ([1], 'copy')
+        request.session["kotti.paste"] = ([1], "copy")
         response = NodeActions(root, request).paste_nodes()
-        assert response.status == '302 Found'
+        assert response.status == "302 Found"
 
 
 class TestNodeRename:
     def setUp(self):
         from pyramid.threadlocal import get_current_registry
         from kotti.url_normalizer import url_normalizer
+
         r = get_current_registry()
         settings = r.settings = {}
-        settings['kotti.url_normalizer'] = [url_normalizer]
-        settings['kotti.url_normalizer.map_non_ascii_characters'] = False
+        settings["kotti.url_normalizer"] = [url_normalizer]
+        settings["kotti.url_normalizer.map_non_ascii_characters"] = False
 
     def test_rename_to_empty_name(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        child = root['child'] = Document(title="Child")
+        child = root["child"] = Document(title="Child")
         request = DummyRequest()
-        request.params['rename'] = 'on'
-        request.params['name'] = ''
-        request.params['title'] = 'foo'
+        request.params["rename"] = "on"
+        request.params["name"] = ""
+        request.params["title"] = "foo"
         NodeActions(child, request).rename_node()
-        assert (request.session.pop_flash('error') ==
-                ['Name and title are required.'])
+        assert request.session.pop_flash("error") == ["Name and title are required."]
 
     def test_multi_rename(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
+
         self.setUp()
-        root['child1'] = Document(title="Child 1")
-        root['child2'] = Document(title="Child 2")
+        root["child1"] = Document(title="Child 1")
+        root["child2"] = Document(title="Child 2")
         request = DummyRequest()
         request.POST = MultiDict()
-        id1 = str(root['child1'].id)
-        id2 = str(root['child2'].id)
-        request.POST.add('children-to-rename', id1)
-        request.POST.add('children-to-rename', id2)
-        request.POST.add(id1 + '-name', '')
-        request.POST.add(id1 + '-title', 'Unhappy Child')
-        request.POST.add(id2 + '-name', 'happy-child')
-        request.POST.add(id2 + '-title', '')
-        request.POST.add('rename_nodes', 'rename_nodes')
+        id1 = str(root["child1"].id)
+        id2 = str(root["child2"].id)
+        request.POST.add("children-to-rename", id1)
+        request.POST.add("children-to-rename", id2)
+        request.POST.add(id1 + "-name", "")
+        request.POST.add(id1 + "-title", "Unhappy Child")
+        request.POST.add(id2 + "-name", "happy-child")
+        request.POST.add(id2 + "-title", "")
+        request.POST.add("rename_nodes", "rename_nodes")
         NodeActions(root, request).rename_nodes()
-        assert request.session.pop_flash('error') ==\
-            ['Name and title are required.']
-
-        request.POST.add(id1 + '-name', 'unhappy-child')
-        request.POST.add(id1 + '-title', 'Unhappy Child')
-        request.POST.add(id2 + '-name', 'happy-child')
-        request.POST.add(id2 + '-title', 'Happy Child')
-        request.POST.add('rename_nodes', 'rename_nodes')
+        assert request.session.pop_flash("error") == ["Name and title are required."]
+
+        request.POST.add(id1 + "-name", "unhappy-child")
+        request.POST.add(id1 + "-title", "Unhappy Child")
+        request.POST.add(id2 + "-name", "happy-child")
+        request.POST.add(id2 + "-title", "Happy Child")
+        request.POST.add("rename_nodes", "rename_nodes")
         NodeActions(root, request).rename_nodes()
-        assert request.session.pop_flash('success') ==\
-            ['Your changes have been saved.']
+        assert request.session.pop_flash("success") == ["Your changes have been saved."]
 
 
 class TestNodeDelete:
-
     def test_multi_delete(self, root):
         from kotti.resources import Document
         from kotti.resources import File
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title="Child 1")
-        root['child2'] = Document(title="Child 2")
-        root['file1'] = File(title="File 1")
+        root["child1"] = Document(title="Child 1")
+        root["child2"] = Document(title="Child 2")
+        root["file1"] = File(title="File 1")
 
         request = DummyRequest()
         request.POST = MultiDict()
-        id1 = str(root['child1'].id)
-        id2 = str(root['child2'].id)
-        id3 = str(root['file1'].id)
-        request.POST.add('delete_nodes', 'delete_nodes')
+        id1 = str(root["child1"].id)
+        id2 = str(root["child2"].id)
+        id3 = str(root["file1"].id)
+        request.POST.add("delete_nodes", "delete_nodes")
         NodeActions(root, request).delete_nodes()
-        assert request.session.pop_flash('info') ==\
-            ['Nothing was deleted.']
+        assert request.session.pop_flash("info") == ["Nothing was deleted."]
 
-        request.POST.add('children-to-delete', id1)
-        request.POST.add('children-to-delete', id2)
-        request.POST.add('children-to-delete', id3)
+        request.POST.add("children-to-delete", id1)
+        request.POST.add("children-to-delete", id2)
+        request.POST.add("children-to-delete", id3)
         NodeActions(root, request).delete_nodes()
-        assert request.session.pop_flash('success') == \
-            ['${title} was deleted.',
-             '${title} was deleted.',
-             '${title} was deleted.']
+        assert request.session.pop_flash("success") == [
+            "${title} was deleted.",
+            "${title} was deleted.",
+            "${title} was deleted.",
+        ]
 
 
 class TestNodeMove:
@@ -175,35 +173,36 @@ def test_move_up(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title="Child 1")
-        root['child2'] = Document(title="Child 2")
-        assert root['child1'].position < root['child2'].position
+        root["child1"] = Document(title="Child 1")
+        root["child2"] = Document(title="Child 2")
+        assert root["child1"].position < root["child2"].position
 
         request = DummyRequest()
-        request.session['kotti.selected-children'] = [str(root['child2'].id)]
+        request.session["kotti.selected-children"] = [str(root["child2"].id)]
         NodeActions(root, request).up()
-        assert request.session.pop_flash('success') ==\
-            ['${title} was moved.']
-        assert root['child1'].position > root['child2'].position
+        assert request.session.pop_flash("success") == ["${title} was moved."]
+        assert root["child1"].position > root["child2"].position
 
     def test_move_down(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title="Child 1")
-        root['child2'] = Document(title="Child 2")
-        root['child3'] = Document(title="Child 3")
-        assert root['child1'].position < root['child3'].position
-        assert root['child2'].position < root['child3'].position
+        root["child1"] = Document(title="Child 1")
+        root["child2"] = Document(title="Child 2")
+        root["child3"] = Document(title="Child 3")
+        assert root["child1"].position < root["child3"].position
+        assert root["child2"].position < root["child3"].position
 
         request = DummyRequest()
-        ids = [str(root['child1'].id), str(root['child2'].id)]
-        request.session['kotti.selected-children'] = ids
+        ids = [str(root["child1"].id), str(root["child2"].id)]
+        request.session["kotti.selected-children"] = ids
         NodeActions(root, request).down()
-        assert request.session.pop_flash('success') ==\
-            ['${title} was moved.', '${title} was moved.']
-        assert root['child1'].position > root['child3'].position
-        assert root['child2'].position > root['child3'].position
+        assert request.session.pop_flash("success") == [
+            "${title} was moved.",
+            "${title} was moved.",
+        ]
+        assert root["child1"].position > root["child3"].position
+        assert root["child2"].position > root["child3"].position
 
     def test_move_child_position_post(self, root, db_session):
 
@@ -214,62 +213,77 @@ def test_move_child_position_post(self, root, db_session):
         from kotti.views.edit.actions import move_child_position
 
         # Create some documents
-        root['child1'] = Document(title="Child 1")
-        root['child2'] = Document(title="Child 2")
-        root['child3'] = Document(title="Child 3")
-        root['child4'] = Document(title="Child 4")
-        root['child5'] = Document(title="Child 5")
+        root["child1"] = Document(title="Child 1")
+        root["child2"] = Document(title="Child 2")
+        root["child3"] = Document(title="Child 3")
+        root["child4"] = Document(title="Child 4")
+        root["child5"] = Document(title="Child 5")
 
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            'child1', 'child2', 'child3', 'child4', 'child5']
+            "child1",
+            "child2",
+            "child3",
+            "child4",
+            "child5",
+        ]
 
         request = DummyRequest()
 
         # Move down
-        request.POST = {'from': '0', 'to': '3'}
+        request.POST = {"from": "0", "to": "3"}
         result = move_child_position(root, request)
         transaction.commit()
         root = get_root()
-        assert result['result'] == 'success'
+        assert result["result"] == "success"
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            'child2', 'child3', 'child4', 'child1', 'child5']
+            "child2",
+            "child3",
+            "child4",
+            "child1",
+            "child5",
+        ]
 
         # Move up
-        request.POST = {'from': '4', 'to': '0'}
+        request.POST = {"from": "4", "to": "0"}
         move_child_position(root, request)
         transaction.commit()
         root = get_root()
-        assert result['result'] == 'success'
+        assert result["result"] == "success"
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            'child5', 'child2', 'child3', 'child4', 'child1']
+            "child5",
+            "child2",
+            "child3",
+            "child4",
+            "child1",
+        ]
 
         # Invalid param value
-        request.POST = {'from': 'a', 'to': '3'}
+        request.POST = {"from": "a", "to": "3"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
-        request.POST = {'from': '0', 'to': '10'}
+        request.POST = {"from": "0", "to": "10"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
-        request.POST = {'from': '10', 'to': '0'}
+        request.POST = {"from": "10", "to": "0"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
         # Missing param
-        request.POST = {'from': 'a', }
+        request.POST = {"from": "a"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
         # we have to clean up, because we committed transactions
-        del root['child1']
-        del root['child2']
-        del root['child3']
-        del root['child4']
-        del root['child5']
+        del root["child1"]
+        del root["child2"]
+        del root["child3"]
+        del root["child4"]
+        del root["child5"]
         transaction.commit()
 
     def test_move_child_position_json(self, root, db_session):
@@ -281,62 +295,77 @@ def test_move_child_position_json(self, root, db_session):
         from kotti.views.edit.actions import move_child_position
 
         # Create some documents
-        root['child1'] = Document(title="Child 1")
-        root['child2'] = Document(title="Child 2")
-        root['child3'] = Document(title="Child 3")
-        root['child4'] = Document(title="Child 4")
-        root['child5'] = Document(title="Child 5")
+        root["child1"] = Document(title="Child 1")
+        root["child2"] = Document(title="Child 2")
+        root["child3"] = Document(title="Child 3")
+        root["child4"] = Document(title="Child 4")
+        root["child5"] = Document(title="Child 5")
 
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            'child1', 'child2', 'child3', 'child4', 'child5']
+            "child1",
+            "child2",
+            "child3",
+            "child4",
+            "child5",
+        ]
 
         request = DummyRequest()
 
         # Move down
-        request.json_body = {'from': '0', 'to': '3'}
+        request.json_body = {"from": "0", "to": "3"}
         result = move_child_position(root, request)
         transaction.commit()
         root = get_root()
-        assert result['result'] == 'success'
+        assert result["result"] == "success"
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            'child2', 'child3', 'child4', 'child1', 'child5']
+            "child2",
+            "child3",
+            "child4",
+            "child1",
+            "child5",
+        ]
 
         # Move up
-        request.json_body = {'from': '4', 'to': '0'}
+        request.json_body = {"from": "4", "to": "0"}
         move_child_position(root, request)
         transaction.commit()
         root = get_root()
-        assert result['result'] == 'success'
+        assert result["result"] == "success"
         assert [c.position for c in root._children] == [0, 1, 2, 3, 4]
         assert [c.name for c in root._children] == [
-            'child5', 'child2', 'child3', 'child4', 'child1']
+            "child5",
+            "child2",
+            "child3",
+            "child4",
+            "child1",
+        ]
 
         # Invalid param value
-        request.json_body = {'from': 'a', 'to': '3'}
+        request.json_body = {"from": "a", "to": "3"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
-        request.json_body = {'from': '0', 'to': '10'}
+        request.json_body = {"from": "0", "to": "10"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
-        request.json_body = {'from': '10', 'to': '0'}
+        request.json_body = {"from": "10", "to": "0"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
         # Missing param
-        request.json_body = {'from': 'a', }
+        request.json_body = {"from": "a"}
         result = move_child_position(root, request)
-        assert result['result'] == 'error'
+        assert result["result"] == "error"
 
         # we have to clean up, because we committed transactions
-        del root['child1']
-        del root['child2']
-        del root['child3']
-        del root['child4']
-        del root['child5']
+        del root["child1"]
+        del root["child2"]
+        del root["child3"]
+        del root["child4"]
+        del root["child5"]
         transaction.commit()
 
 
@@ -345,21 +374,23 @@ def test_show_hide(self, root):
         from kotti.resources import Document
         from kotti.views.edit.actions import NodeActions
 
-        root['child1'] = Document(title="Child 1")
-        assert root['child1'].in_navigation is True
+        root["child1"] = Document(title="Child 1")
+        assert root["child1"].in_navigation is True
 
         request = DummyRequest()
-        request.session['kotti.selected-children'] = [str(root['child1'].id)]
+        request.session["kotti.selected-children"] = [str(root["child1"].id)]
         NodeActions(root, request).hide()
-        assert request.session.pop_flash('success') ==\
-            ['${title} is no longer visible in the navigation.']
-        assert root['child1'].in_navigation is False
+        assert request.session.pop_flash("success") == [
+            "${title} is no longer visible in the navigation."
+        ]
+        assert root["child1"].in_navigation is False
 
-        request.session['kotti.selected-children'] = [str(root['child1'].id)]
+        request.session["kotti.selected-children"] = [str(root["child1"].id)]
         NodeActions(root, request).show()
-        assert request.session.pop_flash('success') ==\
-            ['${title} is now visible in the navigation.']
-        assert root['child1'].in_navigation is True
+        assert request.session.pop_flash("success") == [
+            "${title} is now visible in the navigation."
+        ]
+        assert root["child1"].in_navigation is True
 
 
 class TestNodeShare:
@@ -370,9 +401,9 @@ def test_roles(self, root):
         # The 'share_node' view will return a list of available roles
         # as defined in 'kotti.security.SHARING_ROLES'
         request = DummyRequest()
-        assert (
-            [r.name for r in share_node(root, request)['available_roles']] ==
-            SHARING_ROLES)
+        assert [
+            r.name for r in share_node(root, request)["available_roles"]
+        ] == SHARING_ROLES
 
     def test_search(self, extra_principals, root, db_session):
         from kotti.security import get_principals
@@ -385,45 +416,44 @@ def test_search(self, extra_principals, root, db_session):
 
         # Search for "Bob", which will return both the user and the
         # group, both of which have no roles:
-        request.params['search'] = ''
-        request.params['query'] = 'Bob'
-        entries = share_node(root, request)['entries']
+        request.params["search"] = ""
+        request.params["query"] = "Bob"
+        entries = share_node(root, request)["entries"]
         assert len(entries) == 2
-        assert entries[0][0] == P['bob']
+        assert entries[0][0] == P["bob"]
         assert entries[0][1] == ([], [])
-        assert entries[1][0] == P['group:bobsgroup']
+        assert entries[1][0] == P["group:bobsgroup"]
         assert entries[1][1] == ([], [])
 
         # We make Bob an Editor in this context, and Bob's Group
         # becomes global Admin:
-        set_groups('bob', root, ['role:editor'])
+        set_groups("bob", root, ["role:editor"])
         db_session.flush()
-        P['group:bobsgroup'].groups = ['role:admin']
+        P["group:bobsgroup"].groups = ["role:admin"]
         db_session.flush()
-        entries = share_node(root, request)['entries']
+        entries = share_node(root, request)["entries"]
         assert len(entries) == 2
-        assert entries[0][0] == P['bob']
-        assert entries[0][1] == (['role:editor'], [])
-        assert entries[1][0] == P['group:bobsgroup']
-        assert entries[1][1] == (['role:admin'], ['role:admin'])
+        assert entries[0][0] == P["bob"]
+        assert entries[0][1] == (["role:editor"], [])
+        assert entries[1][0] == P["group:bobsgroup"]
+        assert entries[1][1] == (["role:admin"], ["role:admin"])
 
         # A search that doesn't return any items will still include
         # entries with existing local roles:
-        request.params['query'] = 'Weeee'
-        entries = share_node(root, request)['entries']
+        request.params["query"] = "Weeee"
+        entries = share_node(root, request)["entries"]
         assert len(entries) == 1
-        assert entries[0][0] == P['bob']
-        assert entries[0][1] == (['role:editor'], [])
-        assert (request.session.pop_flash('info') ==
-                ['No users or groups were found.'])
+        assert entries[0][0] == P["bob"]
+        assert entries[0][1] == (["role:editor"], [])
+        assert request.session.pop_flash("info") == ["No users or groups were found."]
 
         # It does not, however, include entries that have local group
         # assignments only:
-        set_groups('frank', root, ['group:franksgroup'])
-        request.params['query'] = 'Weeee'
-        entries = share_node(root, request)['entries']
+        set_groups("frank", root, ["group:franksgroup"])
+        request.params["query"] = "Weeee"
+        entries = share_node(root, request)["entries"]
         assert len(entries) == 1
-        assert entries[0][0] == P['bob']
+        assert entries[0][0] == P["bob"]
 
     def test_apply(self, extra_principals, root):
         from kotti.security import list_groups
@@ -432,49 +462,52 @@ def test_apply(self, extra_principals, root):
 
         request = DummyRequest()
 
-        request.params['apply'] = ''
-        request.params['csrf_token'] = request.session.get_csrf_token()
+        request.params["apply"] = ""
+        request.params["csrf_token"] = request.session.get_csrf_token()
         share_node(root, request)
-        assert (request.session.pop_flash('info') == ['No changes were made.'])
-        assert list_groups('bob', root) == []
-        set_groups('bob', root, ['role:special'])
+        assert request.session.pop_flash("info") == ["No changes were made."]
+        assert list_groups("bob", root) == []
+        set_groups("bob", root, ["role:special"])
 
-        request.params['role::bob::role:owner'] = '1'
-        request.params['role::bob::role:editor'] = '1'
-        request.params['orig-role::bob::role:owner'] = ''
-        request.params['orig-role::bob::role:editor'] = ''
+        request.params["role::bob::role:owner"] = "1"
+        request.params["role::bob::role:editor"] = "1"
+        request.params["orig-role::bob::role:owner"] = ""
+        request.params["orig-role::bob::role:editor"] = ""
 
         share_node(root, request)
-        assert (request.session.pop_flash('success') ==
-                ['Your changes have been saved.'])
-        assert (
-            set(list_groups('bob', root)) ==
-            {'role:owner', 'role:editor', 'role:special'}
-            )
+        assert request.session.pop_flash("success") == ["Your changes have been saved."]
+        assert set(list_groups("bob", root)) == {
+            "role:owner",
+            "role:editor",
+            "role:special",
+        }
 
         # We cannot set a role that's not displayed, even if we forged
         # the request:
-        request.params['role::bob::role:admin'] = '1'
-        request.params['orig-role::bob::role:admin'] = ''
+        request.params["role::bob::role:admin"] = "1"
+        request.params["orig-role::bob::role:admin"] = ""
         with raises(Forbidden):
             share_node(root, request)
-        assert (
-            set(list_groups('bob', root)) ==
-            {'role:owner', 'role:editor', 'role:special'}
-            )
+        assert set(list_groups("bob", root)) == {
+            "role:owner",
+            "role:editor",
+            "role:special",
+        }
 
     def test_csrf(self, extra_principals, root, dummy_request):
         """ Test if a CSRF token is present and checked on submission """
         from kotti.views.users import share_node
 
         result = share_node(root, dummy_request)
-        assert 'csrf_token' in result
+        assert "csrf_token" in result
 
-        dummy_request.params['apply'] = ''
+        dummy_request.params["apply"] = ""
 
         with raises(HTTPBadRequest):
             share_node(root, dummy_request)
 
-        dummy_request.params['csrf_token'] = dummy_request.session.get_csrf_token()  # noqa
+        dummy_request.params[
+            "csrf_token"
+        ] = dummy_request.session.get_csrf_token()  # noqa
         result = share_node(root, dummy_request)
-        assert result['csrf_token'] == dummy_request.session.get_csrf_token()
+        assert result["csrf_token"] == dummy_request.session.get_csrf_token()
diff --git a/kotti/tests/test_principals.py b/kotti/tests/test_principals.py
index cadf3b828..43f08b8ff 100644
--- a/kotti/tests/test_principals.py
+++ b/kotti/tests/test_principals.py
@@ -1,28 +1,26 @@
 class TestMassageGroups:
-
     def test_massage_groups_in(self):
         from kotti.views.users import _massage_groups_in
 
-        appstruct = {'groups': ['user-group', ],
-                     'roles': ['role:editor', ]}
+        appstruct = {"groups": ["user-group"], "roles": ["role:editor"]}
         _massage_groups_in(appstruct)
-        assert appstruct['groups'] == ['role:editor', 'group:user-group']
-        assert 'roles' not in appstruct
+        assert appstruct["groups"] == ["role:editor", "group:user-group"]
+        assert "roles" not in appstruct
 
         appstruct = {}
         _massage_groups_in(appstruct)
-        assert appstruct['groups'] == []
-        assert 'roles' not in appstruct
+        assert appstruct["groups"] == []
+        assert "roles" not in appstruct
 
     def test_massage_groups_out(self):
         from kotti.views.users import _massage_groups_out
 
-        appstruct = {'groups': ['group:user-group', 'role:editor']}
+        appstruct = {"groups": ["group:user-group", "role:editor"]}
         _massage_groups_out(appstruct)
-        assert appstruct['groups'] == ['user-group']
-        assert appstruct['roles'] == ['role:editor']
+        assert appstruct["groups"] == ["user-group"]
+        assert appstruct["roles"] == ["role:editor"]
 
-        appstruct = {'groups': []}
+        appstruct = {"groups": []}
         _massage_groups_out(appstruct)
-        assert appstruct['groups'] == []
-        assert appstruct['roles'] == []
+        assert appstruct["groups"] == []
+        assert appstruct["roles"] == []
diff --git a/kotti/tests/test_register.py b/kotti/tests/test_register.py
index ad6b30710..b29b47522 100644
--- a/kotti/tests/test_register.py
+++ b/kotti/tests/test_register.py
@@ -4,92 +4,105 @@
 
 
 class TestRegister:
-
     def test_register_form(self, root):
         from kotti.views.login import register
 
         request = DummyRequest()
         res = register(root, request)
-        assert(res['form'][:5] == '<form')
+        assert res["form"][:5] == "<form"
 
     def test_register_submit_empty(self, root):
         from kotti.views.login import register
 
         request = DummyRequest()
-        request.POST['register'] = 'register'
+        request.POST["register"] = "register"
         res = register(root, request)
-        assert 'There was a problem with your submission' in res['form']
+        assert "There was a problem with your submission" in res["form"]
 
     def test_register_submit(self, root):
         from kotti.views.login import register
         from pyramid.httpexceptions import HTTPFound
 
         request = DummyRequest()
-        request.POST['title'] = 'Test User'
-        request.POST['name'] = 'test'
-        request.POST['email'] = 'test@example.com'
-        request.POST['register'] = 'register',
+        request.POST["title"] = "Test User"
+        request.POST["name"] = "test"
+        request.POST["email"] = "test@example.com"
+        request.POST["register"] = ("register",)
 
-        with mock.patch('kotti.views.login.UserAddFormView') as form:
-            with mock.patch('kotti.views.login.get_principals'):
+        with mock.patch("kotti.views.login.UserAddFormView") as form:
+            with mock.patch("kotti.views.login.get_principals"):
                 res = register(root, request)
-                form.assert_has_calls([mock.call().add_user_success({
-                    'name': 'test',
-                    'roles': '',
-                    'title': 'Test User',
-                    'send_email': True,
-                    'groups': '',
-                    'email': 'test@example.com'})]
+                form.assert_has_calls(
+                    [
+                        mock.call().add_user_success(
+                            {
+                                "name": "test",
+                                "roles": "",
+                                "title": "Test User",
+                                "send_email": True,
+                                "groups": "",
+                                "email": "test@example.com",
+                            }
+                        )
+                    ]
                 )
-        assert(isinstance(res, HTTPFound))
+        assert isinstance(res, HTTPFound)
 
     def test_register_event(self, root):
         from kotti.views.login import register
+
         request = DummyRequest()
-        request.POST['title'] = 'Test User'
-        request.POST['name'] = 'test'
-        request.POST['email'] = 'test@example.com'
-        request.POST['register'] = 'register',
-
-        with mock.patch('kotti.views.login.UserAddFormView'):
-            with mock.patch('kotti.views.login.get_principals'):
-                with mock.patch('kotti.views.login.notify') as notify:
+        request.POST["title"] = "Test User"
+        request.POST["name"] = "test"
+        request.POST["email"] = "test@example.com"
+        request.POST["register"] = ("register",)
+
+        with mock.patch("kotti.views.login.UserAddFormView"):
+            with mock.patch("kotti.views.login.get_principals"):
+                with mock.patch("kotti.views.login.notify") as notify:
                     register(root, request)
-        assert(notify.call_count == 1)
+        assert notify.call_count == 1
 
     def test_register_submit_groups_and_roles(self, root):
         from kotti.views.login import register
         from pyramid.httpexceptions import HTTPFound
 
         request = DummyRequest()
-        request.POST['title'] = 'Test User'
-        request.POST['name'] = 'test'
-        request.POST['email'] = 'test@example.com'
-        request.POST['register'] = 'register',
-
-        with mock.patch('kotti.views.login.UserAddFormView') as form:
-            with mock.patch('kotti.views.login.get_principals'):
-                with mock.patch('kotti.views.login.get_settings') as get_settings:  # noqa
+        request.POST["title"] = "Test User"
+        request.POST["name"] = "test"
+        request.POST["email"] = "test@example.com"
+        request.POST["register"] = ("register",)
+
+        with mock.patch("kotti.views.login.UserAddFormView") as form:
+            with mock.patch("kotti.views.login.get_principals"):
+                with mock.patch(
+                    "kotti.views.login.get_settings"
+                ) as get_settings:  # noqa
                     get_settings.return_value = {
-                        'kotti.register.group': 'mygroup',
-                        'kotti.register.role': 'myrole',
-                        }
+                        "kotti.register.group": "mygroup",
+                        "kotti.register.role": "myrole",
+                    }
 
                     res = register(root, request)
 
-        form.assert_has_calls([
-            mock.call().add_user_success({
-                'name': 'test',
-                'roles': {'role:myrole'},
-                'title': 'Test User',
-                'send_email': True,
-                'groups': ['mygroup'],
-                'email': 'test@example.com',
-                })])
-        assert(isinstance(res, HTTPFound))
+        form.assert_has_calls(
+            [
+                mock.call().add_user_success(
+                    {
+                        "name": "test",
+                        "roles": {"role:myrole"},
+                        "title": "Test User",
+                        "send_email": True,
+                        "groups": ["mygroup"],
+                        "email": "test@example.com",
+                    }
+                )
+            ]
+        )
+        assert isinstance(res, HTTPFound)
 
 
 class TestNotRegister:
     def test_it(self, app):
-        res = app.post('/register', status=404)
-        assert res.status == '404 Not Found'
+        res = app.post("/register", status=404)
+        assert res.status == "404 Not Found"
diff --git a/kotti/tests/test_request.py b/kotti/tests/test_request.py
index abd848694..c59832b01 100644
--- a/kotti/tests/test_request.py
+++ b/kotti/tests/test_request.py
@@ -1,11 +1,10 @@
 class TestExtendingRequest:
-
     def test_it(self):
         from kotti.request import Request
         from zope.interface import providedBy, implementedBy
 
         req = Request({})
-        req.set_property(lambda x: 'exists', 'marker', reify=True)
+        req.set_property(lambda x: "exists", "marker", reify=True)
 
         assert providedBy(req) == implementedBy(Request)
-        assert req.marker == 'exists'
+        assert req.marker == "exists"
diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
index 86da03788..d059dfce2 100644
--- a/kotti/tests/test_sanitizers.py
+++ b/kotti/tests/test_sanitizers.py
@@ -1,4 +1,4 @@
-unsanitized = '''
+unsanitized = """
 <h1>Title</h1>
 <div class="teaser umlaut">Descrüptiön</div>
 <p>
@@ -12,12 +12,12 @@
   alert('XSS!')
 </script>
 <p>Unclosed paragraph
-'''
+"""
 
 
 def _verify_no_html(sanitized):
-    assert '<' not in sanitized
-    assert 'external links' in sanitized
+    assert "<" not in sanitized
+    assert "external links" in sanitized
 
 
 def test_no_html():
@@ -34,11 +34,11 @@ def _verify_minimal_html(sanitized):
     from bleach_whitelist.bleach_whitelist import print_tags
 
     for tag in set(all_tags) - set(markdown_tags) - set(print_tags):
-        assert '<{}'.format(tag) not in sanitized
+        assert "<{}".format(tag) not in sanitized
 
     assert 'style=""' in sanitized
     assert '<a href="http://external.com/">' in sanitized
-    assert 'size' not in sanitized.lower()
+    assert "size" not in sanitized.lower()
 
 
 def test_minmal_html():
@@ -50,11 +50,11 @@ def test_minmal_html():
 
 def _verify_xss_protection(sanitized):
 
-    assert '<script>' not in sanitized
-    assert '<h1>Title</h1>' in sanitized
+    assert "<script>" not in sanitized
+    assert "<h1>Title</h1>" in sanitized
     assert '<a href="internal.html" target="_blank">internal</a>' in sanitized
     assert 'b size="17"' in sanitized
-    assert '<p>Unclosed paragraph\n</p>' in sanitized
+    assert "<p>Unclosed paragraph\n</p>" in sanitized
 
 
 def test_xss_protection():
@@ -66,11 +66,17 @@ def test_xss_protection():
 
 def test_default_config(unresolved_settings):
 
-    assert 'kotti.sanitizers' in unresolved_settings
-    assert 'kotti.sanitize_on_write' in unresolved_settings
+    assert "kotti.sanitizers" in unresolved_settings
+    assert "kotti.sanitize_on_write" in unresolved_settings
 
-    assert unresolved_settings['kotti.sanitizers'] == 'xss_protection:kotti.sanitizers.xss_protection minimal_html:kotti.sanitizers.minimal_html no_html:kotti.sanitizers.no_html'  # noqa
-    assert unresolved_settings['kotti.sanitize_on_write'] == 'kotti.resources.Document.body:xss_protection kotti.resources.Content.title:no_html kotti.resources.Content.description:no_html'  # noqa
+    assert (
+        unresolved_settings["kotti.sanitizers"]
+        == "xss_protection:kotti.sanitizers.xss_protection minimal_html:kotti.sanitizers.minimal_html no_html:kotti.sanitizers.no_html"
+    )  # noqa
+    assert (
+        unresolved_settings["kotti.sanitize_on_write"]
+        == "kotti.resources.Document.body:xss_protection kotti.resources.Content.title:no_html kotti.resources.Content.description:no_html"
+    )  # noqa
 
 
 def test_setup_sanitizers(unresolved_settings):
@@ -81,30 +87,28 @@ def test_setup_sanitizers(unresolved_settings):
 
     _setup_sanitizers(unresolved_settings)
 
-    settings = unresolved_settings['kotti.sanitizers']
+    settings = unresolved_settings["kotti.sanitizers"]
 
-    assert 'minimal_html' in settings
-    assert 'no_html' in settings
-    assert 'xss_protection' in settings
+    assert "minimal_html" in settings
+    assert "no_html" in settings
+    assert "xss_protection" in settings
 
-    assert settings['minimal_html'] == minimal_html
-    assert settings['no_html'] == no_html
-    assert settings['xss_protection'] == xss_protection
+    assert settings["minimal_html"] == minimal_html
+    assert settings["no_html"] == no_html
+    assert settings["xss_protection"] == xss_protection
 
 
 def test_listeners(app, root, db_session):
 
     from kotti.resources import Document
 
-    root['d'] = doc = Document(
-        name='test',
-        title='<h1>Title</h1>',
-        description=unsanitized,
-        body=unsanitized)
+    root["d"] = doc = Document(
+        name="test", title="<h1>Title</h1>", description=unsanitized, body=unsanitized
+    )
 
     db_session.flush()
 
-    assert doc.title == 'Title'
+    assert doc.title == "Title"
     _verify_no_html(doc.description)
     _verify_xss_protection(doc.body)
 
@@ -115,11 +119,11 @@ def test_sanitize(app, dummy_request):
     from kotti.resources import Document
     from kotti.views.util import TemplateAPI
 
-    _verify_no_html(sanitize(unsanitized, 'no_html'))
-    _verify_minimal_html(sanitize(unsanitized, 'minimal_html'))
-    _verify_xss_protection(sanitize(unsanitized, 'xss_protection'))
+    _verify_no_html(sanitize(unsanitized, "no_html"))
+    _verify_minimal_html(sanitize(unsanitized, "minimal_html"))
+    _verify_xss_protection(sanitize(unsanitized, "xss_protection"))
 
     api = TemplateAPI(Document(), dummy_request)
-    _verify_no_html(api.sanitize(unsanitized, 'no_html'))
-    _verify_minimal_html(api.sanitize(unsanitized, 'minimal_html'))
-    _verify_xss_protection(api.sanitize(unsanitized, 'xss_protection'))
+    _verify_no_html(api.sanitize(unsanitized, "no_html"))
+    _verify_minimal_html(api.sanitize(unsanitized, "minimal_html"))
+    _verify_xss_protection(api.sanitize(unsanitized, "xss_protection"))
diff --git a/kotti/tests/test_search.py b/kotti/tests/test_search.py
index d6771a52e..09c1a0414 100644
--- a/kotti/tests/test_search.py
+++ b/kotti/tests/test_search.py
@@ -3,48 +3,49 @@
 
 def _create_contents(root):
     from kotti.resources import Content, File
-    doc1 = root['doc1'] = Content(
-        title='First Document',
-        description='I am the first.')
-    doc11 = root['doc1']['doc11'] = Content(
-        title='Second Document',
-        description='And I am the second.')
-    doc12 = root['doc1']['doc12'] = Content(
-        title='Third Document')
-    file1 = root['doc1']['file1'] = File(
-        title='First File',
-        description='this is a file')
+
+    doc1 = root["doc1"] = Content(title="First Document", description="I am the first.")
+    doc11 = root["doc1"]["doc11"] = Content(
+        title="Second Document", description="And I am the second."
+    )
+    doc12 = root["doc1"]["doc12"] = Content(title="Third Document")
+    file1 = root["doc1"]["file1"] = File(
+        title="First File", description="this is a file"
+    )
     return doc1, doc11, doc12, file1
 
 
 def _create_contents_with_tags(root=None):
     from kotti.resources import get_root
     from kotti.resources import Content, File
+
     if root is None:
         root = get_root()
 
-    animals = root['animals'] = Content(title='Animals')
-    cat = root['animals']['cat'] = Content(title='Cat')
-    dog = root['animals']['dog'] = Content(title='Dog')
-    monkey = root['animals']['monkey'] = Content(title='Monkey')
-    gorilla = root['animals']['gorilla'] = Content(title='Gorilla')
-    monkey_file = root['animals']['monkey_file'] = File(
-        title='Monkey File',
-        description='A Rhesus Macaque and a Green Monkey walk into a bar...')
-
-    root['animals']['cat'].tags = ['Animals', 'Cat']
-    root['animals']['dog'].tags = ['Animals', 'Dog']
-    root['animals']['monkey'].tags = ['Animals', 'Monkey', 'Primate']
-    root['animals']['monkey_file'].tags = ['Animals', 'Monkey', 'Primate']
-    root['animals']['gorilla'].tags = ['Animals', 'Gorilla', 'Primate']
+    animals = root["animals"] = Content(title="Animals")
+    cat = root["animals"]["cat"] = Content(title="Cat")
+    dog = root["animals"]["dog"] = Content(title="Dog")
+    monkey = root["animals"]["monkey"] = Content(title="Monkey")
+    gorilla = root["animals"]["gorilla"] = Content(title="Gorilla")
+    monkey_file = root["animals"]["monkey_file"] = File(
+        title="Monkey File",
+        description="A Rhesus Macaque and a Green Monkey walk into a bar...",
+    )
+
+    root["animals"]["cat"].tags = ["Animals", "Cat"]
+    root["animals"]["dog"].tags = ["Animals", "Dog"]
+    root["animals"]["monkey"].tags = ["Animals", "Monkey", "Primate"]
+    root["animals"]["monkey_file"].tags = ["Animals", "Monkey", "Primate"]
+    root["animals"]["gorilla"].tags = ["Animals", "Gorilla", "Primate"]
 
     return animals, cat, dog, monkey, gorilla, monkey_file
 
 
 def test_search_empty_content(db_session):
     from kotti.views.util import search_content
+
     request = DummyRequest()
-    results = search_content('teststring', request)
+    results = search_content("teststring", request)
     assert results == []
 
 
@@ -55,28 +56,27 @@ def test_search_content(root):
 
     request = DummyRequest()
     doc1, doc11, doc12, file1 = _create_contents(root)
-    results = search_content('First Document', request)
+    results = search_content("First Document", request)
     assert len(results) == 1
-    assert results[0]['name'] == 'doc1'
-    assert results[0]['title'] == 'First Document'
-    results = search_content('Document', request)
+    assert results[0]["name"] == "doc1"
+    assert results[0]["title"] == "First Document"
+    results = search_content("Document", request)
     # The frontpage contains 'Documentation' in its body!
     assert len(results) == 4
-    assert results[1]['name'] == 'doc11'
-    assert results[1]['title'] == 'Second Document'
-    assert results[1]['path'] == '/doc1/doc11/'
-    assert results[1]['path'][-1] == '/'
+    assert results[1]["name"] == "doc11"
+    assert results[1]["title"] == "Second Document"
+    assert results[1]["path"] == "/doc1/doc11/"
+    assert results[1]["path"][-1] == "/"
 
-    animals, cat, dog, \
-        monkey, gorilla, monkey_file = _create_contents_with_tags()
+    animals, cat, dog, monkey, gorilla, monkey_file = _create_contents_with_tags()
 
     tags = DBSession.query(Tag).all()
     assert len(tags) == 6
-    results = search_content('Animals', request)
+    results = search_content("Animals", request)
     assert len(results) == 6
-    results = search_content('Cat', request)
+    results = search_content("Cat", request)
     assert len(results) == 1
-    results = search_content('Primate', request)
+    results = search_content("Primate", request)
     assert len(results) == 3
 
     # Tags were included in general search by modifying the pre-existing
@@ -95,28 +95,30 @@ def test_search_content(root):
     # Note: this ordering is done to have some method, but it does not
     #       necessarily constitute a specification.
     #
-    results = search_content('Animals', request)
+    results = search_content("Animals", request)
     assert len(results) == 6
-    assert results[0]['name'] == 'animals'
+    assert results[0]["name"] == "animals"
 
 
 def test_search_file_description(root):
     from kotti.views.util import search_content
+
     request = DummyRequest()
     doc1, doc11, doc12, file1 = _create_contents(root)
-    results = search_content('this is a file', request)
+    results = search_content("this is a file", request)
     assert len(results) == 1
-    assert results[0]['name'] == 'file1'
-    assert results[0]['title'] == 'First File'
-    assert results[0]['path'] == '/doc1/file1/'
+    assert results[0]["name"] == "file1"
+    assert results[0]["title"] == "First File"
+    assert results[0]["path"] == "/doc1/file1/"
 
 
 def test_search_content_without_permission(config, root):
     from kotti.views.util import search_content
+
     request = DummyRequest()
     _create_contents(root)
     config.testing_securitypolicy(permissive=False)
-    results = search_content('Document', request)
+    results = search_content("Document", request)
     assert len(results) == 0
 
 
@@ -124,23 +126,23 @@ def test_search_functional(webtest, root):
 
     doc1, doc11, doc12, file1 = _create_contents(root)
 
-    resp = webtest.app.get('/')
+    resp = webtest.app.get("/")
 
-    search_form = resp.forms['form-search']
-    search_form['search-term'] = 'First Document'
+    search_form = resp.forms["form-search"]
+    search_form["search-term"] = "First Document"
     resp = search_form.submit()
-    assert 'I am the first' in resp.text
-    assert 'And I am the second' not in resp.text
+    assert "I am the first" in resp.text
+    assert "And I am the second" not in resp.text
 
-    search_form = resp.forms['form-search']
-    search_form['search-term'] = 'Document'
+    search_form = resp.forms["form-search"]
+    search_form["search-term"] = "Document"
     resp = search_form.submit()
-    assert 'I am the first' in resp.text
-    assert 'And I am the second' in resp.text
+    assert "I am the first" in resp.text
+    assert "And I am the second" in resp.text
 
-    search_form = resp.forms['form-search']
-    search_form['search-term'] = 'is a file'
+    search_form = resp.forms["form-search"]
+    search_form["search-term"] = "is a file"
     resp = search_form.submit()
-    assert 'And I am the second' not in resp.text
-    assert 'Third' not in resp.text
-    assert 'First File' in resp.text
+    assert "And I am the second" not in resp.text
+    assert "Third" not in resp.text
+    assert "First File" in resp.text
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index ec4f5399c..101f2ba31 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -6,16 +6,18 @@
 
 
 class HasPermissionTests:
-
     def test_has_permission(self):
         import mock
         from kotti.security import has_permission
-        permission = 'edit'
+
+        permission = "edit"
         context = object()
         request = mock.MagicMock()
         has_permission(permission, context, request)
-        assert request.has_permission.assert_called_once_with(
-            permission, context=context) is None
+        assert (
+            request.has_permission.assert_called_once_with(permission, context=context)
+            is None
+        )
 
 
 class TestGroups:
@@ -23,27 +25,27 @@ def test_root_default(self, db_session, root):
         from kotti.security import list_groups
         from kotti.security import list_groups_raw
 
-        assert list_groups('admin', root) == ['role:admin']
-        assert list_groups_raw('admin', root) == set([])
+        assert list_groups("admin", root) == ["role:admin"]
+        assert list_groups_raw("admin", root) == set([])
 
     def test_empty(self, db_session, root):
         from kotti.security import list_groups
 
-        assert list_groups('bob', root) == []
+        assert list_groups("bob", root) == []
 
     def test_simple(self, db_session, root):
         from kotti.security import list_groups
         from kotti.security import list_groups_raw
         from kotti.security import set_groups
 
-        set_groups('bob', root, ['role:editor'])
-        assert list_groups('bob', root) == ['role:editor']
-        assert list_groups_raw('bob', root) == {'role:editor'}
+        set_groups("bob", root, ["role:editor"])
+        assert list_groups("bob", root) == ["role:editor"]
+        assert list_groups_raw("bob", root) == {"role:editor"}
 
     def test_not_a_node(self):
         from kotti.security import list_groups_raw
 
-        assert list_groups_raw('bob', object()) == set()
+        assert list_groups_raw("bob", object()) == set()
 
     def test_overwrite_and_delete(self, db_session, root):
         from kotti.resources import get_root
@@ -51,16 +53,16 @@ def test_overwrite_and_delete(self, db_session, root):
         from kotti.security import list_groups_raw
         from kotti.security import set_groups
 
-        set_groups('bob', root, ['role:editor'])
-        assert list_groups('bob', root) == ['role:editor']
-        assert list_groups_raw('bob', root) == {'role:editor'}
+        set_groups("bob", root, ["role:editor"])
+        assert list_groups("bob", root) == ["role:editor"]
+        assert list_groups_raw("bob", root) == {"role:editor"}
 
-        set_groups('bob', root, ['role:admin'])
-        assert list_groups('bob', root) == ['role:admin']
-        assert list_groups_raw('bob', root) == {'role:admin'}
+        set_groups("bob", root, ["role:admin"])
+        assert list_groups("bob", root) == ["role:admin"]
+        assert list_groups_raw("bob", root) == {"role:admin"}
 
-        set_groups('bob', root)
-        assert list_groups('bob', root) == []
+        set_groups("bob", root)
+        assert list_groups("bob", root) == []
         assert get_root() is root
 
     def test_inherit(self, db_session, root):
@@ -69,30 +71,27 @@ def test_inherit(self, db_session, root):
         from kotti.security import list_groups_raw
         from kotti.security import set_groups
 
-        child = root['child'] = Node()
+        child = root["child"] = Node()
         db_session.flush()
 
-        assert list_groups('bob', child) == []
-        set_groups('bob', root, ['role:editor'])
-        assert list_groups('bob', child) == ['role:editor']
+        assert list_groups("bob", child) == []
+        set_groups("bob", root, ["role:editor"])
+        assert list_groups("bob", child) == ["role:editor"]
 
         # Groups from the child are added:
-        set_groups('bob', child, ['group:somegroup'])
-        assert (
-            set(list_groups('bob', child)) ==
-            {'group:somegroup', 'role:editor'}
-            )
+        set_groups("bob", child, ["group:somegroup"])
+        assert set(list_groups("bob", child)) == {"group:somegroup", "role:editor"}
 
         # We can ask to list only those groups that are defined locally:
-        assert list_groups_raw('bob', child) == {'group:somegroup'}
+        assert list_groups_raw("bob", child) == {"group:somegroup"}
 
     @staticmethod
     def add_some_groups(db_session, root):
         from kotti.resources import Node
         from kotti.security import set_groups
 
-        child = root['child'] = Node()
-        grandchild = child['grandchild'] = Node()
+        child = root["child"] = Node()
+        grandchild = child["grandchild"] = Node()
         db_session.flush()
 
         # root:
@@ -106,66 +105,69 @@ def add_some_groups(db_session, root):
         #   group:franksgroup -> group:bobsgroup
 
         # bob and frank are a site-wide members of their respective groups:
-        set_groups('bob', root, ['group:bobsgroup'])
-        set_groups('frank', root, ['group:franksgroup'])
+        set_groups("bob", root, ["group:bobsgroup"])
+        set_groups("frank", root, ["group:franksgroup"])
 
         # franksgroup has a site-wide editor role:
-        set_groups('group:franksgroup', root, ['role:editor'])
+        set_groups("group:franksgroup", root, ["role:editor"])
 
         # bobsgroup is part of franksgroup on the child level:
-        set_groups('group:bobsgroup', child, ['group:franksgroup'])
+        set_groups("group:bobsgroup", child, ["group:franksgroup"])
 
         # franksgroup has the admin role on the grandchild.
         # and finally, to test recursion, we make franksgroup part of
         # bobsgroup on the grandchild level:
-        set_groups('group:franksgroup', grandchild,
-                   ['role:owner', 'group:bobsgroup'])
+        set_groups("group:franksgroup", grandchild, ["role:owner", "group:bobsgroup"])
 
     def test_nested_groups(self, db_session, root):
         from kotti.security import list_groups
         from kotti.security import list_groups_ext
 
         self.add_some_groups(db_session, root)
-        child = root['child']
-        grandchild = child['grandchild']
+        child = root["child"]
+        grandchild = child["grandchild"]
 
         # Check bob's groups on every level:
-        assert list_groups('bob', root) == ['group:bobsgroup']
-        assert (set(list_groups('bob', child)) ==
-                {'group:bobsgroup', 'group:franksgroup', 'role:editor'})
-        assert (set(list_groups('bob', grandchild)) ==
-                {'group:bobsgroup', 'group:franksgroup', 'role:editor',
-                 'role:owner'})
+        assert list_groups("bob", root) == ["group:bobsgroup"]
+        assert set(list_groups("bob", child)) == {
+            "group:bobsgroup",
+            "group:franksgroup",
+            "role:editor",
+        }
+        assert set(list_groups("bob", grandchild)) == {
+            "group:bobsgroup",
+            "group:franksgroup",
+            "role:editor",
+            "role:owner",
+        }
 
         # Check group:franksgroup groups on every level:
-        assert (set(list_groups('frank', root)) ==
-                {'group:franksgroup', 'role:editor'})
-        assert (set(list_groups('frank', child)) ==
-                {'group:franksgroup', 'role:editor'})
-        assert (set(list_groups('frank', grandchild)) ==
-                {'group:franksgroup', 'role:editor', 'role:owner',
-                 'group:bobsgroup'})
+        assert set(list_groups("frank", root)) == {"group:franksgroup", "role:editor"}
+        assert set(list_groups("frank", child)) == {"group:franksgroup", "role:editor"}
+        assert set(list_groups("frank", grandchild)) == {
+            "group:franksgroup",
+            "role:editor",
+            "role:owner",
+            "group:bobsgroup",
+        }
 
         # Sometimes it's useful to know which of the groups were
         # inherited, that's what 'list_groups_ext' is for:
-        groups, inherited = list_groups_ext('bob', root)
-        assert groups == ['group:bobsgroup']
+        groups, inherited = list_groups_ext("bob", root)
+        assert groups == ["group:bobsgroup"]
         assert inherited == []
 
-        groups, inherited = list_groups_ext('bob', child)
-        assert (set(groups) ==
-                {'group:bobsgroup', 'group:franksgroup', 'role:editor'})
-        assert (set(inherited) ==
-                {'group:bobsgroup', 'group:franksgroup', 'role:editor'})
+        groups, inherited = list_groups_ext("bob", child)
+        assert set(groups) == {"group:bobsgroup", "group:franksgroup", "role:editor"}
+        assert set(inherited) == {"group:bobsgroup", "group:franksgroup", "role:editor"}
 
-        groups, inherited = list_groups_ext('group:bobsgroup', child)
-        assert set(groups) == {'group:franksgroup', 'role:editor'}
-        assert inherited == ['role:editor']
+        groups, inherited = list_groups_ext("group:bobsgroup", child)
+        assert set(groups) == {"group:franksgroup", "role:editor"}
+        assert inherited == ["role:editor"]
 
-        groups, inherited = list_groups_ext('group:franksgroup', grandchild)
-        assert (set(groups) ==
-                {'group:bobsgroup', 'role:owner', 'role:editor'})
-        assert inherited == ['role:editor']
+        groups, inherited = list_groups_ext("group:franksgroup", grandchild)
+        assert set(groups) == {"group:bobsgroup", "role:owner", "role:editor"}
+        assert inherited == ["role:editor"]
 
     def test_works_with_auth(self, db_session, root):
         from kotti.resources import Node
@@ -173,64 +175,64 @@ def test_works_with_auth(self, db_session, root):
         from kotti.security import list_groups_callback
         from kotti.security import set_groups
 
-        child = root['child'] = Node()
+        child = root["child"] = Node()
         db_session.flush()
 
         request = DummyRequest()
         auth = CallbackAuthenticationPolicy()
-        auth.unauthenticated_userid = lambda *args: 'bob'
+        auth.unauthenticated_userid = lambda *args: "bob"
         auth.callback = list_groups_callback
 
         request.context = root
-        assert (  # user doesn't exist yet
-            auth.effective_principals(request) ==
-            ['system.Everyone']
-            )
+        assert auth.effective_principals(request) == [  # user doesn't exist yet
+            "system.Everyone"
+        ]
 
-        get_principals()['bob'] = dict(name='bob')
-        assert (
-            auth.effective_principals(request) ==
-            ['system.Everyone', 'system.Authenticated', 'bob']
-            )
+        get_principals()["bob"] = dict(name="bob")
+        assert auth.effective_principals(request) == [
+            "system.Everyone",
+            "system.Authenticated",
+            "bob",
+        ]
 
         # Define that bob belongs to bobsgroup on the root level:
-        set_groups('bob', root, ['group:bobsgroup'])
+        set_groups("bob", root, ["group:bobsgroup"])
         request.context = child
-        assert (
-            set(auth.effective_principals(request)) == {'system.Everyone',
-                                                        'system.Authenticated',
-                                                        'bob',
-                                                        'group:bobsgroup'}
-            )
+        assert set(auth.effective_principals(request)) == {
+            "system.Everyone",
+            "system.Authenticated",
+            "bob",
+            "group:bobsgroup",
+        }
 
         # define that bob belongs to franksgroup in the user db:
-        get_principals()['bob'].groups = ['group:franksgroup']
-        set_groups('group:franksgroup', child, ['group:anothergroup'])
-        assert (
-            set(auth.effective_principals(request)) == {'system.Everyone',
-                                                        'system.Authenticated',
-                                                        'bob',
-                                                        'group:bobsgroup',
-                                                        'group:franksgroup',
-                                                        'group:anothergroup'}
-            )
+        get_principals()["bob"].groups = ["group:franksgroup"]
+        set_groups("group:franksgroup", child, ["group:anothergroup"])
+        assert set(auth.effective_principals(request)) == {
+            "system.Everyone",
+            "system.Authenticated",
+            "bob",
+            "group:bobsgroup",
+            "group:franksgroup",
+            "group:anothergroup",
+        }
 
         # And lastly test that circular group defintions are not a
         # problem here either:
-        get_principals()['group:franksgroup'] = dict(
-            name='group:franksgroup',
+        get_principals()["group:franksgroup"] = dict(
+            name="group:franksgroup",
             title="Frank's group",
-            groups=['group:funnygroup', 'group:bobsgroup'],
-            )
-        assert (
-            set(auth.effective_principals(request)) == {'system.Everyone',
-                                                        'system.Authenticated',
-                                                        'bob',
-                                                        'group:bobsgroup',
-                                                        'group:franksgroup',
-                                                        'group:anothergroup',
-                                                        'group:funnygroup'}
-            )
+            groups=["group:funnygroup", "group:bobsgroup"],
+        )
+        assert set(auth.effective_principals(request)) == {
+            "system.Everyone",
+            "system.Authenticated",
+            "bob",
+            "group:bobsgroup",
+            "group:franksgroup",
+            "group:anothergroup",
+            "group:funnygroup",
+        }
 
     def test_list_groups_callback_with_groups(self, db_session):
         from kotti.security import list_groups_callback
@@ -238,12 +240,12 @@ def test_list_groups_callback_with_groups(self, db_session):
 
         # Although group definitions are also in the user database,
         # we're not allowed to authenticate with a group id:
-        get_principals()['bob'] = dict(name='bob')
-        get_principals()['group:bobsgroup'] = dict(name='group:bobsgroup')
+        get_principals()["bob"] = dict(name="bob")
+        get_principals()["group:bobsgroup"] = dict(name="group:bobsgroup")
 
         request = DummyRequest()
-        assert list_groups_callback('bob', request) == []
-        assert list_groups_callback('group:bobsgroup', request) is None
+        assert list_groups_callback("bob", request) == []
+        assert list_groups_callback("group:bobsgroup", request) is None
 
     def test_principals_with_local_roles(self, db_session, root):
         from kotti.resources import Node
@@ -251,7 +253,7 @@ def test_principals_with_local_roles(self, db_session, root):
         from kotti.security import principals_with_local_roles
         from kotti.security import set_groups
 
-        child = root['child'] = Node()
+        child = root["child"] = Node()
         db_session.flush()
 
         assert principals_with_local_roles(root) == []
@@ -259,46 +261,42 @@ def test_principals_with_local_roles(self, db_session, root):
         assert map_principals_with_local_roles(root) == []
         assert map_principals_with_local_roles(child) == []
 
-        set_groups('group:bobsgroup', child, ['role:editor'])
-        set_groups('bob', root, ['group:bobsgroup'])
-        set_groups('group:franksgroup', root, ['role:editor'])
+        set_groups("group:bobsgroup", child, ["role:editor"])
+        set_groups("bob", root, ["group:bobsgroup"])
+        set_groups("group:franksgroup", root, ["role:editor"])
 
-        assert (
-            set(principals_with_local_roles(child)) ==
-            {'bob', 'group:bobsgroup', 'group:franksgroup'}
-            )
-        assert (
-            set(principals_with_local_roles(child, inherit=False)) ==
-            {'group:bobsgroup'}
-            )
-        assert (
-            set(principals_with_local_roles(root)) ==
-            {'bob', 'group:franksgroup'}
-            )
+        assert set(principals_with_local_roles(child)) == {
+            "bob",
+            "group:bobsgroup",
+            "group:franksgroup",
+        }
+        assert set(principals_with_local_roles(child, inherit=False)) == {
+            "group:bobsgroup"
+        }
+        assert set(principals_with_local_roles(root)) == {"bob", "group:franksgroup"}
 
     def test_copy_local_groups(self, db_session, root):
         from kotti.security import principals_with_local_roles
         from kotti.security import set_groups
 
         self.test_principals_with_local_roles(db_session, root)
-        child = root['child']
-        assert (
-            set(principals_with_local_roles(child)) ==
-            {'bob', 'group:bobsgroup', 'group:franksgroup'}
-            )
+        child = root["child"]
+        assert set(principals_with_local_roles(child)) == {
+            "bob",
+            "group:bobsgroup",
+            "group:franksgroup",
+        }
 
         # We make a copy of 'child', and we expect the local roles set
         # on 'child' to not be copied over:
-        child2 = root['child2'] = child.copy()
+        child2 = root["child2"] = child.copy()
         db_session.flush()
-        assert (
-            set(principals_with_local_roles(child2)) ==
-            {'bob', 'group:franksgroup'})
+        assert set(principals_with_local_roles(child2)) == {"bob", "group:franksgroup"}
         assert len(principals_with_local_roles(child)) == 3
 
         # When we now change the local roles of 'child', the copy is
         # unaffected:
-        set_groups('group:bobsgroup', child, [])
+        set_groups("group:bobsgroup", child, [])
         assert len(principals_with_local_roles(child)) == 2
         assert len(principals_with_local_roles(child2)) == 2
 
@@ -307,28 +305,28 @@ def test_map_principals_with_local_roles(self, db_session, root):
         from kotti.security import map_principals_with_local_roles
 
         self.test_principals_with_local_roles(db_session, root)
-        child = root['child']
+        child = root["child"]
         P = get_principals()
 
         # No users are defined in P, thus we get the empty list:
         assert map_principals_with_local_roles(root) == []
 
-        P['bob'] = {'name': 'bob'}
-        P['group:bobsgroup'] = {'name': 'group:bobsgroup'}
+        P["bob"] = {"name": "bob"}
+        P["group:bobsgroup"] = {"name": "group:bobsgroup"}
 
         value = map_principals_with_local_roles(root)
         assert len(value) == 1
         bob, (bob_all, bob_inherited) = value[0]
-        assert bob_all == ['group:bobsgroup']
+        assert bob_all == ["group:bobsgroup"]
         assert bob_inherited == []
 
         value = map_principals_with_local_roles(child)
         assert len(value) == 2
         bob, (bob_all, bob_inherited) = value[0]
         bobsgroup, (bobsgroup_all, bobsgroup_inherited) = value[1]
-        assert (set(bob_all) == {'group:bobsgroup', 'role:editor'})
-        assert (set(bob_inherited) == {'group:bobsgroup', 'role:editor'})
-        assert bobsgroup_all == ['role:editor']
+        assert set(bob_all) == {"group:bobsgroup", "role:editor"}
+        assert set(bob_inherited) == {"group:bobsgroup", "role:editor"}
+        assert bobsgroup_all == ["role:editor"]
         assert bobsgroup_inherited == []
 
     def test_local_roles_db_cascade(self, db_session, root):
@@ -336,16 +334,16 @@ def test_local_roles_db_cascade(self, db_session, root):
         from kotti.resources import Node
         from kotti.security import set_groups
 
-        child = root['child'] = Node()
+        child = root["child"] = Node()
         db_session.flush()
 
         # We set a local group on child and delete child.  We then
         # expect the LocalGroup entry to have been deleted from the
         # database:
         assert db_session.query(LocalGroup).count() == 0
-        set_groups('group:bobsgroup', child, ['role:editor'])
+        set_groups("group:bobsgroup", child, ["role:editor"])
         assert db_session.query(LocalGroup).count() == 1
-        del root['child']
+        del root["child"]
         db_session.flush()
         assert db_session.query(LocalGroup).count() == 0
 
@@ -353,52 +351,52 @@ def test_local_roles_db_cascade(self, db_session, root):
 class TestPrincipals:
     def get_principals(self):
         from kotti.security import get_principals
+
         return get_principals()
 
     def make_bob(self):
         users = self.get_principals()
-        users['bob'] = dict(
-            name='bob',
-            password='secret',
-            email='bob@dabolina.com',
-            title='Bob Dabolina',
-            groups=['group:bobsgroup'],
-            )
-        return users['bob']
+        users["bob"] = dict(
+            name="bob",
+            password="secret",
+            email="bob@dabolina.com",
+            title="Bob Dabolina",
+            groups=["group:bobsgroup"],
+        )
+        return users["bob"]
 
     def _assert_is_bob(self, bob):
-        assert bob.name == 'bob'
-        assert bob.title == 'Bob Dabolina'
-        assert bob.groups == ['group:bobsgroup']
+        assert bob.name == "bob"
+        assert bob.title == "Bob Dabolina"
+        assert bob.groups == ["group:bobsgroup"]
 
     def test_hash_password_non_ascii(self, db_session):
-        self.get_principals().hash_password('\xd6TEst')
+        self.get_principals().hash_password("\xd6TEst")
 
     def test_default_admin(self, db_session):
-        admin = self.get_principals()['admin']
-        assert self.get_principals().validate_password(
-            'secret', admin.password)
-        assert admin.groups == ['role:admin']
+        admin = self.get_principals()["admin"]
+        assert self.get_principals().validate_password("secret", admin.password)
+        assert admin.groups == ["role:admin"]
 
     def test_users_empty(self, db_session):
         users = self.get_principals()
         with raises(KeyError):
-            users['bob']
+            users["bob"]
         with raises(KeyError):
-            del users['bob']
-        assert users.keys() == ['admin']
+            del users["bob"]
+        assert users.keys() == ["admin"]
 
     def test_users_add_and_remove(self, db_session):
         self.make_bob()
         users = self.get_principals()
-        self._assert_is_bob(users['bob'])
-        assert set(users.keys()) == {'admin', 'bob'}
+        self._assert_is_bob(users["bob"])
+        assert set(users.keys()) == {"admin", "bob"}
 
-        del users['bob']
+        del users["bob"]
         with raises(KeyError):
-            users['bob']
+            users["bob"]
         with raises(KeyError):
-            del users['bob']
+            del users["bob"]
 
     def test_users_search(self, db_session):
         users = self.get_principals()
@@ -416,9 +414,8 @@ def test_users_search(self, db_session):
         # search on a non string attribute
         assert bob in list(users.search(active=True))
         # test operator
-        assert len(list(users.search(name='bob', active=True))) == 2
-        assert len(list(users.search(match='all', name='bob',
-                                     active=True))) == 1
+        assert len(list(users.search(name="bob", active=True))) == 2
+        assert len(list(users.search(match="all", name="bob", active=True))) == 1
 
     def test_groups_from_users(self, db_session, root):
         from kotti.resources import Node
@@ -426,25 +423,27 @@ def test_groups_from_users(self, db_session, root):
         from kotti.security import set_groups
 
         self.make_bob()
-        child = root['child'] = Node()
+        child = root["child"] = Node()
         db_session.flush()
 
-        assert list_groups('bob', root) == ['group:bobsgroup']
+        assert list_groups("bob", root) == ["group:bobsgroup"]
 
-        set_groups('group:bobsgroup', root, ['role:editor'])
-        set_groups('role:editor', child, ['group:foogroup'])
+        set_groups("group:bobsgroup", root, ["role:editor"])
+        set_groups("role:editor", child, ["group:foogroup"])
 
-        assert (set(list_groups('bob', root)) ==
-                {'group:bobsgroup', 'role:editor'})
-        assert (set(list_groups('bob', child)) ==
-                {'group:bobsgroup', 'role:editor', 'group:foogroup'})
+        assert set(list_groups("bob", root)) == {"group:bobsgroup", "role:editor"}
+        assert set(list_groups("bob", child)) == {
+            "group:bobsgroup",
+            "role:editor",
+            "group:foogroup",
+        }
 
     def test_is_user(self, db_session):
         from kotti.security import is_user
 
         bob = self.make_bob()
         assert is_user(bob) is True
-        bob.name = 'group:bobsgroup'
+        bob.name = "group:bobsgroup"
         assert is_user(bob) is False
 
     def test_hash_and_validate_password(self, db_session):
@@ -461,9 +460,8 @@ def test_bobs_hashed_password(self, db_session):
 
         # When we set the 'password' attribute directly, we have to do
         # the hashing ourselves.  This won't work:
-        bob.password = 'anothersecret'
-        assert principals.validate_password(
-            "anothersecret", bob.password) is False
+        bob.password = "anothersecret"
+        assert principals.validate_password("anothersecret", bob.password) is False
 
         # This will:
         bob.password = principals.hash_password("anothersecret")
@@ -480,15 +478,15 @@ def test_reset_password(self, db_session):
 
         request = DummyRequest()
         self.make_bob()
-        request.params['reset-password'] = 'on'
-        request.params['login'] = 'bob'
-        request.params['password'] = 'secret'
-        with patch(
-                'kotti.views.login.email_set_password') as email_set_password:
+        request.params["reset-password"] = "on"
+        request.params["login"] = "bob"
+        request.params["password"] = "secret"
+        with patch("kotti.views.login.email_set_password") as email_set_password:
             login(None, request)
-        assert (request.session.pop_flash('success') == [
+        assert request.session.pop_flash("success") == [
             "You should be receiving an email with a link to reset your "
-            "password. Doing so will activate your account."])
+            "password. Doing so will activate your account."
+        ]
         assert email_set_password.call_count == 1
 
     def test_reset_password_inactive_user(self, db_session):
@@ -496,82 +494,84 @@ def test_reset_password_inactive_user(self, db_session):
 
         request = DummyRequest()
         self.make_bob().active = False
-        request.params['reset-password'] = 'on'
-        request.params['login'] = 'bob'
-        request.params['password'] = 'secret'
-        with patch(
-                'kotti.views.login.email_set_password') as email_set_password:
+        request.params["reset-password"] = "on"
+        request.params["login"] = "bob"
+        request.params["password"] = "secret"
+        with patch("kotti.views.login.email_set_password") as email_set_password:
             login(None, request)
-        assert (request.session.pop_flash('error') ==
-                ["That username or email is not known by this system."])
+        assert request.session.pop_flash("error") == [
+            "That username or email is not known by this system."
+        ]
         assert email_set_password.call_count == 0
 
     def test_login(self, db_session):
         from kotti.views.login import login
+
         request = DummyRequest()
 
         # No login attempt:
         result = login(None, request)
         assert isinstance(result, dict)
-        assert request.session.pop_flash('success') == []
-        assert request.session.pop_flash('error') == []
+        assert request.session.pop_flash("success") == []
+        assert request.session.pop_flash("error") == []
 
         # Attempt to log in before Bob exists:
-        request.params['submit'] = 'on'
-        request.params['login'] = 'bob'
-        request.params['password'] = 'secret'
+        request.params["submit"] = "on"
+        request.params["login"] = "bob"
+        request.params["password"] = "secret"
         result = login(None, request)
         assert isinstance(result, dict)
-        assert request.session.pop_flash('success') == []
-        assert (request.session.pop_flash('error') == ['Login failed.'])
+        assert request.session.pop_flash("success") == []
+        assert request.session.pop_flash("error") == ["Login failed."]
 
         # Make Bob and do it again:
         bob = self.make_bob()
         assert bob.last_login_date is None
         result = login(None, request)
-        assert result.status == '302 Found'
-        assert (
-            [request.session.pop_flash('success')[0].interpolate()] ==
-            ['Welcome, Bob Dabolina!'])
+        assert result.status == "302 Found"
+        assert [request.session.pop_flash("success")[0].interpolate()] == [
+            "Welcome, Bob Dabolina!"
+        ]
         last_login_date = bob.last_login_date
         assert last_login_date is not None
-        assert request.session.pop_flash('error') == []
+        assert request.session.pop_flash("error") == []
 
         # Log in with email:
-        request.params['login'] = 'bob@dabolina.com'
+        request.params["login"] = "bob@dabolina.com"
         result = login(None, request)
-        assert result.status == '302 Found'
-        assert (
-            [request.session.pop_flash('success')[0].interpolate()] ==
-            ['Welcome, Bob Dabolina!'])
+        assert result.status == "302 Found"
+        assert [request.session.pop_flash("success")[0].interpolate()] == [
+            "Welcome, Bob Dabolina!"
+        ]
         assert last_login_date < bob.last_login_date
 
         # Deactive Bob, logging in is no longer possible:
         bob.active = False
         result = login(None, request)
         assert isinstance(result, dict)
-        assert (request.session.pop_flash('error') == ['Login failed.'])
+        assert request.session.pop_flash("error") == ["Login failed."]
 
         # If Bob has a 'confirm_token' set, logging in is still possible:
         bob.active = True
-        bob.confirm_token = 'token'
+        bob.confirm_token = "token"
         result = login(None, request)
-        assert result.status == '302 Found'
-        assert (
-            [request.session.pop_flash('success')[0].interpolate()] ==
-            ['Welcome, Bob Dabolina!'])
+        assert result.status == "302 Found"
+        assert [request.session.pop_flash("success")[0].interpolate()] == [
+            "Welcome, Bob Dabolina!"
+        ]
 
     def test_login_with_email_remembers(self, db_session):
         from kotti.views.login import login
+
         request = DummyRequest()
 
         self.make_bob()
-        request.params['submit'] = 'on'
-        request.params['login'] = 'bob@dabolina.com'
-        request.params['password'] = 'secret'
-        with patch('kotti.views.login.remember') as remember:
+        request.params["submit"] = "on"
+        request.params["login"] = "bob@dabolina.com"
+        request.params["password"] = "secret"
+        with patch("kotti.views.login.remember") as remember:
             login(None, request)
-            remember.assert_called_with(request, 'bob')
+            remember.assert_called_with(request, "bob")
 
 
 class TestAuthzContextManager:
@@ -580,52 +580,51 @@ def test_basic(self):
 
         context, request = object(), DummyRequest()
         with authz_context(context, request):
-            assert request.environ['authz_context'] == context
-        assert 'authz_context' not in request.environ
+            assert request.environ["authz_context"] == context
+        assert "authz_context" not in request.environ
 
     def test_set_before(self):
         from kotti.security import authz_context
 
         context, context2, request = object(), object(), DummyRequest()
-        request.environ['authz_context'] = context2
+        request.environ["authz_context"] = context2
         with authz_context(context, request):
-            assert request.environ['authz_context'] == context
-        assert request.environ['authz_context'] == context2
+            assert request.environ["authz_context"] == context
+        assert request.environ["authz_context"] == context2
 
     def test_with_exception(self):
         from kotti.security import authz_context
 
         context, context2, request = object(), object(), DummyRequest()
-        request.environ['authz_context'] = context2
+        request.environ["authz_context"] = context2
         try:
             with authz_context(context, request):
-                assert request.environ['authz_context'] == context
+                assert request.environ["authz_context"] == context
                 raise ValueError
         except ValueError:
-            assert request.environ['authz_context'] == context2
+            assert request.environ["authz_context"] == context2
 
 
 class TestViewPermitted:
-    @patch('kotti.security.view_execution_permitted')
+    @patch("kotti.security.view_execution_permitted")
     def test_with_post_request(self, view_execution_permitted):
         from kotti.security import view_permitted
 
         context, request = object(), DummyRequest()
-        request.method = 'POST'
+        request.method = "POST"
         calls = []
 
         def view_execution_permitted_mock(context, request, name):
             calls.append((context, request, name))
-            assert request.method == 'GET'
+            assert request.method == "GET"
 
         view_execution_permitted.side_effect = view_execution_permitted_mock
         view_permitted(context, request)
         assert len(calls) == 1
-        assert request.method == 'POST'
+        assert request.method == "POST"
 
 
 class TestHasPermission:
-
     def test_request_has_permission(self):
 
         from kotti.request import Request
@@ -635,11 +634,13 @@ def test_request_has_permission(self):
 
         def has_permission_fake(self, permission, context=None):
             args.append((permission, context))
-            assert self.environ['authz_context'] == context
+            assert self.environ["authz_context"] == context
 
-        with patch('kotti.request.pyramid.request.Request.has_permission',
-                   new=has_permission_fake):
-            request = Request.blank('/')
+        with patch(
+            "kotti.request.pyramid.request.Request.has_permission",
+            new=has_permission_fake,
+        ):
+            request = Request.blank("/")
             request.has_permission(permission, context)
 
         assert args == [(permission, context)]
@@ -652,8 +653,8 @@ def test_set_roles(self):
         from kotti.security import reset_roles
 
         before = ROLES.copy()
-        set_roles({'role:admin': ROLES['role:admin']})
-        assert ROLES == {'role:admin': ROLES['role:admin']}
+        set_roles({"role:admin": ROLES["role:admin"]})
+        assert ROLES == {"role:admin": ROLES["role:admin"]}
         reset_roles()
         assert ROLES == before
 
@@ -663,8 +664,8 @@ def test_set_sharing_roles(self):
         from kotti.security import reset_sharing_roles
 
         before = SHARING_ROLES[:]
-        set_sharing_roles(['role:admin'])
-        assert SHARING_ROLES == ['role:admin']
+        set_sharing_roles(["role:admin"])
+        assert SHARING_ROLES == ["role:admin"]
         reset_sharing_roles()
         assert SHARING_ROLES == before
 
@@ -674,7 +675,7 @@ def test_set_user_management_roles(self):
         from kotti.security import reset_user_management_roles
 
         before = USER_MANAGEMENT_ROLES[:]
-        set_user_management_roles(['role:admin'])
-        assert USER_MANAGEMENT_ROLES == ['role:admin']
+        set_user_management_roles(["role:admin"])
+        assert USER_MANAGEMENT_ROLES == ["role:admin"]
         reset_user_management_roles()
         assert USER_MANAGEMENT_ROLES == before
diff --git a/kotti/tests/test_security_views.py b/kotti/tests/test_security_views.py
index c9557cb21..019e2649b 100644
--- a/kotti/tests/test_security_views.py
+++ b/kotti/tests/test_security_views.py
@@ -13,9 +13,9 @@ def test_roles(self, root):
         from kotti.views.users import UsersManage
 
         request = DummyRequest()
-        assert ([r.name
-                 for r in UsersManage(root, request)()['available_roles']] ==
-                USER_MANAGEMENT_ROLES)
+        assert [
+            r.name for r in UsersManage(root, request)()["available_roles"]
+        ] == USER_MANAGEMENT_ROLES
 
     def test_search(self, extra_principals, root):
         from kotti.security import get_principals
@@ -24,26 +24,25 @@ def test_search(self, extra_principals, root):
         request = DummyRequest()
         P = get_principals()
 
-        request.params['search'] = ''
-        request.params['query'] = 'Joe'
-        entries = UsersManage(root, request)()['entries']
+        request.params["search"] = ""
+        request.params["query"] = "Joe"
+        entries = UsersManage(root, request)()["entries"]
         assert len(entries) == 0
-        assert (request.session.pop_flash('info') ==
-                ['No users or groups were found.'])
-        request.params['query'] = 'Bob'
-        entries = UsersManage(root, request)()['entries']
-        assert entries[0][0] == P['bob']
+        assert request.session.pop_flash("info") == ["No users or groups were found."]
+        request.params["query"] = "Bob"
+        entries = UsersManage(root, request)()["entries"]
+        assert entries[0][0] == P["bob"]
         assert entries[0][1] == ([], [])
-        assert entries[1][0] == P['group:bobsgroup']
+        assert entries[1][0] == P["group:bobsgroup"]
         assert entries[1][1] == ([], [])
 
-        P['bob'].groups = ['group:bobsgroup']
-        P['group:bobsgroup'].groups = ['role:admin']
-        entries = UsersManage(root, request)()['entries']
+        P["bob"].groups = ["group:bobsgroup"]
+        P["group:bobsgroup"].groups = ["role:admin"]
+        entries = UsersManage(root, request)()["entries"]
         # assert entries[0][1] == (['group:bobsgroup', 'role:admin'], ['role:admin'])  # noqa
-        assert set(entries[0][1][0]) == {'group:bobsgroup', 'role:admin'}
-        assert entries[0][1][1] == ['role:admin']
-        assert entries[1][1] == (['role:admin'], [])
+        assert set(entries[0][1][0]) == {"group:bobsgroup", "role:admin"}
+        assert entries[0][1][1] == ["role:admin"]
+        assert entries[1][1] == (["role:admin"], [])
 
     def test_apply(self, extra_principals, root):
         from kotti.security import get_principals
@@ -52,29 +51,28 @@ def test_apply(self, extra_principals, root):
 
         request = DummyRequest()
 
-        bob = get_principals()['bob']
+        bob = get_principals()["bob"]
 
-        request.params['apply'] = ''
+        request.params["apply"] = ""
         UsersManage(root, request)()
-        assert (request.session.pop_flash('info') == ['No changes were made.'])
-        assert list_groups('bob') == []
-        bob.groups = ['role:special']
+        assert request.session.pop_flash("info") == ["No changes were made."]
+        assert list_groups("bob") == []
+        bob.groups = ["role:special"]
 
-        request.params['role::bob::role:owner'] = '1'
-        request.params['role::bob::role:editor'] = '1'
-        request.params['orig-role::bob::role:owner'] = ''
-        request.params['orig-role::bob::role:editor'] = ''
+        request.params["role::bob::role:owner"] = "1"
+        request.params["role::bob::role:editor"] = "1"
+        request.params["orig-role::bob::role:owner"] = ""
+        request.params["orig-role::bob::role:editor"] = ""
 
         UsersManage(root, request)()
-        assert (request.session.pop_flash('success') ==
-                ['Your changes have been saved.'])
-        assert (set(list_groups('bob')) == {'role:owner', 'role:editor',
-                                            'role:special'})
+        assert request.session.pop_flash("success") == ["Your changes have been saved."]
+        assert set(list_groups("bob")) == {"role:owner", "role:editor", "role:special"}
 
     def test_group_validator(self, db_session):
         from kotti.views.users import group_validator
+
         with raises(colander.Invalid):
-            group_validator(None, 'this-group-never-exists')
+            group_validator(None, "this-group-never-exists")
 
 
 class TestUserDelete:
@@ -83,67 +81,69 @@ def test_user_delete(self, events, extra_principals, root):
         from kotti.views.users import user_delete
 
         request = DummyRequest()
-        bob = get_principals()['bob']
+        bob = get_principals()["bob"]
 
-        request.params['name'] = ''
+        request.params["name"] = ""
         user_delete(root, request)
-        assert request.session.pop_flash('error') == ['No name was given.']
-        assert 'bob' in get_principals().keys()
+        assert request.session.pop_flash("error") == ["No name was given."]
+        assert "bob" in get_principals().keys()
 
-        request.params['name'] = 'bob'
+        request.params["name"] = "bob"
         result = user_delete(root, request)
-        assert 'api' in result
-        api = result['api']
+        assert "api" in result
+        api = result["api"]
         assert api.principal == bob
-        assert api.principal_type == 'User'
-        assert 'bob' in get_principals().keys()
+        assert api.principal_type == "User"
+        assert "bob" in get_principals().keys()
 
-        request.params['name'] = 'john'
-        request.params['delete'] = 'delete'
+        request.params["name"] = "john"
+        request.params["delete"] = "delete"
         user_delete(root, request)
-        assert request.session.pop_flash('error') == ["User was not found."]
-        assert 'bob' in get_principals().keys()
+        assert request.session.pop_flash("error") == ["User was not found."]
+        assert "bob" in get_principals().keys()
 
-        request.params['name'] = 'bob'
-        request.params['delete'] = 'delete'
+        request.params["name"] = "bob"
+        request.params["delete"] = "delete"
         user_delete(root, request)
         with pytest.raises(KeyError):
             # noinspection PyStatementEffect
-            get_principals()['bob']
+            get_principals()["bob"]
 
-    def test_deleted_group_removed_in_usergroups(self, events, extra_principals,
-                                                 root, db_session):
+    def test_deleted_group_removed_in_usergroups(
+        self, events, extra_principals, root, db_session
+    ):
         from kotti.security import get_principals
         from kotti.views.users import user_delete
 
         request = DummyRequest()
-        bob = get_principals()['bob']
-        bob.groups = ['group:bobsgroup']
-        assert bob.groups == ['group:bobsgroup']
+        bob = get_principals()["bob"]
+        bob.groups = ["group:bobsgroup"]
+        assert bob.groups == ["group:bobsgroup"]
 
-        request.params['name'] = 'group:bobsgroup'
-        request.params['delete'] = 'delete'
+        request.params["name"] = "group:bobsgroup"
+        request.params["delete"] = "delete"
         user_delete(root, request)
         db_session.expire(bob)
         with pytest.raises(KeyError):
             # noinspection PyStatementEffect
-            get_principals()['group:bobsgroup']
+            get_principals()["group:bobsgroup"]
         assert bob.groups == []
 
-    def test_deleted_group_removed_from_localgroups(self, events,
-                                                    extra_principals, root):
+    def test_deleted_group_removed_from_localgroups(
+        self, events, extra_principals, root
+    ):
         from kotti.security import set_groups
         from kotti.resources import LocalGroup
         from kotti.views.users import user_delete
 
         request = DummyRequest()
-        set_groups('group:bobsgroup', root, ['role:admin'])
+        set_groups("group:bobsgroup", root, ["role:admin"])
         local_group = LocalGroup.query.first()
-        assert local_group.principal_name == 'group:bobsgroup'
+        assert local_group.principal_name == "group:bobsgroup"
         assert local_group.node == root
 
-        request.params['name'] = 'group:bobsgroup'
-        request.params['delete'] = 'delete'
+        request.params["name"] = "group:bobsgroup"
+        request.params["delete"] = "delete"
         user_delete(root, request)
         assert LocalGroup.query.first() is None
 
@@ -153,31 +153,30 @@ def test_reset_owner_to_none(self, events, extra_principals, root):
 
         request = DummyRequest()
 
-        root['content_1'] = Content()
-        root['content_1'].owner = 'bob'
-        assert root['content_1'].owner == 'bob'
+        root["content_1"] = Content()
+        root["content_1"].owner = "bob"
+        assert root["content_1"].owner == "bob"
 
-        request.params['name'] = 'bob'
-        request.params['delete'] = 'delete'
+        request.params["name"] = "bob"
+        request.params["delete"] = "delete"
         user_delete(root, request)
-        assert root['content_1'].owner is None
+        assert root["content_1"].owner is None
 
 
 # noinspection PyAttributeOutsideInit
 class TestSetPassword:
     def setup_method(self, method):
-        Form_patcher = patch('kotti.views.login.Form')
+        Form_patcher = patch("kotti.views.login.Form")
         self.Form_mock = Form_patcher.start()
 
-        _find_user_patcher = patch('kotti.views.login._find_user')
+        _find_user_patcher = patch("kotti.views.login._find_user")
         self._find_user_mock = _find_user_patcher.start()
         self.user = self._find_user_mock.return_value
 
-        validate_token_patcher = patch('kotti.views.login.validate_token')
+        validate_token_patcher = patch("kotti.views.login.validate_token")
         self.validate_token_mock = validate_token_patcher.start()
 
-        self.patchers = (
-            Form_patcher, _find_user_patcher, validate_token_patcher)
+        self.patchers = (Form_patcher, _find_user_patcher, validate_token_patcher)
 
     def teardown_method(self, method):
         for patcher in self.patchers:
@@ -190,87 +189,90 @@ def test_success(self, root):
         from kotti.security import get_principals
         from kotti.views.login import set_password
 
-        self.form_values({
-            'token': 'mytoken',
-            'email': 'myemail',
-            'password': 'mypassword',
-            'continue_to': '',
-            })
-        self.user.confirm_token = 'mytoken'
-        self.user.password = 'old_password'
-        context, request = root, DummyRequest(post={'submit': 'submit'})
+        self.form_values(
+            {
+                "token": "mytoken",
+                "email": "myemail",
+                "password": "mypassword",
+                "continue_to": "",
+            }
+        )
+        self.user.confirm_token = "mytoken"
+        self.user.password = "old_password"
+        context, request = root, DummyRequest(post={"submit": "submit"})
         self.user.last_login_date = None
         res = set_password(context, request)
 
         assert self.user.confirm_token is None
         assert self.user.last_login_date is not None
-        assert get_principals().validate_password(
-            'mypassword', self.user.password)
-        assert res.status == '302 Found'
+        assert get_principals().validate_password("mypassword", self.user.password)
+        assert res.status == "302 Found"
 
     def test_wrong_token(self, root):
         from kotti.security import get_principals
         from kotti.views.login import set_password
 
-        self.form_values({
-            'token': 'wrongtoken',
-            'email': 'myemail',
-            'password': 'mypassword',
-            'continue_to': '',
-            })
-        self.user.confirm_token = 'mytoken'
-        self.user.password = 'old_password'
-        context, request = root, DummyRequest(post={'submit': 'submit'})
+        self.form_values(
+            {
+                "token": "wrongtoken",
+                "email": "myemail",
+                "password": "mypassword",
+                "continue_to": "",
+            }
+        )
+        self.user.confirm_token = "mytoken"
+        self.user.password = "old_password"
+        context, request = root, DummyRequest(post={"submit": "submit"})
         res = set_password(context, request)
 
-        assert self.user.confirm_token == 'mytoken'
-        assert not get_principals().validate_password(
-            'mypassword', self.user.password)
+        assert self.user.confirm_token == "mytoken"
+        assert not get_principals().validate_password("mypassword", self.user.password)
         assert not request.is_response(res)
 
     def test_inactive_user(self, root):
         from kotti.security import get_principals
         from kotti.views.login import set_password
 
-        self.form_values({
-            'token': 'mytoken',
-            'email': 'myemail',
-            'password': 'mypassword',
-            'continue_to': '',
-            })
-        self.user.confirm_token = 'mytoken'
-        self.user.password = 'old_password'
-        context, request = root, DummyRequest(post={'submit': 'submit'})
+        self.form_values(
+            {
+                "token": "mytoken",
+                "email": "myemail",
+                "password": "mypassword",
+                "continue_to": "",
+            }
+        )
+        self.user.confirm_token = "mytoken"
+        self.user.password = "old_password"
+        context, request = root, DummyRequest(post={"submit": "submit"})
         self.user.active = False
         self.user.last_login_date = None
         res = set_password(context, request)
 
-        assert self.user.confirm_token == 'mytoken'
+        assert self.user.confirm_token == "mytoken"
         assert self.user.last_login_date is None
-        assert not get_principals().validate_password(
-            'mypassword', self.user.password)
+        assert not get_principals().validate_password("mypassword", self.user.password)
         assert not request.is_response(res)
 
     def test_success_continue(self, root):
         from kotti.views.login import set_password
 
-        self.form_values({
-            'token': 'mytoken',
-            'email': 'myemail',
-            'password': 'mypassword',
-            'continue_to': 'http://example.com/here#there',
-            })
-        self.user.confirm_token = 'mytoken'
-        context, request = root, DummyRequest(
-            post={'submit': 'submit'})
+        self.form_values(
+            {
+                "token": "mytoken",
+                "email": "myemail",
+                "password": "mypassword",
+                "continue_to": "http://example.com/here#there",
+            }
+        )
+        self.user.confirm_token = "mytoken"
+        context, request = root, DummyRequest(post={"submit": "submit"})
         res = set_password(context, request)
 
-        assert res.status == '302 Found'
-        assert res.location == 'http://example.com/here#there'
+        assert res.status == "302 Found"
+        assert res.location == "http://example.com/here#there"
 
 
 class TestUserManageForm:
-
     def test_schema_factory(self, root):
         from kotti.views.users import UserManageFormView
 
@@ -278,15 +280,15 @@ def test_schema_factory(self, root):
         view = UserManageFormView(root, request)
 
         schema = view.schema_factory()
-        assert 'name' not in schema
-        assert 'password' in schema
+        assert "name" not in schema
+        assert "password" in schema
 
     def test_form(self, root):
         from kotti.views.users import UserManageFormView
 
         request = DummyRequest()
         form = UserManageFormView(root, request)()
-        assert ('input type="password"' in form['form'])
+        assert 'input type="password"' in form["form"]
 
     def test_hashed_password_save(self, root):
         from kotti.views.users import UserManageFormView
@@ -294,16 +296,16 @@ def test_hashed_password_save(self, root):
         user = Mock()
         request = DummyRequest()
         view = UserManageFormView(user, request)
-        appstruct = {'password': 'foo'}
+        appstruct = {"password": "foo"}
         view.save_success(appstruct)
-        assert user.password.startswith('$2a$10$')
+        assert user.password.startswith("$2a$10$")
 
     def test_hashed_password_empty(self, root):
         from kotti.views.users import UserManageFormView
 
-        user = Mock(password='before')
+        user = Mock(password="before")
         request = DummyRequest()
         view = UserManageFormView(user, request)
-        appstruct = {'password': ''}
+        appstruct = {"password": ""}
         view.save_success(appstruct)
         assert user.password == "before"
diff --git a/kotti/tests/test_sqla.py b/kotti/tests/test_sqla.py
index c9736f04b..eaba1b3d5 100644
--- a/kotti/tests/test_sqla.py
+++ b/kotti/tests/test_sqla.py
@@ -9,15 +9,13 @@ def test_dictwrapper_comparison(self):
         from kotti.sqla import NestedMutationDict
 
         assert NestedMutationDict({}) == NestedMutationDict({})
-        assert (
-            NestedMutationDict({'a': 'ok'}) == NestedMutationDict({'a': 'ok'}))
+        assert NestedMutationDict({"a": "ok"}) == NestedMutationDict({"a": "ok"})
 
     def test_listwrapper_comparison(self):
         from kotti.sqla import NestedMutationList
 
         assert NestedMutationList({}) == NestedMutationList({})
-        assert (
-            NestedMutationList(['ok']) == NestedMutationList(['ok']))
+        assert NestedMutationList(["ok"]) == NestedMutationList(["ok"])
 
     def test_dictwrapper_changed(self):
         from kotti.sqla import NestedMutationDict
@@ -26,21 +24,21 @@ def test_dictwrapper_changed(self):
         wrapper = NestedMutationDict(data)
         changed = wrapper.changed = MagicMock()
 
-        wrapper['name'] = 'andy'
-        assert data == {'name': 'andy'}
-        assert wrapper == {'name': 'andy'}
-        assert wrapper['name'] == 'andy'
+        wrapper["name"] = "andy"
+        assert data == {"name": "andy"}
+        assert wrapper == {"name": "andy"}
+        assert wrapper["name"] == "andy"
         assert changed.call_count == 1
 
-        wrapper['age'] = 77
-        assert data == {'name': 'andy', 'age': 77}
-        assert wrapper['age'] == 77
-        assert wrapper['name'] == 'andy'
+        wrapper["age"] = 77
+        assert data == {"name": "andy", "age": 77}
+        assert wrapper["age"] == 77
+        assert wrapper["name"] == "andy"
         assert changed.call_count == 2
 
-        wrapper['age'] += 1
-        assert data == {'name': 'andy', 'age': 78}
-        assert wrapper['age'] == 78
+        wrapper["age"] += 1
+        assert data == {"name": "andy", "age": 78}
+        assert wrapper["age"] == 78
         assert changed.call_count == 3
 
     def test_listwrapper_changed(self):
@@ -70,51 +68,53 @@ def test_dictwrapper_wraps(self):
         from kotti.sqla import NestedMutationDict
         from kotti.sqla import NestedMutationList
 
-        wrapper = NestedMutationDict(
-            {'name': 'andy', 'age': 77, 'children': []})
-        assert getattr(wrapper, 'get', False) is not False
+        wrapper = NestedMutationDict({"name": "andy", "age": 77, "children": []})
+        assert getattr(wrapper, "get", False) is not False
         changed = wrapper.changed = MagicMock()
 
-        wrapper['name'] = 'randy'
+        wrapper["name"] = "randy"
         assert changed.call_count == 1
 
-        assert isinstance(wrapper['children'], NestedMutationList)
-        wrapper['children'].append({'name': 'sandy', 'age': 33})
+        assert isinstance(wrapper["children"], NestedMutationList)
+        wrapper["children"].append({"name": "sandy", "age": 33})
         assert changed.call_count == 2
-        assert len(wrapper['children']), 1
-        assert isinstance(wrapper['children'][0], NestedMutationDict)
+        assert len(wrapper["children"]), 1
+        assert isinstance(wrapper["children"][0], NestedMutationDict)
 
     def test_listwrapper_wraps(self):
         from kotti.sqla import NestedMutationDict
         from kotti.sqla import NestedMutationList
 
-        wrapper = NestedMutationList(
-            [{'name': 'andy', 'age': 77, 'children': []}])
-        assert getattr(wrapper, 'get', False) is False
+        wrapper = NestedMutationList([{"name": "andy", "age": 77, "children": []}])
+        assert getattr(wrapper, "get", False) is False
         changed = wrapper.changed = MagicMock()
 
         assert isinstance(wrapper[0], NestedMutationDict)
-        assert isinstance(wrapper[0]['children'], NestedMutationList)
+        assert isinstance(wrapper[0]["children"], NestedMutationList)
         assert changed.call_count == 0
 
     def test_setdefault_dict(self):
         from kotti.sqla import NestedMutationDict
+
         mdict = NestedMutationDict({})
-        assert isinstance(mdict.setdefault('bar', {}), NestedMutationDict)
+        assert isinstance(mdict.setdefault("bar", {}), NestedMutationDict)
 
     def test_setdefault_list(self):
         from kotti.sqla import NestedMutationDict
         from kotti.sqla import NestedMutationList
+
         mdict = NestedMutationDict({})
-        assert isinstance(mdict.setdefault('bar', []), NestedMutationList)
+        assert isinstance(mdict.setdefault("bar", []), NestedMutationList)
 
     def test_setdefault_parent(self):
         from kotti.sqla import NestedMutationDict
+
         mdict = NestedMutationDict({})
-        assert mdict.setdefault('bar', []).__parent__ is mdict
+        assert mdict.setdefault("bar", []).__parent__ is mdict
 
     def test_dunder_json(self):
         from kotti.sqla import NestedMutationDict
+
         data = {"some": ["other", {"stuff": 1}]}
         mdict = NestedMutationDict(data)
 
@@ -124,6 +124,7 @@ def test_dunder_json(self):
 class TestJsonType:
     def make(self):
         from kotti.sqla import JsonType
+
         return JsonType()
 
     def test_process_bind_param_no_value(self):
@@ -131,14 +132,13 @@ def test_process_bind_param_no_value(self):
         assert value is None
 
     def test_process_bind_param_with_value(self):
-        value = self.make().process_bind_param([{'foo': 'bar'}], None)
+        value = self.make().process_bind_param([{"foo": "bar"}], None)
         assert value == '[{"foo": "bar"}]'
 
     def test_process_bind_param_with_mutationlist(self):
         from kotti.sqla import MutationList
 
-        value = self.make().process_bind_param(
-            MutationList([{'foo': 'bar'}]), None)
+        value = self.make().process_bind_param(MutationList([{"foo": "bar"}]), None)
 
         assert value == '[{"foo": "bar"}]'
 
@@ -154,6 +154,7 @@ def test_process_result_value_with_value(self):
 class TestACLType:
     def make(self):
         from kotti.sqla import ACLType
+
         return ACLType()
 
     def test_process_bind_param_no_value(self):
@@ -161,24 +162,20 @@ def test_process_bind_param_no_value(self):
         assert value is None
 
     def test_process_bind_param_with_value(self):
-        value = self.make().process_bind_param(
-            [('Allow', 'role:admin', 'edit')], None)
+        value = self.make().process_bind_param([("Allow", "role:admin", "edit")], None)
         assert value == '[["Allow", "role:admin", "edit"]]'
 
     def test_process_bind_param_with_default_permissions(self):
-        acl = [('Allow', 'role:admin', ALL_PERMISSIONS)]
+        acl = [("Allow", "role:admin", ALL_PERMISSIONS)]
         value = self.make().process_bind_param(acl, None)
-        assert value == '[]'
+        assert value == "[]"
 
     def test_process_bind_param_with_empty_list(self):
         value = self.make().process_bind_param([], None)
-        assert value == '[]'
+        assert value == "[]"
 
     def test_process_bind_param_with_default_permissions_and_others(self):
-        acl = [
-            ('Allow', 'role:admin', ALL_PERMISSIONS),
-            ('Deny', 'role:admin', 'edit'),
-            ]
+        acl = [("Allow", "role:admin", ALL_PERMISSIONS), ("Deny", "role:admin", "edit")]
         value = self.make().process_bind_param(acl, None)
         assert value == '[["Deny", "role:admin", "edit"]]'
         assert self.make().process_result_value(value, None) == acl
@@ -189,49 +186,53 @@ def test_process_result_value_no_value(self):
 
     def test_process_result_value_with_value(self):
         acl = self.make().process_result_value(
-            '[["Allow", "role:admin", "edit"]]', None)
+            '[["Allow", "role:admin", "edit"]]', None
+        )
         assert acl == [
-            ('Allow', 'role:admin', ALL_PERMISSIONS),
-            ('Allow', 'role:admin', 'edit'),
-            ]
+            ("Allow", "role:admin", ALL_PERMISSIONS),
+            ("Allow", "role:admin", "edit"),
+        ]
 
 
 class TestMutationList:
     def test_radd(self):
         from kotti.sqla import MutationList
-        mlist = MutationList(['foo'])
-        assert ['bar'] + mlist == ['bar', 'foo']
+
+        mlist = MutationList(["foo"])
+        assert ["bar"] + mlist == ["bar", "foo"]
 
 
 class TestMutationDunderJson:
     def test_dunder_json(self):
         from kotti.sqla import MutationList
-        mlist = MutationList(['foo'])
-        json.loads(json.dumps(mlist.__json__())) == ['foo']
+
+        mlist = MutationList(["foo"])
+        json.loads(json.dumps(mlist.__json__())) == ["foo"]
 
     def test_dunder_json_recursive(self):
         from kotti.sqla import MutationList
         from kotti.sqla import MutationDict
 
-        mlist = MutationList([
-            MutationDict({'foo': MutationList([{'bar': 'baz'}])}),
-            {'foo': ['bar', 'baz']},
-            ])
+        mlist = MutationList(
+            [
+                MutationDict({"foo": MutationList([{"bar": "baz"}])}),
+                {"foo": ["bar", "baz"]},
+            ]
+        )
 
         json.loads(json.dumps(mlist.__json__())) == [
-            {'foo': [{'bar': 'baz'}]},
-            {'foo': ['bar', 'baz']},
-            ]
+            {"foo": [{"bar": "baz"}]},
+            {"foo": ["bar", "baz"]},
+        ]
 
-        mdict = MutationDict({
-            'foo': MutationList([{'bar': 'baz'}]),
-            'bar': ['bar', 'baz'],
-            })
+        mdict = MutationDict(
+            {"foo": MutationList([{"bar": "baz"}]), "bar": ["bar", "baz"]}
+        )
 
         json.loads(json.dumps(mdict.__json__())) == {
-            'foo': [{'bar': 'baz'}],
-            'bar': ['bar', 'baz'],
-            }
+            "foo": [{"bar": "baz"}],
+            "bar": ["bar", "baz"],
+        }
 
 
 def test_missing_foreign_key_indices(db_session):
@@ -240,4 +241,5 @@ def test_missing_foreign_key_indices(db_session):
 
     from sqlalchemy_utils.functions import non_indexed_foreign_keys
     from kotti import metadata
+
     assert non_indexed_foreign_keys(metadata) == {}
diff --git a/kotti/tests/test_static.py b/kotti/tests/test_static.py
index 1b7bd3539..38ec3ddbe 100644
--- a/kotti/tests/test_static.py
+++ b/kotti/tests/test_static.py
@@ -15,9 +15,9 @@ def NeededGroupFactory(resources):
     with raises(ValueError):
         NeededGroupFactory(["foo", "bar"])
 
-    needed = NeededGroup([deform_js, ])
+    needed = NeededGroup([deform_js])
 
-    assert needed.resources == [deform_js, ]
+    assert needed.resources == [deform_js]
 
     needed.add(contents_view_js)
 
diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index e447dae91..bce61b095 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -5,8 +5,8 @@
 
 
 class DummyContext(object):
-    view_name = 'view_name'
-    tags = ['tag 1', 'tag 2', 'tag 3']
+    view_name = "view_name"
+    tags = ["tag 1", "tag 2", "tag 3"]
 
 
 class TestTags:
@@ -15,84 +15,85 @@ def test_empty(self, root):
 
     def test_tags(self, db_session):
         from kotti.resources import Tag
+
         new_tag = Tag(title="test tag")
         assert str(new_tag) == "<Tag ('test tag')>"
 
     def test_add(self, root):
         from kotti.resources import Tag, TagsToContents
 
-        root.tags = ['tag 1', 'tag 2']
+        root.tags = ["tag 1", "tag 2"]
         result = Tag.query.filter(TagsToContents.item == root).all()
         assert result[0].items == [root]
-        assert root.tags == ['tag 1', 'tag 2']
+        assert root.tags == ["tag 1", "tag 2"]
         assert len(Tag.query.all()) == 2
 
     def test_edit(self, root):
-        root.tags = ['tag 1', 'tag_2']
-        assert root._tags[0].tag.title == 'tag 1'
-        root.tags = ['edited tag', 'tag_2']
-        assert root._tags[0].tag.title == 'edited tag'
+        root.tags = ["tag 1", "tag_2"]
+        assert root._tags[0].tag.title == "tag 1"
+        root.tags = ["edited tag", "tag_2"]
+        assert root._tags[0].tag.title == "edited tag"
 
     def test_association_proxy(self, root):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root['content_1'] = Content()
-        root['content_1'].tags = ['tag 1', 'tag 2']
-        assert root['content_1'].tags == ['tag 1', 'tag 2']
-        assert type(root['content_1']._tags[0]) == TagsToContents
-        assert type(root['content_1']._tags[0].tag) == Tag
-        assert root['content_1']._tags[0].tag.title == 'tag 1'
-        assert root['content_1']._tags[0].position == 0
-        assert root['content_1']._tags[1].tag.title == 'tag 2'
-        assert root['content_1']._tags[1].position == 1
-        assert len(root['content_1']._tags) == 2
-
-        root['content_2'] = Content()
-        root['content_2'].tags = ['tag 1', 'tag 3']
-        assert len(root['content_2']._tags) == 2
-        assert root['content_2']._tags[0].tag.title == 'tag 1'
-        assert root['content_2']._tags[0].position == 0
-        assert root['content_2']._tags[1].tag.title == 'tag 3'
-        assert root['content_2']._tags[1].position == 1
+        root["content_1"] = Content()
+        root["content_1"].tags = ["tag 1", "tag 2"]
+        assert root["content_1"].tags == ["tag 1", "tag 2"]
+        assert type(root["content_1"]._tags[0]) == TagsToContents
+        assert type(root["content_1"]._tags[0].tag) == Tag
+        assert root["content_1"]._tags[0].tag.title == "tag 1"
+        assert root["content_1"]._tags[0].position == 0
+        assert root["content_1"]._tags[1].tag.title == "tag 2"
+        assert root["content_1"]._tags[1].position == 1
+        assert len(root["content_1"]._tags) == 2
+
+        root["content_2"] = Content()
+        root["content_2"].tags = ["tag 1", "tag 3"]
+        assert len(root["content_2"]._tags) == 2
+        assert root["content_2"]._tags[0].tag.title == "tag 1"
+        assert root["content_2"]._tags[0].position == 0
+        assert root["content_2"]._tags[1].tag.title == "tag 3"
+        assert root["content_2"]._tags[1].position == 1
         assert len(Tag.query.all()) == 3
 
     def test_delete_tag_doesnt_touch_content(self, root, db_session):
         from kotti.resources import Tag, Content
 
-        root['content_1'] = Content()
-        root['content_1'].tags = ['my tag']
+        root["content_1"] = Content()
+        root["content_1"].tags = ["my tag"]
 
-        assert Content.query.filter_by(name='content_1').count() == 1
-        db_session.delete(Tag.query.filter_by(title='my tag').one())
-        assert Content.query.filter_by(name='content_1').count() == 1
+        assert Content.query.filter_by(name="content_1").count() == 1
+        db_session.delete(Tag.query.filter_by(title="my tag").one())
+        assert Content.query.filter_by(name="content_1").count() == 1
 
     def test_delete_content_deletes_orphaned_tags(self, root, events):
         from kotti.resources import Tag, Content
 
-        root['content_1'] = Content()
-        root['content_2'] = Content()
-        root['content_1'].tags = ['tag 1', 'tag 2']
-        root['content_2'].tags = ['tag 2']
+        root["content_1"] = Content()
+        root["content_2"] = Content()
+        root["content_1"].tags = ["tag 1", "tag 2"]
+        root["content_2"].tags = ["tag 2"]
         assert Tag.query.count() == 2
-        del root['content_1']
-        assert Tag.query.one().title == 'tag 2'
+        del root["content_1"]
+        assert Tag.query.one().title == "tag 2"
 
     def test_delete_tag_assignment_doesnt_touch_content(self, root, db_session):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root['content_1'] = Content()
-        root['content_1'].tags = ['my tag']
+        root["content_1"] = Content()
+        root["content_1"].tags = ["my tag"]
 
         assert Tag.query.count() == 1
-        assert Content.query.filter_by(name='content_1').count() == 1
+        assert Content.query.filter_by(name="content_1").count() == 1
         db_session.delete(TagsToContents.query.one())
-        assert Content.query.filter_by(name='content_1').count() == 1
+        assert Content.query.filter_by(name="content_1").count() == 1
 
     def test_delete_tag_assignment_delete_tag(self, root, events, db_session):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root['content_1'] = Content()
-        root['content_1'].tags = ['my tag']
+        root["content_1"] = Content()
+        root["content_1"].tags = ["my tag"]
 
         assert Tag.query.count() == 1
         db_session.delete(TagsToContents.query.one())
@@ -101,15 +102,15 @@ def test_delete_tag_assignment_delete_tag(self, root, events, db_session):
     def test_copy_content_copy_tags(self, root, db_session):
         from kotti.resources import Tag, TagsToContents, Content
 
-        root['content_1'] = Content()
-        root['content_1'].tags = ['my tag']
+        root["content_1"] = Content()
+        root["content_1"].tags = ["my tag"]
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
-        root['content_2'] = root['content_1'].copy()
+        root["content_2"] = root["content_1"].copy()
         db_session.flush()
-        assert root['content_1'].tags == ['my tag']
-        assert root['content_2'].tags == ['my tag']
+        assert root["content_1"].tags == ["my tag"]
+        assert root["content_2"].tags == ["my tag"]
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 2
 
@@ -117,17 +118,17 @@ def test_cut_and_paste_content_copy_tags(self, root):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.edit.actions import NodeActions
 
-        root['folder_1'] = Content()
-        root['content_1'] = Content()
-        root['content_1'].tags = ['my tag']
+        root["folder_1"] = Content()
+        root["content_1"] = Content()
+        root["content_1"].tags = ["my tag"]
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
         request = DummyRequest()
-        request.params['paste'] = 'on'
-        request.session['kotti.paste'] = ([root['content_1'].id], 'cut')
-        NodeActions(root['folder_1'], request).paste_nodes()
-        assert root['folder_1']['content_1'].tags == ['my tag']
+        request.params["paste"] = "on"
+        request.session["kotti.paste"] = ([root["content_1"].id], "cut")
+        NodeActions(root["folder_1"], request).paste_nodes()
+        assert root["folder_1"]["content_1"].tags == ["my tag"]
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
@@ -135,18 +136,18 @@ def test_copy_and_paste_content_copy_tags(self, root, events):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.edit.actions import NodeActions
 
-        root['folder_1'] = Content()
-        root['content_1'] = Content()
-        root['content_1'].tags = ['my tag']
+        root["folder_1"] = Content()
+        root["content_1"] = Content()
+        root["content_1"].tags = ["my tag"]
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 1
 
         request = DummyRequest()
-        request.params['paste'] = 'on'
-        request.session['kotti.paste'] = ([root['content_1'].id], 'copy')
-        NodeActions(root['folder_1'], request).paste_nodes()
-        assert root['content_1'].tags == ['my tag']
-        assert root['folder_1']['content_1'].tags == ['my tag']
+        request.params["paste"] = "on"
+        request.session["kotti.paste"] = ([root["content_1"].id], "copy")
+        NodeActions(root["folder_1"], request).paste_nodes()
+        assert root["content_1"].tags == ["my tag"]
+        assert root["folder_1"]["content_1"].tags == ["my tag"]
         assert Tag.query.count() == 1
         assert TagsToContents.query.count() == 2
 
@@ -154,59 +155,69 @@ def test_delete_content_delete_tags_and_assignments(self, root, events):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.edit.actions import NodeActions
 
-        root['folder_1'] = Content()
-        root['folder_1'].tags = ['first tag']
-        root['folder_1']['content_1'] = Content()
-        root['folder_1']['content_1'].tags = ['second tag']
-        root['folder_1']['content_2'] = Content()
-        root['folder_1']['content_2'].tags = ['third tag']
+        root["folder_1"] = Content()
+        root["folder_1"].tags = ["first tag"]
+        root["folder_1"]["content_1"] = Content()
+        root["folder_1"]["content_1"].tags = ["second tag"]
+        root["folder_1"]["content_2"] = Content()
+        root["folder_1"]["content_2"].tags = ["third tag"]
         assert Tag.query.count() == 3
         assert TagsToContents.query.count() == 3
 
         request = DummyRequest()
-        request.POST['delete'] = 'delete'
-        NodeActions(root['folder_1'], request).delete_node()
+        request.POST["delete"] = "delete"
+        NodeActions(root["folder_1"], request).delete_node()
         assert Tag.query.count() == 0
         assert TagsToContents.query.count() == 0
 
     def test_get_content_items_from_tag(self, root):
         from kotti.resources import Tag, Content
 
-        root['folder_1'] = Content()
-        root['folder_1'].tags = ['first tag', 'second tag']
-        root['folder_1']['content_1'] = Content()
-        root['folder_1']['content_1'].tags = ['third tag']
-        root['folder_1']['content_2'] = Content()
-        root['folder_1']['content_2'].tags = ['first tag', 'third tag']
-        first_tag = Tag.query.filter(Tag.title == 'first tag').one()
-        assert [rel.name for rel in first_tag.items] == [
-            'folder_1', 'content_2']
-        second_tag = Tag.query.filter(Tag.title == 'second tag').one()
-        assert [rel.name for rel in second_tag.items] == ['folder_1']
-        third_tag = Tag.query.filter(Tag.title == 'third tag').one()
-        assert [rel.name for rel in third_tag.items] == [
-            'content_1', 'content_2']
+        root["folder_1"] = Content()
+        root["folder_1"].tags = ["first tag", "second tag"]
+        root["folder_1"]["content_1"] = Content()
+        root["folder_1"]["content_1"].tags = ["third tag"]
+        root["folder_1"]["content_2"] = Content()
+        root["folder_1"]["content_2"].tags = ["first tag", "third tag"]
+        first_tag = Tag.query.filter(Tag.title == "first tag").one()
+        assert [rel.name for rel in first_tag.items] == ["folder_1", "content_2"]
+        second_tag = Tag.query.filter(Tag.title == "second tag").one()
+        assert [rel.name for rel in second_tag.items] == ["folder_1"]
+        third_tag = Tag.query.filter(Tag.title == "third tag").one()
+        assert [rel.name for rel in third_tag.items] == ["content_1", "content_2"]
 
     def test_get_content_items_for_tag_title(self, root):
         from kotti.resources import Tag, TagsToContents, Content
         from kotti.views.util import content_with_tags
 
-        root['folder_1'] = Content()
-        root['folder_1'].tags = ['first tag', 'second tag']
-        root['folder_1']['content_1'] = Content()
-        root['folder_1']['content_1'].tags = ['third tag']
-        root['folder_1']['content_2'] = Content()
-        root['folder_1']['content_2'].tags = ['first tag', 'third tag']
-
-        result = Content.query.join(TagsToContents).join(Tag).filter(
-            Tag.title == 'first tag').all()
-        assert [res.name for res in result] == ['folder_1', 'content_2']
-        result = Content.query.join(TagsToContents).join(Tag).filter(
-            Tag.title == 'second tag').all()
-        assert [res.name for res in result] == ['folder_1']
-        result = Content.query.join(TagsToContents).join(Tag).filter(
-            Tag.title == 'third tag').all()
-        assert sorted(res.name for res in result) == sorted(['content_1', 'content_2'])
+        root["folder_1"] = Content()
+        root["folder_1"].tags = ["first tag", "second tag"]
+        root["folder_1"]["content_1"] = Content()
+        root["folder_1"]["content_1"].tags = ["third tag"]
+        root["folder_1"]["content_2"] = Content()
+        root["folder_1"]["content_2"].tags = ["first tag", "third tag"]
+
+        result = (
+            Content.query.join(TagsToContents)
+            .join(Tag)
+            .filter(Tag.title == "first tag")
+            .all()
+        )
+        assert [res.name for res in result] == ["folder_1", "content_2"]
+        result = (
+            Content.query.join(TagsToContents)
+            .join(Tag)
+            .filter(Tag.title == "second tag")
+            .all()
+        )
+        assert [res.name for res in result] == ["folder_1"]
+        result = (
+            Content.query.join(TagsToContents)
+            .join(Tag)
+            .filter(Tag.title == "third tag")
+            .all()
+        )
+        assert sorted(res.name for res in result) == sorted(["content_1", "content_2"])
 
         # The same tests again, using content_with_tags():
         #
@@ -221,43 +232,42 @@ def test_get_content_items_for_tag_title(self, root):
         # add-ons for searching, we do not support multiple tags searching, in
         # part to avoid establishing a specification.
         #
-        result = content_with_tags(['first tag'])
-        assert sorted([res.name for res in result]) == sorted(['folder_1', 'content_2'])
-        result = content_with_tags(['second tag'])
-        assert sorted([res.name for res in result]) == sorted(['folder_1'])
-        result = content_with_tags(['third tag'])
-        assert sorted([res.name for res in result]) == sorted(['content_1', 'content_2'])
+        result = content_with_tags(["first tag"])
+        assert sorted([res.name for res in result]) == sorted(["folder_1", "content_2"])
+        result = content_with_tags(["second tag"])
+        assert sorted([res.name for res in result]) == sorted(["folder_1"])
+        result = content_with_tags(["third tag"])
+        assert sorted([res.name for res in result]) == sorted(
+            ["content_1", "content_2"]
+        )
 
 
 class TestCommaSeparatedListWidget:
     def make_one(self):
         from kotti.views.form import CommaSeparatedListWidget
-        return CommaSeparatedListWidget(template='')
+
+        return CommaSeparatedListWidget(template="")
 
     def test_widget_serialize_none(self):
         field = Mock()
         widget = self.make_one()
         widget.serialize(field, None)
-        field.renderer.assert_called_with(
-            widget.template, field=field, cstruct=[])
+        field.renderer.assert_called_with(widget.template, field=field, cstruct=[])
 
     def test_widget_serialize_null(self):
         field = Mock()
         widget = self.make_one()
         widget.serialize(field, colander.null)
-        field.renderer.assert_called_with(
-            widget.template, field=field, cstruct=[])
+        field.renderer.assert_called_with(widget.template, field=field, cstruct=[])
 
     def test_widget_serialize(self):
         field = Mock()
         widget = self.make_one()
-        widget.serialize(field, ['yes'])
-        field.renderer.assert_called_with(
-            widget.template, field=field, cstruct=['yes'])
+        widget.serialize(field, ["yes"])
+        field.renderer.assert_called_with(widget.template, field=field, cstruct=["yes"])
 
     def test_widget_deserialize_null(self):
-        assert (self.make_one().deserialize(None, colander.null) ==
-                colander.null)
+        assert self.make_one().deserialize(None, colander.null) == colander.null
 
     def test_widget_deserialize(self):
-        assert self.make_one().deserialize(None, 'foo,bar') == ['foo', 'bar']
+        assert self.make_one().deserialize(None, "foo,bar") == ["foo", "bar"]
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index cc2fc7b26..fa5e1e16e 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -16,40 +16,40 @@ def test_upload_anonymous(root, dummy_request, browser):
 
     link = browser.getLink
 
-    browser.open('{0}/'.format(BASE_URL))
+    browser.open("{0}/".format(BASE_URL))
 
     # There must be no Upload Link for anonymous users
     with raises(LinkNotFoundError):
-        link('Upload Content').click()
+        link("Upload Content").click()
 
     # Upload views must redirect to login for anonymous users
-    browser.open('{0}/upload'.format(BASE_URL))
-    assert browser.url.startswith('{0}/@@login'.format(BASE_URL))
+    browser.open("{0}/upload".format(BASE_URL))
+    assert browser.url.startswith("{0}/@@login".format(BASE_URL))
 
-    browser.open('{0}/content_types'.format(BASE_URL))
-    assert browser.url.startswith('{0}/@@login'.format(BASE_URL))
+    browser.open("{0}/content_types".format(BASE_URL))
+    assert browser.url.startswith("{0}/@@login".format(BASE_URL))
 
 
-@user('admin')
+@user("admin")
 def test_upload_authenticated_wo_mimetype(root, dummy_request, browser):
 
     # cannot call content_types without mimetype
     with raises(KeyError):
-        browser.open('{0}/content_types'.format(BASE_URL))
+        browser.open("{0}/content_types".format(BASE_URL))
 
 
-@user('admin')
+@user("admin")
 def test_upload_authenticated_text(root, dummy_request, browser):
 
     # get possible content types for text/plain
-    browser.open('{0}/content_types?mimetype=text/plain'.format(BASE_URL))
+    browser.open("{0}/content_types?mimetype=text/plain".format(BASE_URL))
     c = browser.contents
     if isinstance(c, bytes):
         c = c.decode()
     j = json.loads(c)
-    assert 'content_types' in j
+    assert "content_types" in j
 
     # only files are allowed
-    types = j['content_types']
+    types = j["content_types"]
     assert len(types) == 1
-    assert types[0]['name'] == 'File'
+    assert types[0]["name"] == "File"
diff --git a/kotti/tests/test_url_normalizer.py b/kotti/tests/test_url_normalizer.py
index cbd11adfd..b6df61768 100644
--- a/kotti/tests/test_url_normalizer.py
+++ b/kotti/tests/test_url_normalizer.py
@@ -3,19 +3,19 @@
 
 
 class URLNormalizerTests:
-
     def test_normalizer(self):
-        assert url_normalizer('simpleandsafe') == 'simpleandsafe'
-        assert url_normalizer(' Whitespace and capital Letters  ') == \
-            'whitespace-and-capital-letters'
-        assert url_normalizer(">here's another!") == 'heres-another'
-        assert url_normalizer(">>>here'!--s yet another!!!") == \
-            "here-s-yet-another"
+        assert url_normalizer("simpleandsafe") == "simpleandsafe"
+        assert (
+            url_normalizer(" Whitespace and capital Letters  ")
+            == "whitespace-and-capital-letters"
+        )
+        assert url_normalizer(">here's another!") == "heres-another"
+        assert url_normalizer(">>>here'!--s yet another!!!") == "here-s-yet-another"
         assert url_normalizer("Doe, Joe") == "doe-joe"
         assert url_normalizer("umläut.doc") == "umläut.doc"
         assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zażółć-gęślą-jaźń"
         assert url_normalizer("zażółć gęślą jaźń") == "zażółć-gęślą-jaźń"
-        assert url_normalizer('quote-this') == 'quote-this'
+        assert url_normalizer("quote-this") == "quote-this"
         assert url_normalizer("quote 'this'!") == "quote-this"
         assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
         assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
@@ -24,18 +24,19 @@ def test_normalizer(self):
         assert url_normalizer("short-hello-version", max_length=10) == "short"
 
     def test_normalizer_map_non_ascii_characters(self):
-        get_settings()['kotti.url_normalizer.map_non_ascii_characters'] = True
-        assert url_normalizer('simpleandsafe') == 'simpleandsafe'
-        assert url_normalizer(' Whitespace and capital Letters  ') == \
-            'whitespace-and-capital-letters'
-        assert url_normalizer(">here's another!") == 'heres-another'
-        assert url_normalizer(">>>here'!--s yet another!!!") == \
-            "here-s-yet-another"
+        get_settings()["kotti.url_normalizer.map_non_ascii_characters"] = True
+        assert url_normalizer("simpleandsafe") == "simpleandsafe"
+        assert (
+            url_normalizer(" Whitespace and capital Letters  ")
+            == "whitespace-and-capital-letters"
+        )
+        assert url_normalizer(">here's another!") == "heres-another"
+        assert url_normalizer(">>>here'!--s yet another!!!") == "here-s-yet-another"
         assert url_normalizer("Doe, Joe") == "doe-joe"
         assert url_normalizer("umläut.doc") == "umlaut.doc"
         assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zazolc-gesla-jazn"
         assert url_normalizer("zażółć gęślą jaźń") == "zazolc-gesla-jazn"
-        assert url_normalizer('quote-this') == 'quote-this'
+        assert url_normalizer("quote-this") == "quote-this"
         assert url_normalizer("quote 'this'!") == "quote-this"
         assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
         assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index d5f821e08..5f6c1b149 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -3,10 +3,10 @@
 
 
 class TestRequestCache(object):
-
     @property
     def cache_decorator(self):
         from kotti.util import request_cache
+
         return request_cache
 
     def test_it(self, dummy_request):
@@ -30,6 +30,7 @@ def my_fun(a, b):
 
     def test_dont_cache(self, dummy_request):
         from kotti.util import DontCache
+
         called = []
 
         def dont_cache(a, b):
@@ -45,10 +46,10 @@ def my_fun(a, b):
 
 
 class TestLRUCache(TestRequestCache):
-
     @property
     def cache_decorator(self):
         from kotti.util import lru_cache
+
         return lru_cache
 
 
@@ -56,53 +57,67 @@ class TestTitleToName:
     def setUp(self):
         from pyramid.threadlocal import get_current_registry
         from kotti.url_normalizer import url_normalizer
+
         r = get_current_registry()
         settings = r.settings = {}
-        settings['kotti.url_normalizer'] = [url_normalizer]
-        settings['kotti.url_normalizer.map_non_ascii_characters'] = False
+        settings["kotti.url_normalizer"] = [url_normalizer]
+        settings["kotti.url_normalizer.map_non_ascii_characters"] = False
 
     def test_max_length_40(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name('a' * 50)) == 50
+
+        assert len(title_to_name("a" * 50)) == 50
 
     def test_max_length_250(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name('a' * 250)) == 240
+
+        assert len(title_to_name("a" * 250)) == 240
 
     def test_max_length_255(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name('a' * 255)) == 240
+
+        assert len(title_to_name("a" * 255)) == 240
 
     def test_normal(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert title_to_name('Foo Bar') == 'foo-bar'
+
+        assert title_to_name("Foo Bar") == "foo-bar"
 
     def test_max_length_40_no_default(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert len(title_to_name('a' * 50, max_length=40)) == 40
+
+        assert len(title_to_name("a" * 50, max_length=40)) == 40
 
     def test_numbering(self):
         self.setUp()
         from kotti.util import title_to_name
-        assert title_to_name('Report Part 1',
-                             blacklist=[]) == 'report-part-1'
-        assert title_to_name('Report Part 1',
-                             blacklist=['report-part-1']) == 'report-part-1-1'
-        assert title_to_name('Report Part 3',
-                             blacklist=['report-part-3']) == 'report-part-3-1'
-        assert title_to_name(
-            'Report Part 3', blacklist=['report-part-3', 'report-part-3-1']
-        ) == 'report-part-3-2'
+
+        assert title_to_name("Report Part 1", blacklist=[]) == "report-part-1"
+        assert (
+            title_to_name("Report Part 1", blacklist=["report-part-1"])
+            == "report-part-1-1"
+        )
+        assert (
+            title_to_name("Report Part 3", blacklist=["report-part-3"])
+            == "report-part-3-1"
+        )
+        assert (
+            title_to_name(
+                "Report Part 3", blacklist=["report-part-3", "report-part-3-1"]
+            )
+            == "report-part-3-2"
+        )
 
     def test_disambiguate_name(self):
         from kotti.util import disambiguate_name
-        assert disambiguate_name('foo') == 'foo-1'
-        assert disambiguate_name('foo-3') == 'foo-4'
+
+        assert disambiguate_name("foo") == "foo-1"
+        assert disambiguate_name("foo-3") == "foo-4"
 
 
 class TestCommand:
@@ -111,14 +126,14 @@ def test_it(self):
 
         func = Mock()
         closer = Mock()
-        with patch('kotti.util.docopt') as docopt:
-            with patch('kotti.util.bootstrap') as bootstrap:
-                docopt.return_value = {'<config_uri>': 'app.ini'}
-                bootstrap.return_value = {'closer': closer}
-                assert command(func, 'doc') == 0
-                func.assert_called_with({'<config_uri>': 'app.ini'})
-                docopt.assert_called_with('doc')
-                bootstrap.assert_called_with('app.ini')
+        with patch("kotti.util.docopt") as docopt:
+            with patch("kotti.util.bootstrap") as bootstrap:
+                docopt.return_value = {"<config_uri>": "app.ini"}
+                bootstrap.return_value = {"closer": closer}
+                assert command(func, "doc") == 0
+                func.assert_called_with({"<config_uri>": "app.ini"})
+                docopt.assert_called_with("doc")
+                bootstrap.assert_called_with("app.ini")
                 assert closer.call_count == 1
 
 
@@ -126,12 +141,11 @@ class TestTemplateStructure:
     def test_getattr(self):
         from kotti.util import TemplateStructure
 
-        item = TemplateStructure('123')
-        assert item.split('2') == ['1', '3']
+        item = TemplateStructure("123")
+        assert item.split("2") == ["1", "3"]
 
 
 class TestLink:
-
     def test_link_selected(self):
         from kotti.util import Link
         from kotti.testing import DummyRequest
@@ -139,15 +153,16 @@ def test_link_selected(self):
         req = DummyRequest()
         req.view_name = "manage"
 
-        assert Link('manage').selected(Mock(__name__=None), req)
+        assert Link("manage").selected(Mock(__name__=None), req)
 
-        req.view_name = 'manage_cats'
-        assert not Link('manage').selected(Mock(__name__=None), req)
+        req.view_name = "manage_cats"
+        assert not Link("manage").selected(Mock(__name__=None), req)
 
-        req.view_name = ''
-        assert Link('').selected(Mock(__name__=None), req)
+        req.view_name = ""
+        assert Link("").selected(Mock(__name__=None), req)
 
     def test_link_target(self):
         from kotti.util import Link
-        assert Link('').target is None
-        assert Link('', target='_blank').target == '_blank'
+
+        assert Link("").target is None
+        assert Link("", target="_blank").target == "_blank"
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 86c89a6e2..43d2e57ce 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -13,7 +13,7 @@
 from kotti.testing import Dummy
 from kotti.testing import DummyRequest
 
-filterwarnings('ignore', '^kotti.views.slots.register is deprecated')
+filterwarnings("ignore", "^kotti.views.slots.register is deprecated")
 
 
 def create_contents(root):
@@ -27,12 +27,12 @@ def create_contents(root):
     #               |
     #               \ --> acb
 
-    a = root['a'] = Content()
-    aa = root['a']['aa'] = Content()
-    ab = root['a']['ab'] = Content()
-    ac = root['a']['ac'] = Content()
-    aca = ac['aca'] = Content()
-    acb = ac['acb'] = Content()
+    a = root["a"] = Content()
+    aa = root["a"]["aa"] = Content()
+    ab = root["a"]["ab"] = Content()
+    ac = root["a"]["ac"] = Content()
+    aca = ac["aca"] = Content()
+    acb = ac["acb"] = Content()
     return a, aa, ab, ac, aca, acb
 
 
@@ -42,7 +42,6 @@ class MockContext(object):
 
 
 class TestTemplateAPI:
-
     def make(self, context=None, request=None, id=1, **kwargs):
         from kotti.resources import get_root
         from kotti.views.util import TemplateAPI
@@ -65,10 +64,12 @@ def test_page_title(self, db_session):
         assert api.page_title == "Hello, world! - Wasnhierlos"
 
     def test_site_title(self, db_session):
-        with patch('kotti.views.util.get_settings',
-                   return_value={'kotti.site_title': 'This is it.'}):
+        with patch(
+            "kotti.views.util.get_settings",
+            return_value={"kotti.site_title": "This is it."},
+        ):
             api = self.make()
-            assert api.site_title == 'This is it.'
+            assert api.site_title == "This is it."
 
     def test_list_children(self, db_session):
         api = self.make()  # the default context is root
@@ -77,25 +78,22 @@ def test_list_children(self, db_session):
 
         # Now try it on a little graph:
         a, aa, ab, ac, aca, acb = create_contents(root)
-        with patch('kotti.testing.DummyRequest.has_permission',
-                   return_value=True):
+        with patch("kotti.testing.DummyRequest.has_permission", return_value=True):
             assert api.list_children() == [a]
             assert api.list_children(root) == [a]
             assert api.list_children(a) == [aa, ab, ac]
             assert api.list_children(aca) == []
 
         # Try permissions
-        with patch('kotti.testing.DummyRequest.has_permission') \
-                as has_permission:
+        with patch("kotti.testing.DummyRequest.has_permission") as has_permission:
             has_permission.return_value = False
             assert api.list_children(root) == []
-            has_permission.assert_called_once_with('view', a)
+            has_permission.assert_called_once_with("view", a)
 
-        with patch('kotti.testing.DummyRequest.has_permission') \
-                as has_permission:
+        with patch("kotti.testing.DummyRequest.has_permission") as has_permission:
             has_permission.return_value = False
-            assert api.list_children(root, permission='edit') == []
-            has_permission.assert_called_once_with('edit', a)
+            assert api.list_children(root, permission="edit") == []
+            has_permission.assert_called_once_with("edit", a)
 
     def test_root(self, db_session):
         api = self.make()
@@ -138,11 +136,10 @@ def test_breadcrumbs_with_navigation_root(self, db_session):
         assert breadcrumbs == [a, ac, acb]
 
     def test_has_permission(self, db_session):
-        with patch('kotti.testing.DummyRequest.has_permission') \
-                as has_permission:
+        with patch("kotti.testing.DummyRequest.has_permission") as has_permission:
             api = self.make()
-            api.has_permission('drink')
-            has_permission.assert_called_with('drink', api.root)
+            api.has_permission("drink")
+            has_permission.assert_called_with("drink", api.root)
 
     def test_contenttypefactories_add_links(self, config):
         from kotti.views.edit.actions import content_type_factories
@@ -151,8 +148,8 @@ def test_contenttypefactories_add_links(self, config):
 
         config.include(content)
 
-        res = content_type_factories(Document(''), DummyRequest())
-        assert res['factories'] == [Document, File]
+        res = content_type_factories(Document(""), DummyRequest())
+        assert res["factories"] == [Document, File]
 
     def test_contenttypefactories_with_invalid_add_link(self, config):
         from kotti.resources import Document, File
@@ -162,26 +159,25 @@ def test_contenttypefactories_with_invalid_add_link(self, config):
 
         class TestContent(object):
             type_info = default_type_info.copy(
-                name='TestContent',
-                title='Test Content',
+                name="TestContent",
+                title="Test Content",
                 add_view=None,
-                addable_to=['Document'],
+                addable_to=["Document"],
             )
 
         config.include(content)
         req = DummyRequest()
-        root = Document('')
+        root = Document("")
 
-        with patch('kotti.views.edit.actions.get_settings') as gs:
-            gs.return_value = {'kotti.available_types':
-                               [TestContent, Document, File]}
+        with patch("kotti.views.edit.actions.get_settings") as gs:
+            gs.return_value = {"kotti.available_types": [TestContent, Document, File]}
             res = content_type_factories(root, req)
 
-            assert res['factories'] == [Document, File]
+            assert res["factories"] == [Document, File]
 
-            TestContent.type_info.add_view = 'add_document'
+            TestContent.type_info.add_view = "add_document"
             res = content_type_factories(root, req)
-            assert res['factories'] == [TestContent, Document, File]
+            assert res["factories"] == [TestContent, Document, File]
 
     def test_edit_links(self, config, db_session):
         from kotti import views
@@ -196,11 +192,11 @@ def test_edit_links(self, config, db_session):
         config.include(default_views)
         config.include(users)
 
-        assert (api.edit_links[:3] == [
-            Link('contents', 'Contents'),
-            Link('edit', 'Edit'),
-            Link('share', 'Share'),
-            ])
+        assert api.edit_links[:3] == [
+            Link("contents", "Contents"),
+            Link("edit", "Edit"),
+            Link("share", "Share"),
+        ]
 
         # Edit links are controlled through
         # 'root.type_info.edit_links' and the permissions that guard
@@ -211,13 +207,12 @@ class MyLink(Link):
             def permitted(self, context, request):
                 return self.permit
 
-        open_link = MyLink('open')
-        secure_link = MyLink('secure')
+        open_link = MyLink("open")
+        secure_link = MyLink("secure")
         secure_link.permit = False
 
         root = api.root
-        root.type_info = root.type_info.copy(
-            edit_links=[open_link, secure_link])
+        root.type_info = root.type_info.copy(edit_links=[open_link, secure_link])
         api = self.make()
         assert api.edit_links == [open_link]
 
@@ -225,46 +220,46 @@ def test_default_actions(self):
         from kotti.resources import default_actions, Document
         from kotti.util import Link
 
-        default_actions.append(Link('test', 'Test'))
-        assert Document().type_info.edit_links[-1].children[-1].name == 'test'
+        default_actions.append(Link("test", "Test"))
+        assert Document().type_info.edit_links[-1].children[-1].name == "test"
 
     def test_find_edit_view_not_permitted(self, db_session):
-        with patch('kotti.views.util.view_permitted', return_value=False):
+        with patch("kotti.views.util.view_permitted", return_value=False):
             api = self.make()
-            api.request.view_name = 'edit'
-            assert api.find_edit_view(api.context) == ''
+            api.request.view_name = "edit"
+            assert api.find_edit_view(api.context) == ""
 
     def test_find_edit_view(self, db_session):
-        with patch('kotti.views.util.view_permitted', return_value=True):
+        with patch("kotti.views.util.view_permitted", return_value=True):
             api = self.make()
-            api.request.view_name = 'share'
-            assert api.find_edit_view(api.context) == 'share'
+            api.request.view_name = "share"
+            assert api.find_edit_view(api.context) == "share"
 
     def test_macro(self, db_session):
-        with patch('kotti.views.util.get_renderer') as get_renderer:
+        with patch("kotti.views.util.get_renderer") as get_renderer:
             get_renderer().implementation().macros = MagicMock()
             api = self.make()
-            macro = api.macro('mypackage:mytemplate.pt')
-            get_renderer.assert_called_with('mypackage:mytemplate.pt')
-            assert get_renderer().implementation().macros['main'] == macro
+            macro = api.macro("mypackage:mytemplate.pt")
+            get_renderer.assert_called_with("mypackage:mytemplate.pt")
+            assert get_renderer().implementation().macros["main"] == macro
 
     def test_macro_bare_with_master(self, db_session):
         # getting EDIT_MASTER when bare=True will return BARE_MASTER
-        with patch('kotti.views.util.get_renderer') as get_renderer:
+        with patch("kotti.views.util.get_renderer") as get_renderer:
             get_renderer().implementation().macros = MagicMock()
             api = self.make(bare=True)
             macro = api.macro(api.EDIT_MASTER)
             get_renderer.assert_called_with(api.BARE_MASTER)
-            assert get_renderer().implementation().macros['main'] == macro
+            assert get_renderer().implementation().macros["main"] == macro
 
     def test_macro_bare_without_master(self, db_session):
         # getting other templates when bare=True
-        with patch('kotti.views.util.get_renderer') as get_renderer:
+        with patch("kotti.views.util.get_renderer") as get_renderer:
             get_renderer().implementation().macros = MagicMock()
             api = self.make(bare=True)
-            macro = api.macro('mypackage:mytemplate.pt')
-            get_renderer.assert_called_with('mypackage:mytemplate.pt')
-            assert get_renderer().implementation().macros['main'] == macro
+            macro = api.macro("mypackage:mytemplate.pt")
+            get_renderer.assert_called_with("mypackage:mytemplate.pt")
+            assert get_renderer().implementation().macros["main"] == macro
 
     def test_url_without_context(self, db_session):
         context, request = MockContext(), MagicMock()
@@ -281,9 +276,8 @@ def test_url_with_context(self, db_session):
     def test_url_with_context_and_elements(self, db_session):
         context, request = MockContext(), MagicMock()
         api = self.make(request=request)
-        api.url(context, 'first', second='second')
-        request.resource_url.assert_called_with(
-            context, 'first', second='second')
+        api.url(context, "first", second="second")
+        request.resource_url.assert_called_with(context, "first", second="second")
 
     def test_bare(self, db_session):
         # By default, no "bare" templates are used:
@@ -308,43 +302,44 @@ def test_assign_to_slots(self, config, db_session, events):
         from kotti.views.slots import assign_slot
 
         def foo(context, request):
-            greeting = request.POST['greeting']
+            greeting = request.POST["greeting"]
             return Response("{} world!".format(greeting))
-        config.add_view(foo, name='foo')
-        assign_slot('foo', 'left', params=dict(greeting="Y\u0153"))
+
+        config.add_view(foo, name="foo")
+        assign_slot("foo", "left", params=dict(greeting="Y\u0153"))
 
         api = self.make()
         assert api.slots.left == ["Y\u0153 world!"]
 
-    def test_assign_to_slot_predicate_mismatch(self, config, db_session,
-                                               events):
+    def test_assign_to_slot_predicate_mismatch(self, config, db_session, events):
         from kotti.views.slots import assign_slot
 
         def special(context, request):
             return Response("Hello world!")
-        assign_slot('special', 'right')
 
-        config.add_view(special, name='special', request_method="GET")
+        assign_slot("special", "right")
+
+        config.add_view(special, name="special", request_method="GET")
         api = self.make()
         assert api.slots.right == []
 
-        config.add_view(special, name='special')
+        config.add_view(special, name="special")
         api = self.make()
         assert api.slots.right == ["Hello world!"]
 
-    def test_assign_to_slot_forbidden(self, config, db_session,
-                                      events):
+    def test_assign_to_slot_forbidden(self, config, db_session, events):
         from kotti.views.slots import assign_slot
         from pyramid.exceptions import HTTPForbidden
 
         def special(context, request):
             return Response("Hello world!")
-        assign_slot('special', 'right')
 
-        config.add_view(special, name='special', permission='admin')
+        assign_slot("special", "right")
+
+        config.add_view(special, name="special", permission="admin")
         # the slot rendering must not fail if a HTTPForbidden exception
         api = self.make()
-        with patch('kotti.views.slots.render_view') as render_view:
+        with patch("kotti.views.slots.render_view") as render_view:
             render_view.side_effect = HTTPForbidden()
             assert api.slots.right == []
 
@@ -352,19 +347,20 @@ def test_assign_slot_bad_name(self):
         from kotti.views.slots import assign_slot
 
         with raises(KeyError):
-            assign_slot('viewname', 'noslotlikethis')
+            assign_slot("viewname", "noslotlikethis")
 
     def test_slot_request_has_attributes(self, config, db_session, events):
         from kotti.views.slots import assign_slot
 
         def my_viewlet(request):
-            assert hasattr(request, 'registry')
-            assert hasattr(request, 'context')
-            assert hasattr(request, 'user')
+            assert hasattr(request, "registry")
+            assert hasattr(request, "context")
+            assert hasattr(request, "user")
             return Response("Hello world!")
-        assign_slot('my-viewlet', 'right')
 
-        config.add_view(my_viewlet, name='my-viewlet')
+        assign_slot("my-viewlet", "right")
+
+        config.add_view(my_viewlet, name="my-viewlet")
         api = self.make()
         assert api.slots.right == ["Hello world!"]
 
@@ -372,13 +368,14 @@ def test_slot_request_has_parameters(self, config, db_session):
         from kotti.views.slots import assign_slot
 
         def foo(context, request):
-            bar = request.POST['bar']
+            bar = request.POST["bar"]
             return Response("{} world!".format(bar))
-        config.add_view(foo, name='foo')
-        assign_slot('foo', 'left', params=dict(greeting="Y\u0153"))
+
+        config.add_view(foo, name="foo")
+        assign_slot("foo", "left", params=dict(greeting="Y\u0153"))
 
         request = DummyRequest()
-        request.params['bar'] = 'Hello'
+        request.params["bar"] = "Hello"
         api = self.make(request=request)
         assert api.slots.left == ["Hello world!"]
 
@@ -388,9 +385,10 @@ def test_slot_view_know_slot(self, config, db_session):
         def foo(context, request):
             slot = request.kotti_slot
             return Response("I'm in slot {}.".format(slot))
-        config.add_view(foo, name='foo')
-        assign_slot('foo', 'beforebodyend')
-        assign_slot('foo', 'right')
+
+        config.add_view(foo, name="foo")
+        assign_slot("foo", "beforebodyend")
+        assign_slot("foo", "right")
 
         request = DummyRequest()
         api = self.make(request=request)
@@ -429,8 +427,8 @@ def foo(context, request):
             called.append(True)
             return Response("")
 
-        config.add_view(foo, name='foo')
-        assign_slot('foo', 'abovecontent')
+        config.add_view(foo, name="foo")
+        assign_slot("foo", "abovecontent")
 
         api = self.make()
         api.slots.belowcontent
@@ -443,30 +441,31 @@ def foo(context, request):
 
     def test_format_currency(self, db_session):
         api = self.make()
-        assert '€13.99' == api.format_currency(13.99, 'EUR')
-        assert '$15,499.12' == api.format_currency(15499.12, 'USD')
-        assert '€1.00' == api.format_currency(
-            1, fmt='€#,##0', currency='EUR')
-        assert 'CHF3.14' == api.format_currency(
-            decimal.Decimal((0, (3, 1, 4), -2)), 'CHF')
+        assert "€13.99" == api.format_currency(13.99, "EUR")
+        assert "$15,499.12" == api.format_currency(15499.12, "USD")
+        assert "€1.00" == api.format_currency(1, fmt="€#,##0", currency="EUR")
+        assert "CHF3.14" == api.format_currency(
+            decimal.Decimal((0, (3, 1, 4), -2)), "CHF"
+        )
 
     def test_format_datetime(self, db_session):
         import datetime
         from babel.dates import format_datetime
         from babel.core import UnknownLocaleError
+
         api = self.make()
         first = datetime.datetime(2012, 1, 1)
-        assert (
-            api.format_datetime(first) ==
-            format_datetime(first, format='medium', locale='en'))
-        assert (
-            api.format_datetime(time.mktime(first.timetuple())) ==
-            format_datetime(first, format='medium', locale='en'))
-        assert (
-            api.format_datetime(first, fmt='short') ==
-            format_datetime(first, format='short', locale='en'))
+        assert api.format_datetime(first) == format_datetime(
+            first, format="medium", locale="en"
+        )
+        assert api.format_datetime(time.mktime(first.timetuple())) == format_datetime(
+            first, format="medium", locale="en"
+        )
+        assert api.format_datetime(first, fmt="short") == format_datetime(
+            first, format="short", locale="en"
+        )
         # noinspection PyPropertyAccess
-        api.locale_name = 'unknown'
+        api.locale_name = "unknown"
         with raises(UnknownLocaleError):
             api.format_datetime(first)
 
@@ -474,16 +473,17 @@ def test_format_date(self, db_session):
         import datetime
         from babel.dates import format_date
         from babel.core import UnknownLocaleError
+
         api = self.make()
         first = datetime.date(2012, 1, 1)
-        assert (
-            api.format_date(first) ==
-            format_date(first, format='medium', locale='en'))
-        assert (
-            api.format_date(first, fmt='short') ==
-            format_date(first, format='short', locale='en'))
+        assert api.format_date(first) == format_date(
+            first, format="medium", locale="en"
+        )
+        assert api.format_date(first, fmt="short") == format_date(
+            first, format="short", locale="en"
+        )
         # noinspection PyPropertyAccess
-        api.locale_name = 'unknown'
+        api.locale_name = "unknown"
         with raises(UnknownLocaleError):
             api.format_date(first)
 
@@ -491,108 +491,109 @@ def test_format_time(self, db_session):
         import datetime
         from babel.dates import format_time
         from babel.core import UnknownLocaleError
+
         api = self.make()
         first = datetime.time(23, 59)
-        assert (
-            api.format_time(first) ==
-            format_time(first, format='medium', locale='en'))
-        assert (
-            api.format_time(first, fmt='short') ==
-            format_time(first, format='short', locale='en'))
+        assert api.format_time(first) == format_time(
+            first, format="medium", locale="en"
+        )
+        assert api.format_time(first, fmt="short") == format_time(
+            first, format="short", locale="en"
+        )
         # noinspection PyPropertyAccess
-        api.locale_name = 'unknown'
+        api.locale_name = "unknown"
         with raises(UnknownLocaleError):
             api.format_time(first)
 
     def test_render_view(self, config, db_session):
         def first_view(context, request):
-            return Response('first')
+            return Response("first")
 
         def second_view(context, request):
-            return Response('second')
+            return Response("second")
 
-        config.add_view(first_view, name='')
-        config.add_view(second_view, name='second')
+        config.add_view(first_view, name="")
+        config.add_view(second_view, name="second")
         api = self.make()
-        assert api.render_view().__unicode__() == 'first'
-        assert api.render_view('second').__unicode__() == 'second'
-        assert api.render_view(
-            context=api.context, request=api.request).__unicode__() == 'first'
+        assert api.render_view().__unicode__() == "first"
+        assert api.render_view("second").__unicode__() == "second"
+        assert (
+            api.render_view(context=api.context, request=api.request).__unicode__()
+            == "first"
+        )
 
     def test_render_template(self, config, db_session):
         renderer = MagicMock()
-        config.testing_add_renderer('my-rendererer', renderer)
+        config.testing_add_renderer("my-rendererer", renderer)
         api = self.make()
-        api.render_template('my-rendererer', some='variable')
-        assert renderer.call_args[0][0] == {'some': 'variable'}
+        api.render_template("my-rendererer", some="variable")
+        assert renderer.call_args[0][0] == {"some": "variable"}
 
     def test_get_type(self, db_session):
         from kotti.resources import Document
+
         api = self.make()
-        assert api.get_type('Document') == Document
-        assert api.get_type('NoExist') is None
+        assert api.get_type("Document") == Document
+        assert api.get_type("NoExist") is None
 
     def test_avatar_url(self, db_session):
         api = self.make()
-        user = Dummy(email='daniel.nouri@gmail.com')
+        user = Dummy(email="daniel.nouri@gmail.com")
         result = api.avatar_url(user)
-        assert result.startswith('https://secure.gravatar.com/avatar/'
-                                 'd3aeefdd7afe103ab70875172135cab7')
+        assert result.startswith(
+            "https://secure.gravatar.com/avatar/" "d3aeefdd7afe103ab70875172135cab7"
+        )
 
     def test_avatar_url_request_user(self, db_session):
         api = self.make()
-        api.request.user = Dummy(email='daniel.nouri@gmail.com')
+        api.request.user = Dummy(email="daniel.nouri@gmail.com")
         result = api.avatar_url()
-        assert result.startswith('https://secure.gravatar.com/avatar/'
-                                 'd3aeefdd7afe103ab70875172135cab7')
+        assert result.startswith(
+            "https://secure.gravatar.com/avatar/" "d3aeefdd7afe103ab70875172135cab7"
+        )
 
 
 class TestViewUtil:
     def test_add_renderer_globals_json(self):
         from kotti.views.util import add_renderer_globals
 
-        event = {'renderer_name': 'json'}
+        event = {"renderer_name": "json"}
         add_renderer_globals(event)
-        assert list(event.keys()) == ['renderer_name']
+        assert list(event.keys()) == ["renderer_name"]
 
     def test_add_renderer_globals_request_has_template_api(self):
         from kotti.views.util import add_renderer_globals
 
         request = DummyRequest()
         request.template_api = template_api = object()
-        event = {'request': request, 'renderer_name': 'foo'}
+        event = {"request": request, "renderer_name": "foo"}
         add_renderer_globals(event)
-        assert event['api'] is template_api
+        assert event["api"] is template_api
 
     def test_add_renderer_globals(self, db_session):
         from kotti.views.util import add_renderer_globals
 
         request = DummyRequest()
-        event = {
-            'request': request,
-            'context': object(),
-            'renderer_name': 'foo', }
+        event = {"request": request, "context": object(), "renderer_name": "foo"}
         add_renderer_globals(event)
-        assert 'api' in event
+        assert "api" in event
 
     def test_add_renderer_globals_event_has_no_renderer_name(self, db_session):
         from kotti.views.util import add_renderer_globals
 
         request = DummyRequest()
-        event = {
-            'request': request,
-            'context': object(),
-            }
+        event = {"request": request, "context": object()}
         add_renderer_globals(event)
-        assert 'api' in event
+        assert "api" in event
 
 
 class TestLocalNavigationSlot:
     def test_it(self, config, root):
-        config.testing_add_renderer('kotti:templates/view/nav-local.pt')
+        config.testing_add_renderer("kotti:templates/view/nav-local.pt")
         from zope.interface import alsoProvides
         from kotti.interfaces import INavigationRoot
         from kotti.views.navigation import local_navigation
+
         a, aa, ab, ac, aca, acb = create_contents(root)
 
         ret = local_navigation(ac, DummyRequest())
@@ -601,34 +602,34 @@ def test_it(self, config, root):
         ret = local_navigation(acb, DummyRequest())
         assert ret == dict(parent=ac, children=[aca, acb])
 
-        assert local_navigation(a.__parent__, DummyRequest())['parent'] is None
+        assert local_navigation(a.__parent__, DummyRequest())["parent"] is None
 
         alsoProvides(ac, INavigationRoot)
-        assert local_navigation(ac, DummyRequest())['parent'] is None
+        assert local_navigation(ac, DummyRequest())["parent"] is None
 
     def test_no_permission(self, config, root):
-        config.testing_add_renderer('kotti:templates/view/nav-local.pt')
+        config.testing_add_renderer("kotti:templates/view/nav-local.pt")
         from kotti.views.navigation import local_navigation
+
         a, aa, ab, ac, aca, acb = create_contents(root)
 
-        with patch('kotti.testing.DummyRequest.has_permission',
-                   return_value=True):
-            assert local_navigation(ac, DummyRequest())['parent'] is not None
+        with patch("kotti.testing.DummyRequest.has_permission", return_value=True):
+            assert local_navigation(ac, DummyRequest())["parent"] is not None
 
-        with patch('kotti.testing.DummyRequest.has_permission',
-                   return_value=False):
-            assert local_navigation(ac, DummyRequest())['parent'] is None
+        with patch("kotti.testing.DummyRequest.has_permission", return_value=False):
+            assert local_navigation(ac, DummyRequest())["parent"] is None
 
     def test_in_navigation(self, config, root):
-        config.testing_add_renderer('kotti:templates/view/nav-local.pt')
+        config.testing_add_renderer("kotti:templates/view/nav-local.pt")
         from kotti.views.navigation import local_navigation
+
         a, aa, ab, ac, aca, acb = create_contents(root)
 
-        assert local_navigation(a, DummyRequest())['parent'] is not None
+        assert local_navigation(a, DummyRequest())["parent"] is not None
         aa.in_navigation = False
         ab.in_navigation = False
         ac.in_navigation = False
-        assert local_navigation(a, DummyRequest())['parent'] is None
+        assert local_navigation(a, DummyRequest())["parent"] is None
 
 
 class TestNodesTree:
@@ -640,8 +641,7 @@ def test_it(self, root):
         tree = nodes_tree(DummyRequest())
         assert tree.id == a.__parent__.id
         assert [ch.name for ch in tree.children] == [a.name]
-        assert [ch.id for ch in tree.children[0].children] == [
-            aa.id, ab.id, ac.id]
+        assert [ch.id for ch in tree.children[0].children] == [aa.id, ab.id, ac.id]
 
     def test_ordering(self, root):
         from kotti.views.util import nodes_tree
@@ -649,10 +649,8 @@ def test_ordering(self, root):
         a, aa, ab, ac, aca, acb = create_contents(root)
         a.children.insert(1, a.children.pop(0))
         tree = nodes_tree(DummyRequest())
-        assert [ch.position for ch in tree.children[0].children] == [
-            0, 1, 2]
-        assert [ch.id for ch in tree.children[0].children] == [
-            ab.id, aa.id, ac.id]
+        assert [ch.position for ch in tree.children[0].children] == [0, 1, 2]
+        assert [ch.id for ch in tree.children[0].children] == [ab.id, aa.id, ac.id]
 
     def test_tolist(self, root):
         from kotti.views.util import nodes_tree
@@ -669,19 +667,19 @@ class TestSettingHasValuePredicate:
     def test_basic(self):
         from kotti.views.util import SettingHasValuePredicate
 
-        predicate = SettingHasValuePredicate(('mysetting', True), None)
+        predicate = SettingHasValuePredicate(("mysetting", True), None)
         request = Mock()
-        request.registry.settings = {'mysetting': 'True'}
+        request.registry.settings = {"mysetting": "True"}
         assert predicate(None, request) is True
 
-        request.registry.settings = {'mysetting': '0'}
+        request.registry.settings = {"mysetting": "0"}
         assert predicate(None, request) is False
 
     def test_bool_value_assertion(self):
         from kotti.views.util import SettingHasValuePredicate
 
         with raises(ValueError):
-            SettingHasValuePredicate(('mysetting', 'hello'), None)
+            SettingHasValuePredicate(("mysetting", "hello"), None)
 
 
 class TestRootOnlyPredicate:
diff --git a/kotti/tests/test_views_form.py b/kotti/tests/test_views_form.py
index 054269c52..db6371f1c 100644
--- a/kotti/tests/test_views_form.py
+++ b/kotti/tests/test_views_form.py
@@ -9,12 +9,14 @@
 class TestBaseFormView:
     def make(self):
         from kotti.views.form import BaseFormView
+
         return BaseFormView(Dummy(), DummyRequest())
 
     def test_init(self):
         from kotti.views.form import BaseFormView
-        view = BaseFormView(Dummy(), DummyRequest(), more='args')
-        assert view.more == 'args'
+
+        view = BaseFormView(Dummy(), DummyRequest(), more="args")
+        assert view.more == "args"
 
     def test_schema_factory_bind(self):
         view = self.make()
@@ -29,7 +31,7 @@ def test_use_csrf_token(self):
         schema = view.schema = MagicMock()
         view.__call__()
         assert schema.children.append.called
-        assert schema.children.append.call_args[0][0].name == 'csrf_token'
+        assert schema.children.append.call_args[0][0].name == "csrf_token"
 
     def test_use_csrf_token_not(self):
         view = self.make()
@@ -42,95 +44,97 @@ def test_use_csrf_token_not(self):
 class TestGetAppstruct:
     def call(self, *args, **kwargs):
         from kotti.views.form import get_appstruct
+
         return get_appstruct(*args, **kwargs)
 
     def test_schema_has_more_children_than_attrs(self):
-        context = Dummy(first='firstvalue')
-        schema = Dummy(children=[Dummy(name='first'), Dummy(name='second')])
-        assert self.call(context, schema) == {'first': 'firstvalue'}
+        context = Dummy(first="firstvalue")
+        schema = Dummy(children=[Dummy(name="first"), Dummy(name="second")])
+        assert self.call(context, schema) == {"first": "firstvalue"}
 
     def test_schema_has_fewer_children_than_attrs(self):
-        context = Dummy(first='firstvalue', second='secondvalue')
-        schema = Dummy(children=[Dummy(name='first')])
-        assert self.call(context, schema) == {'first': 'firstvalue'}
+        context = Dummy(first="firstvalue", second="secondvalue")
+        schema = Dummy(children=[Dummy(name="first")])
+        assert self.call(context, schema) == {"first": "firstvalue"}
 
     def test_none_converted_to_null(self):
         context = Dummy(first=None)
-        schema = Dummy(children=[Dummy(name='first')])
-        assert self.call(context, schema) == {'first': colander.null}
+        schema = Dummy(children=[Dummy(name="first")])
+        assert self.call(context, schema) == {"first": colander.null}
 
 
 class TestEditFormView:
     def make(self):
         from kotti.views.form import EditFormView
-        return EditFormView(
-            Dummy(), DummyRequest(), success_url='http://localhost')
+
+        return EditFormView(Dummy(), DummyRequest(), success_url="http://localhost")
 
     def test_before(self):
         view = self.make()
         view.context.three = 3
         view.schema = Dummy()
-        view.schema.children = [Dummy(name='three')]
+        view.schema.children = [Dummy(name="three")]
         form = Dummy()
         view.before(form)
-        assert form.appstruct == {'three': 3}
+        assert form.appstruct == {"three": 3}
 
     def test_save_success_calls_edit(self):
         view = self.make()
         view.edit = MagicMock()
-        view.save_success({'three': 3})
+        view.save_success({"three": 3})
         view.edit.assert_called_with(three=3)
 
     def test_save_success_redirects(self):
         view = self.make()
-        result = view.save_success({'three': 3})
-        assert result.status == '302 Found'
+        result = view.save_success({"three": 3})
+        assert result.status == "302 Found"
         assert result.location == view.success_url
 
     def test_save_success_redirects_to_resource_url(self):
         view = self.make()
         view.success_url = None
         view.request.resource_url = lambda context: context.__class__.__name__
-        result = view.save_success({'three': 3})
-        assert result.status == '302 Found'
-        assert result.location == 'Dummy'
+        result = view.save_success({"three": 3})
+        assert result.status == "302 Found"
+        assert result.location == "Dummy"
 
 
 class TestAddFormView:
     def make(self):
         from kotti.views.form import AddFormView
+
         return AddFormView(Dummy(), DummyRequest())
 
     def test_save_success_calls_add(self):
         view = self.make()
         view.add = MagicMock()
-        view.find_name = lambda appstruct: 'somename'
-        view.request.resource_url = lambda context: ''
-        view.save_success({'three': 3})
+        view.find_name = lambda appstruct: "somename"
+        view.request.resource_url = lambda context: ""
+        view.save_success({"three": 3})
         view.add.assert_called_with(three=3)
-        assert view.add.return_value == view.context['somename']
+        assert view.add.return_value == view.context["somename"]
 
     def test_save_success_redirects(self):
         view = self.make()
         view.add = MagicMock()
-        view.find_name = lambda appstruct: 'somename'
-        view.request.resource_url = lambda context: 'MagicMock'
-        result = view.save_success({'three': 3})
-        assert result.status == '302 Found'
-        assert result.location == 'MagicMock'
+        view.find_name = lambda appstruct: "somename"
+        view.request.resource_url = lambda context: "MagicMock"
+        result = view.save_success({"three": 3})
+        assert result.status == "302 Found"
+        assert result.location == "MagicMock"
 
     def test_save_success_redirects_custom_url(self):
         view = self.make()
         view.add = MagicMock()
-        view.success_url = 'there'
-        view.find_name = lambda appstruct: 'somename'
-        result = view.save_success({'three': 3})
-        assert result.status == '302 Found'
-        assert result.location == 'there'
+        view.success_url = "there"
+        view.find_name = lambda appstruct: "somename"
+        result = view.save_success({"three": 3})
+        assert result.status == "302 Found"
+        assert result.location == "there"
 
-    @patch('kotti.views.form.title_to_name')
+    @patch("kotti.views.form.title_to_name")
     def test_find_name_uses_title_to_name(self, title_to_name):
         view = self.make()
-        title_to_name.return_value = 'cafe'
-        assert view.find_name({'title': 'Bar'}) == 'cafe'
-        title_to_name.assert_called_with('Bar', blacklist={}.keys())
+        title_to_name.return_value = "cafe"
+        assert view.find_name({"title": "Bar"}) == "cafe"
+        title_to_name.assert_called_with("Bar", blacklist={}.keys())
diff --git a/kotti/tests/test_workflow.py b/kotti/tests/test_workflow.py
index 856418b81..b52c5d87f 100644
--- a/kotti/tests/test_workflow.py
+++ b/kotti/tests/test_workflow.py
@@ -5,7 +5,6 @@
 
 
 class TestWorkflow:
-
     def test_workflow_callback(self):
         from kotti.workflow import workflow_callback
 
@@ -13,21 +12,21 @@ def test_workflow_callback(self):
         info = Dummy()
         info.transition = {"to_state": "next_state"}
         info.workflow = Dummy()
-        info.workflow.initial_state = 'bar'
+        info.workflow.initial_state = "bar"
         info.workflow._state_data = {
             "next_state": {
                 "role:me": "myfirstpermission mysecondpermission",
                 "role:you": " \t yourpermission ",
-                },
             }
+        }
         workflow_callback(context, info)
 
         assert sorted(context.__acl__) == [
-            ('Allow', 'role:me', 'myfirstpermission'),
-            ('Allow', 'role:me', 'mysecondpermission'),
-            ('Allow', 'role:you', 'yourpermission'),
-            ('Deny', 'system.Everyone', ALL_PERMISSIONS),
-            ]
+            ("Allow", "role:me", "myfirstpermission"),
+            ("Allow", "role:me", "mysecondpermission"),
+            ("Allow", "role:you", "yourpermission"),
+            ("Deny", "system.Everyone", ALL_PERMISSIONS),
+        ]
 
     def test_workflow_callback_with_inheritance(self):
         from kotti.workflow import workflow_callback
@@ -36,21 +35,21 @@ def test_workflow_callback_with_inheritance(self):
         info = Dummy()
         info.transition = {"to_state": "next_state"}
         info.workflow = Dummy()
-        info.workflow.initial_state = 'bar'
+        info.workflow.initial_state = "bar"
         info.workflow._state_data = {
             "next_state": {
                 "role:me": "myfirstpermission mysecondpermission",
                 "role:you": " \t yourpermission ",
                 "inherit": "true",
-                },
             }
+        }
         workflow_callback(context, info)
 
         assert sorted(context.__acl__) == [
-            ('Allow', 'role:me', 'myfirstpermission'),
-            ('Allow', 'role:me', 'mysecondpermission'),
-            ('Allow', 'role:you', 'yourpermission'),
-            ]
+            ("Allow", "role:me", "myfirstpermission"),
+            ("Allow", "role:me", "mysecondpermission"),
+            ("Allow", "role:you", "yourpermission"),
+        ]
 
     def test_workflow_callback_event(self):
         from kotti.events import listeners
@@ -66,7 +65,7 @@ def test_workflow_callback_event(self):
         info = Dummy()
         info.transition = {"to_state": "next_state"}
         info.workflow = Dummy()
-        info.workflow.initial_state = 'bar'
+        info.workflow.initial_state = "bar"
         info.workflow._state_data = {"next_state": {}}
         workflow_callback(context, info)
 
@@ -77,18 +76,18 @@ def test_workflow_callback_event(self):
         assert isinstance(event, ObjectEvent)
 
 
-@patch('kotti.workflow.transaction.commit')
+@patch("kotti.workflow.transaction.commit")
 class TestResetWorkflow(object):
-
     @staticmethod
     def call(*args, **kwargs):
         from kotti.workflow import reset_workflow
+
         return reset_workflow(*args, **kwargs)
 
     def test_workflow_reset_calls(self, commit):
         objs = [Dummy(), Dummy()]
 
-        with patch('kotti.workflow.get_workflow') as get_workflow:
+        with patch("kotti.workflow.get_workflow") as get_workflow:
             wf = get_workflow.return_value
             self.call(objs)
             assert wf.reset.call_count == 2
@@ -96,37 +95,36 @@ def test_workflow_reset_calls(self, commit):
             assert wf.reset.call_args_list[1][0][0] is objs[1]
 
     def test_reset_purge_existing(self, commit):
-        dummy = Dummy(state='partying')
+        dummy = Dummy(state="partying")
         self.call([dummy], purge_existing=True)
         assert dummy.state is None
 
     def test_reset_no_purge(self, commit):
-        dummy = Dummy(state='partying')
+        dummy = Dummy(state="partying")
         self.call([dummy], purge_existing=False)
-        assert dummy.state == 'partying'
+        assert dummy.state == "partying"
 
 
-@patch('kotti.workflow.transaction.commit')
+@patch("kotti.workflow.transaction.commit")
 class TestResetWorkflowCommand:
     def test_it(self, commit):
         from kotti.workflow import reset_workflow_command
 
-        with patch('kotti.workflow.command') as command:
-            with patch('kotti.workflow.reset_workflow') as reset_workflow:
+        with patch("kotti.workflow.command") as command:
+            with patch("kotti.workflow.reset_workflow") as reset_workflow:
                 reset_workflow_command()
                 func, doc = command.call_args[0]
-                func({'--purge-existing': True})
+                func({"--purge-existing": True})
                 reset_workflow.assert_called_with(purge_existing=True)
 
 
 class TestDefaultWorkflow(object):
-
     @staticmethod
     def make_document(root):
         from kotti import DBSession
         from kotti.resources import Document
 
-        content = root['document'] = Document()
+        content = root["document"] = Document()
         DBSession.flush()
         DBSession.refresh(content)
         return content
@@ -135,27 +133,26 @@ def test_workflow_root(self, root, workflow):
         from kotti.workflow import get_workflow
 
         wf = get_workflow(root)
-        assert wf.name == 'simple'
-        assert root.state == 'public'
+        assert wf.name == "simple"
+        assert root.state == "public"
 
     def test_workflow_new_content(self, root, workflow, events):
         from kotti.workflow import get_workflow
 
         content = self.make_document(root)
         wf = get_workflow(content)
-        assert wf.name == 'simple'
-        assert content.state == 'private'
-        assert content.__acl__[0] == (
-            'Allow', 'role:admin', ALL_PERMISSIONS)
-        assert content.__acl__[-1] == (
-            'Deny', 'system.Everyone', ALL_PERMISSIONS)
+        assert wf.name == "simple"
+        assert content.state == "private"
+        assert content.__acl__[0] == ("Allow", "role:admin", ALL_PERMISSIONS)
+        assert content.__acl__[-1] == ("Deny", "system.Everyone", ALL_PERMISSIONS)
 
     def test_workflow_transition(self, root, workflow, events):
         from kotti.workflow import get_workflow
+
         content = self.make_document(root)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, 'public')
-        assert content.state == 'public'
+        wf.transition_to_state(content, None, "public")
+        assert content.state == "public"
 
     def test_reset_workflow(self, root, workflow, events):
         from kotti.workflow import get_workflow
@@ -163,13 +160,13 @@ def test_reset_workflow(self, root, workflow, events):
 
         content = self.make_document(root)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, 'public')
-        assert content.state == 'public'
+        wf.transition_to_state(content, None, "public")
+        assert content.state == "public"
         save_acl = content.__acl__
         content.__acl__ = []
-        with patch('kotti.workflow.transaction.commit'):
+        with patch("kotti.workflow.transaction.commit"):
             reset_workflow()
-        assert content.state == 'public'
+        assert content.state == "public"
         assert len(content.__acl__) == len(save_acl)
 
     def test_reset_workflow_purge_existing(self, root, workflow, events):
@@ -178,11 +175,11 @@ def test_reset_workflow_purge_existing(self, root, workflow, events):
 
         content = self.make_document(root)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, 'public')
-        assert content.state == 'public'
-        with patch('kotti.workflow.transaction.commit'):
+        wf.transition_to_state(content, None, "public")
+        assert content.state == "public"
+        with patch("kotti.workflow.transaction.commit"):
             reset_workflow(purge_existing=True)
-        assert content.state == 'private'
+        assert content.state == "private"
 
     def test_translate_titles(self, root, dummy_request):
         from pyramid.i18n import TranslationString
@@ -190,11 +187,10 @@ def test_translate_titles(self, root, dummy_request):
 
         content = self.make_document(root)
         for state in _state_info(content, dummy_request):
-            assert isinstance(state['title'], TranslationString)
+            assert isinstance(state["title"], TranslationString)
 
 
 class TestContentExtensibleWithWorkflow:
-
     def test_add_wf_interface_to_content(self, workflow):
         from zope import interface
         from kotti.resources import Content
@@ -207,5 +203,5 @@ def test_add_wf_interface_to_content(self, workflow):
 
         interface.directlyProvides(content, IDefaultWorkflow)
         wf = get_workflow(content)
-        wf.transition_to_state(content, None, 'public')
-        assert content.state == 'public'
+        wf.transition_to_state(content, None, "public")
+        assert content.state == "public"
diff --git a/kotti/traversal.py b/kotti/traversal.py
index 233951fa8..e5e4ed286 100644
--- a/kotti/traversal.py
+++ b/kotti/traversal.py
@@ -69,10 +69,10 @@ def _extract_from_request(request):  # pragma: no cover
         environ = request.environ
         matchdict = request.matchdict
         if matchdict is not None:
-            path = matchdict.get('traverse', slash) or slash
+            path = matchdict.get("traverse", slash) or slash
             if is_nonstr_iter(path):
-                path = '/' + slash.join(path) or slash
-            subpath = matchdict.get('subpath', ())
+                path = "/" + slash.join(path) or slash
+            subpath = matchdict.get("subpath", ())
             if not is_nonstr_iter(subpath):
                 subpath = split_path_info(subpath)
         else:
@@ -82,8 +82,7 @@ def _extract_from_request(request):  # pragma: no cover
             except KeyError:
                 path = slash
             except UnicodeDecodeError as e:
-                raise URLDecodeError(e.encoding, e.object, e.start, e.end,
-                                     e.reason)
+                raise URLDecodeError(e.encoding, e.object, e.start, e.end, e.reason)
         if VH_ROOT_KEY in environ:
             vroot_path = decode_path_info(environ[VH_ROOT_KEY])
             vroot_tuple = split_path_info(vroot_path)
@@ -112,13 +111,14 @@ def __call__(self, request):
         vs = self.VIEW_SELECTOR
         lvs = len(vs)
         result = {
-            'context': root,
-            'view_name': empty,
-            'subpath': subpath,
-            'traversed': (),
-            'virtual_root': root,
-            'virtual_root_path': vroot_tuple,
-            'root': root}
+            "context": root,
+            "view_name": empty,
+            "subpath": subpath,
+            "traversed": (),
+            "virtual_root": root,
+            "virtual_root_path": vroot_tuple,
+            "root": root,
+        }
 
         if vpath == slash:
             return result
@@ -129,24 +129,26 @@ def __call__(self, request):
                 view_name = vpath_tuple[0]
                 if view_name[:lvs] == vs:
                     view_name = view_name[lvs:]
-                result['view_name'] = view_name
-                result['subpath'] = vpath_tuple[1:]
+                result["view_name"] = view_name
+                result["subpath"] = vpath_tuple[1:]
                 return result
-            traversed = vpath_tuple[:len(traversed_nodes)]
-            subpath = list(vpath_tuple[len(traversed_nodes):])
+            traversed = vpath_tuple[: len(traversed_nodes)]
+            subpath = list(vpath_tuple[len(traversed_nodes) :])
             if subpath:
                 view_name = subpath.pop(0)
                 if view_name[:lvs] == vs:
                     view_name = view_name[lvs:]
             else:
                 view_name = empty
-            return {'context': traversed_nodes[-1],
-                    'view_name': view_name,
-                    'subpath': subpath,
-                    'traversed': traversed,
-                    'virtual_root': root,
-                    'virtual_root_path': vroot_tuple,
-                    'root': root}
+            return {
+                "context": traversed_nodes[-1],
+                "view_name": view_name,
+                "subpath": subpath,
+                "traversed": traversed,
+                "virtual_root": root,
+                "virtual_root_path": vroot_tuple,
+                "root": root,
+            }
 
     @staticmethod
     def traverse(root, vpath_tuple):
@@ -165,17 +167,17 @@ def traverse(root, vpath_tuple):
         """
 
         conditions = [
-            (Node.path == root.path + '/'.join(vpath_tuple[:idx + 1]) + '/')
-            for idx, item in enumerate(vpath_tuple)]
-        nodes = DBSession().query(Node)\
-            .order_by(Node.path)\
-            .filter(or_(*conditions))\
-            .all()
+            (Node.path == root.path + "/".join(vpath_tuple[: idx + 1]) + "/")
+            for idx, item in enumerate(vpath_tuple)
+        ]
+        nodes = (
+            DBSession().query(Node).order_by(Node.path).filter(or_(*conditions)).all()
+        )
         for i, node in enumerate(nodes):
             if i == 0:
-                setattr(node, 'parent', root)
+                setattr(node, "parent", root)
             else:
-                setattr(node, 'parent', nodes[i - 1])
+                setattr(node, "parent", nodes[i - 1])
 
         return nodes
 
@@ -192,7 +194,7 @@ def _traverse_cte(root, vpath_tuple):  # pragma: no cover
         recursion maassacre we have right now.
         """
 
-        raise NotImplementedError('Use the traverse method instead.')
+        raise NotImplementedError("Use the traverse method instead.")
 
         """
         # needed until we find out how to pass an empty array of type String
diff --git a/kotti/url_normalizer.py b/kotti/url_normalizer.py
index bf61c7015..578e4dade 100644
--- a/kotti/url_normalizer.py
+++ b/kotti/url_normalizer.py
@@ -8,8 +8,7 @@
 # Define and compile static regexes
 FILENAME_REGEX = re.compile(r"^(.+)\.(\w{,4})$", re.U)
 IGNORE_REGEX = re.compile(r"['\"]", re.U)
-URL_DANGEROUS_CHARS_REGEX = re.compile(r"[!#$%&()*+,/:;<=>?@\\^{|}\[\]~`]+",
-                                       re.U)
+URL_DANGEROUS_CHARS_REGEX = re.compile(r"[!#$%&()*+,/:;<=>?@\\^{|}\[\]~`]+", re.U)
 MULTIPLE_DASHES_REGEX = re.compile(r"\-+", re.U)
 EXTRA_DASHES_REGEX = re.compile(r"(^\-+)|(\-+$)", re.U)
 # Define static constraints
@@ -22,7 +21,7 @@ def crop_name(base, maxLength=MAX_LENGTH):
 
     index = baseLength
     while index > maxLength:
-        index = base.rfind('-', 0, index)
+        index = base.rfind("-", 0, index)
 
     if index == -1 and baseLength > maxLength:
         base = base[:maxLength]
@@ -35,29 +34,29 @@ def crop_name(base, maxLength=MAX_LENGTH):
 
 def url_normalizer(text, locale=None, max_length=MAX_URL_LENGTH):
 
-    key = 'kotti.url_normalizer.map_non_ascii_characters'
+    key = "kotti.url_normalizer.map_non_ascii_characters"
     map_non_ascii = asbool(get_settings()[key])
     if map_non_ascii:
         text = unidecode(text)
 
     # lowercase text
     base = text.lower()
-    ext = ''
+    ext = ""
 
     m = FILENAME_REGEX.match(base)
     if m is not None:
         base = m.groups()[0]
         ext = m.groups()[1]
 
-    base = base.replace(' ', '-')
-    base = IGNORE_REGEX.sub('', base)
-    base = URL_DANGEROUS_CHARS_REGEX.sub('-', base)
-    base = EXTRA_DASHES_REGEX.sub('', base)
-    base = MULTIPLE_DASHES_REGEX.sub('-', base)
+    base = base.replace(" ", "-")
+    base = IGNORE_REGEX.sub("", base)
+    base = URL_DANGEROUS_CHARS_REGEX.sub("-", base)
+    base = EXTRA_DASHES_REGEX.sub("", base)
+    base = MULTIPLE_DASHES_REGEX.sub("-", base)
 
     base = crop_name(base, maxLength=max_length)
 
-    if ext != '':
-        base = base + '.' + ext
+    if ext != "":
+        base = base + "." + ext
 
     return base
diff --git a/kotti/util.py b/kotti/util.py
index 0dfba4910..8dff132af 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -26,7 +26,7 @@
 
 from kotti import DBSession
 
-_ = TranslationStringFactory('Kotti')
+_ = TranslationStringFactory("Kotti")
 
 
 def get_localizer_for_locale_name(locale_name):
@@ -38,7 +38,7 @@ def get_localizer_for_locale_name(locale_name):
 def translate(*args, **kwargs):
     request = get_current_request()
     if request is None:
-        localizer = get_localizer_for_locale_name('en')
+        localizer = get_localizer_for_locale_name("en")
     else:
         localizer = get_localizer(request)
     return localizer.translate(*args, **kwargs)
@@ -48,14 +48,14 @@ def get_paste_items(context, request):
     from kotti.resources import Node
 
     items = []
-    info = request.session.get('kotti.paste')
+    info = request.session.get("kotti.paste")
     if info:
         ids, action = info
         for id in ids:
             item = DBSession.query(Node).get(id)
             if item is None or not item.type_info.addable(context, request):
                 continue
-            if action == 'cut' and inside(context, item):
+            if action == "cut" and inside(context, item):
                 continue
             if context == item:
                 continue
@@ -63,7 +63,7 @@ def get_paste_items(context, request):
     return items
 
 
-def render_view(context, request, name='', secure=True):
+def render_view(context, request, name="", secure=True):
     from kotti.security import authz_context
 
     with authz_context(context, request):
@@ -78,6 +78,7 @@ def __init__(self, html):
 
     def __html__(self):
         return self.html
+
     __unicode__ = __html__
 
     def __getattr__(self, key):
@@ -91,8 +92,8 @@ def __call__(self, context, request):
                 self.template,
                 dict(link=self, context=context, request=request),
                 request,
-                )
             )
+        )
 
     def selected(self, context, request):
         """ Returns True if the Link's url, based on its name,
@@ -106,6 +107,7 @@ def selected(self, context, request):
 
     def permitted(self, context, request):
         from kotti.security import view_permitted
+
         return view_permitted(context, request, self.name)
 
     def visible(self, context, request):
@@ -121,6 +123,7 @@ def visible(self, context, request):
 class LinkRenderer(LinkBase):
     """A menu link that renders a view to render the link.
     """
+
     def __init__(self, name, predicate=None):
         self.name = name
         self.predicate = predicate
@@ -137,7 +140,8 @@ def selected(context, request):
 class LinkParent(LinkBase):
     """A menu link that renders sublinks in a dropdown.
     """
-    template = 'kotti:templates/edit/el-parent.pt'
+
+    template = "kotti:templates/edit/el-parent.pt"
 
     def __init__(self, title, children):
         self.title = title
@@ -154,19 +158,19 @@ def get_visible_children(self, context, request):
 
 
 class Link(LinkBase):
-    template = 'kotti:templates/edit/el-link.pt'
+    template = "kotti:templates/edit/el-link.pt"
 
     def __init__(self, name, title=None, predicate=None, target=None):
         self.name = name
         if title is None:
-            title = name.replace('-', ' ').replace('_', ' ').title()
+            title = name.replace("-", " ").replace("_", " ").title()
         self.title = title
         self.predicate = predicate
         self.target = target
 
     def url(self, context, request):
         if self.name:
-            return resource_url(context, request) + '@@' + self.name
+            return resource_url(context, request) + "@@" + self.name
         else:
             return resource_url(context, request)
 
@@ -174,12 +178,13 @@ def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)
 
     def __repr__(self):
-        return 'Link({0}, {1})'.format(self.name, self.title)
+        return "Link({0}, {1})".format(self.name, self.title)
 
 
 class ActionButton(Link):
-    def __init__(self, path, title=None, no_children=False,
-                 css_class='btn btn-default'):
+    def __init__(
+        self, path, title=None, no_children=False, css_class="btn btn-default"
+    ):
         super(ActionButton, self).__init__(path, title)
         self.no_children = no_children
         self.css_class = css_class
@@ -189,7 +194,7 @@ class DontCache(Exception):
     pass
 
 
-_CACHE_ATTR = 'kotti_cache'
+_CACHE_ATTR = "kotti_cache"
 
 
 def request_container():
@@ -215,15 +220,17 @@ def replacement(*args, **kwargs):
                 key = compute_key(*args, **kwargs)
             except DontCache:
                 return func(*args, **kwargs)
-            key = '{0}.{1}:{2}'.format(func.__module__, func.__name__, key)
+            key = "{0}.{1}:{2}".format(func.__module__, func.__name__, key)
             cached_value = cache.get(key, marker)
             if cached_value is marker:
                 cached_value = cache[key] = func(*args, **kwargs)
             else:
                 pass
             return cached_value
+
         replacement.__doc__ = func.__doc__
         return replacement
+
     return decorator
 
 
@@ -257,26 +264,27 @@ def extract_from_settings(prefix, settings=None):
       {'foo_bar': '1'}
     """
     from kotti import get_settings
+
     settings = settings if settings is not None else get_settings()
     extracted = {}
     for key, value in settings.items():
         if key.startswith(prefix):
-            extracted[key[len(prefix):]] = value
+            extracted[key[len(prefix) :]] = value
     return extracted
 
 
 def disambiguate_name(name):
-    parts = name.split('-')
+    parts = name.split("-")
     if len(parts) > 1:
         try:
             index = int(parts[-1])
         except ValueError:
-            parts.append('1')
+            parts.append("1")
         else:
             parts[-1] = str(index + 1)
     else:
-        parts.append('1')
-    return '-'.join(parts)
+        parts.append("1")
+    return "-".join(parts)
 
 
 def title_to_name(title, blacklist=(), max_length=None):
@@ -285,19 +293,21 @@ def title_to_name(title, blacklist=(), max_length=None):
     """
     if max_length is None:
         from kotti.resources import Node
+
         # See #428, #427 and #31
         max_length = Node.name.property.columns[0].type.length - 10
     request = get_current_request()
     if request is not None:
         locale_name = get_locale_name(request)
     else:
-        locale_name = 'en'
+        locale_name = "en"
     from kotti import get_settings
-    urlnormalizer = get_settings()['kotti.url_normalizer'][0]
+
+    urlnormalizer = get_settings()["kotti.url_normalizer"][0]
     name = urlnormalizer(title, locale_name, max_length=max_length)
     if name not in blacklist:
         return name
-    name += '-1'
+    name += "-1"
     while name in blacklist:
         name = disambiguate_name(name)
     return name
@@ -316,21 +326,20 @@ def camel_case_to_name(text):
       >>> camel_case_to_name('f')
       'f'
     """
-    return re.sub(
-        r'((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))', r'_\1', text).lower()
+    return re.sub(r"((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))", r"_\1", text).lower()
 
 
 def command(func, doc):
     args = docopt(doc)
     # establish config file uri
-    config_uri = args['<config_uri>']
+    config_uri = args["<config_uri>"]
     pyramid_env = bootstrap(config_uri)
     # Setup logging to allow log output from command methods
     setup_logging(config_uri)
     try:
         func(args)
     finally:
-        pyramid_env['closer']()
+        pyramid_env["closer"]()
     return 0
 
 
diff --git a/kotti/views/__init__.py b/kotti/views/__init__.py
index 306070a62..a2617c076 100644
--- a/kotti/views/__init__.py
+++ b/kotti/views/__init__.py
@@ -25,9 +25,9 @@ def includeme(config):
     :type config: :class:`pyramid.config.Configurator`
     """
 
-    config.add_static_view('static-kotti', 'kotti:static')
+    config.add_static_view("static-kotti", "kotti:static")
 
-    config.include('pyramid_deform')
-    config.include('js.deform')
+    config.include("pyramid_deform")
+    config.include("js.deform")
 
-    config.include('kotti.views.util')
+    config.include("kotti.views.util")
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index 5cab7a11a..b3178bcc3 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -9,7 +9,7 @@
 from kotti import get_settings
 from kotti.security import get_user
 
-CACHE_POLICY_HEADER = 'x-caching-policy'
+CACHE_POLICY_HEADER = "x-caching-policy"
 
 logger = getLogger(__name__)
 
@@ -30,13 +30,13 @@ def set_max_age(response, delta, cache_ctrl=None):
         seconds = 0
     now = datetime.datetime.utcnow()
 
-    cache_ctrl.setdefault('max-age', seconds)
+    cache_ctrl.setdefault("max-age", seconds)
 
     # Preserve an existing cache-control header:
-    existing = response.headers.get('cache-control')
+    existing = response.headers.get("cache-control")
     if existing:
-        for e in [e.strip() for e in existing.split(',')]:
-            kv = e.split('=')
+        for e in [e.strip() for e in existing.split(",")]:
+            kv = e.split("=")
             if len(kv) == 2:
                 cache_ctrl.setdefault(kv[0], kv[1])
             else:
@@ -48,30 +48,26 @@ def set_max_age(response, delta, cache_ctrl=None):
         if value is None:
             cache_control_header.append(key)
         else:
-            cache_control_header.append('{0}={1}'.format(key, value))
-    cache_control_header = ','.join(cache_control_header)
-    response.headers['cache-control'] = cache_control_header
+            cache_control_header.append("{0}={1}".format(key, value))
+    cache_control_header = ",".join(cache_control_header)
+    response.headers["cache-control"] = cache_control_header
 
-    response.headers['expires'] = (now + delta).strftime(
-        "%a, %d %b %Y %H:%M:%S GMT")
+    response.headers["expires"] = (now + delta).strftime("%a, %d %b %Y %H:%M:%S GMT")
 
 
 # This is our mapping of caching policies (X-Caching-Policy) to
 # functions that set the response headers accordingly:
 caching_policies = {
-    'Cache HTML':
-    lambda response: set_max_age(response, datetime.timedelta(days=-1),
-                                 cache_ctrl={'s-maxage': '3600'}),
-
-    'Cache Media Content':
-    lambda response: set_max_age(response, datetime.timedelta(hours=4)),
-
-    'Cache Resource':
-    lambda response: set_max_age(response, datetime.timedelta(days=32),
-                                 cache_ctrl={'public': None}),
-
-    'No Cache':
-    lambda response: set_max_age(response, datetime.timedelta(days=-1)),
+    "Cache HTML": lambda response: set_max_age(
+        response, datetime.timedelta(days=-1), cache_ctrl={"s-maxage": "3600"}
+    ),
+    "Cache Media Content": lambda response: set_max_age(
+        response, datetime.timedelta(hours=4)
+    ),
+    "Cache Resource": lambda response: set_max_age(
+        response, datetime.timedelta(days=32), cache_ctrl={"public": None}
+    ),
+    "No Cache": lambda response: set_max_age(response, datetime.timedelta(days=-1)),
 }
 
 
@@ -83,21 +79,20 @@ def _safe_get_user(request):
 
 
 def default_caching_policy_chooser(context, request, response):
-    if request.method != 'GET' or response.status_int != 200:
+    if request.method != "GET" or response.status_int != 200:
         return None
     elif isinstance(response, FileResponse):
-        return 'Cache Resource'
+        return "Cache Resource"
     elif _safe_get_user(request) is not None:
-        return 'No Cache'
-    elif response.headers['content-type'].startswith('text/html'):
-        return 'Cache HTML'
+        return "No Cache"
+    elif response.headers["content-type"].startswith("text/html"):
+        return "Cache HTML"
     else:
-        return 'Cache Media Content'
+        return "Cache Media Content"
 
 
 def caching_policy_chooser(context, request, response):
-    return get_settings()['kotti.caching_policy_chooser'][0](
-        context, request, response)
+    return get_settings()["kotti.caching_policy_chooser"][0](context, request, response)
 
 
 @subscriber(NewResponse)
@@ -106,7 +101,7 @@ def set_cache_headers(event):
 
     # this can happen if a Pyramid tween will shortcut the normal tween
     # chain processing and return its own response early
-    if not hasattr(event.request, 'context'):
+    if not hasattr(event.request, "context"):
         return
 
     context = event.request.context
@@ -121,8 +116,7 @@ def set_cache_headers(event):
         except:
             # We don't want to screw up the response if the
             # caching_policy_chooser raises an exception.
-            logger.exception("{0} raised an exception.".format(
-                caching_policy_chooser))
+            logger.exception("{0} raised an exception.".format(caching_policy_chooser))
     if caching_policy is not None:
         response.headers[CACHE_POLICY_HEADER] = caching_policy
 
diff --git a/kotti/views/edit/__init__.py b/kotti/views/edit/__init__.py
index 706aff88b..316329845 100644
--- a/kotti/views/edit/__init__.py
+++ b/kotti/views/edit/__init__.py
@@ -18,12 +18,14 @@ def _translate_titles(info):
     for d in info:
         d = d.copy()
         try:
-            d['title'] = eval(d['title']) if 'title' in d else d['name']
-            warnings.warn('_() in workflow.zcml is deprecated. '
-                          'Support will be removed in Kotti 2.0.0.',
-                          DeprecationWarning)
+            d["title"] = eval(d["title"]) if "title" in d else d["name"]
+            warnings.warn(
+                "_() in workflow.zcml is deprecated. "
+                "Support will be removed in Kotti 2.0.0.",
+                DeprecationWarning,
+            )
         except (NameError, SyntaxError):
-            d['title'] = _(d['title']) if 'title' in d else d['name']
+            d["title"] = _(d["title"]) if "title" in d else d["name"]
         result.append(d)
     return result
 
@@ -38,7 +40,7 @@ def _state_info(context, request):
 
 def _states(context, request):
     state_info = _state_info(context, request)
-    return dict([(i['name'], i) for i in state_info])
+    return dict([(i["name"], i) for i in state_info])
 
 
 # noinspection PyUnusedLocal
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index a9efa938c..5d87e70ed 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -23,7 +23,7 @@
 from kotti.workflow import get_workflow
 
 
-@view_defaults(permission='edit')
+@view_defaults(permission="edit")
 class NodeActions(object):
     """Actions related to content nodes."""
 
@@ -39,20 +39,18 @@ def _selected_children(self, add_context=True):
         :result: List with select children.
         :rtype: list
         """
-        ids = self.request.session.pop('kotti.selected-children')
+        ids = self.request.session.pop("kotti.selected-children")
         if ids is None and add_context:
             ids = [self.context.id]
         return ids
 
-    def _all_children(self, context, permission='view'):
+    def _all_children(self, context, permission="view"):
         """ Recursively get all children of the given context.
 
         :result: List with all children of a given context.
         :rtype: list
         """
-        tree = nodes_tree(self.request,
-                          context=context,
-                          permission=permission)
+        tree = nodes_tree(self.request, context=context, permission=permission)
         return tree.tolist()[1:]
 
     def back(self, view=None):
@@ -68,20 +66,20 @@ def back(self, view=None):
             url = self.request.referrer
         return HTTPFound(location=url)
 
-    @view_config(name='workflow-change', permission='state_change')
+    @view_config(name="workflow-change", permission="state_change")
     def workflow_change(self):
         """ Handle workflow change requests from workflow dropdown.
 
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
         """
-        new_state = self.request.params['new_state']
+        new_state = self.request.params["new_state"]
         wf = get_workflow(self.context)
         wf.transition_to_state(self.context, self.request, new_state)
-        self.flash(EditFormView.success_message, 'success')
+        self.flash(EditFormView.success_message, "success")
         return self.back()
 
-    @view_config(name='copy')
+    @view_config(name="copy")
     def copy_node(self):
         """ Copy nodes view. Copy the current node or the selected nodes in the
         contents view and save the result in the session of the request.
@@ -89,9 +87,9 @@ def copy_node(self):
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
         """
-        return self._do_copy_or_cut('copy', 'copied')
+        return self._do_copy_or_cut("copy", "copied")
 
-    @view_config(name='cut')
+    @view_config(name="cut")
     def cut_nodes(self):
         """ Cut nodes view. Cut the current node or the selected nodes in the
         contents view and save the result in the session of the request.
@@ -99,19 +97,21 @@ def cut_nodes(self):
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
         """
-        return self._do_copy_or_cut('cut', 'cut')
+        return self._do_copy_or_cut("cut", "cut")
 
     def _do_copy_or_cut(self, action, action_title):
         ids = self._selected_children()
-        self.request.session['kotti.paste'] = (ids, action)
+        self.request.session["kotti.paste"] = (ids, action)
         for id in ids:
             item = DBSession.query(Node).get(id)
-            self.flash(_('${title} was %s.' % action_title,
-                         mapping=dict(title=item.title)), 'success')
+            self.flash(
+                _("${title} was %s." % action_title, mapping=dict(title=item.title)),
+                "success",
+            )
         if not self.request.is_xhr:
             return self.back()
 
-    @view_config(name='paste')
+    @view_config(name="paste")
     def paste_nodes(self):
         """ Paste nodes view.  Paste formerly copied or cutted nodes into the
         current context.  Note that a cutted node can not be pasted into itself.
@@ -119,20 +119,19 @@ def paste_nodes(self):
         :result: Redirect response to the referrer of the request.
         :rtype: pyramid.httpexceptions.HTTPFound
         """
-        ids, action = self.request.session['kotti.paste']
+        ids, action = self.request.session["kotti.paste"]
         for count, id in enumerate(ids):
             item = DBSession.query(Node).get(id)
             if item is not None:
-                if action == 'cut':
-                    if not self.request.has_permission('edit', item):
+                if action == "cut":
+                    if not self.request.has_permission("edit", item):
                         raise Forbidden()
                     item.__parent__.children.remove(item)
-                    item.name = title_to_name(item.name,
-                                              blacklist=self.context.keys())
+                    item.name = title_to_name(item.name, blacklist=self.context.keys())
                     self.context[item.name] = item
                     if count is len(ids) - 1:
-                        del self.request.session['kotti.paste']
-                elif action == 'copy':
+                        del self.request.session["kotti.paste"]
+                elif action == "copy":
                     copy = item.copy()
                     name = copy.name
                     if not name:  # for root
@@ -140,11 +139,11 @@ def paste_nodes(self):
                     name = title_to_name(name, blacklist=self.context.keys())
                     copy.name = name
                     self.context[name] = copy
-                self.flash(_('${title} was pasted.',
-                             mapping=dict(title=item.title)), 'success')
+                self.flash(
+                    _("${title} was pasted.", mapping=dict(title=item.title)), "success"
+                )
             else:
-                self.flash(_('Could not paste node. It no longer exists.'),
-                           'error')
+                self.flash(_("Could not paste node. It no longer exists."), "error")
         DBSession.flush()
         if not self.request.is_xhr:
             return self.back()
@@ -164,12 +163,13 @@ def move(self, move):
             index = self.context.children.index(child)
             self.context.children.pop(index)
             self.context.children.insert(index + move, child)
-            self.flash(_('${title} was moved.',
-                         mapping=dict(title=child.title)), 'success')
+            self.flash(
+                _("${title} was moved.", mapping=dict(title=child.title)), "success"
+            )
         if not self.request.is_xhr:
             return self.back()
 
-    @view_config(name='up')
+    @view_config(name="up")
     def up(self):
         """ Move up nodes view. Move the selected nodes up by 1 position
         and get back to the referrer of the request.
@@ -179,7 +179,7 @@ def up(self):
         """
         return self.move(-1)
 
-    @view_config(name='down')
+    @view_config(name="down")
     def down(self):
         """ Move down nodes view. Move the selected nodes down by 1 position
         and get back to the referrer of the request.
@@ -203,16 +203,19 @@ def set_visibility(self, show):
                 child.in_navigation = show
                 mapping = dict(title=child.title)
                 if show:
-                    mg = _('${title} is now visible in the navigation.',
-                           mapping=mapping)
+                    mg = _(
+                        "${title} is now visible in the navigation.", mapping=mapping
+                    )
                 else:
-                    mg = _('${title} is no longer visible in the navigation.',
-                           mapping=mapping)
-                self.flash(mg, 'success')
+                    mg = _(
+                        "${title} is no longer visible in the navigation.",
+                        mapping=mapping,
+                    )
+                self.flash(mg, "success")
         if not self.request.is_xhr:
             return self.back()
 
-    @view_config(name='show')
+    @view_config(name="show")
     def show(self):
         """ Show nodes view.  Switch the in_navigation attribute of selected
         nodes to ``True`` and get back to the referrer of the request.
@@ -222,7 +225,7 @@ def show(self):
         """
         return self.set_visibility(True)
 
-    @view_config(name='hide')
+    @view_config(name="hide")
     def hide(self):
         """ Hide nodes view. Switch the in_navigation attribute of selected
         nodes to ``False`` and get back to the referrer of the request.
@@ -232,9 +235,9 @@ def hide(self):
         """
         return self.set_visibility(False)
 
-    @view_config(name='delete',
-                 permission='delete',
-                 renderer='kotti:templates/edit/delete.pt')
+    @view_config(
+        name="delete", permission="delete", renderer="kotti:templates/edit/delete.pt"
+    )
     def delete_node(self):
         """ Delete node view. Renders either a view to delete the current node
         or handle the deletion of the current node and get back to the
@@ -245,16 +248,17 @@ def delete_node(self):
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
 
-        action = self.request.POST.get('delete')
+        action = self.request.POST.get("delete")
         if action is not None:
 
             parent = self.context.__parent__
 
-            if action == 'delete':
+            if action == "delete":
                 location = resource_url(parent, self.request)
-                self.flash(_('${title} was deleted.',
-                             mapping=dict(title=self.context.title)),
-                           'success')
+                self.flash(
+                    _("${title} was deleted.", mapping=dict(title=self.context.title)),
+                    "success",
+                )
                 del parent[self.context.name]
             else:
                 location = resource_url(self.context, self.request)
@@ -263,9 +267,11 @@ def delete_node(self):
 
         return {}
 
-    @view_config(name='delete_nodes',
-                 permission='delete',
-                 renderer='kotti:templates/edit/delete-nodes.pt')
+    @view_config(
+        name="delete_nodes",
+        permission="delete",
+        renderer="kotti:templates/edit/delete-nodes.pt",
+    )
     def delete_nodes(self):
         """ Delete nodes view. Renders either a view to delete multiple nodes or
         delete the selected nodes and get back to the referrer of the request.
@@ -274,31 +280,35 @@ def delete_nodes(self):
                  template for rendering.
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
-        if 'delete_nodes' in self.request.POST:
-            ids = self.request.POST.getall('children-to-delete')
+        if "delete_nodes" in self.request.POST:
+            ids = self.request.POST.getall("children-to-delete")
             if not ids:
-                self.flash(_("Nothing was deleted."), 'info')
+                self.flash(_("Nothing was deleted."), "info")
             for id in ids:
                 item = DBSession.query(Node).get(id)
-                self.flash(_('${title} was deleted.',
-                             mapping=dict(title=item.title)), 'success')
+                self.flash(
+                    _("${title} was deleted.", mapping=dict(title=item.title)),
+                    "success",
+                )
                 del self.context[item.name]
-            return self.back('@@contents')
+            return self.back("@@contents")
 
-        if 'cancel' in self.request.POST:
-            self.flash(_('No changes were made.'), 'info')
-            return self.back('@@contents')
+        if "cancel" in self.request.POST:
+            self.flash(_("No changes were made."), "info")
+            return self.back("@@contents")
 
         ids = self._selected_children(add_context=False)
         items = []
         if ids is not None:
-            items = DBSession.query(Node).filter(Node.id.in_(ids)).\
-                order_by(Node.position).all()
-        return {'items': items,
-                'states': _states(self.context, self.request)}
-
-    @view_config(name='rename',
-                 renderer='kotti:templates/edit/rename.pt')
+            items = (
+                DBSession.query(Node)
+                .filter(Node.id.in_(ids))
+                .order_by(Node.position)
+                .all()
+            )
+        return {"items": items, "states": _states(self.context, self.request)}
+
+    @view_config(name="rename", renderer="kotti:templates/edit/rename.pt")
     def rename_node(self):
         """ Rename node view. Renders either a view to change the title and
         name for the current node or handle the changes and get back to the
@@ -308,20 +318,19 @@ def rename_node(self):
                  template for rendering.
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
-        if 'rename' in self.request.POST:
-            name = self.request.POST['name']
-            title = self.request.POST['title']
+        if "rename" in self.request.POST:
+            name = self.request.POST["name"]
+            title = self.request.POST["title"]
             if not name or not title:
-                self.flash(_('Name and title are required.'), 'error')
+                self.flash(_("Name and title are required."), "error")
             else:
-                self.context.name = name.replace('/', '')
+                self.context.name = name.replace("/", "")
                 self.context.title = title
-                self.flash(_('Item was renamed.'), 'success')
-                return self.back('')
+                self.flash(_("Item was renamed."), "success")
+                return self.back("")
         return {}
 
-    @view_config(name='rename_nodes',
-                 renderer='kotti:templates/edit/rename-nodes.pt')
+    @view_config(name="rename_nodes", renderer="kotti:templates/edit/rename-nodes.pt")
     def rename_nodes(self):
         """ Rename nodes view. Renders either a view to change the titles and
         names for multiple nodes or handle the changes and get back to the
@@ -331,36 +340,35 @@ def rename_nodes(self):
                  template for rendering.
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
-        if 'rename_nodes' in self.request.POST:
-            ids = self.request.POST.getall('children-to-rename')
+        if "rename_nodes" in self.request.POST:
+            ids = self.request.POST.getall("children-to-rename")
             for id in ids:
                 item = DBSession.query(Node).get(id)
-                name = self.request.POST[id + '-name']
-                title = self.request.POST[id + '-title']
+                name = self.request.POST[id + "-name"]
+                title = self.request.POST[id + "-title"]
                 if not name or not title:
-                    self.flash(_('Name and title are required.'), 'error')
-                    location = resource_url(self.context, self.request,
-                                            '@@rename_nodes')
+                    self.flash(_("Name and title are required."), "error")
+                    location = resource_url(
+                        self.context, self.request, "@@rename_nodes"
+                    )
                     return HTTPFound(location=location)
                 else:
-                    item.name = title_to_name(name,
-                                              blacklist=self.context.keys())
+                    item.name = title_to_name(name, blacklist=self.context.keys())
                     item.title = title
-            self.flash(_('Your changes have been saved.'), 'success')
-            return self.back('@@contents')
+            self.flash(_("Your changes have been saved."), "success")
+            return self.back("@@contents")
 
-        if 'cancel' in self.request.POST:
-            self.flash(_('No changes were made.'), 'info')
-            return self.back('@@contents')
+        if "cancel" in self.request.POST:
+            self.flash(_("No changes were made."), "info")
+            return self.back("@@contents")
 
         ids = self._selected_children(add_context=False)
         items = []
         if ids is not None:
             items = DBSession.query(Node).filter(Node.id.in_(ids)).all()
-        return {'items': items}
+        return {"items": items}
 
-    @view_config(name='change_state',
-                 renderer='kotti:templates/edit/change-state.pt')
+    @view_config(name="change_state", renderer="kotti:templates/edit/change-state.pt")
     def change_state(self):
         """ Change state view. Renders either a view to handle workflow changes
         for multiple nodes or handle the selected workflow changes and get
@@ -370,33 +378,30 @@ def change_state(self):
                  template for rendering.
         :rtype: pyramid.httpexceptions.HTTPFound or dict
         """
-        if 'change_state' in self.request.POST:
-            ids = self.request.POST.getall('children-to-change-state')
-            to_state = self.request.POST.get('to-state', 'no-change')
-            include_children = self.request.POST.get('include-children')
-            if to_state != 'no-change':
+        if "change_state" in self.request.POST:
+            ids = self.request.POST.getall("children-to-change-state")
+            to_state = self.request.POST.get("to-state", "no-change")
+            include_children = self.request.POST.get("include-children")
+            if to_state != "no-change":
                 items = DBSession.query(Node).filter(Node.id.in_(ids)).all()
                 for item in items:
                     wf = get_workflow(item)
                     if wf is not None:
                         wf.transition_to_state(item, self.request, to_state)
                     if include_children:
-                        childs = self._all_children(item,
-                                                    permission='state_change')
+                        childs = self._all_children(item, permission="state_change")
                         for child in childs:
                             wf = get_workflow(child)
                             if wf is not None:
-                                wf.transition_to_state(child,
-                                                       self.request,
-                                                       to_state, )
-                self.flash(_('Your changes have been saved.'), 'success')
+                                wf.transition_to_state(child, self.request, to_state)
+                self.flash(_("Your changes have been saved."), "success")
             else:
-                self.flash(_('No changes were made.'), 'info')
-            return self.back('@@contents')
+                self.flash(_("No changes were made."), "info")
+            return self.back("@@contents")
 
-        if 'cancel' in self.request.POST:
-            self.flash(_('No changes were made.'), 'info')
-            return self.back('@@contents')
+        if "cancel" in self.request.POST:
+            self.flash(_("No changes were made."), "info")
+            return self.back("@@contents")
 
         ids = self._selected_children(add_context=False)
         items = transitions = []
@@ -405,13 +410,15 @@ def change_state(self):
             if wf is not None:
                 items = DBSession.query(Node).filter(Node.id.in_(ids)).all()
                 for item in items:
-                        trans_info = wf.get_transitions(item, self.request)
-                        for tran_info in trans_info:
-                            if tran_info not in transitions:
-                                transitions.append(tran_info)
-        return {'items': items,
-                'states': _states(self.context, self.request),
-                'transitions': transitions, }
+                    trans_info = wf.get_transitions(item, self.request)
+                    for tran_info in trans_info:
+                        if tran_info not in transitions:
+                            transitions.append(tran_info)
+        return {
+            "items": items,
+            "states": _states(self.context, self.request),
+            "transitions": transitions,
+        }
 
 
 def contents_buttons(context, request):
@@ -423,43 +430,46 @@ def contents_buttons(context, request):
     """
     buttons = []
     if get_paste_items(context, request):
-        buttons.append(ActionButton('paste', title=_('Paste'),
-                                    no_children=True))
+        buttons.append(ActionButton("paste", title=_("Paste"), no_children=True))
     if context.children:
-        buttons.append(ActionButton('copy', title=_('Copy')))
-        buttons.append(ActionButton('cut', title=_('Cut')))
-        buttons.append(ActionButton('rename_nodes', title=_('Rename'),
-                                    css_class='btn btn-warning'))
-        buttons.append(ActionButton('delete_nodes', title=_('Delete'),
-                                    css_class='btn btn-danger'))
+        buttons.append(ActionButton("copy", title=_("Copy")))
+        buttons.append(ActionButton("cut", title=_("Cut")))
+        buttons.append(
+            ActionButton("rename_nodes", title=_("Rename"), css_class="btn btn-warning")
+        )
+        buttons.append(
+            ActionButton("delete_nodes", title=_("Delete"), css_class="btn btn-danger")
+        )
         if get_workflow(context) is not None:
-            buttons.append(ActionButton('change_state',
-                                        title=_('Change State')))
-        buttons.append(ActionButton('up', title=_('Move up')))
-        buttons.append(ActionButton('down', title=_('Move down')))
-        buttons.append(ActionButton('show', title=_('Show')))
-        buttons.append(ActionButton('hide', title=_('Hide')))
+            buttons.append(ActionButton("change_state", title=_("Change State")))
+        buttons.append(ActionButton("up", title=_("Move up")))
+        buttons.append(ActionButton("down", title=_("Move down")))
+        buttons.append(ActionButton("show", title=_("Show")))
+        buttons.append(ActionButton("hide", title=_("Hide")))
     return [button for button in buttons if button.permitted(context, request)]
 
 
-@view_config(name='add-dropdown',
-             renderer='kotti:templates/add-dropdown.pt')
+@view_config(name="add-dropdown", renderer="kotti:templates/add-dropdown.pt")
 def content_type_factories(context, request):
     """ Renders the drop down menu for Add button in editor bar.
 
     :result: Dictionary passed to the template for rendering.
     :rtype: pyramid.httpexceptions.HTTPFound or dict
     """
-    all_types = get_settings()['kotti.available_types']
+    all_types = get_settings()["kotti.available_types"]
     factories = []
     for factory in all_types:
         if factory.type_info.addable(context, request):
             factories.append(factory)
-    return {'factories': factories}
+    return {"factories": factories}
 
 
-@view_config(context=IContent, name='contents', permission='view',
-             renderer='kotti:templates/edit/contents.pt')
+@view_config(
+    context=IContent,
+    name="contents",
+    permission="view",
+    renderer="kotti:templates/edit/contents.pt",
+)
 def contents(context, request):
     """ Contents view. Renders either the contents view or handle the action
     button actions of the view.
@@ -472,24 +482,26 @@ def contents(context, request):
     buttons = contents_buttons(context, request)
     for button in buttons:
         if button.name in request.POST:
-            children = request.POST.getall('children')
-            if not children and button.name != 'paste':
+            children = request.POST.getall("children")
+            if not children and button.name != "paste":
                 request.session.flash(
-                    _('You have to select items to perform an action.'),
-                    'info')
-                location = resource_url(context, request) + '@@contents'
+                    _("You have to select items to perform an action."), "info"
+                )
+                location = resource_url(context, request) + "@@contents"
                 return HTTPFound(location=location)
-            request.session['kotti.selected-children'] = children
+            request.session["kotti.selected-children"] = children
             location = button.url(context, request)
             return HTTPFound(location, request=request)
 
-    return {'children': context.children_with_permission(request),
-            'buttons': buttons,
-            }
+    return {"children": context.children_with_permission(request), "buttons": buttons}
 
 
-@view_config(name='move-child-position', permission='edit',
-             request_method="POST", renderer="json")
+@view_config(
+    name="move-child-position",
+    permission="edit",
+    request_method="POST",
+    renderer="json",
+)
 def move_child_position(context, request):
     """ Move the child from one position to another.
 
@@ -508,31 +520,32 @@ def move_child_position(context, request):
 
     data = request.POST or request.json_body
 
-    if ('from' in data) and ('to' in data):
+    if ("from" in data) and ("to" in data):
 
         max_pos = len(context.children) - 1
         try:
-            old_position = int(data['from'])
-            new_position = int(data['to'])
-            if not ((0 <= old_position <= max_pos) and
-                    (0 <= new_position <= max_pos)):
+            old_position = int(data["from"])
+            new_position = int(data["to"])
+            if not ((0 <= old_position <= max_pos) and (0 <= new_position <= max_pos)):
                 raise ValueError
         except ValueError:
-            return {'result': 'error'}
+            return {"result": "error"}
 
         # sqlalchemy.ext.orderinglist takes care of the "right" sequence
         # numbers (immediately consecutive, starting with 0) for us.
-        context.children.insert(new_position,
-                                context.children.pop(old_position))
-        result = 'success'
+        context.children.insert(new_position, context.children.pop(old_position))
+        result = "success"
     else:
-        result = 'error'
+        result = "error"
 
-    return {'result': result}
+    return {"result": result}
 
 
-@view_config(name='workflow-dropdown', permission='view',
-             renderer='kotti:templates/workflow-dropdown.pt')
+@view_config(
+    name="workflow-dropdown",
+    permission="view",
+    renderer="kotti:templates/workflow-dropdown.pt",
+)
 def workflow(context, request):
     """ Renders the drop down menu for workflow actions.
 
@@ -542,23 +555,27 @@ def workflow(context, request):
     wf = get_workflow(context)
     if wf is not None:
         state_info = _state_info(context, request)
-        curr_state = [i for i in state_info if i['current']][0]
-        trans_info = [trans for trans in wf.get_transitions(context, request)
-                      if request.has_permission(trans['permission'], context)]
+        curr_state = [i for i in state_info if i["current"]][0]
+        trans_info = [
+            trans
+            for trans in wf.get_transitions(context, request)
+            if request.has_permission(trans["permission"], context)
+        ]
 
         return {
-            'states': _states(context, request),
-            'transitions': trans_info,
-            'current_state': curr_state,
+            "states": _states(context, request),
+            "transitions": trans_info,
+            "current_state": curr_state,
         }
 
-    return {
-        'current_state': None
-    }
+    return {"current_state": None}
 
 
-@view_config(name='actions-dropdown', permission='edit',
-             renderer='kotti:templates/actions-dropdown.pt')
+@view_config(
+    name="actions-dropdown",
+    permission="edit",
+    renderer="kotti:templates/actions-dropdown.pt",
+)
 def actions(context, request):
     """ Renders the drop down menu for Actions button in editor bar.
 
@@ -566,10 +583,11 @@ def actions(context, request):
     :rtype: dict
     """
     actions = []
-    if hasattr(context, 'type_info'):
-        actions = [a for a in context.type_info.action_links
-                   if a.visible(context, request)]
-    return {'actions': actions}
+    if hasattr(context, "type_info"):
+        actions = [
+            a for a in context.type_info.action_links if a.visible(context, request)
+        ]
+    return {"actions": actions}
 
 
 def includeme(config):
@@ -580,6 +598,7 @@ def includeme(config):
     """
 
     import warnings
+
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
         config.scan(__name__)
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 268c65ba7..118653da7 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -25,34 +25,30 @@
 class ContentSchema(colander.MappingSchema):
     title = colander.SchemaNode(
         colander.String(),
-        title=_('Title'),
-        validator=colander.Length(
-            max=Node.title.property.columns[0].type.length),
-        )
+        title=_("Title"),
+        validator=colander.Length(max=Node.title.property.columns[0].type.length),
+    )
     description = colander.SchemaNode(
         colander.String(),
-        title=_('Description'),
+        title=_("Description"),
         widget=TextAreaWidget(cols=40, rows=5),
-        missing='',
-        )
+        missing="",
+    )
     tags = colander.SchemaNode(
-        ObjectType(),
-        title=_('Tags'),
-        widget=deferred_tag_it_widget,
-        missing=[],
-        )
+        ObjectType(), title=_("Tags"), widget=deferred_tag_it_widget, missing=[]
+    )
 
 
 class DocumentSchema(ContentSchema):
     body = colander.SchemaNode(
         colander.String(),
-        title=_('Body'),
+        title=_("Body"),
         widget=RichTextWidget(
             # theme='advanced', width=790, height=500
-            height=500,
+            height=500
         ),
         missing="",
-        )
+    )
 
 
 class DocumentAddForm(AddFormView):
@@ -70,15 +66,15 @@ def FileSchema(tmpstore, title_missing=None):
     class FileSchema(ContentSchema):
         file = SchemaNode(
             FileData(),
-            title=_('File'),
+            title=_("File"),
             widget=FileUploadWidget(tmpstore),
             validator=validate_file_size_limit,
-            )
+        )
 
     # noinspection PyUnusedLocal
     def set_title_missing(node, kw):
         if title_missing is not None:
-            node['title'].missing = title_missing
+            node["title"].missing = title_missing
 
     return FileSchema(after_bind=set_title_missing)
 
@@ -92,17 +88,17 @@ def schema_factory(self):
         return FileSchema(tmpstore, title_missing=null)
 
     def save_success(self, appstruct):
-        if not appstruct['title']:
-            appstruct['title'] = appstruct['file']['filename']
+        if not appstruct["title"]:
+            appstruct["title"] = appstruct["file"]["filename"]
         return super(FileAddForm, self).save_success(appstruct)
 
     def add(self, **appstruct):
-        filename = appstruct['file']['filename']
+        filename = appstruct["file"]["filename"]
         item = self.item_class(
-            title=appstruct['title'] or filename,
-            description=appstruct['description'],
-            tags=appstruct['tags'],
-            data=_to_fieldstorage(**appstruct['file']),
+            title=appstruct["title"] or filename,
+            description=appstruct["description"],
+            tags=appstruct["tags"],
+            data=_to_fieldstorage(**appstruct["file"]),
         )
         return item
 
@@ -111,12 +107,16 @@ class FileEditForm(EditFormView):
     def before(self, form):
         form.appstruct = get_appstruct(self.context, self.schema)
         if self.context.data is not None:
-            form.appstruct.update({'file': {
-                'fp': None,
-                'filename': self.context.data['filename'],  # self.context.name
-                'mimetype': self.context.mimetype,
-                'uid': str(random.randint(1000000000, 9999999999)),
-            }})
+            form.appstruct.update(
+                {
+                    "file": {
+                        "fp": None,
+                        "filename": self.context.data["filename"],  # self.context.name
+                        "mimetype": self.context.mimetype,
+                        "uid": str(random.randint(1000000000, 9999999999)),
+                    }
+                }
+            )
 
     def schema_factory(self):
         # File uploads are stored in the session so that you don't need
@@ -126,12 +126,12 @@ def schema_factory(self):
         return FileSchema(tmpstore)
 
     def edit(self, **appstruct):
-        title = appstruct['title']
+        title = appstruct["title"]
         self.context.title = title
-        self.context.description = appstruct['description']
-        self.context.tags = appstruct['tags']
-        if appstruct['file'] and appstruct['file']['fp']:
-            self.context.data = _to_fieldstorage(**appstruct['file'])
+        self.context.description = appstruct["description"]
+        self.context.tags = appstruct["tags"]
+        if appstruct["file"] and appstruct["file"]["fp"]:
+            self.context.data = _to_fieldstorage(**appstruct["file"])
 
 
 def includeme(config):
@@ -144,29 +144,29 @@ def includeme(config):
     config.add_view(
         DocumentEditForm,
         context=Document,
-        name='edit',
-        permission='edit',
-        renderer='kotti:templates/edit/node.pt',
-        )
+        name="edit",
+        permission="edit",
+        renderer="kotti:templates/edit/node.pt",
+    )
 
     config.add_view(
         DocumentAddForm,
         name=Document.type_info.add_view,
         permission=Document.type_info.add_permission,
-        renderer='kotti:templates/edit/node.pt',
-        )
+        renderer="kotti:templates/edit/node.pt",
+    )
 
     config.add_view(
         FileEditForm,
         context=File,
-        name='edit',
-        permission='edit',
-        renderer='kotti:templates/edit/node.pt',
-        )
+        name="edit",
+        permission="edit",
+        renderer="kotti:templates/edit/node.pt",
+    )
 
     config.add_view(
         FileAddForm,
         name=File.type_info.add_view,
         permission=File.type_info.add_permission,
-        renderer='kotti:templates/edit/node.pt',
-        )
+        renderer="kotti:templates/edit/node.pt",
+    )
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index ce09c7fe9..16529f872 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -15,9 +15,8 @@
 from kotti.util import _
 
 
-@view_defaults(permission='edit')
+@view_defaults(permission="edit")
 class DefaultViewSelection(object):
-
     def __init__(self, context, request):
 
         self.context = context
@@ -29,10 +28,7 @@ def _get_view(self, view_name):  # pragma: no cover
 
            Returns True if a view with name view_name is registered for context.
         """
-        provides = [IViewClassifier] + map_(
-            providedBy,
-            (self.request, self.context)
-        )
+        provides = [IViewClassifier] + map_(providedBy, (self.request, self.context))
 
         try:
             reg = self.request.registry
@@ -53,10 +49,13 @@ def _is_valid_default_view(self, view_name):
         """
 
         return self._is_valid_view(view_name) and view_name in [
-            v[0] for v in self.context.type_info.selectable_default_views]
+            v[0] for v in self.context.type_info.selectable_default_views
+        ]
 
-    @view_config(name='default-view-selector',
-                 renderer='kotti:templates/default-view-selector.pt')
+    @view_config(
+        name="default-view-selector",
+        renderer="kotti:templates/default-view-selector.pt",
+    )
     def default_view_selector(self):
         """
         :summary: Submenu for selection of the node's default view.
@@ -69,15 +68,19 @@ def default_view_selector(self):
         for v in self.context.type_info.selectable_default_views:
             name, title = v
             if self._is_valid_view(name):
-                sviews.append({
-                    "name": name,
-                    "title": title,
-                    "is_current": name == self.context.default_view,
-                })
+                sviews.append(
+                    {
+                        "name": name,
+                        "title": title,
+                        "is_current": name == self.context.default_view,
+                    }
+                )
             else:
                 warnings.warn(
                     "No view called '{0}' is registered for {1!r}.".format(
-                        name, self.context))
+                        name, self.context
+                    )
+                )
 
         return {
             "selectable_default_views": [
@@ -86,10 +89,11 @@ def default_view_selector(self):
                     "title": _("Default view"),
                     "is_current": self.context.default_view is None,
                 }
-            ] + sviews,
+            ]
+            + sviews
         }
 
-    @view_config(name='set-default-view')
+    @view_config(name="set-default-view")
     def set_default_view(self):
         """
         :summary: Set the node's default view and redirect to it.
@@ -97,32 +101,27 @@ def set_default_view(self):
         :rtype: pyramid.httpexceptions.HTTPFound
         """
 
-        if 'view_name' in self.request.GET:
+        if "view_name" in self.request.GET:
 
-            view_name = self.request.GET['view_name']
+            view_name = self.request.GET["view_name"]
 
             if view_name == "default":
                 self.context.default_view = None
                 self.request.session.flash(
-                    _("Default view has been reset to default."),
-                    'success'
+                    _("Default view has been reset to default."), "success"
                 )
             else:
                 if self._is_valid_default_view(view_name):
                     self.context.default_view = view_name
                     self.request.session.flash(
-                        _("Default view has been set."),
-                        'success'
+                        _("Default view has been set."), "success"
                     )
                 else:
                     self.request.session.flash(
-                        _("Default view could not be set."),
-                        'error'
+                        _("Default view could not be set."), "error"
                     )
 
-        return HTTPFound(
-            location=self.request.resource_url(self.context)
-        )
+        return HTTPFound(location=self.request.resource_url(self.context))
 
 
 def includeme(config):
@@ -132,4 +131,4 @@ def includeme(config):
     :type config: :class:`pyramid.config.Configurator`
     """
 
-    config.scan('.default_views')
+    config.scan(".default_views")
diff --git a/kotti/views/edit/upload.py b/kotti/views/edit/upload.py
index 84520fffc..a63c1f8ce 100644
--- a/kotti/views/edit/upload.py
+++ b/kotti/views/edit/upload.py
@@ -16,10 +16,8 @@
 log = getLogger(__name__)
 
 
-@view_defaults(name="upload", context="kotti.resources.Content",
-               permission="edit")
+@view_defaults(name="upload", context="kotti.resources.Content", permission="edit")
 class UploadView(object):
-
     def __init__(self, context, request):
         """ Constructor.
 
@@ -33,10 +31,9 @@ def __init__(self, context, request):
 
         self.context = context
         self.request = request
-        self.factories = content_type_factories(context, request)['factories']
+        self.factories = content_type_factories(context, request)["factories"]
 
-    @view_config(request_method="GET",
-                 renderer="kotti:templates/edit/upload.pt")
+    @view_config(request_method="GET", renderer="kotti:templates/edit/upload.pt")
     def form(self):
         """ The upload form.
 
@@ -78,11 +75,14 @@ def possible_factories(self, mimetype):
             if match_score:
                 factories.append((match_score, factory))
 
-        return [f[1] for f in sorted(
-            factories, key=lambda factory: -factory[0])]
+        return [f[1] for f in sorted(factories, key=lambda factory: -factory[0])]
 
-    @view_config(name="content_types", request_method="GET",
-                 accept="application/json", renderer="json")
+    @view_config(
+        name="content_types",
+        request_method="GET",
+        accept="application/json",
+        renderer="json",
+    )
     def content_types(self):
         """ Return a list of content type names and title for those types that
             can be created from files of the MIME type given as GET parameter.
@@ -92,12 +92,14 @@ def content_types(self):
         :rtype: dict
         """
 
-        mimetype = self.request.GET['mimetype']
+        mimetype = self.request.GET["mimetype"]
 
-        result = {"content_types": [{
-            'name': f.type_info.name,
-            'title': f.type_info.title,
-        } for f in self.possible_factories(mimetype)]}
+        result = {
+            "content_types": [
+                {"name": f.type_info.name, "title": f.type_info.title}
+                for f in self.possible_factories(mimetype)
+            ]
+        }
 
         return result
 
@@ -133,30 +135,24 @@ def process_upload(self):
         :rtype: dict
         """
 
-        fs = self.request.POST['qqfile']
+        fs = self.request.POST["qqfile"]
         # We can fail hard, as somebody is trying to cheat on us if that fails.
         assert isinstance(fs, FieldStorage)
 
         try:
-            factory = self.factory_by_name(self.request.POST['content_type'])
+            factory = self.factory_by_name(self.request.POST["content_type"])
         except KeyError as e:
-            result = {
-                'success': False,
-                'error': e.message,
-            }
+            result = {"success": False, "error": e.message}
         else:
             name = title_to_name(fs.filename, blacklist=self.context.keys())
             self.context[name] = node = factory.from_field_storage(fs)
             node.title = fs.filename
 
-            result = {
-                "success": True,
-                "url": self.request.resource_url(node),
-            }
+            result = {"success": True, "url": self.request.resource_url(node)}
 
         # FineUploader expects JSON with Content-Type 'text/plain'
         response = Response(json.dumps(result))
-        response.content_type = 'text/plain'
+        response.content_type = "text/plain"
 
         return response
 
diff --git a/kotti/views/file.py b/kotti/views/file.py
index cd22f7a63..f2ca13584 100644
--- a/kotti/views/file.py
+++ b/kotti/views/file.py
@@ -3,20 +3,24 @@
 from kotti.interfaces import IFile
 
 
-@view_config(name='view', context=IFile, permission='view',
-             renderer='kotti:templates/view/file.pt')
+@view_config(
+    name="view",
+    context=IFile,
+    permission="view",
+    renderer="kotti:templates/view/file.pt",
+)
 def view(context, request):
     return {}
 
 
-@view_config(name='inline-view', context=IFile, permission='view')
+@view_config(name="inline-view", context=IFile, permission="view")
 def inline_view(context, request):
     return request.uploaded_file_response(context.data)
 
 
-@view_config(name='attachment-view', context=IFile, permission='view')
+@view_config(name="attachment-view", context=IFile, permission="view")
 def attachment_view(context, request):
-    return request.uploaded_file_response(context.data, 'attachment')
+    return request.uploaded_file_response(context.data, "attachment")
 
 
 def includeme(config):
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 008e9ad8e..7911fe3f6 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -52,9 +52,8 @@ def deserialize(node, value):
 def deferred_tag_it_widget(node, kw):
     tagit.need()
     all_tags = Tag.query.all()
-    available_tags = [tag.title.encode('utf-8') for tag in all_tags]
-    widget = CommaSeparatedListWidget(template='tag_it',
-                                      available_tags=available_tags)
+    available_tags = [tag.title.encode("utf-8") for tag in all_tags]
+    widget = CommaSeparatedListWidget(template="tag_it", available_tags=available_tags)
     return widget
 
 
@@ -63,7 +62,7 @@ class Form(deform.Form):
 
     def render(self, appstruct=None, readonly=False):
         if appstruct is None:
-            appstruct = getattr(self, 'appstruct', colander.null)
+            appstruct = getattr(self, "appstruct", colander.null)
         return super(Form, self).render(appstruct, readonly=readonly)
 
 
@@ -71,9 +70,7 @@ class BaseFormView(FormView):
     """ A basic view for forms with save and cancel buttons. """
 
     form_class = Form
-    buttons = (
-        deform.Button('save', _('Save')),
-        deform.Button('cancel', _('Cancel')))
+    buttons = (deform.Button("save", _("Save")), deform.Button("cancel", _("Cancel")))
     success_message = _("Your changes have been saved.")
     success_url = None
     schema_factory = None
@@ -88,8 +85,8 @@ def __init__(self, context, request, **kwargs):
     def __call__(self):
         if self.schema_factory is not None:
             self.schema = self.schema_factory()
-        if self.use_csrf_token and 'csrf_token' not in self.schema:
-            self.schema.children.append(CSRFSchema()['csrf_token'])
+        if self.use_csrf_token and "csrf_token" not in self.schema:
+            self.schema.children.append(CSRFSchema()["csrf_token"])
         result = super(BaseFormView, self).__call__()
         if isinstance(result, dict):
             result.update(self.more_template_vars())
@@ -98,6 +95,7 @@ def __call__(self):
     def cancel_success(self, appstruct):
         location = self.request.resource_url(self.context)
         return HTTPFound(location=location)
+
     cancel_failure = cancel_success
 
     def more_template_vars(self):
@@ -132,15 +130,15 @@ class DocumentEditForm(EditFormView):
             schema_factory = DocumentSchema
     """
 
-    add_template_vars = ('first_heading',)
+    add_template_vars = ("first_heading",)
 
     def before(self, form):
         form.appstruct = get_appstruct(self.context, self.schema)
 
     def save_success(self, appstruct):
-        appstruct.pop('csrf_token', None)
+        appstruct.pop("csrf_token", None)
         self.edit(**appstruct)
-        self.request.session.flash(self.success_message, 'success')
+        self.request.session.flash(self.success_message, "success")
         location = self.success_url or self.request.resource_url(self.context)
         return HTTPFound(location=location)
 
@@ -150,9 +148,7 @@ def edit(self, **appstruct):
 
     @reify
     def first_heading(self):
-        return _('Edit ${title}',
-                 mapping=dict(title=self.context.title)
-                 )
+        return _("Edit ${title}", mapping=dict(title=self.context.title))
 
 
 class AddFormView(BaseFormView):
@@ -169,37 +165,36 @@ class DocumentAddForm(AddFormView):
 
     success_message = _("Item was added.")
     item_type = None
-    add_template_vars = ('first_heading',)
+    add_template_vars = ("first_heading",)
 
     def save_success(self, appstruct):
-        appstruct.pop('csrf_token', None)
+        appstruct.pop("csrf_token", None)
         name = self.find_name(appstruct)
         new_item = self.context[name] = self.add(**appstruct)
-        self.request.session.flash(self.success_message, 'success')
+        self.request.session.flash(self.success_message, "success")
         location = self.success_url or self.request.resource_url(new_item)
         return HTTPFound(location=location)
 
     def find_name(self, appstruct):
-        name = appstruct.get('name')
+        name = appstruct.get("name")
         if name is None:
-            name = title_to_name(
-                appstruct['title'], blacklist=self.context.keys())
+            name = title_to_name(appstruct["title"], blacklist=self.context.keys())
         return name
 
     @reify
     def first_heading(self):
-        context_title = getattr(self.request.context, 'title', None)
+        context_title = getattr(self.request.context, "title", None)
         type_title = self.item_type or self.add.type_info.title
         if context_title:
-            return _('Add ${type} to ${title}.',
-                     mapping=dict(type=translate(type_title),
-                                  title=context_title))
+            return _(
+                "Add ${type} to ${title}.",
+                mapping=dict(type=translate(type_title), title=context_title),
+            )
         else:
-            return _('Add ${type}.', mapping=dict(type=translate(type_title)))
+            return _("Add ${type}.", mapping=dict(type=translate(type_title)))
 
 
 class CommaSeparatedListWidget(deform.widget.Widget):
-
     def __init__(self, template=None, **kw):
         super(CommaSeparatedListWidget, self).__init__(**kw)
         self.template = template
@@ -214,7 +209,7 @@ def serialize(self, field, cstruct, readonly=False):
     def deserialize(field, pstruct):
         if pstruct is colander.null:
             return colander.null
-        return [item.strip() for item in pstruct.split(',') if item]
+        return [item.strip() for item in pstruct.split(",") if item]
 
 
 class FileUploadTempStore(MutableMapping):
@@ -233,25 +228,25 @@ def __len__(self):
         return len(self.session)
 
     def keys(self):
-        return [k for k in self.session.keys() if not k.startswith('_')]
+        return [k for k in self.session.keys() if not k.startswith("_")]
 
     def __setitem__(self, key, value):
         value = value.copy()
-        fp = value.pop('fp')
+        fp = value.pop("fp")
         if fp is not None:
-            value['file_contents'] = fp.read()
+            value["file_contents"] = fp.read()
             fp.seek(0)
         else:
-            value['file_contents'] = b''
+            value["file_contents"] = b""
         self.session[key] = value
 
     def __getitem__(self, key):
         value = self.session[key].copy()
-        content = value.pop('file_contents')
+        content = value.pop("file_contents")
         if content:
-            value['fp'] = BytesIO(content)
+            value["fp"] = BytesIO(content)
         else:
-            value['fp'] = None
+            value["fp"] = None
         return value
 
     def __delitem__(self, key):
@@ -269,9 +264,9 @@ def validate_file_size_limit(node, value):
     option to the maximum number of bytes that you want to allow.
     """
     try:
-        fp = value.get('fp', None)
+        fp = value.get("fp", None)
     except AttributeError:
-        fp = getattr(value, 'fp', None)
+        fp = getattr(value, "fp", None)
     if not fp:
         return
 
@@ -279,8 +274,8 @@ def validate_file_size_limit(node, value):
     size = fp.tell()
     fp.seek(0)
     # unit for ``kotti.max_file_size`` is MB
-    max_mb = get_settings()['kotti.max_file_size']
+    max_mb = get_settings()["kotti.max_file_size"]
     max_size = int(max_mb) * 1024 * 1024
     if size > max_size:
-        msg = _('Maximum file size: ${size}MB', mapping={'size': max_mb})
+        msg = _("Maximum file size: ${size}MB", mapping={"size": max_mb})
         raise colander.Invalid(node, msg)
diff --git a/kotti/views/login.py b/kotti/views/login.py
index aef1af322..ddf30ee2c 100644
--- a/kotti/views/login.py
+++ b/kotti/views/login.py
@@ -59,58 +59,57 @@ class UserSelfRegistered(ObjectEvent):
 
 
 class RegisterSchema(colander.Schema):
-    title = colander.SchemaNode(
-        colander.String(),
-        title=_('Full name'))
+    title = colander.SchemaNode(colander.String(), title=_("Full name"))
     name = colander.SchemaNode(
         colander.String(),
-        title=_('Username'),
-        validator=colander.All(name_pattern_validator, name_new_validator)
+        title=_("Username"),
+        validator=colander.All(name_pattern_validator, name_new_validator),
     )
     email = colander.SchemaNode(
-        colander.String(),
-        title=_('Email'),
-        validator=deferred_email_validator,
+        colander.String(), title=_("Email"), validator=deferred_email_validator
     )
 
 
-@view_config(name='register', renderer='kotti:templates/edit/simpleform.pt',
-             if_setting_has_value=('kotti.register', True))
+@view_config(
+    name="register",
+    renderer="kotti:templates/edit/simpleform.pt",
+    if_setting_has_value=("kotti.register", True),
+)
 def register(context, request):
     schema = RegisterSchema().bind(request=request)
-    form = Form(schema, buttons=(Button('register', _('Register')),))
+    form = Form(schema, buttons=(Button("register", _("Register")),))
     rendered_form = None
 
-    if 'register' in request.POST:
+    if "register" in request.POST:
         try:
             appstruct = form.validate(request.POST.items())
         except ValidationFailure as e:
-            request.session.flash(_("There was an error."), 'error')
+            request.session.flash(_("There was an error."), "error")
             rendered_form = e.render()
         else:
             settings = get_settings()
 
-            appstruct['groups'] = ''
-            appstruct['roles'] = ''
+            appstruct["groups"] = ""
+            appstruct["roles"] = ""
 
-            register_groups = settings['kotti.register.group']
+            register_groups = settings["kotti.register.group"]
             if register_groups:
-                appstruct['groups'] = [register_groups]
+                appstruct["groups"] = [register_groups]
 
-            register_roles = settings['kotti.register.role']
+            register_roles = settings["kotti.register.role"]
             if register_roles:
-                appstruct['roles'] = {'role:' + register_roles}
+                appstruct["roles"] = {"role:" + register_roles}
 
-            appstruct['send_email'] = True
+            appstruct["send_email"] = True
             form = UserAddFormView(context, request)
             form.add_user_success(appstruct)
             success_msg = _(
-                'Congratulations! You are successfully registered. '
-                'You should be receiving an email with a link to set your '
-                'password. Doing so will activate your account.'
-                )
-            request.session.flash(success_msg, 'success')
-            name = appstruct['name']
+                "Congratulations! You are successfully registered. "
+                "You should be receiving an email with a link to set your "
+                "password. Doing so will activate your account."
+            )
+            request.session.flash(success_msg, "success")
+            name = appstruct["name"]
             notify(UserSelfRegistered(get_principals()[name], request))
             return HTTPFound(location=request.application_url)
 
@@ -118,15 +117,12 @@ def register(context, request):
         rendered_form = form.render(request.params)
 
     api = template_api(
-        context, request,
-        page_title=_("Register - ${title}",
-                     mapping=dict(title=context.title)),
+        context,
+        request,
+        page_title=_("Register - ${title}", mapping=dict(title=context.title)),
     )
 
-    return {
-        'api': api,
-        'form': rendered_form,
-        }
+    return {"api": api, "form": rendered_form}
 
 
 def login_success_callback(request, user, came_from):
@@ -150,8 +146,8 @@ def login_success_callback(request, user, came_from):
 
     headers = remember(request, user.name)
     request.session.flash(
-        _("Welcome, ${user}!",
-          mapping=dict(user=user.title or user.name)), 'success')
+        _("Welcome, ${user}!", mapping=dict(user=user.title or user.name)), "success"
+    )
     user.last_login_date = datetime.now()
     return HTTPFound(location=came_from, headers=headers)
 
@@ -173,16 +169,20 @@ def reset_password_callback(request, user):
     """
 
     email_set_password(
-        user, request,
-        template_name='kotti:templates/email-reset-password.pt')
-    request.session.flash(_(
-        "You should be receiving an email with a link to reset your "
-        "password. Doing so will activate your account."), 'success')
+        user, request, template_name="kotti:templates/email-reset-password.pt"
+    )
+    request.session.flash(
+        _(
+            "You should be receiving an email with a link to reset your "
+            "password. Doing so will activate your account."
+        ),
+        "success",
+    )
 
     return HTTPFound(location=request.url)
 
 
-@view_config(name='login', renderer='kotti:templates/login.pt')
+@view_config(name="login", renderer="kotti:templates/login.pt")
 def login(context, request):
     """ Login view.  Renders either the login or password forgot form templates
     or handles their form submission and redirects to came_from on success.
@@ -194,42 +194,44 @@ def login(context, request):
 
     principals = get_principals()
 
-    came_from = request.params.get(
-        'came_from', request.resource_url(context))
-    login, password = '', ''
+    came_from = request.params.get("came_from", request.resource_url(context))
+    login, password = "", ""
 
-    if 'submit' in request.POST:
-        login = request.params['login'].lower()
-        password = request.params['password']
+    if "submit" in request.POST:
+        login = request.params["login"].lower()
+        password = request.params["password"]
         user = _find_user(login)
 
-        if (user is not None and user.active and
-                principals.validate_password(password, user.password)):
-            return get_settings()['kotti.login_success_callback'][0](
-                request, user, came_from)
-        request.session.flash(_("Login failed."), 'error')
-
-    if 'reset-password' in request.POST:
-        login = request.params['login']
+        if (
+            user is not None
+            and user.active
+            and principals.validate_password(password, user.password)
+        ):
+            return get_settings()["kotti.login_success_callback"][0](
+                request, user, came_from
+            )
+        request.session.flash(_("Login failed."), "error")
+
+    if "reset-password" in request.POST:
+        login = request.params["login"]
         user = _find_user(login)
         if user is not None and user.active:
-            return get_settings()['kotti.reset_password_callback'][0](
-                request, user)
+            return get_settings()["kotti.reset_password_callback"][0](request, user)
         else:
             request.session.flash(
-                _("That username or email is not known by this system."),
-                'error')
+                _("That username or email is not known by this system."), "error"
+            )
 
     return {
-        'url': request.application_url + '/@@login',
-        'came_from': came_from,
-        'login': login,
-        'password': password,
-        'register': asbool(get_settings()['kotti.register']),
-        }
+        "url": request.application_url + "/@@login",
+        "came_from": came_from,
+        "login": login,
+        "password": password,
+        "register": asbool(get_settings()["kotti.register"]),
+    }
 
 
-@view_config(name='logout')
+@view_config(name="logout")
 def logout(context, request):
     """ Logout view.  Always redirects the user to where he came from.
 
@@ -238,8 +240,8 @@ def logout(context, request):
     """
 
     headers = forget(request)
-    request.session.flash(_("You have been logged out."), 'info')
-    location = request.params.get('came_from', request.application_url)
+    request.session.flash(_("You have been logged out."), "info")
+    location = request.params.get("came_from", request.application_url)
     return HTTPFound(location=location, headers=headers)
 
 
@@ -249,32 +251,24 @@ class SetPasswordSchema(colander.MappingSchema):
     #: colander.String
     password = colander.SchemaNode(
         colander.String(),
-        title=_('Password'),
+        title=_("Password"),
         validator=colander.Length(min=5),
         widget=CheckedPasswordWidget(),
-        )
+    )
     #: colander.String
-    token = colander.SchemaNode(
-        colander.String(),
-        widget=HiddenWidget(),
-        )
+    token = colander.SchemaNode(colander.String(), widget=HiddenWidget())
     #: colander.String
     email = colander.SchemaNode(
-        colander.String(),
-        title=_('Email'),
-        widget=HiddenWidget(),
-        )
+        colander.String(), title=_("Email"), widget=HiddenWidget()
+    )
     #: colander.String
     continue_to = colander.SchemaNode(
-        colander.String(),
-        widget=HiddenWidget(),
-        missing=colander.null,
-        )
+        colander.String(), widget=HiddenWidget(), missing=colander.null
+    )
 
 
-@view_config(name='set-password', renderer='kotti:templates/edit/simpleform.pt')
-def set_password(context, request,
-                 success_msg=_("You have reset your password.")):
+@view_config(name="set-password", renderer="kotti:templates/edit/simpleform.pt")
+def set_password(context, request, success_msg=_("You have reset your password.")):
     """ Set password view.  Displays the set password form and handles its form
     submission.
 
@@ -292,53 +286,53 @@ def set_password(context, request,
     :rtype: pyramid.httpexceptions.HTTPFound or dict
     """
 
-    form = Form(SetPasswordSchema(),
-                buttons=(Button('submit', _('Set password')),))
+    form = Form(SetPasswordSchema(), buttons=(Button("submit", _("Set password")),))
     rendered_form = None
 
-    if 'submit' in request.POST:
+    if "submit" in request.POST:
         try:
             appstruct = form.validate(request.POST.items())
         except ValidationFailure as e:
             rendered_form = e.render()
         else:
-            token = appstruct['token']
-            email = appstruct['email']
+            token = appstruct["token"]
+            email = appstruct["email"]
             user = _find_user(email)
-            if (user is not None and
-                    validate_token(user, token) and
-                    token == user.confirm_token and
-                    user.active):
-                password = appstruct['password']
+            if (
+                user is not None
+                and validate_token(user, token)
+                and token == user.confirm_token
+                and user.active
+            ):
+                password = appstruct["password"]
                 user.password = get_principals().hash_password(password)
                 user.confirm_token = None
                 headers = remember(request, user.name)
                 user.last_login_date = datetime.now()
 
-                location = (appstruct['continue_to'] or
-                            resource_url(context, request))
-                request.session.flash(success_msg, 'success')
+                location = appstruct["continue_to"] or resource_url(context, request)
+                request.session.flash(success_msg, "success")
                 return HTTPFound(location=location, headers=headers)
             else:
                 request.session.flash(
-                    _("Your password reset token may have expired."), 'error')
+                    _("Your password reset token may have expired."), "error"
+                )
 
     if rendered_form is None:
         rendered_form = form.render(request.params)
 
     api = template_api(
-        context, request,
-        page_title=_("Reset your password - ${title}.",
-                     mapping=dict(title=context.title)),
-        )
+        context,
+        request,
+        page_title=_(
+            "Reset your password - ${title}.", mapping=dict(title=context.title)
+        ),
+    )
 
-    return {
-        'api': api,
-        'form': rendered_form,
-        }
+    return {"api": api, "form": rendered_form}
 
 
-@view_config(context=HTTPForbidden, accept='text/html',)
+@view_config(context=HTTPForbidden, accept="text/html")
 def forbidden_redirect(context, request):
     """ Forbidden redirect view.  Redirects to the login form for anonymous
     users or to the forbidden view for authenticated users.
@@ -347,10 +341,13 @@ def forbidden_redirect(context, request):
     :rtype: pyramid.httpexceptions.HTTPFound
     """
     if request.authenticated_userid:
-        location = request.application_url + '/@@forbidden'
+        location = request.application_url + "/@@forbidden"
     else:
-        location = request.application_url + '/@@login?' + urlencode(
-            {'came_from': request.url})
+        location = (
+            request.application_url
+            + "/@@login?"
+            + urlencode({"came_from": request.url})
+        )
     return HTTPFound(location=location)
 
 
@@ -366,7 +363,7 @@ def forbidden_view(request):
     return request.exception
 
 
-@view_config(name='forbidden', renderer='kotti:templates/forbidden.pt')
+@view_config(name="forbidden", renderer="kotti:templates/forbidden.pt")
 def forbidden_view_html(request):
     """ Forbidden view for browsers.
 
diff --git a/kotti/views/navigation.py b/kotti/views/navigation.py
index 8d2123bd6..22869c9f5 100644
--- a/kotti/views/navigation.py
+++ b/kotti/views/navigation.py
@@ -7,10 +7,14 @@
 from kotti.views.util import nodes_tree
 
 
-@view_config(name='render_tree_navigation', permission='view',
-             renderer='kotti:templates/edit/nav-tree.pt')
-@view_config(name='navigate', permission='view',
-             renderer='kotti:templates/edit/nav-tree-view.pt')
+@view_config(
+    name="render_tree_navigation",
+    permission="view",
+    renderer="kotti:templates/edit/nav-tree.pt",
+)
+@view_config(
+    name="navigate", permission="view", renderer="kotti:templates/edit/nav-tree-view.pt"
+)
 def render_tree_navigation(context, request):
     """ Renders the navigation view.
 
@@ -18,29 +22,26 @@ def render_tree_navigation(context, request):
     :rtype: dict
     """
     tree = nodes_tree(request)
-    return {
-        'tree': {
-            'children': [tree],
-        },
-    }
+    return {"tree": {"children": [tree]}}
 
 
-@view_config(name='local-navigation', context=INode,
-             renderer='kotti:templates/view/nav-local.pt')
+@view_config(
+    name="local-navigation", context=INode, renderer="kotti:templates/view/nav-local.pt"
+)
 def local_navigation(context, request):
-
     def ch(node):
-        return [child for child in node.values()
-                if child.in_navigation and
-                request.has_permission('view', child)]
+        return [
+            child
+            for child in node.values()
+            if child.in_navigation and request.has_permission("view", child)
+        ]
 
     parent = context
     children = ch(context)
-    if not children and getattr(context, '__parent__', None) is not None:
+    if not children and getattr(context, "__parent__", None) is not None:
         parent = context.__parent__
         children = ch(parent)
-    if children and parent != get_root() and not \
-       INavigationRoot.providedBy(parent):
+    if children and parent != get_root() and not INavigationRoot.providedBy(parent):
         return dict(parent=parent, children=children)
     return dict(parent=None)
 
@@ -55,8 +56,9 @@ def includeme_local_navigation(config):
     # Import is needed in function scope to resolve circular imports caused by
     # compatibility imports in slots.py.
     from kotti.views.slots import assign_slot
+
     config.scan(__name__)
-    assign_slot('local-navigation', 'right')
+    assign_slot("local-navigation", "right")
 
 
 def includeme(config):
diff --git a/kotti/views/site_setup.py b/kotti/views/site_setup.py
index 6c50793c2..8681d6543 100644
--- a/kotti/views/site_setup.py
+++ b/kotti/views/site_setup.py
@@ -1,6 +1,4 @@
 from kotti.util import Link
 from kotti.util import _
 
-CONTROL_PANEL_LINKS = [
-    Link('setup-users', title=_('User Management')),
-    ]
+CONTROL_PANEL_LINKS = [Link("setup-users", title=_("User Management"))]
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index c68518cad..956d9432a 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -48,14 +48,13 @@ def view(request, context):
 from kotti.events import ObjectEvent
 from kotti.events import objectevent_listeners
 
-REQUEST_ATTRS_TO_COPY = ('context', 'registry', 'user', 'cookies', 'session')
+REQUEST_ATTRS_TO_COPY = ("context", "registry", "user", "cookies", "session")
 
 
 def _encode(params):
     if not params:
-        return ''
-    return urlencode(
-        dict((k, v.encode('utf-8')) for k, v in params.items()))
+        return ""
+    return urlencode(dict((k, v.encode("utf-8")) for k, v in params.items()))
 
 
 def _render_view_on_slot_event(view_name, event, params):
@@ -63,9 +62,9 @@ def _render_view_on_slot_event(view_name, event, params):
     request = event.request
 
     view_request = request.__class__.blank(
-        "{0}/{1}".format(request.path.rstrip('/'), view_name),
+        "{0}/{1}".format(request.path.rstrip("/"), view_name),
         base_url=request.application_url,
-        POST=_encode(params)
+        POST=_encode(params),
     )
 
     if request.POST:
@@ -74,7 +73,7 @@ def _render_view_on_slot_event(view_name, event, params):
     # This is quite brittle:
     for name in REQUEST_ATTRS_TO_COPY:
         setattr(view_request, name, getattr(request, name))
-    setattr(view_request, 'kotti_slot', event.name)
+    setattr(view_request, "kotti_slot", event.name)
 
     try:
         result = render_view(context, view_request, view_name)
@@ -82,7 +81,7 @@ def _render_view_on_slot_event(view_name, event, params):
         return None
     if isinstance(context, HTTPException):
         return None
-    return result.decode('utf-8')
+    return result.decode("utf-8")
 
 
 def assign_slot(view_name, slot, params=None):
@@ -104,37 +103,44 @@ def assign_slot(view_name, slot, params=None):
     if not event:
         raise KeyError("Unknown slot '{0}'".format(slot))
     objectevent_listeners[(event[0], None)].append(
-        lambda ev: _render_view_on_slot_event(view_name, ev, params))
+        lambda ev: _render_view_on_slot_event(view_name, ev, params)
+    )
 
 
 class RenderLeftSlot(ObjectEvent):
-    name = 'left'
+    name = "left"
 
 
 class RenderRightSlot(ObjectEvent):
-    name = 'right'
+    name = "right"
 
 
 class RenderAboveContent(ObjectEvent):
-    name = 'abovecontent'
+    name = "abovecontent"
 
 
 class RenderBelowContent(ObjectEvent):
-    name = 'belowcontent'
+    name = "belowcontent"
 
 
 class RenderInHead(ObjectEvent):
-    name = 'inhead'
+    name = "inhead"
 
 
 class RenderBeforeBodyEnd(ObjectEvent):
-    name = 'beforebodyend'
+    name = "beforebodyend"
 
 
 class RenderEditInHead(ObjectEvent):
-    name = 'edit_inhead'
+    name = "edit_inhead"
 
 
 slot_events = [
-    RenderLeftSlot, RenderRightSlot, RenderAboveContent, RenderBelowContent,
-    RenderInHead, RenderBeforeBodyEnd, RenderEditInHead, ]
+    RenderLeftSlot,
+    RenderRightSlot,
+    RenderAboveContent,
+    RenderBelowContent,
+    RenderInHead,
+    RenderBeforeBodyEnd,
+    RenderEditInHead,
+]
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 8a83ce787..fe6c11840 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -36,17 +36,20 @@
 def roles_form_handler(context, request, available_role_names, groups_lister):
     changed = []
 
-    if 'apply' in request.POST:
+    if "apply" in request.POST:
         p_to_r = {}
         for name in request.params:
-            if name.startswith('orig-role::'):
+            if name.startswith("orig-role::"):
                 # orig-role::* is hidden checkboxes that allow us to
                 # see what checkboxes were in the form originally
-                token, principal_name, role_name = name.split('::')
+                token, principal_name, role_name = name.split("::")
                 if role_name not in available_role_names:
                     raise Forbidden()
-                new_value = bool(request.params.get(
-                    'role::{0}::{1}'.format(principal_name, role_name)))
+                new_value = bool(
+                    request.params.get(
+                        "role::{0}::{1}".format(principal_name, role_name)
+                    )
+                )
                 if principal_name not in p_to_r:
                     p_to_r[principal_name] = set()
                 if new_value:
@@ -54,20 +57,19 @@ def roles_form_handler(context, request, available_role_names, groups_lister):
 
         for principal_name, new_role_names in p_to_r.items():
             # We have to be careful with roles that aren't mutable here:
-            orig_role_names = set(
-                groups_lister(principal_name, context))
+            orig_role_names = set(groups_lister(principal_name, context))
             orig_sharing_role_names = set(
-                r for r in orig_role_names if r in available_role_names)
+                r for r in orig_role_names if r in available_role_names
+            )
             if new_role_names != orig_sharing_role_names:
                 final_role_names = orig_role_names - set(available_role_names)
                 final_role_names |= new_role_names
                 changed.append((principal_name, context, final_role_names))
 
         if changed:
-            request.session.flash(
-                _('Your changes have been saved.'), 'success')
+            request.session.flash(_("Your changes have been saved."), "success")
         else:
-            request.session.flash(_('No changes were made.'), 'info')
+            request.session.flash(_("No changes were made."), "info")
 
     return changed
 
@@ -87,33 +89,33 @@ def search_principals(request, context=None, ignore=None, extra=()):
             ignore.add(principal_name)
 
     postdata = request.POST
-    if request.method == 'POST' and request.is_xhr:
+    if request.method == "POST" and request.is_xhr:
         postdata = request.json
-    if 'search' in postdata:
+    if "search" in postdata:
         if request.is_xhr:
-            query = '*{0}*'.format(postdata['query'])
+            query = "*{0}*".format(postdata["query"])
         else:
-            query = '*{0}*'.format(request.params['query'])
+            query = "*{0}*".format(request.params["query"])
         found = False
         for p in principals.search(name=query, title=query, email=query):
             found = True
             if p.name not in ignore:
                 entries.append((p, list_groups_ext(p.name, context)))
         if not found:
-            flash(_('No users or groups were found.'), 'info')
+            flash(_("No users or groups were found."), "info")
 
     return entries
 
 
-@view_config(name='share', permission='manage',
-             renderer='kotti:templates/edit/share.pt')
+@view_config(
+    name="share", permission="manage", renderer="kotti:templates/edit/share.pt"
+)
 def share_node(context, request):
     # Allow roles_form_handler to do processing on 'apply':
-    if 'apply' in request.POST:
-        if request.params.get('csrf_token') != request.session.get_csrf_token():
-            raise HTTPBadRequest('Invalid CSRF token')
-    changed = roles_form_handler(
-        context, request, SHARING_ROLES, list_groups_raw)
+    if "apply" in request.POST:
+        if request.params.get("csrf_token") != request.session.get_csrf_token():
+            raise HTTPBadRequest("Invalid CSRF token")
+    changed = roles_form_handler(context, request, SHARING_ROLES, list_groups_raw)
     if changed:
         for (principal_name, context, groups) in changed:
             set_groups(principal_name, context, groups)
@@ -123,7 +125,7 @@ def share_node(context, request):
 
     def with_roles(entry):
         all_groups = entry[1][0]
-        return len([g for g in all_groups if g.startswith('role:')]) > 0
+        return len([g for g in all_groups if g.startswith("role:")]) > 0
 
     existing = [e for e in filter(with_roles, existing)]
     seen = set([entry[0].name for entry in existing])
@@ -133,10 +135,10 @@ def with_roles(entry):
     available_roles = [ROLES[role_name] for role_name in SHARING_ROLES]
 
     return {
-        'entries': entries,
-        'available_roles': available_roles,
-        'csrf_token': request.session.get_csrf_token()
-        }
+        "entries": entries,
+        "available_roles": available_roles,
+        "csrf_token": request.session.get_csrf_token(),
+    }
 
 
 def name_pattern_validator(node, value):
@@ -157,25 +159,27 @@ def name_pattern_validator(node, value):
 
 def name_new_validator(node, value):
     if get_principals().get(value.lower()) is not None:
-        raise colander.Invalid(
-            node, _("A user with that name already exists."))
+        raise colander.Invalid(node, _("A user with that name already exists."))
 
 
 @colander.deferred
 def deferred_email_validator(node, kw):
     def raise_invalid_email(node, value):
-        raise colander.Invalid(
-            node, _("A user with that email already exists."))
-    request = kw['request']
+        raise colander.Invalid(node, _("A user with that email already exists."))
+
+    request = kw["request"]
     if request.POST:
-        email = request.params.get('email')
-        name = request.params.get('name')
+        email = request.params.get("email")
+        name = request.params.get("name")
         if not name and request.user:
             name = request.user.name
         if email and name:
             principals = get_principals()
-            if any(p for p in principals.search(email=email)
-                   if p.name.lower() != name.lower()):
+            if any(
+                p
+                for p in principals.search(email=email)
+                if p.name.lower() != name.lower()
+            ):
                 # verify duplicated email except myself when update info
                 return raise_invalid_email
 
@@ -187,63 +191,62 @@ def roleset_validator(node, value):
 
 def group_validator(node, value):
     principals = get_principals()
-    if principals.get('group:' + value) is None:
-        raise colander.Invalid(node, _("No such group: ${group}",
-                                       mapping=dict(group=value)))
+    if principals.get("group:" + value) is None:
+        raise colander.Invalid(
+            node, _("No such group: ${group}", mapping=dict(group=value))
+        )
 
 
 class Groups(colander.SequenceSchema):
     group = colander.SchemaNode(
         colander.String(),
-        title=_('Group'),
+        title=_("Group"),
         validator=group_validator,
         missing=None,
         widget=AutocompleteInputWidget(),
-        )
+    )
 
 
 class PrincipalBasic(colander.MappingSchema):
-    title = colander.SchemaNode(colander.String(), title=_('Title'))
+    title = colander.SchemaNode(colander.String(), title=_("Title"))
     email = colander.SchemaNode(
-        colander.String(),
-        title=_('Email'),
-        validator=deferred_email_validator,
+        colander.String(), title=_("Email"), validator=deferred_email_validator
     )
 
 
 class PrincipalFull(PrincipalBasic):
     name = colander.SchemaNode(
         colander.String(),
-        title=_('Name'),
+        title=_("Name"),
         validator=colander.All(name_pattern_validator, name_new_validator),
-        )
+    )
     password = colander.SchemaNode(
         colander.String(),
-        title=_('Password'),
+        title=_("Password"),
         validator=colander.Length(min=5),
         missing=None,
         widget=CheckedPasswordWidget(),
-        )
+    )
     active = colander.SchemaNode(
         colander.Boolean(),
-        title=_('Active'),
+        title=_("Active"),
         description=_("Untick this to deactivate the account."),
-        )
+    )
     roles = colander.SchemaNode(
         colander.Set(),
         validator=roleset_validator,
         missing=[],
         title=_("Global roles"),
         widget=CheckboxChoiceWidget(),
-        )
+    )
     groups = Groups(
-        title=_('Groups'),
+        title=_("Groups"),
         missing=[],
         # XXX min_len doesn't really do what we want here.  We'd like
         # the close buttons to appear nevertheless (maybe the now
         # deprecated render_initial_item did exactly that).
         widget=SequenceWidget(min_len=1),
-        )
+    )
 
 
 def principal_schema(base=PrincipalFull()):
@@ -251,18 +254,19 @@ def principal_schema(base=PrincipalFull()):
     schema = base.clone()
     has_groups = True
     try:
-        schema['groups']
+        schema["groups"]
     except KeyError:
         has_groups = False
     if has_groups:
         all_groups = []
-        for p in principals.search(name='group:*'):
-            value = p.name.split('group:')[1]
+        for p in principals.search(name="group:*"):
+            value = p.name.split("group:")[1]
             label = "{0}, {1}".format(p.title, value)
             all_groups.append(dict(value=value, label=label))
-        schema['groups']['group'].widget.values = all_groups
-        schema['roles'].widget.values = [
-            (n, ROLES[n].title) for n in USER_MANAGEMENT_ROLES]
+        schema["groups"]["group"].widget.values = all_groups
+        schema["roles"].widget.values = [
+            (n, ROLES[n].title) for n in USER_MANAGEMENT_ROLES
+        ]
     return schema
 
 
@@ -270,21 +274,22 @@ def user_schema(base=PrincipalFull()):
     schema = principal_schema(base)
     has_password = True
     try:
-        schema['password']
+        schema["password"]
     except KeyError:
         has_password = False
     if has_password:
-        schema['password'].description = _(
+        schema["password"].description = _(
             "Leave this empty and tick the 'Send password registration' "
-            "box below to have the user set their own password.")
-    schema['title'].title = _("Full name")
+            "box below to have the user set their own password."
+        )
+    schema["title"].title = _("Full name")
     return schema
 
 
 def group_schema(base=PrincipalFull()):
     schema = principal_schema(base)
-    del schema['password']
-    schema['email'].missing = None
+    del schema["password"]
+    schema["email"].missing = None
     return schema
 
 
@@ -298,12 +303,13 @@ def _massage_groups_in(appstruct):
     The value in the form is 'name', not 'group:name', so we'll
     need to append that before we save.
     """
-    groups = appstruct.get('groups', [])
-    all_groups = list(appstruct.get('roles', [])) + [
-        'group:{0}'.format(g) for g in groups if g]
-    if 'roles' in appstruct:
-        del appstruct['roles']
-    appstruct['groups'] = all_groups
+    groups = appstruct.get("groups", [])
+    all_groups = list(appstruct.get("roles", [])) + [
+        "group:{0}".format(g) for g in groups if g
+    ]
+    if "roles" in appstruct:
+        del appstruct["roles"]
+    appstruct["groups"] = all_groups
 
 
 def _massage_groups_out(appstruct):
@@ -311,69 +317,74 @@ def _massage_groups_out(appstruct):
     split 'groups' into 'roles' and 'groups'.
     """
     d = appstruct
-    groups = [g.split('group:')[1] for g in d.get('groups', '')
-              if g and g.startswith('group:')]
-    roles = [r for r in d.get('groups', '') if r and r.startswith('role:')]
-    d['groups'] = groups
-    d['roles'] = roles
+    groups = [
+        g.split("group:")[1]
+        for g in d.get("groups", "")
+        if g and g.startswith("group:")
+    ]
+    roles = [r for r in d.get("groups", "") if r and r.startswith("role:")]
+    d["groups"] = groups
+    d["roles"] = roles
     return d
 
 
 class UserAddFormView(AddFormView):
-    item_type = _('User')
-    form_options = (('formid', 'deform_user_add'), )
-    buttons = (Button('add_user', _('Add User')),
-               Button('cancel', _('Cancel')))
+    item_type = _("User")
+    form_options = (("formid", "deform_user_add"),)
+    buttons = (Button("add_user", _("Add User")), Button("cancel", _("Cancel")))
 
     @staticmethod
     def schema_factory():
         schema = user_schema()
-        del schema['active']
-        schema.add(colander.SchemaNode(
-            colander.Boolean(),
-            name='send_email',
-            title=_('Send password registration link.'),
-            default=True,
-            ))
+        del schema["active"]
+        schema.add(
+            colander.SchemaNode(
+                colander.Boolean(),
+                name="send_email",
+                title=_("Send password registration link."),
+                default=True,
+            )
+        )
         return schema
 
     def add_user_success(self, appstruct):
-        appstruct.pop('csrf_token', None)
+        appstruct.pop("csrf_token", None)
         _massage_groups_in(appstruct)
-        name = appstruct['name'] = appstruct['name'].lower()
-        appstruct['email'] = appstruct['email'] and appstruct['email'].lower()
-        send_email = appstruct.pop('send_email', False)
+        name = appstruct["name"] = appstruct["name"].lower()
+        appstruct["email"] = appstruct["email"] and appstruct["email"].lower()
+        send_email = appstruct.pop("send_email", False)
         get_principals()[name] = appstruct
         if send_email:
             email_set_password(get_principals()[name], self.request)
         self.request.session.flash(
-            _('${title} was added.',
-              mapping=dict(title=appstruct['title'])), 'success')
-        location = self.request.url.split('?')[0] + '?' + urlencode(
-            {'extra': name})
+            _("${title} was added.", mapping=dict(title=appstruct["title"])), "success"
+        )
+        location = self.request.url.split("?")[0] + "?" + urlencode({"extra": name})
         return HTTPFound(location=location)
 
 
 class GroupAddFormView(UserAddFormView):
     item_type = _("Group")
-    form_options = (('formid', 'deform_group_add'), )
-    buttons = (Button('add_group', _('Add Group')),
-               Button('cancel', _('Cancel')))
+    form_options = (("formid", "deform_group_add"),)
+    buttons = (Button("add_group", _("Add Group")), Button("cancel", _("Cancel")))
 
     @staticmethod
     def schema_factory():
         schema = group_schema()
-        del schema['active']
+        del schema["active"]
         return schema
 
     def add_group_success(self, appstruct):
-        appstruct['name'] = 'group:{0}'.format(appstruct['name'].lower())
+        appstruct["name"] = "group:{0}".format(appstruct["name"].lower())
         return self.add_user_success(appstruct)
 
 
-@view_config(name='setup-users', permission='admin',
-             root_only=True,
-             renderer='kotti:templates/site-setup/users.pt')
+@view_config(
+    name="setup-users",
+    permission="admin",
+    root_only=True,
+    renderer="kotti:templates/site-setup/users.pt",
+)
 class UsersManage(FormView):
 
     UserAddFormView = UserAddFormView
@@ -384,8 +395,7 @@ def __init__(self, context, request):
         self.context = context
 
     def __call__(self):
-        api = template_api(self.context, self.request,
-                           cp_links=CONTROL_PANEL_LINKS)
+        api = template_api(self.context, self.request, cp_links=CONTROL_PANEL_LINKS)
 
         api.page_title = _("User Management")
 
@@ -396,23 +406,26 @@ def groups_lister(principal_name, context):
 
         # Handling the user/roles matrix:
         changed = roles_form_handler(
-            self.context, self.request, USER_MANAGEMENT_ROLES, groups_lister)
+            self.context, self.request, USER_MANAGEMENT_ROLES, groups_lister
+        )
         if changed:
             changed_names = []
             for (principal_name, context, groups) in changed:
                 principal = principals[principal_name]
                 principal.groups = list(groups)
                 changed_names.append(principal_name)
-            location = self.request.url.split('?')[0] + '?' + urlencode(
-                {'extra': ','.join(changed_names)})
+            location = (
+                self.request.url.split("?")[0]
+                + "?"
+                + urlencode({"extra": ",".join(changed_names)})
+            )
             return HTTPFound(location=location)
 
-        extra = self.request.params.get('extra') or ()
+        extra = self.request.params.get("extra") or ()
         if isinstance(extra, string_types):
-            extra = extra.split(',')
+            extra = extra.split(",")
         search_entries = search_principals(self.request, extra=extra)
-        available_roles = [ROLES[role_name]
-                           for role_name in USER_MANAGEMENT_ROLES]
+        available_roles = [ROLES[role_name] for role_name in USER_MANAGEMENT_ROLES]
 
         # Add forms:
         user_addform = self.UserAddFormView(self.context, self.request)()
@@ -423,19 +436,19 @@ def groups_lister(principal_name, context):
         if self.request.is_response(group_addform):
             return group_addform
 
-        if self.request.params.get('add_user'):
-            active_tab = 'add_user'
-        elif self.request.params.get('add_group'):
-            active_tab = 'add_group'
+        if self.request.params.get("add_user"):
+            active_tab = "add_user"
+        elif self.request.params.get("add_group"):
+            active_tab = "add_group"
         else:
-            active_tab = 'search'
+            active_tab = "search"
         return {
-            'api': api,
-            'entries': search_entries,
-            'available_roles': available_roles,
-            'user_addform': user_addform['form'],
-            'group_addform': group_addform['form'],
-            'active_tab': active_tab,
+            "api": api,
+            "entries": search_entries,
+            "available_roles": available_roles,
+            "user_addform": user_addform["form"],
+            "group_addform": group_addform["form"],
+            "active_tab": active_tab,
         }
 
 
@@ -451,55 +464,61 @@ def schema_factory():
 
 class UserManageFormView(UserEditFormView):
 
-    buttons = (Button('save', _('Save')),
-               Button('cancel', _('Cancel')),
-               Button('delete', _('Delete'), css_class='btn btn-danger'))
+    buttons = (
+        Button("save", _("Save")),
+        Button("cancel", _("Cancel")),
+        Button("delete", _("Delete"), css_class="btn btn-danger"),
+    )
 
     @staticmethod
     def schema_factory():
         schema = user_schema()
-        del schema['name']
+        del schema["name"]
         return schema
 
     def before(self, form):
         context = self.context.__dict__.copy()
-        context['password'] = ''
+        context["password"] = ""
         form.appstruct = _massage_groups_out(context)
 
     def save_success(self, appstruct):
-        if appstruct.get('password'):
-            hashed = get_principals().hash_password(appstruct['password'])
-            appstruct['password'] = hashed
+        if appstruct.get("password"):
+            hashed = get_principals().hash_password(appstruct["password"])
+            appstruct["password"] = hashed
         else:
-            appstruct.pop('password', None)
+            appstruct.pop("password", None)
         _massage_groups_in(appstruct)
         return super(UserManageFormView, self).save_success(appstruct)
 
     def cancel_success(self, appstruct):
-        self.request.session.flash(_('No changes were made.'), 'info')
-        location = '{0}/@@setup-users'.format(self.request.application_url)
+        self.request.session.flash(_("No changes were made."), "info")
+        location = "{0}/@@setup-users".format(self.request.application_url)
         return HTTPFound(location=location)
+
     cancel_failure = cancel_success
 
     def delete_success(self, appstruct):
-        location = '{0}/@@delete-user?name={1}'.format(
-            self.request.application_url, self.request.params['name'])
+        location = "{0}/@@delete-user?name={1}".format(
+            self.request.application_url, self.request.params["name"]
+        )
         return HTTPFound(location=location)
 
 
 class GroupManageFormView(UserManageFormView):
-
     @staticmethod
     def schema_factory():
         schema = group_schema()
-        del schema['name']
-        del schema['active']
+        del schema["name"]
+        del schema["active"]
         return schema
 
 
-@view_config(name='setup-user', permission='admin',
-             root_only=True,
-             renderer='kotti:templates/site-setup/user.pt')
+@view_config(
+    name="setup-user",
+    permission="admin",
+    root_only=True,
+    renderer="kotti:templates/site-setup/user.pt",
+)
 class UserManage(FormView):
 
     GroupManageFormView = GroupManageFormView
@@ -510,82 +529,93 @@ def __init__(self, context, request):
         self.context = context
 
     def __call__(self):
-        user_or_group = self.request.params['name']
+        user_or_group = self.request.params["name"]
         principal = get_principals()[user_or_group]
 
         is_group = user_or_group.startswith("group:")
         principal_type = _("Group") if is_group else _("User")
 
         api = template_api(
-            self.context, self.request,
-            page_title=_("Edit ${principal_type} ${title}",
-                         mapping=dict(principal_type=principal_type,
-                                      title=self.context.title)),
+            self.context,
+            self.request,
+            page_title=_(
+                "Edit ${principal_type} ${title}",
+                mapping=dict(principal_type=principal_type, title=self.context.title),
+            ),
             cp_links=CONTROL_PANEL_LINKS,
-            principal=principal)
+            principal=principal,
+        )
 
-        form_view = self.GroupManageFormView if is_group \
-            else self.UserManageFormView
+        form_view = self.GroupManageFormView if is_group else self.UserManageFormView
         form = form_view(principal, self.request)()
         if self.request.is_response(form):
             return form
 
-        return {
-            'api': api,
-            'form': form['form'],
-            }
+        return {"api": api, "form": form["form"]}
 
 
-@view_config(name='delete-user', permission='admin',
-             root_only=True,
-             renderer='kotti:templates/site-setup/delete-user.pt')
+@view_config(
+    name="delete-user",
+    permission="admin",
+    root_only=True,
+    renderer="kotti:templates/site-setup/delete-user.pt",
+)
 def user_delete(context, request):
     principals = get_principals()
 
-    if 'name' in request.params and request.params['name']:
-        user_or_group = request.params['name']
+    if "name" in request.params and request.params["name"]:
+        user_or_group = request.params["name"]
         principal = principals.search(name=user_or_group).first()
         if principal is None:
-            request.session.flash(_('User was not found.'), 'error')
+            request.session.flash(_("User was not found."), "error")
         else:
             is_group = user_or_group.startswith("group:")
             principal_type = _("Group") if is_group else _("User")
 
             # We already coming from the confirmation page.
-            if 'delete' in request.POST:
+            if "delete" in request.POST:
                 principals.__delitem__(principal.name)
                 notify(UserDeleted(principal, request))
                 request.session.flash(
-                    _('${principal_type} ${title} was deleted.',
-                      mapping=dict(principal_type=principal_type,
-                                   title=principal.title)), 'info')
-                location = '{0}/@@setup-users'.format(request.application_url)
+                    _(
+                        "${principal_type} ${title} was deleted.",
+                        mapping=dict(
+                            principal_type=principal_type, title=principal.title
+                        ),
+                    ),
+                    "info",
+                )
+                location = "{0}/@@setup-users".format(request.application_url)
                 return HTTPFound(location=location)
 
             api = template_api(
-                context, request,
-                page_title=_("Delete ${principal_type} ${title}",
-                             mapping=dict(principal_type=principal_type,
-                                          title=principal.title)),
+                context,
+                request,
+                page_title=_(
+                    "Delete ${principal_type} ${title}",
+                    mapping=dict(principal_type=principal_type, title=principal.title),
+                ),
                 principal_type=principal_type,
-                principal=principal)
-            return {'api': api, }
+                principal=principal,
+            )
+            return {"api": api}
     else:
-        request.session.flash(_('No name was given.'), 'error')
+        request.session.flash(_("No name was given."), "error")
 
-    return {'api': template_api(context, request), }
+    return {"api": template_api(context, request)}
 
 
 class PreferencesFormView(UserEditFormView):
-
     def cancel_success(self, appstruct):
         location = self.request.resource_url(get_root())
         return HTTPFound(location=location)
+
     cancel_failure = cancel_success
 
 
-@view_config(name='prefs', root_only=True,
-             renderer='kotti:templates/edit/simpleform.pt')
+@view_config(
+    name="prefs", root_only=True, renderer="kotti:templates/edit/simpleform.pt"
+)
 class Preferences(FormView):
 
     PreferencesFormView = PreferencesFormView
@@ -600,8 +630,9 @@ def __call__(self):
             raise Forbidden()
 
         api = template_api(self.context, self.request)
-        api.page_title = _("My preferences - ${title}",
-                           mapping=dict(title=api.site_title))
+        api.page_title = _(
+            "My preferences - ${title}", mapping=dict(title=api.site_title)
+        )
 
         form = self.PreferencesFormView(user, self.request)()
 
@@ -609,10 +640,10 @@ def __call__(self):
             return form
 
         return {
-            'api': api,
-            'form': form['form'],
-            'macro': api.macro('kotti:templates/site-setup/master.pt'),
-            }
+            "api": api,
+            "form": form["form"],
+            "macro": api.macro("kotti:templates/site-setup/master.pt"),
+        }
 
 
 def includeme(config):
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 27aca8341..5e34a3e5b 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -43,8 +43,7 @@ def __init__(self, val, config):
             raise ValueError("Only boolean values supported")
 
     def text(self):
-        return 'if_setting_has_value = {0} == {1}'.format(
-            self.name, self.value)
+        return "if_setting_has_value = {0} == {1}".format(self.name, self.value)
 
     phash = text
 
@@ -57,7 +56,7 @@ def __init__(self, val, config):
         self.val = val
 
     def text(self):
-        return 'root_only = {0}'.format(self.val)
+        return "root_only = {0}".format(self.val)
 
     phash = text
 
@@ -66,17 +65,16 @@ def __call__(self, context, request):
 
 
 def template_api(context, request, **kwargs):
-    return get_settings()['kotti.templates.api'][0](
-        context, request, **kwargs)
+    return get_settings()["kotti.templates.api"][0](context, request, **kwargs)
 
 
 def add_renderer_globals(event):
-    if event.get('renderer_name') != 'json':
-        request = event['request']
-        api = getattr(request, 'template_api', None)
+    if event.get("renderer_name") != "json":
+        request = event["request"]
+        api = getattr(request, "template_api", None)
         if api is None and request is not None:
-            api = template_api(event['context'], event['request'])
-        event['api'] = api
+            api = template_api(event["context"], event["request"])
+        event["api"] = api
 
 
 class Slots(object):
@@ -110,17 +108,17 @@ class TemplateAPI(object):
 
     # Instead of overriding these, consider using the
     # ``kotti.overrides`` variable.
-    BARE_MASTER = 'kotti:templates/master-bare.pt'
-    VIEW_MASTER = 'kotti:templates/view/master.pt'
-    EDIT_MASTER = 'kotti:templates/edit/master.pt'
-    SITE_SETUP_MASTER = 'kotti:templates/site-setup/master.pt'
+    BARE_MASTER = "kotti:templates/master-bare.pt"
+    VIEW_MASTER = "kotti:templates/view/master.pt"
+    EDIT_MASTER = "kotti:templates/edit/master.pt"
+    SITE_SETUP_MASTER = "kotti:templates/site-setup/master.pt"
 
-    body_css_class = ''
+    body_css_class = ""
 
     def __init__(self, context, request, bare=None, **kwargs):
         self.context, self.request = context, request
 
-        if getattr(request, 'template_api', None) is None:
+        if getattr(request, "template_api", None) is None:
             request.template_api = self
 
         self.S = get_settings()
@@ -144,17 +142,20 @@ def is_location(context):
 
     @reify
     def edit_needed(self):
-        if 'kotti.fanstatic.edit_needed' in self.S:
-            return [r.need() for r in self.S['kotti.fanstatic.edit_needed']]
+        if "kotti.fanstatic.edit_needed" in self.S:
+            return [r.need() for r in self.S["kotti.fanstatic.edit_needed"]]
 
     @reify
     def view_needed(self):
-        if 'kotti.fanstatic.view_needed' in self.S:
-            return [r.need() for r in self.S['kotti.fanstatic.view_needed']]
+        if "kotti.fanstatic.view_needed" in self.S:
+            return [r.need() for r in self.S["kotti.fanstatic.view_needed"]]
 
-    def macro(self, asset_spec, macro_name='main'):
+    def macro(self, asset_spec, macro_name="main"):
         if self.bare and asset_spec in (
-                self.VIEW_MASTER, self.EDIT_MASTER, self.SITE_SETUP_MASTER):
+            self.VIEW_MASTER,
+            self.EDIT_MASTER,
+            self.SITE_SETUP_MASTER,
+        ):
             asset_spec = self.BARE_MASTER
         return get_renderer(asset_spec).implementation().macros[macro_name]
 
@@ -166,7 +167,7 @@ def site_title(self):
                  the root item's ``title`` attribute.
         :rtype: str
         """
-        value = get_settings().get('kotti.site_title')
+        value = get_settings().get("kotti.site_title")
         if not value:
             value = self.root.title
         return value
@@ -182,11 +183,11 @@ def page_title(self):
         :rtype: str
         """
 
-        view_title = self.request.view_name.replace('_', ' ').title()
+        view_title = self.request.view_name.replace("_", " ").title()
         if view_title:
-            view_title += ' '
+            view_title += " "
         view_title += self.context.title
-        return '{0} - {1}'.format(view_title, self.site_title)
+        return "{0} - {1}".format(view_title, self.site_title)
 
     def url(self, context=None, *elements, **kwargs):
         """
@@ -252,7 +253,7 @@ def breadcrumbs(self):
         breadcrumbs = self.lineage
         if self.root != self.navigation_root:
             index = breadcrumbs.index(self.navigation_root)
-            breadcrumbs = breadcrumbs[:index + 1]
+            breadcrumbs = breadcrumbs[: index + 1]
         return reversed(breadcrumbs)
 
     def has_permission(self, permission, context=None):
@@ -263,8 +264,7 @@ def has_permission(self, permission, context=None):
             context = self.context
         return self.request.has_permission(permission, context)
 
-    def render_view(self, name='', context=None, request=None, secure=True,
-                    bare=True):
+    def render_view(self, name="", context=None, request=None, secure=True, bare=True):
         if context is None:
             context = self.context
         if request is None:
@@ -281,7 +281,7 @@ def render_view(self, name='', context=None, request=None, secure=True,
     def render_template(self, renderer, **kwargs):
         return TemplateStructure(render(renderer, kwargs, self.request))
 
-    def list_children(self, context=None, permission='view'):
+    def list_children(self, context=None, permission="view"):
 
         if context is None:
             context = self.context
@@ -291,22 +291,23 @@ def list_children(self, context=None, permission='view'):
                 return context.children
             return context.children_with_permission(self.request, permission)
 
-        return [c for c in getattr(context, 'values', lambda: [])()
-                if (not permission or
-                    self.request.has_permission(permission, c))]
+        return [
+            c
+            for c in getattr(context, "values", lambda: [])()
+            if (not permission or self.request.has_permission(permission, c))
+        ]
 
     inside = staticmethod(inside)
 
-    def avatar_url(self, user=None, size="14", default_image='identicon'):
+    def avatar_url(self, user=None, size="14", default_image="identicon"):
         if user is None:
             user = self.request.user
         email = user.email
         if not email:
             email = user.name
-        h = hashlib.md5(email.encode('utf8')).hexdigest()
-        query = {'default': default_image, 'size': str(size)}
-        url = 'https://secure.gravatar.com/avatar/{0}?{1}'.format(
-            h, urlencode(query))
+        h = hashlib.md5(email.encode("utf8")).hexdigest()
+        query = {"default": default_image, "size": str(size)}
+        url = "https://secure.gravatar.com/avatar/{0}?{1}".format(h, urlencode(query))
         return url
 
     @reify
@@ -315,53 +316,54 @@ def locale_name(self):
 
     def format_date(self, d, fmt=None):
         if fmt is None:
-            fmt = self.S['kotti.date_format']
+            fmt = self.S["kotti.date_format"]
         return format_date(d, format=fmt, locale=self.locale_name)
 
     def format_datetime(self, dt, fmt=None):
         if fmt is None:
-            fmt = self.S['kotti.datetime_format']
+            fmt = self.S["kotti.datetime_format"]
         if not isinstance(dt, datetime):
             dt = datetime.fromtimestamp(dt)
         return format_datetime(dt, format=fmt, locale=self.locale_name)
 
     def format_time(self, t, fmt=None):
         if fmt is None:
-            fmt = self.S['kotti.time_format']
+            fmt = self.S["kotti.time_format"]
         return format_time(t, format=fmt, locale=self.locale_name)
 
     def format_currency(self, n, currency, fmt=None):
-        return format_currency(n, currency,
-                               format=fmt, locale=self.locale_name)
+        return format_currency(n, currency, format=fmt, locale=self.locale_name)
 
     @staticmethod
     def get_type(name):
-        for class_ in get_settings()['kotti.available_types']:
+        for class_ in get_settings()["kotti.available_types"]:
             if class_.type_info.name == name:
                 return class_
 
     def find_edit_view(self, item):
         view_name = self.request.view_name
         if not view_permitted(item, self.request, view_name):
-            view_name = 'edit'
+            view_name = "edit"
         if not view_permitted(item, self.request, view_name):
-            view_name = ''
+            view_name = ""
         return view_name
 
     @reify
     def edit_links(self):
-        if not hasattr(self.context, 'type_info'):
+        if not hasattr(self.context, "type_info"):
             return []
-        return [l for l in self.context.type_info.edit_links
-                if l.visible(self.context, self.request)]
+        return [
+            l
+            for l in self.context.type_info.edit_links
+            if l.visible(self.context, self.request)
+        ]
 
     @reify
     def site_setup_links(self):
-        return [l for l in CONTROL_PANEL_LINKS
-                if l.visible(self.root, self.request)]
+        return [l for l in CONTROL_PANEL_LINKS if l.visible(self.root, self.request)]
 
     @staticmethod
-    def sanitize(html, sanitizer='default'):
+    def sanitize(html, sanitizer="default"):
         """ Convenience wrapper for :func:`kotti.sanitizers.sanitize`.
 
         :param html: HTML to be sanitized
@@ -378,8 +380,7 @@ def sanitize(html, sanitizer='default'):
 
 
 class NodesTree(object):
-    def __init__(self, node, request, item_mapping, item_to_children,
-                 permission):
+    def __init__(self, node, request, item_mapping, item_to_children, permission):
         self._node = node
         self._request = request
         self._item_mapping = item_mapping
@@ -419,7 +420,7 @@ def __getattr__(self, key):
         return getattr(self._node, key)
 
 
-def nodes_tree(request, context=None, permission='view'):
+def nodes_tree(request, context=None, permission="view"):
     item_mapping = {}
     item_to_children = defaultdict(lambda: [])
     for node in DBSession.query(Content).with_polymorphic(Content):
@@ -435,60 +436,67 @@ def nodes_tree(request, context=None, permission='view'):
     else:
         node = context
 
-    return NodesTree(
-        node,
-        request,
-        item_mapping,
-        item_to_children,
-        permission,
-    )
+    return NodesTree(node, request, item_mapping, item_to_children, permission)
 
 
 def search_content(search_term, request=None):
-    return get_settings()['kotti.search_content'][0](search_term, request)
+    return get_settings()["kotti.search_content"][0](search_term, request)
 
 
 def default_search_content(search_term, request=None):
 
     # noinspection PyUnresolvedReferences
-    searchstring = '%{0}%'.format(search_term)
+    searchstring = "%{0}%".format(search_term)
 
     # generic_filter can be applied to all Node (and subclassed) objects
-    generic_filter = or_(Content.name.like(searchstring),
-                         Content.title.like(searchstring),
-                         Content.description.like(searchstring))
+    generic_filter = or_(
+        Content.name.like(searchstring),
+        Content.title.like(searchstring),
+        Content.description.like(searchstring),
+    )
 
-    results = DBSession.query(Content).filter(generic_filter).\
-        order_by(Content.title.asc()).all()
+    results = (
+        DBSession.query(Content)
+        .filter(generic_filter)
+        .order_by(Content.title.asc())
+        .all()
+    )
 
     # specific result contain objects matching additional criteria
     # but must not match the generic criteria (because these objects
     # are already in the generic_results)
     document_results = DBSession.query(Document).filter(
-        and_(Document.body.like(searchstring),
-             not_(generic_filter)))
+        and_(Document.body.like(searchstring), not_(generic_filter))
+    )
 
-    for results_set in [content_with_tags([searchstring]),
-                        document_results.all()]:
+    for results_set in [content_with_tags([searchstring]), document_results.all()]:
         [results.append(c) for c in results_set if c not in results]
 
     result_dicts = []
 
     for result in results:
-        if request.has_permission('view', result):
-            result_dicts.append(dict(
-                name=result.name,
-                title=result.title,
-                description=result.description,
-                path=request.resource_path(result)))
+        if request.has_permission("view", result):
+            result_dicts.append(
+                dict(
+                    name=result.name,
+                    title=result.title,
+                    description=result.description,
+                    path=request.resource_path(result),
+                )
+            )
 
     return result_dicts
 
 
 def content_with_tags(tag_terms):
 
-    return DBSession.query(Content).join(TagsToContents).join(Tag).filter(
-        or_(*[Tag.title.like(tag_term) for tag_term in tag_terms])).all()
+    return (
+        DBSession.query(Content)
+        .join(TagsToContents)
+        .join(Tag)
+        .filter(or_(*[Tag.title.like(tag_term) for tag_term in tag_terms]))
+        .all()
+    )
 
 
 def search_content_for_tags(tags, request=None):
@@ -496,12 +504,15 @@ def search_content_for_tags(tags, request=None):
     result_dicts = []
 
     for result in content_with_tags(tags):
-        if request.has_permission('view', result):
-            result_dicts.append(dict(
-                name=result.name,
-                title=result.title,
-                description=result.description,
-                path=request.resource_path(result)))
+        if request.has_permission("view", result):
+            result_dicts.append(
+                dict(
+                    name=result.name,
+                    title=result.title,
+                    description=result.description,
+                    path=request.resource_path(result),
+                )
+            )
 
     return result_dicts
 
@@ -513,5 +524,5 @@ def includeme(config):
     :type config: :class:`pyramid.config.Configurator`
     """
 
-    config.add_view_predicate('root_only', RootOnlyPredicate)
-    config.add_view_predicate('if_setting_has_value', SettingHasValuePredicate)
+    config.add_view_predicate("root_only", RootOnlyPredicate)
+    config.add_view_predicate("if_setting_has_value", SettingHasValuePredicate)
diff --git a/kotti/views/view.py b/kotti/views/view.py
index c4c1e2c03..543df049a 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -20,12 +20,14 @@ def view_content_default(context, request):
     with the name 'view'.
     """
 
-    view_name = context.default_view or 'view'
+    view_name = context.default_view or "view"
     response = render_view_to_response(context, request, name=view_name)
     if response is None:  # pragma: no cover
         warnings.warn(
-            'Failed to look up default view called {0!r} for {1!r}.'.format(
-                view_name, context))
+            "Failed to look up default view called {0!r} for {1!r}.".format(
+                view_name, context
+            )
+        )
         raise HTTPNotFound()
     return response
 
@@ -36,42 +38,57 @@ def view_node(context, request):  # pragma: no cover
 
 
 # noinspection PyUnusedLocal
-@view_config(name='search-results', permission='view',
-             renderer='kotti:templates/view/search-results.pt')
+@view_config(
+    name="search-results",
+    permission="view",
+    renderer="kotti:templates/view/search-results.pt",
+)
 def search_results(context, request):
     results = []
-    if 'search-term' in request.POST:
-        search_term = request.POST['search-term']
+    if "search-term" in request.POST:
+        search_term = request.POST["search-term"]
         results = search_content(search_term, request)
-    return {'results': results}
+    return {"results": results}
 
 
 # noinspection PyUnusedLocal
-@view_config(name='search-tag', permission='view',
-             renderer='kotti:templates/view/search-results.pt')
+@view_config(
+    name="search-tag",
+    permission="view",
+    renderer="kotti:templates/view/search-results.pt",
+)
 def search_results_for_tag(context, request):
     results = []
-    if 'tag' in request.GET:
+    if "tag" in request.GET:
         # Single tag searching only, is allowed in default Kotti. Add-ons can
         # utilize search_content_for_tags(tags) to enable multiple tags
         # searching, but here it is called with a single tag.
-        tags = [request.GET['tag'].strip()]
+        tags = [request.GET["tag"].strip()]
         results = search_content_for_tags(tags, request)
-    return {'results': results}
+    return {"results": results}
 
 
 # noinspection PyUnusedLocal
-@view_config(name='search', permission='view',
-             renderer='kotti:templates/view/search.pt')
-@view_config(name='folder_view', context=IContent, permission='view',
-             renderer='kotti:templates/view/folder.pt')
-@view_config(name='view', context=IContent, permission='view',
-             renderer='kotti:templates/view/document.pt')
+@view_config(
+    name="search", permission="view", renderer="kotti:templates/view/search.pt"
+)
+@view_config(
+    name="folder_view",
+    context=IContent,
+    permission="view",
+    renderer="kotti:templates/view/folder.pt",
+)
+@view_config(
+    name="view",
+    context=IContent,
+    permission="view",
+    renderer="kotti:templates/view/document.pt",
+)
 def view(context, request):
     return {}
 
 
-@notfound_view_config(renderer='kotti:templates/http-errors/notfound.pt')
+@notfound_view_config(renderer="kotti:templates/http-errors/notfound.pt")
 def notfound_view(context, request):
     request.response = context
     return {}
diff --git a/kotti/workflow.py b/kotti/workflow.py
index 81c968749..e644ff55c 100644
--- a/kotti/workflow.py
+++ b/kotti/workflow.py
@@ -16,7 +16,7 @@ def __init__(self, obj, info, **kwargs):
         self.info = info
 
 
-def get_workflow(context, name='security'):
+def get_workflow(context, name="security"):
     return base_get_workflow(context, name, context=context)
 
 
@@ -40,7 +40,7 @@ def initialize_workflow(event):
 
 def workflow_callback(context, info):
     wf = info.workflow
-    to_state = info.transition.get('to_state')
+    to_state = info.transition.get("to_state")
 
     if to_state is None:
         if context.state:
@@ -52,13 +52,13 @@ def workflow_callback(context, info):
     acl = []
 
     # This could definitely be cached...
-    special_roles = ('system.Everyone', 'system.Authenticated')
+    special_roles = ("system.Everyone", "system.Authenticated")
     for key, value in state_data.items():
-        if key.startswith('role:') or key in special_roles:
+        if key.startswith("role:") or key in special_roles:
             for perm in value.split():
                 acl.append(("Allow", key, perm))
 
-    if state_data.get('inherit', '0').lower() not in TRUE_VALUES:
+    if state_data.get("inherit", "0").lower() not in TRUE_VALUES:
         acl.append(DENY_ALL)
 
     context.__acl__ = acl
@@ -92,6 +92,5 @@ def reset_workflow_command():
       --purge-existing   Reset all objects to new workflow's initial state.
     """
     return command(
-        lambda args: reset_workflow(purge_existing=args['--purge-existing']),
-        __doc__,
-        )
+        lambda args: reset_workflow(purge_existing=args["--purge-existing"]), __doc__
+    )
diff --git a/pip-selfcheck.json b/pip-selfcheck.json
new file mode 100644
index 000000000..4413a30db
--- /dev/null
+++ b/pip-selfcheck.json
@@ -0,0 +1 @@
+{"last_check":"2019-01-04T14:55:48Z","pypi_version":"18.1"}
\ No newline at end of file
diff --git a/pytest.ini b/pytest.ini
index a278f3ffd..c093b78b9 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -16,7 +16,8 @@ addopts =
     --cov-report=term-missing
     kotti/
 python_files = test_*.py
-pep8ignore = E501 E122 E123 E125 E128 E711 E713 E714 E402
+pep8ignore = E122 E123 E125 E128 E203 E251 E501 E711 E713 E714 E402 W503
+pep8maxlinelength = 88
 markers =
     user: mark test to be run as the given user
     slow: mark test to be run only with --runslow option
diff --git a/requirements.txt b/requirements.txt
index 26198553f..71233f34a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,26 +1,25 @@
-alembic==0.9.9
+alembic==1.0.5
 appdirs==1.4.3
-Babel==2.5.3
-Beaker==1.9.0
-bleach==2.1.3
-bleach-whitelist==0.0.8
-Chameleon==3.2
-colander==1.4
-deform==2.0.5
+Babel==2.6.0
+Beaker==1.10.0
+bleach==3.0.2
+bleach-whitelist==0.0.9
+Chameleon==3.5
+colander==1.5.1
+deform==2.0.7
 docopt==0.6.2
 fanstatic==1.0.0
 filedepot==0.5.2
 FormEncode==2.0.0a1
 html2text==2018.1.9
-html5lib==1.0.1
-hupper==1.1
+hupper==1.4.2
 iso8601==0.1.11  # rq.filter: !=0.1.12
 js.angular==1.1.4
 js.bootstrap==3.3.4
-#js.deform==2.0.5.dev0
+js.deform==2.0.3
 js.fineuploader==5.14.0
 js.html5shiv==3.7.3
-js.jquery==1.9.1  # rq.filter: <2.0
+js.jquery==1.9.1
 js.jquery-form==3.9
 js.jquery-maskedinput==1.4.1
 js.jquery-maskmoney==3.0.2
@@ -35,45 +34,48 @@ js.tinymce==4.5.4
 LEPL==5.1.3
 lingua==4.13
 Mako==1.0.7
-MarkupSafe==1.0
-PasteDeploy==1.5.2
-peppercorn==0.5
+MarkupSafe==1.1.0
+PasteDeploy==2.0.1
+peppercorn==0.6
 plaster==1.0
-plaster-pastedeploy==0.5
+plaster-pastedeploy==0.6
 polib==1.1.0
 py-bcrypt==0.4
-pyramid==1.9.1
+pyramid==1.10.1
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.15.1
-pyramid-tm==2.2
+pyramid-tm==2.2.1
 pyramid-zcml==1.1.0
-python-dateutil==2.7.0
+python-dateutil==2.7.5
 python-editor==1.0.3
-pytz==2018.3
+pytz==2018.9
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 rfc6266-parser==0.0.5.post2
 shutilwhich==1.1.0
-six==1.11.0
-SQLAlchemy==1.2.6
-SQLAlchemy-Utils==0.33.2
-transaction==2.2.1
+six==1.12.0
+SQLAlchemy==1.2.15
+SQLAlchemy-Utils==0.33.10
+transaction==2.4.0
 translationstring==1.3
-Unidecode==1.0.22
+Unidecode==1.0.23
 usersettings==1.0.7
 venusian==1.1.0
 waitress==1.1.0
 webencodings==0.5.1
-WebOb==1.7.4
-zope.component==4.4.1
-zope.configuration==4.1.0
-zope.deprecation==4.3.0
-zope.event==4.3.0
-zope.i18nmessageid==4.1.0
-zope.interface==4.4.3
-zope.schema==4.5.0
-zope.sqlalchemy==1.0
+WebOb==1.8.5
+zope.component==4.5
+zope.configuration==4.3.0
+zope.deferredimport==4.3
+zope.deprecation==4.4.0
+zope.event==4.4
+zope.hookable==4.2.0
+zope.i18nmessageid==4.3.1
+zope.interface==4.6.0
+zope.proxy==4.3.1
+zope.schema==4.9.3
+zope.sqlalchemy==1.1
diff --git a/setup.py b/setup.py
index de79b88cd..b97428aa7 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.0'
+version = '2.0.1.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 532ca414b0cbb3eee290cf0910ad9cef5e071020 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 9 Jan 2019 09:39:14 +0100
Subject: [PATCH 527/600] Remove testing import from package code.

---
 CHANGES.txt        | 9 ++++++++-
 kotti/filedepot.py | 9 ++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7f33ba511..1d9c76038 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
 Change History
 ==============
 
+2.0.1 - unreleased
+------------------
+
+- Reformat source code with black.
+
+- Remove testing import from package code.
+
 2.0.0 - 2019-01-07
 ------------------
 
@@ -8,7 +15,7 @@ Change History
   See https://github.com/Kotti/kotti-cookiecutter
 
 - Require pytest >= 4.1.0, use ``request.node.get_closest_marker`` instead of
-  deprecated ``request.keywords``. 
+  deprecated ``request.keywords``.
 
 2.0.0b2 - 2018-04-04
 --------------------
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 1581e8a27..42f17b300 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -43,7 +43,6 @@
 from kotti.events import ObjectInsert
 from kotti.events import ObjectUpdate
 from kotti.request import Request
-from kotti.testing import DummyRequest
 from kotti.util import _to_fieldstorage
 from kotti.util import camel_case_to_name
 from kotti.util import command
@@ -202,6 +201,7 @@ def __declare_last__(cls) -> None:
         event.listen(DBStoredFile.data, "set", handle_change_data)
 
 
+# noinspection PyUnusedLocal
 def handle_change_data(
     target: DBStoredFile,
     value: Optional[bytes],
@@ -359,6 +359,7 @@ def _get_file_id(file_or_id: Union[DBStoredFile, str]) -> str:
         return file_or_id
 
 
+# noinspection PyUnusedLocal
 def migrate_storage(from_storage: str, to_storage: str) -> None:
 
     log = logging.getLogger(__name__)
@@ -425,7 +426,7 @@ class StoredFileResponse(Response):
     def __init__(
         self,
         f: MemoryStoredFile,
-        request: Union[DummyRequest, Request],
+        request: Request,
         disposition: str = "attachment",
         cache_max_age: int = 604800,
         content_type: None = None,
@@ -518,7 +519,7 @@ def generate_etag(f: MemoryStoredFile) -> str:
 
 
 def uploaded_file_response(
-    self: Union[DummyRequest, Request],
+    self: Request,
     uploaded_file: UploadedFile,
     disposition: str = "inline",
     cache_max_age: int = 604800,
@@ -623,6 +624,7 @@ def __call__(self, request: Request) -> Response:
         return response
 
 
+# noinspection PyUnusedLocal
 def adjust_for_engine(conn: Connection, branch: bool) -> None:
     # adjust for engine type
 
@@ -636,6 +638,7 @@ def adjust_for_engine(conn: Connection, branch: bool) -> None:
     # can be saved corectly by
     # :class:`depot.fields.sqlalchemy.upload.UploadedFile`
 
+    # noinspection PyUnusedLocal
     def patched_processed_result_value(self, value, dialect):
         if not value:
             return None

From 42bcf6285e03cca1e7212dd4583ae739c48c2cba Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 9 Jan 2019 09:49:20 +0100
Subject: [PATCH 528/600] Bump version.

---
 CHANGES.txt | 2 +-
 setup.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1d9c76038..26f0624f4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-2.0.1 - unreleased
+2.0.1 - 2019-01-09
 ------------------
 
 - Reformat source code with black.
diff --git a/setup.py b/setup.py
index b97428aa7..493c26719 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.1.dev0'
+version = '2.0.1'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 792be911dfe771cc7b4af26a4573894c1f8b95b5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 9 Jan 2019 09:50:26 +0100
Subject: [PATCH 529/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 26f0624f4..3a1ab3e90 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.2.dev0 - unreleased
+-----------------------
+
+- No changes yet.
+
 2.0.1 - 2019-01-09
 ------------------
 
diff --git a/setup.py b/setup.py
index 493c26719..15b81a6a2 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.1'
+version = '2.0.2.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 1a231728edacda9f2d061d853a3023dbfb58bc32 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 26 Jun 2019 11:16:35 +0200
Subject: [PATCH 530/600] Fix broken tags widget (#562). Declare Python 3.7
 compatibility.

---
 .travis.yml         | 2 +-
 CHANGES.txt         | 5 ++---
 kotti/views/form.py | 2 +-
 setup.py            | 3 ++-
 tox.ini             | 5 ++++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa0deabd9..75ba7de85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ cache:
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 python:
+  - "3.7"
   - "3.6"
   - "3.5"
-#  - "2.7"
 env:
   - KOTTI_TEST_DB_STRING=postgresql://postgres@localhost:5432/kotti_testing
   - KOTTI_TEST_DB_STRING=mysql+mysqldb://root@localhost:3306/kotti_testing
diff --git a/CHANGES.txt b/CHANGES.txt
index 3a1ab3e90..35afe119f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,9 @@
 Change History
 ==============
 
-2.0.2.dev0 - unreleased
------------------------
+- Fix broken tags widget (#562).
 
-- No changes yet.
+- Declare Python 3.7 compatibility.
 
 2.0.1 - 2019-01-09
 ------------------
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 7911fe3f6..5138173da 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -52,7 +52,7 @@ def deserialize(node, value):
 def deferred_tag_it_widget(node, kw):
     tagit.need()
     all_tags = Tag.query.all()
-    available_tags = [tag.title.encode("utf-8") for tag in all_tags]
+    available_tags = [tag.title for tag in all_tags]
     widget = CommaSeparatedListWidget(template="tag_it", available_tags=available_tags)
     return widget
 
diff --git a/setup.py b/setup.py
index 15b81a6a2..84b0c1c6b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.2.dev0'
+version = '2.0.1'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."
@@ -145,6 +145,7 @@ def read(*parts):
           'Programming Language :: Python :: 3 :: Only',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: Implementation',
           'Programming Language :: Python :: Implementation :: CPython',
           # 'Programming Language :: Python :: Implementation :: PyPy',
diff --git a/tox.ini b/tox.ini
index 0f586fb72..71b3203c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py35,py36}-{postgresql,sqlite,mysql}
+envlist = {py35,py36,p37}-{postgresql,sqlite,mysql}
 
 [testenv]
 deps =
@@ -8,12 +8,15 @@ deps =
 envdir:
     py35: {toxworkdir}/3.5
     py36: {toxworkdir}/3.6
+    py37: {toxworkdir}/3.7
 setenv:
     sqlite: KOTTI_TEST_DB_STRING=sqlite://
     py35-mysql: KOTTI_TEST_DB_STRING=mysql://root@localhost:3306/kotti_testing
     py36-mysql: KOTTI_TEST_DB_STRING=mysql://root@localhost:3306/kotti_testing
+    py37-mysql: KOTTI_TEST_DB_STRING=mysql://root@localhost:3306/kotti_testing
     py35-postgresql: KOTTI_TEST_DB_STRING=postgresql://127.0.0.1:5432/kotti_testing
     py36-postgresql: KOTTI_TEST_DB_STRING=postgresql://127.0.0.1:5432/kotti_testing
+    py37-postgresql: KOTTI_TEST_DB_STRING=postgresql://127.0.0.1:5432/kotti_testing
 install_command: pip install {opts} {packages}
 whitelist_externals =
     mysql

From f33b6b8964caa0d1dd85449fc9a810c79d273487 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 26 Jun 2019 11:20:50 +0200
Subject: [PATCH 531/600] Update requirements.

---
 requirements.txt | 50 ++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 71233f34a..23b1cbcdc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
-alembic==1.0.5
+alembic==1.0.11
 appdirs==1.4.3
-Babel==2.6.0
-Beaker==1.10.0
-bleach==3.0.2
-bleach-whitelist==0.0.9
-Chameleon==3.5
-colander==1.5.1
+Babel==2.7.0
+Beaker==1.10.1
+bleach==3.1.0
+bleach-whitelist==0.0.10
+Chameleon==3.6.2
+colander==1.7.0
 deform==2.0.7
 docopt==0.6.2
-fanstatic==1.0.0
-filedepot==0.5.2
+fanstatic==1.1
+filedepot==0.6.0
 FormEncode==2.0.0a1
 html2text==2018.1.9
-hupper==1.4.2
-iso8601==0.1.11  # rq.filter: !=0.1.12
+hupper==1.8.1
+iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.3
@@ -33,24 +33,24 @@ js.select2==4.0.4.post1
 js.tinymce==4.5.4
 LEPL==5.1.3
 lingua==4.13
-Mako==1.0.7
-MarkupSafe==1.1.0
+Mako==1.0.12
+MarkupSafe==1.1.1
 PasteDeploy==2.0.1
 peppercorn==0.6
 plaster==1.0
-plaster-pastedeploy==0.6
+plaster-pastedeploy==0.7
 polib==1.1.0
 py-bcrypt==0.4
-pyramid==1.10.1
+pyramid==1.10.4
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.15.1
 pyramid-tm==2.2.1
-pyramid-zcml==1.1.0
-python-dateutil==2.7.5
-python-editor==1.0.3
-pytz==2018.9
+pyramid-zcml==1.2.0
+python-dateutil==2.8.0
+python-editor==1.0.4
+pytz==2019.1
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.0b1
@@ -58,18 +58,18 @@ repoze.zcml==1.0b1
 rfc6266-parser==0.0.5.post2
 shutilwhich==1.1.0
 six==1.12.0
-SQLAlchemy==1.2.15
-SQLAlchemy-Utils==0.33.10
+SQLAlchemy==1.3.5
+SQLAlchemy-Utils==0.34.0
 transaction==2.4.0
 translationstring==1.3
-Unidecode==1.0.23
+Unidecode==1.1.1
 usersettings==1.0.7
-venusian==1.1.0
-waitress==1.1.0
+venusian==1.2.0
+waitress==1.3.0
 webencodings==0.5.1
 WebOb==1.8.5
 zope.component==4.5
-zope.configuration==4.3.0
+zope.configuration==4.3.1
 zope.deferredimport==4.3
 zope.deprecation==4.4.0
 zope.event==4.4

From 5f6b3f18687d9659aa8974c993125c25ff2c604e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 26 Jun 2019 11:26:17 +0200
Subject: [PATCH 532/600] Enable Python 3.7 on Travis.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 75ba7de85..383acefcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial
 language: python
 sudo: false
 cache:

From e64a9e7904adbc7c63521a314e9620aa69cb5d14 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 26 Jun 2019 11:35:33 +0200
Subject: [PATCH 533/600] Start mysql and postgresql services in Travis.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 383acefcb..778107421 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 dist: xenial
+services:
+  - mysql
+  - postgresql
 language: python
 sudo: false
 cache:

From d60e7ed9b9486080b80759085a754e4291c97d7f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Wed, 26 Jun 2019 12:05:05 +0200
Subject: [PATCH 534/600] Remove ``pytest-xdist`` from testing requirements, as
 it currently causes Travis to fail.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 84b0c1c6b..08b9b1130 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@
     'pytest-pep8>=1.0.6',
     'pytest-travis-fold',
     'pytest-virtualenv',
-    'pytest-xdist',
+    # 'pytest-xdist',  # currently causes Travis to fail
     'tox',
     'zope.testbrowser>=5.0.0',
     ]

From ae77d126f8d0528191e0de7784881e38d230c1f2 Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Wed, 20 Nov 2019 19:18:26 +1100
Subject: [PATCH 535/600] Fix simple typo: trigerred -> triggered (#566)

---
 kotti/events.py    | 6 +++---
 kotti/filedepot.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kotti/events.py b/kotti/events.py
index 18f995c6b..bc67e95ed 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -261,7 +261,7 @@ def _before_flush(session, flush_context, instances):
 def set_owner(event):
     """Set ``owner`` of the object that triggered the event.
 
-    :param event: event that trigerred this handler.
+    :param event: event that triggered this handler.
     :type event: :class:`ObjectInsert`
     """
 
@@ -281,7 +281,7 @@ def set_owner(event):
 def set_creation_date(event):
     """Set ``creation_date`` of the object that triggered the event.
 
-    :param event: event that trigerred this handler.
+    :param event: event that triggered this handler.
     :type event: :class:`ObjectInsert`
     """
 
@@ -293,7 +293,7 @@ def set_creation_date(event):
 def set_modification_date(event):
     """Update ``modification_date`` of the object that triggered the event.
 
-    :param event: event that trigerred this handler.
+    :param event: event that triggered this handler.
     :type event: :class:`ObjectUpdate`
     """
 
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 42f17b300..24b454a31 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -215,7 +215,7 @@ def handle_change_data(
 def set_metadata(event: Union[ObjectUpdate, ObjectInsert]) -> None:
     """Set DBStoredFile metadata based on data
 
-    :param event: event that trigerred this handler.
+    :param event: event that triggered this handler.
     :type event: :class:`ObjectInsert` or :class:`ObjectUpdate`
     """
     obj = event.object

From b015394b783c4ae3d9f6afba43d0d2ab0019eeb0 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 21 Nov 2019 08:21:04 +0100
Subject: [PATCH 536/600] Try to solve #563

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 08b9b1130..17880dc36 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@
     'Pillow',  # thumbnail filter in depot tween tests
     'py>=1.4.29',
     'pyquery',
-    'pytest>=4.1.0',
+    'pytest<5',  # see #563
     'pytest-cov',
     'pytest-pep8>=1.0.6',
     'pytest-travis-fold',

From 828f7509abf1099bcbbe56fb853e79fed4d66c79 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 21 Nov 2019 08:37:29 +0100
Subject: [PATCH 537/600] Solve #564.

---
 kotti/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kotti/__init__.py b/kotti/__init__.py
index a4c3bd5a4..f38d7192a 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -13,12 +13,13 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm import sessionmaker
-from zope.sqlalchemy import ZopeTransactionExtension
+from zope.sqlalchemy import register
 
 from kotti.sqla import Base as KottiBase
 
 metadata = MetaData()
-DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
+DBSession = scoped_session(sessionmaker(autoflush=True))
+register(DBSession)
 Base = declarative_base(cls=KottiBase)
 Base.metadata = metadata
 Base.query = DBSession.query_property()

From b9cdc09fdd9c9fd9c9300a8b0e5e533a705c2c6d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Thu, 21 Nov 2019 08:47:00 +0100
Subject: [PATCH 538/600] Fix #567.

---
 docs/contributing.rst         | 4 ++--
 docs/first_steps/overview.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index cd4262963..d1ab211ee 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -30,9 +30,9 @@ To run and develop within your clone, do these steps:
 
 .. code-block:: bash
 
-  virtualenv . --no-site-packages
+  python3 -m venv .
 
-  bin/python setup.py develop
+  bin/pip install -e ".[testing]"
 
 This will create a new virtualenv "in place" and do the python develop steps to
 use the Kotti code in the repo.
diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index 602d021df..6c852fb9f 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -72,7 +72,7 @@ Use this command:
 Support
 -------
 
-- Python 2.7 (Python 3 coming soon)
+- Python 3.5-3.7
 - Support for PostgreSQL, MySQL and SQLite (tested regularly), and a list of `other SQL databases`_
 - Support for WSGI and a `variety of web servers`_, including Apache
 

From ffdfd2ec250bcc3dce1aa59e3d9ba3549c82672c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 28 Jan 2020 22:12:04 +0100
Subject: [PATCH 539/600] - Run ``pyupgrade --py36-plus`` on all Python files
 to use some more modern language   features where appropriate (for example
 f-strings). - Declare Python 3.7 and 3.8 compatibility. - Remove Python 3.5
 compatibility. - Remove ``rfc6266-parser`` dependency. - Remove CircleCI.

---
 .circleci/config.yml                          | 106 ------------------
 .gitignore                                    |   1 +
 .travis.yml                                   |   2 +-
 CHANGES.txt                                   |  11 +-
 kotti/__init__.py                             |   6 +-
 .../versions/413fa5fcc581_add_filedepot.py    |   2 +-
 kotti/events.py                               |  14 +--
 kotti/fanstatic.py                            |   2 +-
 kotti/filedepot.py                            |  32 +++---
 kotti/message.py                              |   6 +-
 kotti/migrate.py                              |  16 +--
 kotti/populate.py                             |  12 +-
 kotti/request.py                              |   2 +-
 kotti/resources.py                            |  32 +++---
 kotti/sanitizers.py                           |   2 +-
 kotti/security.py                             |  19 ++--
 kotti/sqla.py                                 |  20 ++--
 kotti/testing.py                              |   6 +-
 kotti/tests/__init__.py                       |   2 +-
 kotti/tests/test_app.py                       |   2 +-
 kotti/tests/test_events.py                    |   2 +-
 kotti/tests/test_file.py                      |   8 +-
 kotti/tests/test_sanitizers.py                |   2 +-
 kotti/tests/test_security.py                  |   2 +-
 kotti/tests/test_tags.py                      |   2 +-
 kotti/tests/test_upload.py                    |  14 +--
 kotti/tests/test_util.py                      |   2 +-
 kotti/tests/test_util_views.py                |  10 +-
 kotti/tests/test_workflow.py                  |   4 +-
 kotti/util.py                                 |  10 +-
 kotti/views/__init__.py                       |   2 +-
 kotti/views/cache.py                          |   4 +-
 kotti/views/edit/__init__.py                  |   2 +-
 kotti/views/edit/actions.py                   |   2 +-
 kotti/views/edit/content.py                   |   2 +-
 kotti/views/edit/default_views.py             |   4 +-
 kotti/views/edit/upload.py                    |   2 +-
 kotti/views/form.py                           |   8 +-
 kotti/views/slots.py                          |   6 +-
 kotti/views/users.py                          |  34 +++---
 kotti/views/util.py                           |  23 ++--
 kotti/views/view.py                           |   2 +-
 kotti/workflow.py                             |   2 +-
 requirements.txt                              |  54 ++++-----
 setup.py                                      |   3 +-
 tox.ini                                       |   4 +-
 46 files changed, 199 insertions(+), 306 deletions(-)
 delete mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 3806a278e..000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-# Python CircleCI 2.0 configuration file
-# Check https://circleci.com/docs/2.0/language-python/ for more details
-
-version: 2
-
-dependencies:
-  override:
-    - pip install tox tox-pyenv
-    - pyenv local 3.6.4 3.5.4
-
-jobs:
-  python3.6-sqlite: &py36sqlite
-    docker:
-      # specify the version you desire here. use `-browsers` prefix for selenium tests, e.g. `3.6.4-browsers`
-      - image: circleci/python:3.6.4
-
-    working_directory: ~/kotti
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            # Download and cache dependencies
-            - v2-dependencies-{{ checksum "setup.py" }}
-      - run:
-          name: install dependencies
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install -U pip wheel setuptools setuptools-git
-            pip install psycopg2-binary mysqlclient python-coveralls codecov
-            pip install -e .[testing]
-      - save_cache:
-          paths:
-            - ./venv
-          key: v2-dependencies-{{ checksum "setup.py" }}
-      - run:
-          name: run tests
-          command: |
-            . venv/bin/activate
-            py.test --junitxml=test-reports/junit
-      - store_test_results:
-          path: test-reports
-      - store_artifacts:
-          path: test-reports
-
-  python3.6-postgresql10.1:
-    <<: *py36sqlite
-    docker:
-      - image: circleci/python:3.6.4
-        environment: &pgenv
-          KOTTI_TEST_DB_STRING: postgresql://kotti@localhost/kotti?sslmode=disable
-          POSTGRES_USER: kotti
-          POSTGRES_DB: kotti
-          POSTGRES_PASSWORD: ""
-      - image: circleci/postgres:10.1
-        environment:
-          <<: *pgenv
-
-  python3.6-mysql5.6:
-    <<: *py36sqlite
-    docker:
-      - image: circleci/python:3.6.4
-        environment: &mysqlenv
-          KOTTI_TEST_DB_STRING: mysql+mysqldb://root@127.0.0.1:3306/kotti
-          MYSQL_USER: kotti
-          MYSQL_DATABASE: kotti
-      - image: circleci/mysql:5.6-ram
-        environment:
-          <<: *mysqlenv
-
-  python3.5-sqlite:
-    <<: *py36sqlite
-    docker:
-      - image: circleci/python:3.5.4
-
-  python3.5-postgresql10.1:
-    <<: *py36sqlite
-    docker:
-      - image: circleci/python:3.5.4
-        environment:
-          <<: *pgenv
-      - image: circleci/postgres:10.1
-        environment:
-          <<: *pgenv
-
-  python3.5-mysql5.6:
-    <<: *py36sqlite
-    docker:
-      - image: circleci/python:3.5.4
-        environment:
-          <<: *mysqlenv
-      - image: circleci/mysql:5.6-ram
-        environment:
-          <<: *mysqlenv
-
-workflows:
-  version: 2
-  test:
-    jobs:
-      - python3.6-sqlite
-      - python3.6-postgresql10.1
-      - python3.6-mysql5.6
-      - python3.5-sqlite
-      - python3.5-postgresql10.1
-      - python3.5-mysql5.6
diff --git a/.gitignore b/.gitignore
index e8d2fdd2a..2aa502150 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ pyvenv.cfg
 .pytest_cache/v/pep8/mtimes
 
 *.DS_Store
+.venv
diff --git a/.travis.yml b/.travis.yml
index 778107421..cbf8b9e19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,9 @@ cache:
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 python:
+  - "3.8"
   - "3.7"
   - "3.6"
-  - "3.5"
 env:
   - KOTTI_TEST_DB_STRING=postgresql://postgres@localhost:5432/kotti_testing
   - KOTTI_TEST_DB_STRING=mysql+mysqldb://root@localhost:3306/kotti_testing
diff --git a/CHANGES.txt b/CHANGES.txt
index 35afe119f..70e332987 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,18 @@
 Change History
 ==============
 
+- Remove CircleCI
+
 - Fix broken tags widget (#562).
 
-- Declare Python 3.7 compatibility.
+- Run ``pyupgrade --py36-plus`` on all Python files to use some more modern language
+  features where appropriate (for example f-strings).
+
+- Declare Python 3.7 and 3.8 compatibility.
+
+- Remove Python 3.5 compatibility.
+
+- Remove ``rfc6266-parser`` dependency.
 
 2.0.1 - 2019-01-09
 ------------------
diff --git a/kotti/__init__.py b/kotti/__init__.py
index f38d7192a..fdf0d5a11 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -6,8 +6,6 @@
 from pyramid.threadlocal import get_current_registry
 from pyramid.util import DottedNameResolver
 from pyramid_beaker import session_factory_from_settings
-from six import binary_type
-from six import string_types
 from sqlalchemy import MetaData
 from sqlalchemy import engine_from_config
 from sqlalchemy.ext.declarative import declarative_base
@@ -174,7 +172,7 @@ def _resolve_dotted(d, keys=conf_dotted):
 
     for key in keys:
         value = resolved[key]
-        if not isinstance(value, string_types):
+        if not isinstance(value, str):
             continue
         new_value = []
         for dottedname in value.split():
@@ -206,7 +204,7 @@ def base_configure(global_config, **settings):
         settings.setdefault(key, value)
 
     for key, value in settings.items():
-        if key.startswith("kotti") and isinstance(value, binary_type):
+        if key.startswith("kotti") and isinstance(value, bytes):
             settings[key] = value.decode("utf8")
 
     # Allow extending packages to change 'settings' w/ Python:
diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index 346865296..e3f51ddda 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -43,7 +43,7 @@ def process(thing):
         uploaded_file.process_content(
             data, filename=filename, content_type=mimetype)
         _saved.append({'nodeid': id, 'data': uploaded_file.encode()})
-        log.info("Saved data for node id {}".format(id))
+        log.info(f"Saved data for node id {id}")
 
     query = DBSession.query(
         files.c.id, files.c.data, files.c.filename, files.c.mimetype
diff --git a/kotti/events.py b/kotti/events.py
index bc67e95ed..e1aad281f 100644
--- a/kotti/events.py
+++ b/kotti/events.py
@@ -38,7 +38,7 @@
 from kotti.sqla import no_autoflush
 
 
-class ObjectEvent(object):
+class ObjectEvent:
     """Event related to an object."""
 
     def __init__(self, obj, request=None):
@@ -125,7 +125,7 @@ def __deepcopy__(self, memo):
         return type(self)(self.default_factory, copy.deepcopy(self.items()))
 
     def __repr__(self):
-        return "OrderedDefaultDict(%s, %s)" % (
+        return "OrderedDefaultDict({}, {})".format(
             self.default_factory,
             OrderedDict.__repr__(self),
         )
@@ -394,7 +394,7 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
         # We're a new root object
         target_path = "/"
     else:
-        target_path += "/{0}/".format(value)
+        target_path += f"/{value}/"
     target.path = target_path
     # We need to set the name to value here so that the subsequent
     # UPDATE in _update_children_paths will include the new 'name'
@@ -412,7 +412,7 @@ def _set_path_for_new_name(target, value, oldvalue, initiator):
         _update_children_paths(old_path, target_path)
     else:
         for child in _all_children(target):
-            child.path = "{0}{1}/".format(child.__parent__.path, child.__name__)
+            child.path = f"{child.__parent__.path}{child.__name__}/"
 
 
 def _all_children(item, _all=None):
@@ -451,7 +451,7 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         return
 
     target_path = "/".join(node.__name__ for node in line)
-    target_path += "/{0}/".format(target.__name__)
+    target_path += f"/{target.__name__}/"
     target.path = target_path
 
     if old_path and target.id is not None:
@@ -461,11 +461,11 @@ def _set_path_for_new_parent(target, value, oldvalue, initiator):
         # children.  This is the case when we create an object with
         # children before we assign the object itself to a parent.
         for child in _all_children(target):
-            child.path = "{0}{1}/".format(child.__parent__.path, child.__name__)
+            child.path = f"{child.__parent__.path}{child.__name__}/"
 
 
 # noinspection PyPep8Naming
-class subscribe(object):
+class subscribe:
     """Function decorator to attach the decorated function as a handler for a
     Kotti event.  Example::
 
diff --git a/kotti/fanstatic.py b/kotti/fanstatic.py
index 16ce0a04f..d58358f63 100644
--- a/kotti/fanstatic.py
+++ b/kotti/fanstatic.py
@@ -54,7 +54,7 @@
 upload = Group([upload_js, upload_css])
 
 
-class NeededGroup(object):
+class NeededGroup:
     """A collection of fanstatic resources that supports
        dynamic appending of resources after initialization"""
 
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index 24b454a31..fea99b5b7 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -10,12 +10,12 @@
 from typing import Tuple
 from typing import Union
 
-import rfc6266_parser
 from depot.fields.sqlalchemy import _SQLAMutationTracker
 from depot.fields.upload import UploadedFile
 from depot.io.interfaces import FileStorage
 from depot.io.memory import MemoryStoredFile
 from depot.manager import DepotManager
+from depot.utils import make_content_disposition
 from pyramid import tweens
 from pyramid.config import Configurator
 from pyramid.httpexceptions import HTTPMovedPermanently
@@ -35,7 +35,6 @@
 from sqlalchemy.orm import deferred
 from sqlalchemy.orm.attributes import Event
 from sqlalchemy.util.langhelpers import _symbol
-from unidecode import unidecode
 
 from kotti import Base
 from kotti import DBSession
@@ -95,7 +94,7 @@ def __init__(
         content_type=None,
         last_modified=None,
         content_length=None,
-        **kwds
+        **kwds,
     ):
         self.file_id = file_id
         self.filename = filename
@@ -119,9 +118,9 @@ def read(self, n: int = -1) -> bytes:
             )
 
         if n == -1:
-            result = self._data[self._cursor:]
+            result = self._data[self._cursor :]
         else:
-            result = self._data[self._cursor:self._cursor + n]
+            result = self._data[self._cursor : self._cursor + n]
 
         self._cursor += len(result)
 
@@ -242,7 +241,7 @@ def get(file_id: str) -> DBStoredFile:
 
         f = DBSession.query(DBStoredFile).filter_by(file_id=file_id).first()
         if f is None:
-            raise IOError
+            raise OSError
         return f
 
     def create(
@@ -361,7 +360,6 @@ def _get_file_id(file_or_id: Union[DBStoredFile, str]) -> str:
 
 # noinspection PyUnusedLocal
 def migrate_storage(from_storage: str, to_storage: str) -> None:
-
     log = logging.getLogger(__name__)
 
     old_default = DepotManager._default_depot
@@ -461,7 +459,7 @@ def __init__(
             content_encoding, content_type, f
         )
 
-        super(StoredFileResponse, self).__init__(
+        super().__init__(
             conditional_response=True,
             content_type=content_type,
             content_encoding=content_encoding,
@@ -489,12 +487,9 @@ def __init__(
 
         self.etag = self.generate_etag(f)
 
-        disposition = rfc6266_parser.build_header(
-            f.filename, disposition=disposition, filename_compat=unidecode(f.filename)
-        )
-        if isinstance(disposition, bytes):
-            disposition = disposition.decode("iso-8859-1")
-        self.content_disposition = disposition
+        content_disposition = make_content_disposition(disposition, f.filename)
+
+        self.content_disposition = content_disposition
 
     @staticmethod
     def _get_type_and_encoding(
@@ -515,7 +510,7 @@ def _get_type_and_encoding(
 
     @staticmethod
     def generate_etag(f: MemoryStoredFile) -> str:
-        return '"{0}-{1}"'.format(f.last_modified, f.content_length)
+        return f'"{f.last_modified}-{f.content_length}"'
 
 
 def uploaded_file_response(
@@ -534,7 +529,7 @@ def uploaded_file_url(self, uploaded_file, disposition="inline"):
         suffix = "/download"
     else:
         suffix = ""
-    url = "{0}/{1}/{2}{3}".format(
+    url = "{}/{}/{}{}".format(
         self.application_url,
         get_settings()["kotti.depot_mountpoint"][1:],
         uploaded_file.path,
@@ -543,7 +538,7 @@ def uploaded_file_url(self, uploaded_file, disposition="inline"):
     return url
 
 
-class TweenFactory(object):
+class TweenFactory:
     """Factory for a Pyramid tween in charge of serving Depot files.
 
     This is the Pyramid tween version of
@@ -605,7 +600,7 @@ def __call__(self, request: Request) -> Response:
 
         try:
             f = depot.get(fileid)
-        except (IOError, ValueError):
+        except (OSError, ValueError):
             response = HTTPNotFound()
             return response
 
@@ -693,7 +688,6 @@ def extract_depot_settings(
 
 
 def configure_filedepot(settings: Dict[str, str]) -> None:
-
     config = extract_depot_settings("kotti.depot.", settings)
     for conf in config:
         name = conf.pop("name")
diff --git a/kotti/message.py b/kotti/message.py
index 9d68349ad..0a7a4c215 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -28,7 +28,7 @@ def make_token(user: Principal, seconds: Optional[float] = None) -> str:
     secret = get_settings()["kotti.secret2"]
     if seconds is None:
         seconds = time.time()
-    token = "{}:{}:{}".format(user.name, secret, seconds)
+    token = f"{user.name}:{secret}:{seconds}"
     return "{}:{}".format(hashlib.sha224(token.encode("utf8")).hexdigest(), seconds)
 
 
@@ -120,9 +120,9 @@ def email_set_password(
     set_password_query = {"token": token, "email": user.email}
     if add_query:
         set_password_query.update(add_query)
-    url = "{0}/@@set-password?{1}".format(
+    url = "{}/@@set-password?{}".format(
         request.application_url, urlencode(set_password_query)
     )
     variables = dict(user_title=user.title, site_title=site_title, url=url)
-    recipients = ['"{0}" <{1}>'.format(user.title, user.email)]  # XXX naive?
+    recipients = [f'"{user.title}" <{user.email}>']  # XXX naive?
     send_email(request, recipients, template_name, variables)
diff --git a/kotti/migrate.py b/kotti/migrate.py
index 5d6c9b560..ac7475725 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -61,7 +61,7 @@ def kotti_configure(settings):
 class ScriptDirectoryWithDefaultEnvPy(ScriptDirectory):
     @property
     def env_py_location(self) -> str:
-        loc = super(ScriptDirectoryWithDefaultEnvPy, self).env_py_location
+        loc = super().env_py_location
         if not os.path.exists(loc):
             loc = os.path.join(KOTTI_SCRIPT_DIR, "env.py")
         return loc
@@ -71,7 +71,7 @@ def run_env(self) -> None:
         load_python_file(dir_, filename)
 
 
-class PackageEnvironment(object):
+class PackageEnvironment:
     def __init__(self, location: str) -> None:
         self.location = location
         self.config = self._make_config(location)
@@ -83,7 +83,7 @@ def pkg_name(self) -> str:
 
     @property
     def version_table(self) -> str:
-        return "{0}_alembic_version".format(self.pkg_name)
+        return f"{self.pkg_name}_alembic_version"
 
     def run_env(self, fn: Callable, **kw) -> None:
         with EnvironmentContext(
@@ -145,7 +145,7 @@ def upgrade(location=DEFAULT_LOCATION, revision=None):
 
     if revision is None:
         revision = pkg_env.script_dir.get_current_head()
-    print("Upgrading {0}:".format(pkg_env.location))
+    print(f"Upgrading {pkg_env.location}:")
 
     def upgrade(heads, context):
         # alembic supports multiple heads, we don't.
@@ -156,7 +156,7 @@ def upgrade(heads, context):
             print("  - already up to date.")
             return []
 
-        print("  - upgrading from {0} to {1}...".format(rev, revision))
+        print(f"  - upgrading from {rev} to {revision}...")
 
         return context.script._upgrade_revs(revision, rev)
 
@@ -172,18 +172,18 @@ def upgrade_all():
 def list_all():
     pkg_envs = [PackageEnvironment(l) for l in get_locations()]
     for pkg_env in pkg_envs:
-        print("{0}:".format(pkg_env.pkg_name))
+        print(f"{pkg_env.pkg_name}:")
 
         for script in pkg_env.script_dir.walk_revisions():
             print(
-                "  - {0} -> {1}: {2}".format(
+                "  - {} -> {}: {}".format(
                     script.down_revision, script.revision, script.doc
                 )
             )
 
         def current_revision(rev, context):
             rev = rev[0] if rev else None
-            print("  - current revision: {0}".format(rev))
+            print(f"  - current revision: {rev}")
             return []
 
         pkg_env.run_env(current_revision)
diff --git a/kotti/populate.py b/kotti/populate.py
index 786a58077..3445e4c04 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -45,15 +45,15 @@ def populate():
     localizer = lrm.localizer
 
     if DBSession.query(Node.id).count() == 0:
-        localized_root_attrs = dict(
-            [(k, localizer.translate(v)) for k, v in iteritems(_ROOT_ATTRS)]
-        )
+        localized_root_attrs = {
+            k: localizer.translate(v) for k, v in _ROOT_ATTRS.items()
+        }
         root = Document(**localized_root_attrs)
         root.__acl__ = SITE_ACL
         DBSession.add(root)
-        localized_about_attrs = dict(
-            [(k, localizer.translate(v)) for k, v in iteritems(_ABOUT_ATTRS)]
-        )
+        localized_about_attrs = {
+            k: localizer.translate(v) for k, v in _ABOUT_ATTRS.items()
+        }
         root["about"] = Document(**localized_about_attrs)
 
         wf = get_workflow(root)
diff --git a/kotti/request.py b/kotti/request.py
index 1d475edff..77647de69 100644
--- a/kotti/request.py
+++ b/kotti/request.py
@@ -55,4 +55,4 @@ def has_permission(
         from kotti.security import authz_context
 
         with authz_context(context, self):
-            return super(Request, self).has_permission(permission, context)
+            return super().has_permission(permission, context)
diff --git a/kotti/resources.py b/kotti/resources.py
index 2e81ce50a..464456f16 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -9,7 +9,7 @@
 """
 import datetime
 from cgi import FieldStorage
-from collections import MutableMapping
+from collections.abc import MutableMapping
 from typing import Any
 from typing import Iterable
 from typing import List
@@ -236,7 +236,7 @@ def copy(self, **kwargs) -> "LocalGroup":
         return self.__class__(**kwargs)
 
     def __repr__(self):
-        return "<{0} {1} => {2} at {3}>".format(
+        return "<{} {} => {} at {}>".format(
             self.__class__.__name__,
             self.principal_name,
             self.group_name,
@@ -311,7 +311,7 @@ def __init__(
     ):
         """Constructor"""
 
-        super(Node, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         if annotations is None:
             annotations = {}
@@ -333,7 +333,7 @@ def __parent__(self, value):
         self.parent = value
 
     def __repr__(self) -> str:
-        return "<{0} {1} at {2}>".format(
+        return "<{} {} at {}>".format(
             self.__class__.__name__, self.id, resource_path(self)
         )
 
@@ -375,7 +375,7 @@ def copy(self, **kwargs) -> "Node":
         return copy
 
 
-class TypeInfo(object):
+class TypeInfo:
     """TypeInfo instances contain information about the type of a node.
 
        You can pass arbitrary keyword arguments in the constructor, they
@@ -504,7 +504,7 @@ class Tag(Base):
     title = Column(Unicode(100), unique=True, nullable=False)
 
     def __repr__(self) -> str:
-        return "<Tag ('{0}')>".format(self.title)
+        return f"<Tag ('{self.title}')>"
 
     @property
     def items(self) -> List[Node]:
@@ -661,7 +661,7 @@ def __init__(
         **kwargs
     ):
 
-        super(Content, self).__init__(name, parent, title, annotations, **kwargs)
+        super().__init__(name, parent, title, annotations, **kwargs)
 
         self.default_view = default_view
         self.description = description
@@ -676,7 +676,7 @@ def __init__(
     def copy(self, **kwargs) -> "Content":
         # Same as `Node.copy` with additional tag support.
         kwargs["tags"] = self.tags
-        return super(Content, self).copy(**kwargs)
+        return super().copy(**kwargs)
 
 
 @implementer(IDocument, IDefaultWorkflow)
@@ -711,14 +711,14 @@ def __init__(
         self, body: Optional[str] = "", mime_type: Optional[str] = "text/html", **kwargs
     ):
 
-        super(Document, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         self.body = body
         self.mime_type = mime_type
 
 
 # noinspection PyMethodParameters
-class SaveDataMixin(object):
+class SaveDataMixin:
     """ The classmethods must not be implemented on a class that inherits
         from ``Base`` with ``SQLAlchemy>=1.0``, otherwise that class cannot be
         subclassed further.
@@ -811,7 +811,7 @@ def from_field_storage(cls, fs):
         """
 
         if not cls.type_info.is_uploadable_mimetype(fs.type):
-            raise ValueError("Unsupported MIME type: {0}".format(fs.type))
+            raise ValueError(f"Unsupported MIME type: {fs.type}")
 
         return cls(data=fs)
 
@@ -824,7 +824,7 @@ def __init__(
         **kwargs
     ) -> None:
 
-        super(SaveDataMixin, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         self.filename = filename
         self.mimetype = mimetype
@@ -836,7 +836,7 @@ def copy(self, **kwargs) -> "File":
         some special attention, because we don't want the same depot file to be
         assigned to multiple content nodes.
         """
-        _copy = super(SaveDataMixin, self).copy(**kwargs)
+        _copy = super().copy(**kwargs)
         _copy.data = self.data.file.read()
         return _copy
 
@@ -874,7 +874,7 @@ def get_root(request: Optional[Request] = None) -> Node:
     return get_settings()["kotti.root_factory"][0](request)
 
 
-class DefaultRootCache(object):
+class DefaultRootCache:
     """ Default implementation for :func:`~kotti.resources.get_root` """
 
     _id = None
@@ -928,9 +928,9 @@ def _adjust_for_engine(engine: Engine) -> None:
         # We disable the Node.path index for Mysql; in some conditions
         # the index can't be created for columns even with 767 bytes,
         # the maximum default size for column indexes
-        Node.__table__.indexes = set(
+        Node.__table__.indexes = {
             index for index in Node.__table__.indexes if index.name != "ix_nodes_path"
-        )
+        }
 
 
 def initialize_sql(engine: Engine, drop_all: bool = False) -> scoped_session:
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index 1deeabb69..34da6899f 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -114,7 +114,7 @@ def _setup_sanitizers(settings: Dict[str, Union[str, bool]]) -> None:
     # step 1: resolve sanitizer functions and make ``kotti.sanitizers`` a
     # dictionary containing resolved functions
 
-    if not isinstance(settings["kotti.sanitizers"], string_types):
+    if not isinstance(settings["kotti.sanitizers"], str):
         return
 
     sanitizers = {}
diff --git a/kotti/security.py b/kotti/security.py
index 35116fb8a..d935a74c7 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -87,7 +87,7 @@ class Principal(Base):
     last_login_date = Column(DateTime())
 
     __tablename__ = "principals"
-    __mapper_args__ = dict(order_by=name)
+    # __mapper_args__ = dict(order_by=name)
 
     def __init__(
         self,
@@ -114,10 +114,10 @@ def __init__(
         self.last_login_date = None
 
     def __repr__(self):  # pragma: no cover
-        return "<Principal {0!r}>".format(self.name)
+        return f"<Principal {self.name!r}>"
 
 
-class AbstractPrincipals(object):
+class AbstractPrincipals:
     """This class serves as documentation and defines what methods are
     expected from a Principals database.
 
@@ -243,7 +243,7 @@ def reset() -> None:
     reset_user_management_roles()
 
 
-class PersistentACLMixin(object):
+class PersistentACLMixin:
     def _get_acl(self) -> MutationList:
         if self._acl is None:
             raise AttributeError("__acl__")
@@ -276,9 +276,9 @@ def list_groups_raw(name, context):
     from kotti.resources import Node
 
     if isinstance(context, Node):
-        return set(
+        return {
             r.group_name for r in context.local_groups if r.principal_name == name
-        )
+        }
     return set()
 
 
@@ -447,7 +447,7 @@ def map_principals_with_local_roles(context: "Node"):
 
 
 def is_user(principal: Union[Principal, str]) -> bool:
-    if not isinstance(principal, string_types):
+    if not isinstance(principal, str):
         principal = principal.name
     return ":" not in principal
 
@@ -502,8 +502,7 @@ def __delitem__(self, name: str) -> None:
             raise KeyError(name)
 
     def __iter__(self) -> Iterator[str]:
-        for k in self.keys():
-            yield k
+        yield from self.keys()
 
     def __len__(self):
         return len(self.keys())
@@ -537,7 +536,7 @@ def search(self, match: Optional[str] = "any", **kwargs) -> Query:
 
         for key, value in kwargs.items():
             col = getattr(self.factory, key)
-            if isinstance(value, string_types) and "*" in value:
+            if isinstance(value, str) and "*" in value:
                 value = value.replace("*", "%").lower()
                 filters.append(func.lower(col).like(value))
             else:
diff --git a/kotti/sqla.py b/kotti/sqla.py
index 7b9f04594..e4d16f1a2 100644
--- a/kotti/sqla.py
+++ b/kotti/sqla.py
@@ -65,10 +65,10 @@ def process_bind_param(self, value, dialect):
             for ace in value:
                 if ace[2] == ALL_PERMISSIONS:
                     ace[2] = self.ALL_PERMISSIONS_SERIALIZED
-        return super(ACLType, self).process_bind_param(value, dialect)
+        return super().process_bind_param(value, dialect)
 
     def process_result_value(self, value, dialect):
-        acl = super(ACLType, self).process_result_value(value, dialect)
+        acl = super().process_result_value(value, dialect)
         if acl is not None:
             for ace in acl:
                 if ace[2] == self.ALL_PERMISSIONS_SERIALIZED:
@@ -84,7 +84,7 @@ class MutationDict(Mutable):
 
     def __init__(self, data):
         self._d = data
-        super(MutationDict, self).__init__()
+        super().__init__()
 
     @classmethod
     def coerce(cls, key, value):
@@ -112,7 +112,7 @@ class MutationList(Mutable):
 
     def __init__(self, data):
         self._d = data
-        super(MutationList, self).__init__()
+        super().__init__()
 
     @classmethod
     def coerce(cls, key, value):
@@ -178,12 +178,12 @@ def replacer(self, *args, **kwargs):
             )
 
 
-class NestedMixin(object):
+class NestedMixin:
     __parent__ = None
 
     def __init__(self, *args, **kwargs):
         self.__parent__ = kwargs.pop("__parent__", None)
-        super(NestedMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def __getitem__(self, key):
         value = self._d.__getitem__(key)
@@ -193,7 +193,7 @@ def changed(self):
         if self.__parent__ is not None:
             self.__parent__.changed()
         else:
-            super(NestedMixin, self).changed()
+            super().changed()
 
     def try_wrap(self, value):
         for typ, wrapper in MUTATION_WRAPPERS.items():
@@ -212,7 +212,7 @@ def setdefault(self, key, default):
             default = NestedMutationList(default, __parent__=self)
         elif isinstance(default, dict):
             default = NestedMutationDict(default, __parent__=self)
-        return super(NestedMutationDict, self).setdefault(key, default)
+        return super().setdefault(key, default)
 
 
 class NestedMutationList(NestedMixin, MutationList):
@@ -222,9 +222,9 @@ class NestedMutationList(NestedMixin, MutationList):
 MUTATION_WRAPPERS = {dict: NestedMutationDict, list: NestedMutationList}
 
 
-class Base(object):
+class Base:
     @declared_attr
     def __tablename__(cls):
         from kotti.util import camel_case_to_name  # prevent circ import
 
-        return "{0}s".format(camel_case_to_name(cls.__name__))
+        return "{}s".format(camel_case_to_name(cls.__name__))
diff --git a/kotti/testing.py b/kotti/testing.py
index 95470554b..dda1e68b6 100644
--- a/kotti/testing.py
+++ b/kotti/testing.py
@@ -66,7 +66,7 @@ def blank(cls, path, environ=None, base_url=None, headers=None, POST=None, **kw)
         def _decode(body):
             if not body:
                 return {}
-            return dict([(x, y) for x, y in parse_qsl(body)])
+            return {x: y for x, y in parse_qsl(body)}
 
         if POST and isinstance(POST, bytes):
             POST = POST.decode()
@@ -208,7 +208,7 @@ def tearDown(self):
 
 class EventTestBase(TestCase):
     def setUp(self, **kwargs):
-        super(EventTestBase, self).setUp(**kwargs)
+        super().setUp(**kwargs)
         self.config.include("kotti.events")
 
 
@@ -286,7 +286,7 @@ class RootFactory(dict):
     __acl__ = [("Allow", "role:admin", ALL_PERMISSIONS)]
 
     def __init__(self, request):
-        super(RootFactory, self).__init__()
+        super().__init__()
 
 
 def dummy_view(context, request):
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 15d43011b..764557ba6 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -322,7 +322,7 @@ def workflow(config):
 
 class TestStorage(MemoryFileStorage):
     def get(self, file_or_id):
-        f = super(TestStorage, self).get(file_or_id)
+        f = super().get(file_or_id)
         f.last_modified = datetime(2012, 12, 30)
         return f
 
diff --git a/kotti/tests/test_app.py b/kotti/tests/test_app.py
index b733b82b7..691a6252f 100644
--- a/kotti/tests/test_app.py
+++ b/kotti/tests/test_app.py
@@ -29,7 +29,7 @@ def test_override_settings(self, db_session):
         from kotti import main
         from kotti import get_settings
 
-        class MyType(object):
+        class MyType:
             pass
 
         def my_configurator(conf):
diff --git a/kotti/tests/test_events.py b/kotti/tests/test_events.py
index 9be36db37..87fbfa3b5 100644
--- a/kotti/tests/test_events.py
+++ b/kotti/tests/test_events.py
@@ -3,7 +3,7 @@
 from pytest import mark
 
 
-class DummyVenusian(object):
+class DummyVenusian:
     def __init__(self):
         self.attached = []
 
diff --git a/kotti/tests/test_file.py b/kotti/tests/test_file.py
index 4f4f254b9..42b5584f7 100644
--- a/kotti/tests/test_file.py
+++ b/kotti/tests/test_file.py
@@ -37,7 +37,7 @@ def test_file_views(self, params, config, filedepot, dummy_request, depot_tween)
         self._test_common_headers(res.headers)
 
         assert res.content_disposition.startswith(
-            "{0}; filename=my".format(disposition)
+            f"{disposition};filename=\"my"
         )
 
         data = asset("logo.png").read()
@@ -280,10 +280,10 @@ def utcnow():
         assert resp.headers["Expires"] == "Mon, 31 Dec 2012 13:00:10 GMT"
 
     def test_redirect(self, filedepot, dummy_request):
-        class PublicFile(object):
+        class PublicFile:
             public_url = "http://example.com"
 
-        class PublicData(object):
+        class PublicData:
             file = PublicFile()
 
         with pytest.raises(HTTPMovedPermanently) as e:
@@ -351,7 +351,7 @@ def utcnow():
         assert resp.headers["Last-Modified"] == "Sun, 30 Dec 2012 00:00:00 GMT"
 
     def test_redirect(self, filedepot, dummy_request):
-        class PublicFile(object):
+        class PublicFile:
             public_url = "http://example.com"
 
         with pytest.raises(HTTPMovedPermanently) as e:
diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
index d059dfce2..a49960992 100644
--- a/kotti/tests/test_sanitizers.py
+++ b/kotti/tests/test_sanitizers.py
@@ -34,7 +34,7 @@ def _verify_minimal_html(sanitized):
     from bleach_whitelist.bleach_whitelist import print_tags
 
     for tag in set(all_tags) - set(markdown_tags) - set(print_tags):
-        assert "<{}".format(tag) not in sanitized
+        assert f"<{tag}" not in sanitized
 
     assert 'style=""' in sanitized
     assert '<a href="http://external.com/">' in sanitized
diff --git a/kotti/tests/test_security.py b/kotti/tests/test_security.py
index 101f2ba31..55155adad 100644
--- a/kotti/tests/test_security.py
+++ b/kotti/tests/test_security.py
@@ -26,7 +26,7 @@ def test_root_default(self, db_session, root):
         from kotti.security import list_groups_raw
 
         assert list_groups("admin", root) == ["role:admin"]
-        assert list_groups_raw("admin", root) == set([])
+        assert list_groups_raw("admin", root) == set()
 
     def test_empty(self, db_session, root):
         from kotti.security import list_groups
diff --git a/kotti/tests/test_tags.py b/kotti/tests/test_tags.py
index bce61b095..447c2ee79 100644
--- a/kotti/tests/test_tags.py
+++ b/kotti/tests/test_tags.py
@@ -4,7 +4,7 @@
 from kotti.testing import DummyRequest
 
 
-class DummyContext(object):
+class DummyContext:
     view_name = "view_name"
     tags = ["tag 1", "tag 2", "tag 3"]
 
diff --git a/kotti/tests/test_upload.py b/kotti/tests/test_upload.py
index fa5e1e16e..07857bb5d 100644
--- a/kotti/tests/test_upload.py
+++ b/kotti/tests/test_upload.py
@@ -16,18 +16,18 @@ def test_upload_anonymous(root, dummy_request, browser):
 
     link = browser.getLink
 
-    browser.open("{0}/".format(BASE_URL))
+    browser.open(f"{BASE_URL}/")
 
     # There must be no Upload Link for anonymous users
     with raises(LinkNotFoundError):
         link("Upload Content").click()
 
     # Upload views must redirect to login for anonymous users
-    browser.open("{0}/upload".format(BASE_URL))
-    assert browser.url.startswith("{0}/@@login".format(BASE_URL))
+    browser.open(f"{BASE_URL}/upload")
+    assert browser.url.startswith(f"{BASE_URL}/@@login")
 
-    browser.open("{0}/content_types".format(BASE_URL))
-    assert browser.url.startswith("{0}/@@login".format(BASE_URL))
+    browser.open(f"{BASE_URL}/content_types")
+    assert browser.url.startswith(f"{BASE_URL}/@@login")
 
 
 @user("admin")
@@ -35,14 +35,14 @@ def test_upload_authenticated_wo_mimetype(root, dummy_request, browser):
 
     # cannot call content_types without mimetype
     with raises(KeyError):
-        browser.open("{0}/content_types".format(BASE_URL))
+        browser.open(f"{BASE_URL}/content_types")
 
 
 @user("admin")
 def test_upload_authenticated_text(root, dummy_request, browser):
 
     # get possible content types for text/plain
-    browser.open("{0}/content_types?mimetype=text/plain".format(BASE_URL))
+    browser.open(f"{BASE_URL}/content_types?mimetype=text/plain")
     c = browser.contents
     if isinstance(c, bytes):
         c = c.decode()
diff --git a/kotti/tests/test_util.py b/kotti/tests/test_util.py
index 5f6c1b149..6a318a6bc 100644
--- a/kotti/tests/test_util.py
+++ b/kotti/tests/test_util.py
@@ -2,7 +2,7 @@
 from mock import patch
 
 
-class TestRequestCache(object):
+class TestRequestCache:
     @property
     def cache_decorator(self):
         from kotti.util import request_cache
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index 43d2e57ce..fcd502738 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -37,7 +37,7 @@ def create_contents(root):
 
 
 @implementer(ILocation)
-class MockContext(object):
+class MockContext:
     pass
 
 
@@ -157,7 +157,7 @@ def test_contenttypefactories_with_invalid_add_link(self, config):
         from kotti.views.edit import content
         from kotti.views.edit.actions import content_type_factories
 
-        class TestContent(object):
+        class TestContent:
             type_info = default_type_info.copy(
                 name="TestContent",
                 title="Test Content",
@@ -303,7 +303,7 @@ def test_assign_to_slots(self, config, db_session, events):
 
         def foo(context, request):
             greeting = request.POST["greeting"]
-            return Response("{} world!".format(greeting))
+            return Response(f"{greeting} world!")
 
         config.add_view(foo, name="foo")
         assign_slot("foo", "left", params=dict(greeting="Y\u0153"))
@@ -369,7 +369,7 @@ def test_slot_request_has_parameters(self, config, db_session):
 
         def foo(context, request):
             bar = request.POST["bar"]
-            return Response("{} world!".format(bar))
+            return Response(f"{bar} world!")
 
         config.add_view(foo, name="foo")
         assign_slot("foo", "left", params=dict(greeting="Y\u0153"))
@@ -384,7 +384,7 @@ def test_slot_view_know_slot(self, config, db_session):
 
         def foo(context, request):
             slot = request.kotti_slot
-            return Response("I'm in slot {}.".format(slot))
+            return Response(f"I'm in slot {slot}.")
 
         config.add_view(foo, name="foo")
         assign_slot("foo", "beforebodyend")
diff --git a/kotti/tests/test_workflow.py b/kotti/tests/test_workflow.py
index b52c5d87f..e532ec2dd 100644
--- a/kotti/tests/test_workflow.py
+++ b/kotti/tests/test_workflow.py
@@ -77,7 +77,7 @@ def test_workflow_callback_event(self):
 
 
 @patch("kotti.workflow.transaction.commit")
-class TestResetWorkflow(object):
+class TestResetWorkflow:
     @staticmethod
     def call(*args, **kwargs):
         from kotti.workflow import reset_workflow
@@ -118,7 +118,7 @@ def test_it(self, commit):
                 reset_workflow.assert_called_with(purge_existing=True)
 
 
-class TestDefaultWorkflow(object):
+class TestDefaultWorkflow:
     @staticmethod
     def make_document(root):
         from kotti import DBSession
diff --git a/kotti/util.py b/kotti/util.py
index 8dff132af..2ff32dbf0 100644
--- a/kotti/util.py
+++ b/kotti/util.py
@@ -72,7 +72,7 @@ def render_view(context, request, name="", secure=True):
         return response.ubody
 
 
-class TemplateStructure(object):
+class TemplateStructure:
     def __init__(self, html):
         self.html = html
 
@@ -85,7 +85,7 @@ def __getattr__(self, key):
         return getattr(self.html, key)
 
 
-class LinkBase(object):
+class LinkBase:
     def __call__(self, context, request):
         return TemplateStructure(
             render(
@@ -178,14 +178,14 @@ def __eq__(self, other):
         return isinstance(other, Link) and repr(self) == repr(other)
 
     def __repr__(self):
-        return "Link({0}, {1})".format(self.name, self.title)
+        return f"Link({self.name}, {self.title})"
 
 
 class ActionButton(Link):
     def __init__(
         self, path, title=None, no_children=False, css_class="btn btn-default"
     ):
-        super(ActionButton, self).__init__(path, title)
+        super().__init__(path, title)
         self.no_children = no_children
         self.css_class = css_class
 
@@ -220,7 +220,7 @@ def replacement(*args, **kwargs):
                 key = compute_key(*args, **kwargs)
             except DontCache:
                 return func(*args, **kwargs)
-            key = "{0}.{1}:{2}".format(func.__module__, func.__name__, key)
+            key = f"{func.__module__}.{func.__name__}:{key}"
             cached_value = cache.get(key, marker)
             if cached_value is marker:
                 cached_value = cache[key] = func(*args, **kwargs)
diff --git a/kotti/views/__init__.py b/kotti/views/__init__.py
index a2617c076..b975a842b 100644
--- a/kotti/views/__init__.py
+++ b/kotti/views/__init__.py
@@ -1,4 +1,4 @@
-class BaseView(object):
+class BaseView:
     """ Very basic view class that can be subclassed.  Does nothing more than
     assignment of ``context`` and ``request`` to instance attributes on
     initialization. """
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index b3178bcc3..cc2364584 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -48,7 +48,7 @@ def set_max_age(response, delta, cache_ctrl=None):
         if value is None:
             cache_control_header.append(key)
         else:
-            cache_control_header.append("{0}={1}".format(key, value))
+            cache_control_header.append(f"{key}={value}")
     cache_control_header = ",".join(cache_control_header)
     response.headers["cache-control"] = cache_control_header
 
@@ -116,7 +116,7 @@ def set_cache_headers(event):
         except:
             # We don't want to screw up the response if the
             # caching_policy_chooser raises an exception.
-            logger.exception("{0} raised an exception.".format(caching_policy_chooser))
+            logger.exception(f"{caching_policy_chooser} raised an exception.")
     if caching_policy is not None:
         response.headers[CACHE_POLICY_HEADER] = caching_policy
 
diff --git a/kotti/views/edit/__init__.py b/kotti/views/edit/__init__.py
index 316329845..49b11d855 100644
--- a/kotti/views/edit/__init__.py
+++ b/kotti/views/edit/__init__.py
@@ -40,7 +40,7 @@ def _state_info(context, request):
 
 def _states(context, request):
     state_info = _state_info(context, request)
-    return dict([(i["name"], i) for i in state_info])
+    return {i["name"]: i for i in state_info}
 
 
 # noinspection PyUnusedLocal
diff --git a/kotti/views/edit/actions.py b/kotti/views/edit/actions.py
index 5d87e70ed..79ce9ba57 100644
--- a/kotti/views/edit/actions.py
+++ b/kotti/views/edit/actions.py
@@ -24,7 +24,7 @@
 
 
 @view_defaults(permission="edit")
-class NodeActions(object):
+class NodeActions:
     """Actions related to content nodes."""
 
     def __init__(self, context, request):
diff --git a/kotti/views/edit/content.py b/kotti/views/edit/content.py
index 118653da7..66bf7af38 100644
--- a/kotti/views/edit/content.py
+++ b/kotti/views/edit/content.py
@@ -90,7 +90,7 @@ def schema_factory(self):
     def save_success(self, appstruct):
         if not appstruct["title"]:
             appstruct["title"] = appstruct["file"]["filename"]
-        return super(FileAddForm, self).save_success(appstruct)
+        return super().save_success(appstruct)
 
     def add(self, **appstruct):
         filename = appstruct["file"]["filename"]
diff --git a/kotti/views/edit/default_views.py b/kotti/views/edit/default_views.py
index 16529f872..d4f13b9fd 100644
--- a/kotti/views/edit/default_views.py
+++ b/kotti/views/edit/default_views.py
@@ -16,7 +16,7 @@
 
 
 @view_defaults(permission="edit")
-class DefaultViewSelection(object):
+class DefaultViewSelection:
     def __init__(self, context, request):
 
         self.context = context
@@ -77,7 +77,7 @@ def default_view_selector(self):
                 )
             else:
                 warnings.warn(
-                    "No view called '{0}' is registered for {1!r}.".format(
+                    "No view called '{}' is registered for {!r}.".format(
                         name, self.context
                     )
                 )
diff --git a/kotti/views/edit/upload.py b/kotti/views/edit/upload.py
index a63c1f8ce..166d0d6e7 100644
--- a/kotti/views/edit/upload.py
+++ b/kotti/views/edit/upload.py
@@ -17,7 +17,7 @@
 
 
 @view_defaults(name="upload", context="kotti.resources.Content", permission="edit")
-class UploadView(object):
+class UploadView:
     def __init__(self, context, request):
         """ Constructor.
 
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 5138173da..14d850a91 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -63,7 +63,7 @@ class Form(deform.Form):
     def render(self, appstruct=None, readonly=False):
         if appstruct is None:
             appstruct = getattr(self, "appstruct", colander.null)
-        return super(Form, self).render(appstruct, readonly=readonly)
+        return super().render(appstruct, readonly=readonly)
 
 
 class BaseFormView(FormView):
@@ -78,7 +78,7 @@ class BaseFormView(FormView):
     add_template_vars = ()
 
     def __init__(self, context, request, **kwargs):
-        super(BaseFormView, self).__init__(request)
+        super().__init__(request)
         self.context = context
         self.__dict__.update(kwargs)
 
@@ -87,7 +87,7 @@ def __call__(self):
             self.schema = self.schema_factory()
         if self.use_csrf_token and "csrf_token" not in self.schema:
             self.schema.children.append(CSRFSchema()["csrf_token"])
-        result = super(BaseFormView, self).__call__()
+        result = super().__call__()
         if isinstance(result, dict):
             result.update(self.more_template_vars())
         return result
@@ -196,7 +196,7 @@ def first_heading(self):
 
 class CommaSeparatedListWidget(deform.widget.Widget):
     def __init__(self, template=None, **kw):
-        super(CommaSeparatedListWidget, self).__init__(**kw)
+        super().__init__(**kw)
         self.template = template
 
     def serialize(self, field, cstruct, readonly=False):
diff --git a/kotti/views/slots.py b/kotti/views/slots.py
index 956d9432a..06f38133f 100644
--- a/kotti/views/slots.py
+++ b/kotti/views/slots.py
@@ -54,7 +54,7 @@ def view(request, context):
 def _encode(params):
     if not params:
         return ""
-    return urlencode(dict((k, v.encode("utf-8")) for k, v in params.items()))
+    return urlencode({k: v.encode("utf-8") for k, v in params.items()})
 
 
 def _render_view_on_slot_event(view_name, event, params):
@@ -62,7 +62,7 @@ def _render_view_on_slot_event(view_name, event, params):
     request = event.request
 
     view_request = request.__class__.blank(
-        "{0}/{1}".format(request.path.rstrip("/"), view_name),
+        "{}/{}".format(request.path.rstrip("/"), view_name),
         base_url=request.application_url,
         POST=_encode(params),
     )
@@ -101,7 +101,7 @@ def assign_slot(view_name, slot, params=None):
 
     event = [e for e in slot_events if e.name == slot]
     if not event:
-        raise KeyError("Unknown slot '{0}'".format(slot))
+        raise KeyError(f"Unknown slot '{slot}'")
     objectevent_listeners[(event[0], None)].append(
         lambda ev: _render_view_on_slot_event(view_name, ev, params)
     )
diff --git a/kotti/views/users.py b/kotti/views/users.py
index fe6c11840..0f914e950 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -47,7 +47,7 @@ def roles_form_handler(context, request, available_role_names, groups_lister):
                     raise Forbidden()
                 new_value = bool(
                     request.params.get(
-                        "role::{0}::{1}".format(principal_name, role_name)
+                        f"role::{principal_name}::{role_name}"
                     )
                 )
                 if principal_name not in p_to_r:
@@ -58,9 +58,9 @@ def roles_form_handler(context, request, available_role_names, groups_lister):
         for principal_name, new_role_names in p_to_r.items():
             # We have to be careful with roles that aren't mutable here:
             orig_role_names = set(groups_lister(principal_name, context))
-            orig_sharing_role_names = set(
+            orig_sharing_role_names = {
                 r for r in orig_role_names if r in available_role_names
-            )
+            }
             if new_role_names != orig_sharing_role_names:
                 final_role_names = orig_role_names - set(available_role_names)
                 final_role_names |= new_role_names
@@ -93,9 +93,9 @@ def search_principals(request, context=None, ignore=None, extra=()):
         postdata = request.json
     if "search" in postdata:
         if request.is_xhr:
-            query = "*{0}*".format(postdata["query"])
+            query = "*{}*".format(postdata["query"])
         else:
-            query = "*{0}*".format(request.params["query"])
+            query = "*{}*".format(request.params["query"])
         found = False
         for p in principals.search(name=query, title=query, email=query):
             found = True
@@ -128,7 +128,7 @@ def with_roles(entry):
         return len([g for g in all_groups if g.startswith("role:")]) > 0
 
     existing = [e for e in filter(with_roles, existing)]
-    seen = set([entry[0].name for entry in existing])
+    seen = {entry[0].name for entry in existing}
 
     # Allow search to take place and add some entries:
     entries = list(existing) + search_principals(request, context, ignore=seen)
@@ -261,7 +261,7 @@ def principal_schema(base=PrincipalFull()):
         all_groups = []
         for p in principals.search(name="group:*"):
             value = p.name.split("group:")[1]
-            label = "{0}, {1}".format(p.title, value)
+            label = f"{p.title}, {value}"
             all_groups.append(dict(value=value, label=label))
         schema["groups"]["group"].widget.values = all_groups
         schema["roles"].widget.values = [
@@ -305,7 +305,7 @@ def _massage_groups_in(appstruct):
     """
     groups = appstruct.get("groups", [])
     all_groups = list(appstruct.get("roles", [])) + [
-        "group:{0}".format(g) for g in groups if g
+        f"group:{g}" for g in groups if g
     ]
     if "roles" in appstruct:
         del appstruct["roles"]
@@ -375,7 +375,7 @@ def schema_factory():
         return schema
 
     def add_group_success(self, appstruct):
-        appstruct["name"] = "group:{0}".format(appstruct["name"].lower())
+        appstruct["name"] = "group:{}".format(appstruct["name"].lower())
         return self.add_user_success(appstruct)
 
 
@@ -391,7 +391,7 @@ class UsersManage(FormView):
     GroupAddFormView = GroupAddFormView
 
     def __init__(self, context, request):
-        super(UsersManage, self).__init__(request)
+        super().__init__(request)
         self.context = context
 
     def __call__(self):
@@ -422,7 +422,7 @@ def groups_lister(principal_name, context):
             return HTTPFound(location=location)
 
         extra = self.request.params.get("extra") or ()
-        if isinstance(extra, string_types):
+        if isinstance(extra, str):
             extra = extra.split(",")
         search_entries = search_principals(self.request, extra=extra)
         available_roles = [ROLES[role_name] for role_name in USER_MANAGEMENT_ROLES]
@@ -488,17 +488,17 @@ def save_success(self, appstruct):
         else:
             appstruct.pop("password", None)
         _massage_groups_in(appstruct)
-        return super(UserManageFormView, self).save_success(appstruct)
+        return super().save_success(appstruct)
 
     def cancel_success(self, appstruct):
         self.request.session.flash(_("No changes were made."), "info")
-        location = "{0}/@@setup-users".format(self.request.application_url)
+        location = f"{self.request.application_url}/@@setup-users"
         return HTTPFound(location=location)
 
     cancel_failure = cancel_success
 
     def delete_success(self, appstruct):
-        location = "{0}/@@delete-user?name={1}".format(
+        location = "{}/@@delete-user?name={}".format(
             self.request.application_url, self.request.params["name"]
         )
         return HTTPFound(location=location)
@@ -525,7 +525,7 @@ class UserManage(FormView):
     UserManageFormView = UserManageFormView
 
     def __init__(self, context, request):
-        super(UserManage, self).__init__(request)
+        super().__init__(request)
         self.context = context
 
     def __call__(self):
@@ -585,7 +585,7 @@ def user_delete(context, request):
                     ),
                     "info",
                 )
-                location = "{0}/@@setup-users".format(request.application_url)
+                location = f"{request.application_url}/@@setup-users"
                 return HTTPFound(location=location)
 
             api = template_api(
@@ -621,7 +621,7 @@ class Preferences(FormView):
     PreferencesFormView = PreferencesFormView
 
     def __init__(self, context, request):
-        super(Preferences, self).__init__(request)
+        super().__init__(request)
         self.context = context
 
     def __call__(self):
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 5e34a3e5b..98565ba38 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -36,14 +36,14 @@
 from kotti.views.slots import slot_events
 
 
-class SettingHasValuePredicate(object):
+class SettingHasValuePredicate:
     def __init__(self, val, config):
         self.name, self.value = val
         if not isinstance(self.value, bool):
             raise ValueError("Only boolean values supported")
 
     def text(self):
-        return "if_setting_has_value = {0} == {1}".format(self.name, self.value)
+        return f"if_setting_has_value = {self.name} == {self.value}"
 
     phash = text
 
@@ -51,12 +51,12 @@ def __call__(self, context, request):
         return asbool(request.registry.settings[self.name]) == self.value
 
 
-class RootOnlyPredicate(object):
+class RootOnlyPredicate:
     def __init__(self, val, config):
         self.val = val
 
     def text(self):
-        return "root_only = {0}".format(self.val)
+        return f"root_only = {self.val}"
 
     phash = text
 
@@ -77,7 +77,7 @@ def add_renderer_globals(event):
         event["api"] = api
 
 
-class Slots(object):
+class Slots:
     def __init__(self, context, request):
         self.context = context
         self.request = request
@@ -100,7 +100,7 @@ def __getattr__(self, key):
         return value
 
 
-class TemplateAPI(object):
+class TemplateAPI:
     """This implements the ``api`` object that's passed to all templates.
 
     Use dict-access as a shortcut to retrieve template macros from templates.
@@ -187,7 +187,7 @@ def page_title(self):
         if view_title:
             view_title += " "
         view_title += self.context.title
-        return "{0} - {1}".format(view_title, self.site_title)
+        return f"{view_title} - {self.site_title}"
 
     def url(self, context=None, *elements, **kwargs):
         """
@@ -307,7 +307,7 @@ def avatar_url(self, user=None, size="14", default_image="identicon"):
             email = user.name
         h = hashlib.md5(email.encode("utf8")).hexdigest()
         query = {"default": default_image, "size": str(size)}
-        url = "https://secure.gravatar.com/avatar/{0}?{1}".format(h, urlencode(query))
+        url = "https://secure.gravatar.com/avatar/{}?{}".format(h, urlencode(query))
         return url
 
     @reify
@@ -379,7 +379,7 @@ def sanitize(html, sanitizer="default"):
         return sanitize(html, sanitizer)
 
 
-class NodesTree(object):
+class NodesTree:
     def __init__(self, node, request, item_mapping, item_to_children, permission):
         self._node = node
         self._request = request
@@ -410,8 +410,7 @@ def _flatten(self, item):
         # noinspection PyProtectedMember
         yield item._node
         for ch in item.children:
-            for item in self._flatten(ch):
-                yield item
+            yield from self._flatten(ch)
 
     def tolist(self):
         return list(self._flatten(self))
@@ -446,7 +445,7 @@ def search_content(search_term, request=None):
 def default_search_content(search_term, request=None):
 
     # noinspection PyUnresolvedReferences
-    searchstring = "%{0}%".format(search_term)
+    searchstring = f"%{search_term}%"
 
     # generic_filter can be applied to all Node (and subclassed) objects
     generic_filter = or_(
diff --git a/kotti/views/view.py b/kotti/views/view.py
index 543df049a..c7755a3b5 100644
--- a/kotti/views/view.py
+++ b/kotti/views/view.py
@@ -24,7 +24,7 @@ def view_content_default(context, request):
     response = render_view_to_response(context, request, name=view_name)
     if response is None:  # pragma: no cover
         warnings.warn(
-            "Failed to look up default view called {0!r} for {1!r}.".format(
+            "Failed to look up default view called {!r} for {!r}.".format(
                 view_name, context
             )
         )
diff --git a/kotti/workflow.py b/kotti/workflow.py
index e644ff55c..dcb7f13f9 100644
--- a/kotti/workflow.py
+++ b/kotti/workflow.py
@@ -12,7 +12,7 @@
 
 class WorkflowTransition(ObjectEvent):
     def __init__(self, obj, info, **kwargs):
-        super(WorkflowTransition, self).__init__(obj, **kwargs)
+        super().__init__(obj, **kwargs)
         self.info = info
 
 
diff --git a/requirements.txt b/requirements.txt
index 23b1cbcdc..62d5cd4cd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,18 +1,19 @@
-alembic==1.0.11
+alembic==1.3.3
 appdirs==1.4.3
-Babel==2.7.0
-Beaker==1.10.1
+Babel==2.8.0
+Beaker==1.11.0
 bleach==3.1.0
 bleach-whitelist==0.0.10
 Chameleon==3.6.2
+Click==7.0
 colander==1.7.0
-deform==2.0.7
+deform==2.0.8
 docopt==0.6.2
 fanstatic==1.1
-filedepot==0.6.0
+filedepot==0.7.1
 FormEncode==2.0.0a1
-html2text==2018.1.9
-hupper==1.8.1
+html2text==2020.1.16
+hupper==1.9.1
 iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
@@ -32,8 +33,8 @@ js.modernizr==2.5.3.1
 js.select2==4.0.4.post1
 js.tinymce==4.5.4
 LEPL==5.1.3
-lingua==4.13
-Mako==1.0.12
+lingua==4.14
+Mako==1.1.1
 MarkupSafe==1.1.1
 PasteDeploy==2.0.1
 peppercorn==0.6
@@ -46,36 +47,35 @@ pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.15.1
-pyramid-tm==2.2.1
+pyramid-tm==2.4
 pyramid-zcml==1.2.0
-python-dateutil==2.8.0
+python-dateutil==2.8.1
 python-editor==1.0.4
-pytz==2019.1
+pytz==2019.3
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.0b1
 repoze.zcml==1.0b1
-rfc6266-parser==0.0.5.post2
 shutilwhich==1.1.0
-six==1.12.0
-SQLAlchemy==1.3.5
-SQLAlchemy-Utils==0.34.0
-transaction==2.4.0
+six==1.14.0
+SQLAlchemy==1.3.13
+SQLAlchemy-Utils==0.36.1
+transaction==3.0.0
 translationstring==1.3
 Unidecode==1.1.1
 usersettings==1.0.7
-venusian==1.2.0
-waitress==1.3.0
+venusian==3.0.0
+waitress==1.4.2
 webencodings==0.5.1
-WebOb==1.8.5
-zope.component==4.5
+WebOb==1.8.6
+zope.component==4.6
 zope.configuration==4.3.1
-zope.deferredimport==4.3
+zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
 zope.event==4.4
-zope.hookable==4.2.0
-zope.i18nmessageid==4.3.1
-zope.interface==4.6.0
-zope.proxy==4.3.1
+zope.hookable==5.0.0
+zope.i18nmessageid==5.0.0
+zope.interface==4.7.1
+zope.proxy==4.3.3
 zope.schema==4.9.3
-zope.sqlalchemy==1.1
+zope.sqlalchemy==1.2
diff --git a/setup.py b/setup.py
index 17880dc36..6f336c7b2 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,6 @@
     'repoze.lru',
     'repoze.workflow>=1.0b1',
     'repoze.zcml>=1.0b1',
-    'rfc6266-parser',
     'sqlalchemy>=1.0.0',
     'sqlalchemy-utils',
     'transaction>=1.1.0',
@@ -143,9 +142,9 @@ def read(*parts):
           'Programming Language :: Python',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3 :: Only',
-          'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: Implementation',
           'Programming Language :: Python :: Implementation :: CPython',
           # 'Programming Language :: Python :: Implementation :: PyPy',
diff --git a/tox.ini b/tox.ini
index 71b3203c7..dbf543fc5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
-envlist = {py35,py36,p37}-{postgresql,sqlite,mysql}
+envlist = {py36,py37,p38}-{postgresql,sqlite,mysql}
 
 [testenv]
 deps =
     postgresql: psycopg2
     mysql: mysqlclient
 envdir:
-    py35: {toxworkdir}/3.5
     py36: {toxworkdir}/3.6
     py37: {toxworkdir}/3.7
+    py38: {toxworkdir}/3.8
 setenv:
     sqlite: KOTTI_TEST_DB_STRING=sqlite://
     py35-mysql: KOTTI_TEST_DB_STRING=mysql://root@localhost:3306/kotti_testing

From 3c65dfe27b46ddc2f9e58290d4e7828e2ea4add8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 29 Jan 2020 09:05:00 +0100
Subject: [PATCH 540/600] Fix deprecated import.

---
 kotti/security.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotti/security.py b/kotti/security.py
index d935a74c7..0db17d3c8 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -1,4 +1,4 @@
-from collections import MutableMapping
+from collections.abc import MutableMapping
 from contextlib import contextmanager
 from datetime import datetime
 from typing import Dict

From b03c029be66b1162803fa334d84a346adeb52211 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 29 Jan 2020 10:01:59 +0100
Subject: [PATCH 541/600] Remove ``six`` dependency.

---
 kotti/message.py     |  2 +-
 kotti/migrate.py     |  4 ++--
 kotti/populate.py    |  1 -
 kotti/resources.py   | 14 +++++++-------
 kotti/sanitizers.py  |  1 -
 kotti/security.py    |  1 -
 kotti/views/users.py |  4 ++--
 kotti/views/util.py  |  3 ++-
 8 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/kotti/message.py b/kotti/message.py
index 0a7a4c215..0491359c6 100644
--- a/kotti/message.py
+++ b/kotti/message.py
@@ -1,10 +1,10 @@
+import hashlib
 import time
 from typing import Dict
 from typing import List
 from typing import Optional
 from urllib.parse import urlencode
 
-import hashlib
 from html2text import HTML2Text
 from pyramid.renderers import render
 from pyramid_mailer.mailer import Mailer
diff --git a/kotti/migrate.py b/kotti/migrate.py
index ac7475725..8bd0752b7 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -39,6 +39,8 @@ def kotti_configure(settings):
 'stamp_heads' will then include the add-on.
 """
 import os
+from typing import Callable
+from typing import List
 
 import pkg_resources
 from alembic.config import Config
@@ -52,8 +54,6 @@ def kotti_configure(settings):
 from kotti import get_settings
 from kotti.util import command
 
-from typing import Callable, List
-
 KOTTI_SCRIPT_DIR = pkg_resources.resource_filename("kotti", "alembic")
 DEFAULT_LOCATION = "kotti:alembic"
 
diff --git a/kotti/populate.py b/kotti/populate.py
index 3445e4c04..9c5aed594 100644
--- a/kotti/populate.py
+++ b/kotti/populate.py
@@ -5,7 +5,6 @@
 
 from pyramid.i18n import LocalizerRequestMixin
 from pyramid.threadlocal import get_current_registry
-from six import iteritems
 
 from kotti import get_settings
 from kotti.resources import DBSession
diff --git a/kotti/resources.py b/kotti/resources.py
index 464456f16..3341bf992 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -7,25 +7,25 @@
 
 .. inheritance-diagram:: kotti.resources
 """
+import abc
 import datetime
+import os
+import warnings
 from cgi import FieldStorage
 from collections.abc import MutableMapping
+from copy import copy
+from fnmatch import fnmatch
+from io import BufferedReader
+from io import BytesIO
 from typing import Any
 from typing import Iterable
 from typing import List
 from typing import Optional
 from typing import Union
 
-import abc
-import os
-import warnings
-from copy import copy
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.sqlalchemy import _SQLAMutationTracker
 from depot.fields.upload import UploadedFile
-from fnmatch import fnmatch
-from io import BufferedReader
-from io import BytesIO
 from pyramid.decorator import reify
 from pyramid.traversal import resource_path
 from sqlalchemy import Boolean
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index 34da6899f..aa819a9ef 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -13,7 +13,6 @@
 from bleach_whitelist.bleach_whitelist import print_tags
 from pyramid.config import Configurator
 from pyramid.util import DottedNameResolver
-from six import string_types
 
 from kotti import get_settings
 from kotti.events import ObjectInsert
diff --git a/kotti/security.py b/kotti/security.py
index 0db17d3c8..d04d019ee 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -14,7 +14,6 @@
 from pyramid.location import lineage
 from pyramid.security import PermitsResult
 from pyramid.security import view_execution_permitted
-from six import string_types
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime
diff --git a/kotti/views/users.py b/kotti/views/users.py
index 0f914e950..8a5d81d03 100644
--- a/kotti/views/users.py
+++ b/kotti/views/users.py
@@ -9,10 +9,10 @@
 from deform.widget import CheckedPasswordWidget
 from deform.widget import SequenceWidget
 from pyramid.exceptions import Forbidden
-from pyramid.httpexceptions import HTTPFound, HTTPBadRequest
+from pyramid.httpexceptions import HTTPBadRequest
+from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from pyramid_deform import FormView
-from six import string_types
 
 from kotti.events import UserDeleted
 from kotti.events import notify
diff --git a/kotti/views/util.py b/kotti/views/util.py
index 98565ba38..bda202910 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -23,8 +23,9 @@
 from kotti import get_settings
 from kotti.events import objectevent_listeners
 from kotti.interfaces import INavigationRoot
-from kotti.resources import Content, Node
+from kotti.resources import Content
 from kotti.resources import Document
+from kotti.resources import Node
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
 from kotti.resources import get_root

From c163f3d58e69816710f49a4170c58d3eb1391e00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2020 08:15:42 +0100
Subject: [PATCH 542/600] Bump waitress from 1.4.2 to 1.4.3 (#571)

Bumps [waitress](https://github.com/Pylons/waitress) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/Pylons/waitress/releases)
- [Changelog](https://github.com/Pylons/waitress/blob/master/CHANGES.txt)
- [Commits](https://github.com/Pylons/waitress/compare/v1.4.2...v1.4.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 62d5cd4cd..0898249e5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -65,7 +65,7 @@ translationstring==1.3
 Unidecode==1.1.1
 usersettings==1.0.7
 venusian==3.0.0
-waitress==1.4.2
+waitress==1.4.3
 webencodings==0.5.1
 WebOb==1.8.6
 zope.component==4.6

From 12065030afdd5e1f3e5e39b31897e3eef72923f8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Fri, 19 Jun 2020 12:57:52 +0200
Subject: [PATCH 543/600] Update requirements.

---
 CHANGES.txt         |  2 ++
 kotti/views/form.py |  2 +-
 requirements.txt    | 45 +++++++++++++++++++++++----------------------
 setup.py            |  2 +-
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 70e332987..5049edbf3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,8 @@
 Change History
 ==============
 
+- Upgrade ``requirements.txt``.  [fixes #576]
+
 - Remove CircleCI
 
 - Fix broken tags widget (#562).
diff --git a/kotti/views/form.py b/kotti/views/form.py
index 14d850a91..4bac62cac 100644
--- a/kotti/views/form.py
+++ b/kotti/views/form.py
@@ -7,7 +7,7 @@
 .. inheritance-diagram:: kotti.views.form
 """
 
-from collections import MutableMapping
+from collections.abc import MutableMapping
 from io import BytesIO
 
 import colander
diff --git a/requirements.txt b/requirements.txt
index 0898249e5..e2d4b45f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
-alembic==1.3.3
-appdirs==1.4.3
+alembic==1.4.2
+appdirs==1.4.4
 Babel==2.8.0
 Beaker==1.11.0
-bleach==3.1.0
+bleach==3.1.5
 bleach-whitelist==0.0.10
-Chameleon==3.6.2
-Click==7.0
+Chameleon==3.7.4
+click==7.1.2
 colander==1.7.0
 deform==2.0.8
 docopt==0.6.2
@@ -13,7 +13,7 @@ fanstatic==1.1
 filedepot==0.7.1
 FormEncode==2.0.0a1
 html2text==2020.1.16
-hupper==1.9.1
+hupper==1.10.2
 iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
@@ -32,16 +32,17 @@ js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==4.0.4.post1
 js.tinymce==4.5.4
-LEPL==5.1.3
 lingua==4.14
-Mako==1.1.1
+Mako==1.1.3
 MarkupSafe==1.1.1
-PasteDeploy==2.0.1
+packaging==20.4
+PasteDeploy==2.1.0
 peppercorn==0.6
 plaster==1.0
 plaster-pastedeploy==0.7
 polib==1.1.0
 py-bcrypt==0.4
+pyparsing==2.4.7
 pyramid==1.10.4
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
@@ -51,31 +52,31 @@ pyramid-tm==2.4
 pyramid-zcml==1.2.0
 python-dateutil==2.8.1
 python-editor==1.0.4
-pytz==2019.3
+pytz==2020.1
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 shutilwhich==1.1.0
-six==1.14.0
-SQLAlchemy==1.3.13
-SQLAlchemy-Utils==0.36.1
+six==1.15.0
+SQLAlchemy==1.3.17
+SQLAlchemy-Utils==0.36.6
 transaction==3.0.0
 translationstring==1.3
 Unidecode==1.1.1
 usersettings==1.0.7
 venusian==3.0.0
-waitress==1.4.3
+waitress==1.4.4
 webencodings==0.5.1
 WebOb==1.8.6
-zope.component==4.6
-zope.configuration==4.3.1
+zope.component==4.6.1
+zope.configuration==4.4.0
 zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
 zope.event==4.4
-zope.hookable==5.0.0
-zope.i18nmessageid==5.0.0
-zope.interface==4.7.1
-zope.proxy==4.3.3
-zope.schema==4.9.3
-zope.sqlalchemy==1.2
+zope.hookable==5.0.1
+zope.i18nmessageid==5.0.1
+zope.interface==5.1.0
+zope.proxy==4.3.5
+zope.schema==6.0.0
+zope.sqlalchemy==1.3
diff --git a/setup.py b/setup.py
index 6f336c7b2..bc5a2d542 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'alembic>=0.8.0',
-    'bleach>=2.1.4',  # https://nvd.nist.gov/vuln/detail/CVE-2018-7753
+    'bleach>=3.1.4',
     'bleach-whitelist',
     'colander>=1.3.2',
     'deform>=2.0.5',  # fixes file upload on py3 - uncomment after 2.0.5 is released  # noqa

From b6ef84eba3ca78c34aa173b4a59b05f5e029255a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Fri, 19 Jun 2020 13:08:24 +0200
Subject: [PATCH 544/600] Try to fix broken TravisCI (before we move to Github
 actions, maybe?)

---
 .travis.yml | 2 +-
 setup.py    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cbf8b9e19..a3137be50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
+os: linux
 dist: xenial
 services:
   - mysql
   - postgresql
 language: python
-sudo: false
 cache:
   directories:
     - $HOME/.cache/pip
diff --git a/setup.py b/setup.py
index bc5a2d542..23942f20a 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@
     'Pillow',  # thumbnail filter in depot tween tests
     'py>=1.4.29',
     'pyquery',
-    'pytest<5',  # see #563
+    'pytest>=4.6<5',  # see #563
     'pytest-cov',
     'pytest-pep8>=1.0.6',
     'pytest-travis-fold',
@@ -92,7 +92,7 @@
     'repoze.sphinx.autointerface',
     'sphinx_rtd_theme',
     'setuptools-git',  # needed to make "python setup.py install" on rtd.
-    'pytest',  # needed for kotti.testing apidocs
+    'pytest>=4.6<5',  # needed for kotti.testing apidocs
     ]
 
 setup_requires = [

From 858e67435544448300e92835784aa490d749db02 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Fri, 19 Jun 2020 13:14:42 +0200
Subject: [PATCH 545/600] Fix wrong version range spec.

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 23942f20a..b895850c6 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@
     'Pillow',  # thumbnail filter in depot tween tests
     'py>=1.4.29',
     'pyquery',
-    'pytest>=4.6<5',  # see #563
+    'pytest>=4.6,<5',  # see #563
     'pytest-cov',
     'pytest-pep8>=1.0.6',
     'pytest-travis-fold',
@@ -92,7 +92,7 @@
     'repoze.sphinx.autointerface',
     'sphinx_rtd_theme',
     'setuptools-git',  # needed to make "python setup.py install" on rtd.
-    'pytest>=4.6<5',  # needed for kotti.testing apidocs
+    'pytest>=4.6,<5',  # needed for kotti.testing apidocs
     ]
 
 setup_requires = [

From 75cca90b2a91fa1e39fefb09d1222f8074b83bdf Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Mon, 22 Jun 2020 15:32:02 +0200
Subject: [PATCH 546/600] Refactor functional tests.

---
 kotti/tests/test_functional.py | 365 +++++++++++++++++++++++----------
 kotti/tests/test_util_views.py |   7 +
 kotti/views/cache.py           |   2 +-
 tox.ini                        |   2 +-
 4 files changed, 262 insertions(+), 114 deletions(-)

diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
index 67ae05c18..3dbfc5cb1 100644
--- a/kotti/tests/test_functional.py
+++ b/kotti/tests/test_functional.py
@@ -58,7 +58,6 @@ def test_view_uploaded_file(self, browser, filedepot):
 
     @user("admin")
     def test_tempstorage(self, app, filedepot, browser):
-
         # 1. upload a file
         browser.open(BASE_URL + "/@@add_file")
         self.add_file(browser, contents=b"DEF")
@@ -374,97 +373,51 @@ def test_content_management(self, webtest):
         assert "Grandchild was deleted" in resp.text
         assert resp.request.path == "/second-child/"
 
-        # Copy and paste
-        resp = app.get("/second-child/")
-        resp = resp.click("Cut", index=0).maybe_follow()
-        assert "Second Child was cut" in resp.text
-        resp = app.get("/child-one/")
-        resp = resp.click("Paste", index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.text
-        app.get("/second-child/", status=404)
-        resp = app.get("/child-one/second-child/")
-        resp = resp.click("Copy", index=0).maybe_follow()
-        assert "Second Child was copied" in resp.text
-        resp = app.get("/")
-        resp = resp.click("Paste", index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.text
+    @pytest.mark.user("admin")
+    def test_view_actions(self, webtest):
 
-        # We can paste twice since we copied:
-        resp = app.get("/")
-        resp = resp.click("Paste", index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.text
-        resp = app.get("/second-child/")
-        assert "Second Child" in resp.text
-        resp = app.get("/second-child-1/")
-        assert "Second Child" in resp.text
+        from kotti.resources import Document
+        from kotti.resources import File
+
+        save_addable_document = Document.type_info.addable_to
+        save_addable_file = File.type_info.addable_to
+
+        app = webtest.app
+
+        def _add_document(resp, title):
+            resp = resp.click("Document", index=0)
+            form = resp.forms["deform"]
+            form["title"] = title
+            resp = form.submit("save").maybe_follow()
+            return resp
+
+        # Add some documents
 
-        # We can also copy and paste items that contain children,
-        # like the whole site:
         resp = app.get("/")
-        resp = resp.click("Copy", index=0).maybe_follow()
-        assert "Welcome to Kotti was copied" in resp.text
-        resp = app.get("/second-child/")
-        resp = resp.click("Paste", index=0).maybe_follow()
-        assert "Welcome to Kotti was pasted" in resp.text
-        resp = app.get("/second-child/welcome-to-kotti/")
-        assert resp.status_code == 200
-        resp = app.get("/second-child/welcome-to-kotti/second-child/")
-        assert resp.status_code == 200
 
-        # And finally cut and paste a tree:
-        resp = app.get("/second-child/")
-        resp.click("Cut", index=0).maybe_follow()
-        resp = app.get("/child-one/second-child/")
-        resp = resp.click("Paste", index=0).maybe_follow()
-        assert "Second Child was pasted" in resp.text
-        app.get("/second-child/", status=404)
+        resp = _add_document(resp, "Child One")
+        assert resp.request.path == "/child-one/"
 
-        # Note how we can't cut and paste an item into itself:
-        resp = app.get("/child-one/")
-        resp.click("Cut", index=0).maybe_follow()
-        with pytest.raises(IndexError):
-            resp.click("Paste", index=0).maybe_follow()
-        resp = app.get("/child-one/second-child/")
-        with pytest.raises(IndexError):
-            resp.click("Paste", index=0).maybe_follow()
+        resp = _add_document(resp, "Child One One")
+        assert resp.request.path == "/child-one/child-one-one/"
 
-        # Whether we can paste or not also depends on the
-        # ``type_info.addable`` property:
         resp = app.get("/child-one/")
-        resp.click("Copy", index=0).maybe_follow()
-        resp = app.get("/child-one/second-child/")
-        resp.click("Paste", index=0).maybe_follow()
-        try:
-            Document.type_info.addable_to = ()
-            resp = app.get("/child-one/second-child/")
-            with pytest.raises(IndexError):
-                resp.click("Paste", index=0).maybe_follow()
-        finally:
-            Document.type_info.addable_to = save_addable_document
 
-        # You can't cut the root of a site:
-        resp = app.get("/child-one/")
-        resp.click("Cut", index=0)
+        resp = _add_document(resp, "Child One Two")
+        assert resp.request.path == "/child-one/child-one-two/"
+
         resp = app.get("/")
-        with pytest.raises(IndexError):
-            resp.click("Cut", index=0)
 
-        # We can rename an item. Slashes will be stripped out.:
-        resp = app.get("/child-one/second-child/")
-        resp = resp.click("Rename", index=0)
-        form = resp.forms["form-rename"]
-        assert form["name"].value == "second-child"
-        assert form["title"].value == "Second Child"
-        form["name"] = "thi/rd-ch/ild"
-        form["title"] = "My Third Child"
-        resp = form.submit("rename").maybe_follow()
-        assert "Item was renamed" in resp.text
-        assert resp.request.path == "/child-one/third-child/"
+        resp = _add_document(resp, "Child Two")
+        assert resp.request.path == "/child-two/"
 
-        # We cannot rename the root:
-        resp = app.get("/")
-        with pytest.raises(IndexError):
-            resp.click("Rename", index=0)
+        resp = _add_document(resp, "Child Two One")
+        assert resp.request.path == "/child-two/child-two-one/"
+
+        resp = app.get("/child-two/")
+
+        resp = _add_document(resp, "Child Two Two")
+        assert resp.request.path == "/child-two/child-two-two/"
 
         # On setup pages we can't use the actions:
         resp = app.get("/")
@@ -476,28 +429,40 @@ def test_content_management(self, webtest):
             resp.click("Copy", index=0)
 
         # Contents view actions
+
+        # copy
+
         resp = app.get("/child-one")
         resp = resp.click("Contents", index=0)
         assert resp.request.path == "/child-one/@@contents"
         resp = resp.forms["form-contents"].submit("copy").maybe_follow()
         assert "You have to select items" in resp.text
+
         form = self._select_children(resp, 0)
         resp = form.submit("copy").maybe_follow()
-        assert "My Third Child was copied." in resp.text
-        resp = app.get("/second-child-1/@@contents")
-        assert "My Third Child" not in resp.text
+        assert "Child One One was copied." in resp.text
+
+        resp = app.get("/child-two/@@contents")
+        assert "Child One One" not in resp.text
         resp = resp.forms["form-contents"].submit("paste").maybe_follow()
-        assert "My Third Child" in resp.text
-        resp = app.get("/second-child-1/@@contents")
+        assert "Child One One" in resp.text
+
+        # cut
+
+        resp = app.get("/child-two/@@contents")
         form = self._select_children(resp, 0)
         resp = form.submit("cut").maybe_follow()
         assert "cut." in resp.text
+
         resp = app.get("/child-one/@@contents")
-        assert "Grandchild" not in resp.text
+        assert "Child Two One" not in resp.text
+
         resp = resp.forms["form-contents"].submit("paste").maybe_follow()
-        assert "Grandchild" in resp.text
+        assert "Child Two One" in resp.text
+
         with pytest.raises(IndexError):
             resp.click("Paste")
+
         resp = app.get("/child-one/@@contents")
         form = self._select_children(resp, 0, 1)
         form.submit("cut").maybe_follow()
@@ -507,37 +472,49 @@ def test_content_management(self, webtest):
         form["title"] = "Forth child"
         form.submit("save").maybe_follow()
         resp = app.get("/forth-child/@@contents")
-        assert "Grandchild" not in resp.text
-        assert "My Third Child" not in resp.text
+
+        assert "Child One One" not in resp.text
+        assert "Child One Two" not in resp.text
+
         resp.forms["form-contents"].submit("paste").maybe_follow()
         resp = app.get("/forth-child/@@contents")
-        assert "Grandchild" in resp.text
-        assert "My Third Child" in resp.text
+        assert "Child One One" in resp.text
+        assert "Child One Two" in resp.text
+
         resp = app.get("/child-one/@@contents")
-        assert "Grandchild" not in resp.text
+        assert "Child One One" not in resp.text
+        assert "Child One Two" not in resp.text
+
+        # rename
+
         resp = app.get("/forth-child/@@contents")
-        assert "third-child" in resp.text
-        assert "Grandchild" in resp.text
-        assert "child-the-third" not in resp.text
-        assert "Hello Bob" not in resp.text
+        assert "child-one-one" in resp.text
+        assert "Child One One" in resp.text
+        assert "child-one-two" in resp.text
+        assert "Child One Two" in resp.text
         form = self._select_children(resp, 0, 1)
         resp = form.submit("rename_nodes").maybe_follow()
         resp = resp.forms["form-rename-nodes"].submit("cancel").maybe_follow()
         assert "No changes were made." in resp.text
         assert resp.request.path == "/forth-child/@@contents"
+
         form = self._select_children(resp, 0, 1)
         resp = form.submit("rename_nodes").maybe_follow()
         form = resp.forms["form-rename-nodes"]
-        form[form.submit_fields()[1][0]] = "child-the-third"
-        form[form.submit_fields()[2][0]] = "child, the third"
-        form[form.submit_fields()[4][0]] = "hello-bob"
-        form[form.submit_fields()[5][0]] = "Hello Bob"
+        form[form.submit_fields()[1][0]] = "child-one-three"
+        form[form.submit_fields()[2][0]] = "Child One Three"
+        form[form.submit_fields()[4][0]] = "child-one-four"
+        form[form.submit_fields()[5][0]] = "Child One Four"
         resp = form.submit("rename_nodes").maybe_follow()
         assert resp.request.path == "/forth-child/@@contents"
-        assert "third-child" not in resp.text
-        assert "Grandchild" not in resp.text
-        assert "child-the-third" in resp.text
-        assert "Hello Bob" in resp.text
+        assert "child-one-one" not in resp.text
+        assert "Child One One" not in resp.text
+        assert "child-one-two" not in resp.text
+        assert "Child One Two" not in resp.text
+        assert "child-one-three" in resp.text
+        assert "Child One Three" in resp.text
+        assert "child-one-four" in resp.text
+        assert "Child One Four" in resp.text
 
         resp = resp.click("File", index=0)
         form = resp.forms["deform"]
@@ -555,11 +532,11 @@ def test_content_management(self, webtest):
         assert "Are you sure" in resp.text
         resp = (
             resp.forms["form-delete-nodes"]
-            .submit("delete_nodes", status=302)
-            .maybe_follow()
+                .submit("delete_nodes", status=302)
+                .maybe_follow()
         )
-        assert "child, the third was deleted." in resp.text
-        assert "Hello Bob was deleted." in resp.text
+        assert "Child One Three was deleted." in resp.text
+        assert "Child One Four was deleted." in resp.text
         assert "some.txt was deleted." in resp.text
         resp = app.get("/forth-child/@@contents")
         assert "Welcome to Kotti" in resp.text
@@ -571,8 +548,172 @@ def test_content_management(self, webtest):
 
         # Navigation
         resp = resp.click("Navigate")
-        resp = resp.click("Second Child", index=0)
-        assert resp.request.path == "/second-child-1/"
+        resp = resp.click("Child Two", index=0)
+        assert resp.request.path == "/child-two/"
+
+    @pytest.mark.user("admin")
+    def test_rename(self, webtest):
+
+        app = webtest.app
+
+        def _add_document(resp, title):
+            resp = resp.click("Document", index=0)
+            form = resp.forms["deform"]
+            form["title"] = title
+            resp = form.submit("save").maybe_follow()
+            return resp
+
+        # Add some documents
+
+        resp = app.get("/")
+
+        resp = _add_document(resp, "Child One")
+        assert resp.request.path == "/child-one/"
+
+        resp = _add_document(resp, "Child One One")
+        assert resp.request.path == "/child-one/child-one-one/"
+
+        # We can rename an item. Slashes will be stripped out.:
+        resp = app.get("/child-one/child-one-one/")
+        resp = resp.click("Rename", index=0)
+        form = resp.forms["form-rename"]
+        assert form["name"].value == "child-one-one"
+        assert form["title"].value == "Child One One"
+        form["name"] = "child/one/two"
+        form["title"] = "Child One Two"
+        resp = form.submit("rename").maybe_follow()
+        assert "Item was renamed" in resp.text
+        assert resp.request.path == "/child-one/childonetwo/"
+
+        # We cannot rename the root:
+        resp = app.get("/")
+        with pytest.raises(IndexError):
+            resp.click("Rename", index=0)
+
+    @pytest.mark.user("admin")
+    def test_clipboard(self, webtest):
+
+        from kotti.resources import Document
+
+        save_addable_document = Document.type_info.addable_to
+
+        app = webtest.app
+
+        def _add_document(resp, title):
+            resp = resp.click("Document", index=0)
+            form = resp.forms["deform"]
+            form["title"] = title
+            resp = form.submit("save").maybe_follow()
+            return resp
+
+        # Add some documents
+
+        resp = app.get("/")
+
+        resp = _add_document(resp, "Child One")
+        assert resp.request.path == "/child-one/"
+
+        resp = _add_document(resp, "Child One One")
+        assert resp.request.path == "/child-one/child-one-one/"
+
+        resp = app.get("/child-one/")
+
+        resp = _add_document(resp, "Child One Two")
+        assert resp.request.path == "/child-one/child-one-two/"
+
+        resp = app.get("/")
+
+        resp = _add_document(resp, "Child Two")
+        assert resp.request.path == "/child-two/"
+
+        resp = _add_document(resp, "Child Two One")
+        assert resp.request.path == "/child-two/child-two-one/"
+
+        resp = app.get("/child-two/")
+
+        resp = _add_document(resp, "Child Two Two")
+        assert resp.request.path == "/child-two/child-two-two/"
+
+        # cut and paste
+        resp = app.get("/child-two/child-two-two/")
+        resp = resp.click("Cut", index=0).maybe_follow()
+        assert "Child Two Two was cut" in resp.text
+
+        resp = app.get("/child-one/")
+        resp = resp.click("Paste", index=0).maybe_follow()
+        assert "Child Two Two was pasted" in resp.text
+
+        # the former location returns 404 now
+        app.get("/child-two/child-two-two/", status=404)
+
+        # copy and paste
+
+        resp = app.get("/child-one/child-two-two/")
+        resp = resp.click("Copy", index=0).maybe_follow()
+        assert "Child Two Two was copied" in resp.text
+
+        resp = app.get("/child-two/")
+        resp = resp.click("Paste", index=0).maybe_follow()
+        assert "Child Two Two was pasted" in resp.text
+
+        # the former location exists again
+        resp = app.get("/child-two/child-two-two/")
+        assert resp.status_code == 200
+
+        # paste again
+        resp = app.get("/child-two/")
+        resp = resp.click("Paste", index=0).maybe_follow()
+        assert "Child Two Two was pasted" in resp.text
+
+        # the pasted item was renamed to satisfy name uniqueness
+        resp = app.get("/child-two/child-two-two-1/")
+        assert resp.status_code == 200
+
+        # We can also copy and paste items that contain children, like the whole site:
+        resp = app.get("/")
+        resp = resp.click("Copy", index=0).maybe_follow()
+        assert "Welcome to Kotti was copied" in resp.text
+
+        resp = app.get("/child-two/")
+        resp = resp.click("Paste", index=0).maybe_follow()
+        assert "Welcome to Kotti was pasted" in resp.text
+        resp = app.get("/child-two/welcome-to-kotti/")
+        assert resp.status_code == 200
+        resp = app.get("/child-two/welcome-to-kotti/child-two/")
+        assert resp.status_code == 200
+
+        # Note how we can't cut and paste an item into itself:
+        resp = app.get("/child-one/")
+        resp = resp.click("Cut", index=0).maybe_follow()
+        assert "Child One was cut" in resp.text
+        with pytest.raises(IndexError):
+            resp.click("Paste", index=0).maybe_follow()
+
+        # And also not into one of its children
+        resp = app.get("/child-one/child-one-one/")
+        with pytest.raises(IndexError):
+            resp.click("Paste", index=0).maybe_follow()
+
+        # Whether we can paste or not also depends on the ``type_info.addable``
+        # property:
+        resp = app.get("/child-one/")
+        resp.click("Copy", index=0).maybe_follow()
+        resp = app.get("/child-one/child-one-two/")
+        resp.click("Paste", index=0).maybe_follow()
+        try:
+            Document.type_info.addable_to = ()
+            resp = app.get("/child-one/child-one-two/")
+            with pytest.raises(IndexError):
+                resp.click("Paste", index=0).maybe_follow()
+        finally:
+            Document.type_info.addable_to = save_addable_document
+
+        # You can't cut the root of a site:
+        resp = app.get("/child-one/")
+        resp.click("Cut", index=0)
+        resp = app.get("/")
+        with pytest.raises(IndexError):
+            resp.click("Cut", index=0)
 
     @pytest.mark.user("admin")
     def test_workflow_actions(self, webtest):
@@ -861,7 +1002,7 @@ def test_user_management(self, webtest, settings, dummy_mailer):
 
         # We'll use that link to set our password:
         resp.click("Logout").maybe_follow()
-        path = email.body[email.body.index("http://localhost") :].split()[0][16:]
+        path = email.body[email.body.index("http://localhost"):].split()[0][16:]
         resp = app.get(path)
         form = resp.forms["deform"]
         form["password"] = "newpassword"
diff --git a/kotti/tests/test_util_views.py b/kotti/tests/test_util_views.py
index fcd502738..43f0c8e67 100644
--- a/kotti/tests/test_util_views.py
+++ b/kotti/tests/test_util_views.py
@@ -691,3 +691,10 @@ def test_basic(self):
         root = request.root
         assert predicate(root, request) is True
         assert predicate(object(), request) is False
+
+
+def test_base_view(dummy_request, root):
+    from kotti.views import BaseView
+    bv = BaseView(root, dummy_request)
+    assert bv.context == root
+    assert bv.request == dummy_request
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index cc2364584..a439bf22e 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -74,7 +74,7 @@ def set_max_age(response, delta, cache_ctrl=None):
 def _safe_get_user(request):
     try:
         return get_user(request)
-    except DetachedInstanceError:  # XXX need to understand what's happening
+    except DetachedInstanceError:  # noqa XXX need to understand what's happening
         return not None
 
 
diff --git a/tox.ini b/tox.ini
index dbf543fc5..ce2047d44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = {py36,py37,p38}-{postgresql,sqlite,mysql}
 
 [testenv]
 deps =
-    postgresql: psycopg2
+    postgresql: psycopg2-binary
     mysql: mysqlclient
 envdir:
     py36: {toxworkdir}/3.6

From 5046cd17c28df06551a1173fc23b56e46d3939e2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Mon, 22 Jun 2020 16:56:24 +0200
Subject: [PATCH 547/600] Add noxfile.

---
 README.rst | 4 ----
 noxfile.py | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 noxfile.py

diff --git a/README.rst b/README.rst
index c78262999..747e2cf56 100644
--- a/README.rst
+++ b/README.rst
@@ -94,7 +94,6 @@ Development
 |coveralls|_
 |codacy|_
 |codeclimate|_
-|circleci|_
 |scrutinizer|_
 |requires.io|_
 
@@ -130,9 +129,6 @@ Contributions are always welcome, read our `contribution guidelines`_ and visit
 .. |codeclimate| image:: https://api.codeclimate.com/v1/badges/3a4a61548fcc195e4ba1/maintainability
 .. _codeclimate: https://codeclimate.com/github/Kotti/Kotti/maintainability
 
-.. |circleci| image:: https://circleci.com/gh/Kotti/Kotti/tree/master.svg?style=svg
-.. _circleci: https://circleci.com/gh/Kotti/Kotti/tree/master
-
 .. |scrutinizer| image:: https://scrutinizer-ci.com/g/Kotti/Kotti/badges/quality-score.png?b=master
 .. _scrutinizer: https://scrutinizer-ci.com/g/Kotti/Kotti/
 
diff --git a/noxfile.py b/noxfile.py
new file mode 100644
index 000000000..2389d4782
--- /dev/null
+++ b/noxfile.py
@@ -0,0 +1,8 @@
+import nox
+
+
+@nox.session(python=["3.8", "3.7", "3.6"])
+def tests(session):
+    args = session.posargs or ["--cov"]
+    session.run("pip", "install", "-e", ".[testing]", external=True)
+    session.run("pytest", *args)

From b9e8e86f35c3651293218684b474b7210d6332d0 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Mon, 22 Jun 2020 17:05:43 +0200
Subject: [PATCH 548/600] Bump version.

---
 CHANGES.txt | 3 +++
 setup.py    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5049edbf3..148b23a3e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
 Change History
 ==============
 
+2.0.2 - 2020-06-22
+------------------
+
 - Upgrade ``requirements.txt``.  [fixes #576]
 
 - Remove CircleCI
diff --git a/setup.py b/setup.py
index b895850c6..5fd90b2ac 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.1'
+version = '2.0.2'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 497a2288da039faf87098e7b237e30a93907a26e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Mon, 22 Jun 2020 17:07:15 +0200
Subject: [PATCH 549/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 148b23a3e..611015024 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.3 - unreleased
+------------------
+
+- No changes yet.
+
 2.0.2 - 2020-06-22
 ------------------
 
diff --git a/setup.py b/setup.py
index 5fd90b2ac..afa13cae6 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.2'
+version = '2.0.3.dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 7d87c1fbe328001186568d338d7b2dd48f0dfe63 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 22:45:15 +0100
Subject: [PATCH 550/600] Upgrade to ``pytest>=6``. Replace ``pytest-pep8``
 with ``pytest-flake8``; fix or silence flake8 warnings/error in existing code
 (mostly tests and migrations).

---
 CHANGES.txt                                          | 4 +++-
 kotti/__init__.py                                    | 8 ++++++--
 kotti/alembic/env.py                                 | 2 +-
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 2 +-
 kotti/migrate.py                                     | 4 ++--
 kotti/tests/test_httpexceptions.py                   | 2 +-
 kotti/views/cache.py                                 | 2 +-
 kotti/views/util.py                                  | 9 +++++----
 pytest.ini                                           | 8 +++++---
 setup.py                                             | 6 ++----
 10 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 611015024..e189be3f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Change History
 2.0.3 - unreleased
 ------------------
 
-- No changes yet.
+- Upgrade to ``pytest>=6``.
+- Replace ``pytest-pep8`` with ``pytest-flake8``; fix or silence flake8 warnings/errors
+  in existing code (mostly tests and migrations).
 
 2.0.2 - 2020-06-22
 ------------------
diff --git a/kotti/__init__.py b/kotti/__init__.py
index fdf0d5a11..82408b3da 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -1,3 +1,5 @@
+import os.path
+
 import pkg_resources
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
@@ -167,7 +169,6 @@ def get_settings():
 
 
 def _resolve_dotted(d, keys=conf_dotted):
-
     resolved = d.copy()
 
     for key in keys:
@@ -281,7 +282,10 @@ def includeme(config):
     ]:
         config.override_asset(to_override="kotti", override_with=override)
 
-    config.add_translation_dirs("kotti:locale")
+    config.add_translation_dirs(f"{os.path.dirname(__file__)}/locale")
+    # used to be
+    # config.add_translation_dirs("kotti:locale")
+    # which fails with recent pytest (works in non testing though)
 
     workflow = settings["kotti.use_workflow"]
     if workflow.lower() not in FALSE_VALUES:
diff --git a/kotti/alembic/env.py b/kotti/alembic/env.py
index 47868c411..5e88a9a0a 100755
--- a/kotti/alembic/env.py
+++ b/kotti/alembic/env.py
@@ -25,7 +25,7 @@ def run_migrations_online():
     try:
         context.run_migrations()
         mark_changed(DBSession())
-    except:
+    except:  # noqa: E722
         traceback.print_exc()
         transaction.abort()
     else:
diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index e3f51ddda..e89da93ca 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -75,7 +75,7 @@ def process(thing):
     update = files.update().where(files.c.id == bindparam('nodeid')).\
         values({files.c.data: bindparam('data')})
 
-    def chunks(l, n):
+    def chunks(l, n):  # noqa: E741
         for i in range(0, len(l), n):
             yield l[i:i + n]
 
diff --git a/kotti/migrate.py b/kotti/migrate.py
index 8bd0752b7..d2f44cdb7 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -107,7 +107,7 @@ def _make_script_dir(alembic_cfg: Config) -> ScriptDirectoryWithDefaultEnvPy:
 
 def get_locations() -> List[str]:
     conf_str = get_settings()["kotti.alembic_dirs"]
-    return [l.strip() for l in conf_str.split() if l.strip()]
+    return [line.strip() for line in conf_str.split() if line.strip()]
 
 
 def stamp_head(location: str = DEFAULT_LOCATION, revision: None = None) -> None:
@@ -170,7 +170,7 @@ def upgrade_all():
 
 
 def list_all():
-    pkg_envs = [PackageEnvironment(l) for l in get_locations()]
+    pkg_envs = [PackageEnvironment(location) for location in get_locations()]
     for pkg_env in pkg_envs:
         print(f"{pkg_env.pkg_name}:")
 
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
index a60df127e..3c90ea5c8 100644
--- a/kotti/tests/test_httpexceptions.py
+++ b/kotti/tests/test_httpexceptions.py
@@ -8,7 +8,7 @@ def test_404_anon(webtest, root):
 
 
 @pytest.mark.user("admin")
-def test_404_anon(webtest, root):
+def test_404_admin(webtest, root):
 
     resp = webtest.app.get("/non-existent", status=404)
     assert "Not Found" in resp.text
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index a439bf22e..725fbee3b 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -113,7 +113,7 @@ def set_cache_headers(event):
         # noinspection PyBroadException
         try:
             caching_policy = caching_policy_chooser(context, request, response)
-        except:
+        except:  # noqa: E722
             # We don't want to screw up the response if the
             # caching_policy_chooser raises an exception.
             logger.exception(f"{caching_policy_chooser} raised an exception.")
diff --git a/kotti/views/util.py b/kotti/views/util.py
index bda202910..a8fd7c0f1 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -354,14 +354,15 @@ def edit_links(self):
         if not hasattr(self.context, "type_info"):
             return []
         return [
-            l
-            for l in self.context.type_info.edit_links
-            if l.visible(self.context, self.request)
+            link
+            for link in self.context.type_info.edit_links
+            if link.visible(self.context, self.request)
         ]
 
     @reify
     def site_setup_links(self):
-        return [l for l in CONTROL_PANEL_LINKS if l.visible(self.root, self.request)]
+        return [link for link in CONTROL_PANEL_LINKS
+                if link.visible(self.root, self.request)]
 
     @staticmethod
     def sanitize(html, sanitizer="default"):
diff --git a/pytest.ini b/pytest.ini
index c093b78b9..4ec7c489b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -11,13 +11,15 @@ addopts =
     --travis-fold=auto
     --doctest-glob='*.txt'
     --doctest-modules
-    --pep8
+    --flake8
     --cov=kotti
     --cov-report=term-missing
     kotti/
 python_files = test_*.py
-pep8ignore = E122 E123 E125 E128 E203 E251 E501 E711 E713 E714 E402 W503
-pep8maxlinelength = 88
+flake8-ignore =
+    *.py E122 E123 E125 E128 E203 E251 E501 E711 E713 E714 E402 F821 W503
+    tests/*.py F841
+flake8-max-line-length = 88
 markers =
     user: mark test to be run as the given user
     slow: mark test to be run only with --runslow option
diff --git a/setup.py b/setup.py
index afa13cae6..6ba15ee89 100644
--- a/setup.py
+++ b/setup.py
@@ -67,14 +67,12 @@
     'WebTest',
     'mock',
     'Pillow',  # thumbnail filter in depot tween tests
-    'py>=1.4.29',
     'pyquery',
-    'pytest>=4.6,<5',  # see #563
+    'pytest>=6',
     'pytest-cov',
-    'pytest-pep8>=1.0.6',
+    'pytest-flake8',
     'pytest-travis-fold',
     'pytest-virtualenv',
-    # 'pytest-xdist',  # currently causes Travis to fail
     'tox',
     'zope.testbrowser>=5.0.0',
     ]

From eb0af82b6c7878f1f20b56bbc2b0ab11cd64e816 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 22:45:32 +0100
Subject: [PATCH 551/600] Disable doctests.

---
 kotti/tests/{browser-minimal.txt => browser-minimal.txt.disabled} | 0
 .../tests/{browser-workflow.txt => browser-workflow.txt.disabled} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename kotti/tests/{browser-minimal.txt => browser-minimal.txt.disabled} (100%)
 rename kotti/tests/{browser-workflow.txt => browser-workflow.txt.disabled} (100%)

diff --git a/kotti/tests/browser-minimal.txt b/kotti/tests/browser-minimal.txt.disabled
similarity index 100%
rename from kotti/tests/browser-minimal.txt
rename to kotti/tests/browser-minimal.txt.disabled
diff --git a/kotti/tests/browser-workflow.txt b/kotti/tests/browser-workflow.txt.disabled
similarity index 100%
rename from kotti/tests/browser-workflow.txt
rename to kotti/tests/browser-workflow.txt.disabled

From 86e748d5027e4ced858bb6afe1ae5d2444b33de8 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 22:50:54 +0100
Subject: [PATCH 552/600] Add default "python-package" Github action.

---
 .github/workflow/python-package.yml | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/workflow/python-package.yml

diff --git a/.github/workflow/python-package.yml b/.github/workflow/python-package.yml
new file mode 100644
index 000000000..7c8fc61ed
--- /dev/null
+++ b/.github/workflow/python-package.yml
@@ -0,0 +1,38 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ $default-branch, "feature/upgrade_testing" ]
+  pull_request:
+    branches: [ $default-branch ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e ".[testing]"
+    # - name: Lint with flake8
+    #   run: |
+    #     # stop the build if there are Python syntax errors or undefined names
+    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From 0ff1837db18e0cc6b6219d7be49f0651e86e0895 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 17 Nov 2020 22:54:56 +0100
Subject: [PATCH 553/600] Create python-package.yml

---
 .github/workflows/python-package.yml | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/workflows/python-package.yml

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
new file mode 100644
index 000000000..7c8fc61ed
--- /dev/null
+++ b/.github/workflows/python-package.yml
@@ -0,0 +1,38 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ $default-branch, "feature/upgrade_testing" ]
+  pull_request:
+    branches: [ $default-branch ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e ".[testing]"
+    # - name: Lint with flake8
+    #   run: |
+    #     # stop the build if there are Python syntax errors or undefined names
+    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From 284048da1eaad358834d29bd435da3da4fb5799a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 17 Nov 2020 22:59:33 +0100
Subject: [PATCH 554/600] Create python-package2.yml

---
 .github/workflows/python-package2.yml | 38 +++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/workflows/python-package2.yml

diff --git a/.github/workflows/python-package2.yml b/.github/workflows/python-package2.yml
new file mode 100644
index 000000000..9c26d546c
--- /dev/null
+++ b/.github/workflows/python-package2.yml
@@ -0,0 +1,38 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ master, testing, stable ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e ".[testing]"
+    # - name: Lint with flake8
+    #   run: |
+    #     # stop the build if there are Python syntax errors or undefined names
+    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From beb1e7f7a302b76c6aece1ddf50e823ad2a06cc0 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 23:04:00 +0100
Subject: [PATCH 555/600] Remove Github action (added to master in the
 meanwhile).

---
 .github/workflow/python-package.yml | 38 -----------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 .github/workflow/python-package.yml

diff --git a/.github/workflow/python-package.yml b/.github/workflow/python-package.yml
deleted file mode 100644
index 7c8fc61ed..000000000
--- a/.github/workflow/python-package.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python package
-
-on:
-  push:
-    branches: [ $default-branch, "feature/upgrade_testing" ]
-  pull_request:
-    branches: [ $default-branch ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -e ".[testing]"
-    # - name: Lint with flake8
-    #   run: |
-    #     # stop the build if there are Python syntax errors or undefined names
-    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest

From 30b20ef1018e8beacae85216a2f0023af38ee284 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 23:09:19 +0100
Subject: [PATCH 556/600] Remove doctests, travis-autofold.

---
 kotti/tests/browser-minimal.txt.disabled  | 43 -----------------
 kotti/tests/browser-workflow.txt.disabled | 57 -----------------------
 pytest.ini                                |  3 --
 setup.py                                  |  1 -
 4 files changed, 104 deletions(-)
 delete mode 100644 kotti/tests/browser-minimal.txt.disabled
 delete mode 100644 kotti/tests/browser-workflow.txt.disabled

diff --git a/kotti/tests/browser-minimal.txt.disabled b/kotti/tests/browser-minimal.txt.disabled
deleted file mode 100644
index ed1510f33..000000000
--- a/kotti/tests/browser-minimal.txt.disabled
+++ /dev/null
@@ -1,43 +0,0 @@
-Kotti browser tests for a stripped down app
-===========================================
-
-These browser tests use a setup that includes only a selection of
-Kotti's functionality.
-
-  >>> from kotti import testing
-  >>> tools = testing.setUpFunctionalStrippedDownApp()
-  >>> browser = tools['Browser']()
-  >>> ctrl = browser.getControl
-
-Logging in
-----------
-
-  >>> browser.open(testing.BASE_URL)
-  >>> "Welcome, you are not logged in" in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL + '/secured')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "You are logged in" in browser.contents
-  True
-
-User management
----------------
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink("User Management").click()
-
-  >>> ctrl(name="query").value = "admin"
-  >>> ctrl(name="search").click()
-  >>> ctrl(name="role::admin::role:editor").value
-  []
-  >>> ctrl(name="role::admin::role:admin").value
-  True
-
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/kotti/tests/browser-workflow.txt.disabled b/kotti/tests/browser-workflow.txt.disabled
deleted file mode 100644
index 2c373429a..000000000
--- a/kotti/tests/browser-workflow.txt.disabled
+++ /dev/null
@@ -1,57 +0,0 @@
-Kotti browser tests for the default workflow
-============================================
-
-  >>> from kotti import testing
-  >>> from kotti import DBSession
-  >>> tools = testing.setUpFunctional()
-  >>> browser = tools['Browser']()
-  >>> ctrl = browser.getControl
-  >>> browser_anonymous = tools['Browser']()
-  >>> WELCOME = "Wonder what more you can do with Kotti?"
-
-By default, the front page is published and thus visible to all users:
-
-  >>> browser_anonymous.open(testing.BASE_URL)
-  >>> WELCOME in browser_anonymous.contents
-  True
-
-An administrator (or any user with ``state_change`` permission) can
-make the front page private.  First log in:
-
-  >>> browser.open(testing.BASE_URL + '/edit')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-
-Now make private:
-
-  >>> browser.getLink("Make Private").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-
-The administrator can still see the page, but the anonymous user
-can't:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> WELCOME in browser.contents
-  True
-  >>> browser_anonymous.open(testing.BASE_URL)
-  >>> WELCOME in browser_anonymous.contents
-  False
-
-Make the front page public again:
-
-  >>> browser.getLink("Make Public").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-  >>> browser_anonymous.open(testing.BASE_URL)
-  >>> WELCOME in browser_anonymous.contents
-  True
-
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/pytest.ini b/pytest.ini
index 4ec7c489b..2ed80be9c 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -8,9 +8,6 @@ addopts =
     --capture=no
     --strict
     --tb=native
-    --travis-fold=auto
-    --doctest-glob='*.txt'
-    --doctest-modules
     --flake8
     --cov=kotti
     --cov-report=term-missing
diff --git a/setup.py b/setup.py
index 6ba15ee89..a764e1d30 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,6 @@
     'pytest>=6',
     'pytest-cov',
     'pytest-flake8',
-    'pytest-travis-fold',
     'pytest-virtualenv',
     'tox',
     'zope.testbrowser>=5.0.0',

From ab83eefe72ee7248c8314275bda1042e13aee2e7 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 17 Nov 2020 23:22:26 +0100
Subject: [PATCH 557/600] Create postgres.yml

---
 .github/workflows/postgres.yml | 61 ++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 .github/workflows/postgres.yml

diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
new file mode 100644
index 000000000..5205e76fe
--- /dev/null
+++ b/.github/workflows/postgres.yml
@@ -0,0 +1,61 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package (PostgreSQL)
+
+on:
+  push:
+    branches: [ master, testing, stable ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+
+    # Service containers to run with `runner-job`
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e ".[testing]"
+        pip install psycopg2-binary
+        psql -U postgres -c 'CREATE DATABASE kotti_testing;'
+    # - name: Lint with flake8
+    #   run: |
+    #     # stop the build if there are Python syntax errors or undefined names
+    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest
+      env: 
+        KOTTI_TEST_DB_STRING: postgresql://postgres:postgres@localhost:5432/postgres
+        

From c28363b92568a2b7fc32de92e2522b26a72ab57a Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Tue, 17 Nov 2020 23:24:58 +0100
Subject: [PATCH 558/600] Update postgres.yml

---
 .github/workflows/postgres.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 5205e76fe..32ad1226e 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -46,7 +46,6 @@ jobs:
         python -m pip install --upgrade pip
         pip install -e ".[testing]"
         pip install psycopg2-binary
-        psql -U postgres -c 'CREATE DATABASE kotti_testing;'
     # - name: Lint with flake8
     #   run: |
     #     # stop the build if there are Python syntax errors or undefined names

From 6abb70c1b80d6d283594fca7271db52b31d57092 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 08:17:54 +0100
Subject: [PATCH 559/600] Add Github action workflows for MySQL and SQLite.

---
 .../{python-package.yml => mysql.yml}         | 27 ++++++++++++++-----
 .github/workflows/postgres.yml                |  9 +++----
 .../{python-package2.yml => sqlite.yml}       |  6 ++---
 3 files changed, 27 insertions(+), 15 deletions(-)
 rename .github/workflows/{python-package.yml => mysql.yml} (59%)
 rename .github/workflows/{python-package2.yml => sqlite.yml} (88%)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/mysql.yml
similarity index 59%
rename from .github/workflows/python-package.yml
rename to .github/workflows/mysql.yml
index 7c8fc61ed..7143ee6fe 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/mysql.yml
@@ -1,13 +1,10 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python package
+name: MySQL
 
 on:
   push:
-    branches: [ $default-branch, "feature/upgrade_testing" ]
+    branches: [ master, testing, stable ]
   pull_request:
-    branches: [ $default-branch ]
+    branches: [ master ]
 
 jobs:
   build:
@@ -17,6 +14,20 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
 
+    # Service containers to run with `runner-job`
+    services:
+      # Label used to access the service container
+      mysql:
+        image: mariadb:latest
+        env:
+          MYSQL_USER: kotti
+          MYSQL_PASSWORD: kotti
+          MYSQL_DATABASE: kotti
+          MYSQL_ROOT_PASSWORD: kotti
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        ports:
+          - 3306
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -27,6 +38,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -e ".[testing]"
+        pip install mysqlclient
     # - name: Lint with flake8
     #   run: |
     #     # stop the build if there are Python syntax errors or undefined names
@@ -36,3 +48,6 @@ jobs:
     - name: Test with pytest
       run: |
         pytest
+      env:
+        KOTTI_TEST_DB_STRING: mysql://kotti:kotti@mysql:3306/kotti
+
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 32ad1226e..d66b6d224 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -1,7 +1,4 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python package (PostgreSQL)
+name: PostgreSQL
 
 on:
   push:
@@ -55,6 +52,6 @@ jobs:
     - name: Test with pytest
       run: |
         pytest
-      env: 
+      env:
         KOTTI_TEST_DB_STRING: postgresql://postgres:postgres@localhost:5432/postgres
-        
+
diff --git a/.github/workflows/python-package2.yml b/.github/workflows/sqlite.yml
similarity index 88%
rename from .github/workflows/python-package2.yml
rename to .github/workflows/sqlite.yml
index 9c26d546c..b401a335b 100644
--- a/.github/workflows/python-package2.yml
+++ b/.github/workflows/sqlite.yml
@@ -1,7 +1,5 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python package
+name: SQLite
 
 on:
   push:
@@ -27,6 +25,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -e ".[testing]"
+        pip install psycopg2-binary
     # - name: Lint with flake8
     #   run: |
     #     # stop the build if there are Python syntax errors or undefined names
@@ -36,3 +35,4 @@ jobs:
     - name: Test with pytest
       run: |
         pytest
+

From 1a71bbfa8a3eeaec157e16b83d5d4e9e7ad53a0d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 08:21:57 +0100
Subject: [PATCH 560/600] Fix DB connection string for MySQL.

---
 .github/workflows/mysql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 7143ee6fe..6505a53c9 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -49,5 +49,5 @@ jobs:
       run: |
         pytest
       env:
-        KOTTI_TEST_DB_STRING: mysql://kotti:kotti@mysql:3306/kotti
+        KOTTI_TEST_DB_STRING: mysql://kotti:kotti@localhost:3306/kotti
 

From c643f329e2d8f0ac5183ae38199495c0f80c14aa Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 08:29:27 +0100
Subject: [PATCH 561/600] Verify MySQL connection

---
 .github/workflows/mysql.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 6505a53c9..b1223fbe8 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -24,9 +24,14 @@ jobs:
           MYSQL_PASSWORD: kotti
           MYSQL_DATABASE: kotti
           MYSQL_ROOT_PASSWORD: kotti
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
         ports:
-          - 3306
+          # Maps tcp port 3306 on service container to the host
+          - 3306:3306
 
     steps:
     - uses: actions/checkout@v2
@@ -45,9 +50,16 @@ jobs:
     #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
     #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
     #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Verify MySQL connection
+      env:
+        PORT: ${{ job.services.mysql.ports[3306] }}
+      run: |
+        while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
+          sleep 1
+        done
     - name: Test with pytest
       run: |
         pytest
       env:
-        KOTTI_TEST_DB_STRING: mysql://kotti:kotti@localhost:3306/kotti
+        KOTTI_TEST_DB_STRING: mysql://kotti:kotti@127.0.0.1:3306/kotti
 

From fa2e4691e578c64f4c6c9caf6c6912da12ee6d12 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 08:47:06 +0100
Subject: [PATCH 562/600] Remove TravisCI and add Github actions badges to
 ``README.rst`` and docs.

---
 .travis.yml                   | 34 ----------------------------------
 README.rst                    | 32 +++++++++++++++++++++++++-------
 docs/first_steps/overview.rst | 18 +++++++++++++-----
 3 files changed, 38 insertions(+), 46 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a3137be50..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-os: linux
-dist: xenial
-services:
-  - mysql
-  - postgresql
-language: python
-cache:
-  directories:
-    - $HOME/.cache/pip
-before_cache:
-  - rm -f $HOME/.cache/pip/log/debug.log
-python:
-  - "3.8"
-  - "3.7"
-  - "3.6"
-env:
-  - KOTTI_TEST_DB_STRING=postgresql://postgres@localhost:5432/kotti_testing
-  - KOTTI_TEST_DB_STRING=mysql+mysqldb://root@localhost:3306/kotti_testing
-  - KOTTI_TEST_DB_STRING=sqlite://
-install:
-  - travis_retry pip install -U pip wheel setuptools
-  - travis_retry pip install psycopg2-binary mysqlclient python-coveralls codecov
-  - travis_retry pip install -e ".[testing]"
-before_script:
-  - psql -c 'create database kotti_testing;' -U postgres
-  - mysql -e 'create database kotti_testing;'
-script:
-  - py.test -rw --tb=native --cov=kotti --cov-report=term-missing
-after_success:
-  - coveralls
-  - codecov
-notifications:
-  irc: "irc.freenode.org#kotti"
-  email: false
diff --git a/README.rst b/README.rst
index 747e2cf56..ed7b950c3 100644
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,10 @@ Kotti
 
 |pypi|_
 |license|_
-|build_status_stable|_
+
+|build_status_stable_postgresql|_
+|build_status_stable_mysql|_
+|build_status_stable_sqlite|_
 
 .. |pypi| image:: https://img.shields.io/pypi/v/Kotti.svg?style=flat-square
 .. _pypi: https://pypi.python.org/pypi/Kotti/
@@ -12,8 +15,15 @@ Kotti
 .. |license| image:: https://img.shields.io/pypi/l/Kotti.svg?style=flat-square
 .. _license: http://www.repoze.org/LICENSE.txt
 
-.. |build_status_stable| image:: https://img.shields.io/travis/Kotti/Kotti/stable.svg?style=flat-square
-.. _build_status_stable: http://travis-ci.org/Kotti/Kotti
+.. |build_status_stable_postgresql| image:: https://github.com/Kotti/Kotti/workflows/PostgreSQL/badge.svg?branch=stable
+.. _build_status_stable_postgresql: https://github.com/Kotti/Kotti/actions?query=workflow%3APostgreSQL+branch%3Astable
+
+.. |build_status_stable_mysql| image:: https://github.com/Kotti/Kotti/workflows/MySQL/badge.svg?branch=stable
+.. _build_status_stable_mysql: https://github.com/Kotti/Kotti/actions?query=workflow%3AMySQL+branch%3Astable
+
+.. |build_status_stable_sqlite| image:: https://github.com/Kotti/Kotti/workflows/SQLite/badge.svg?branch=stable
+.. _build_status_stable_sqlite: https://github.com/Kotti/Kotti/actions?query=workflow%3ASQLite+branch%3Astable
+
 
 Kotti is a high-level, Pythonic web application framework based on Pyramid_ and SQLAlchemy_.
 It includes an extensible Content Management System called the Kotti CMS (see below).
@@ -90,7 +100,10 @@ If you think you found a bug, open an issue on our `Github bugtracker <https://g
 Development
 ===========
 
-|build_status_master|_
+|build_status_master_postgresql|_
+|build_status_master_mysql|_
+|build_status_master_sqlite|_
+
 |coveralls|_
 |codacy|_
 |codeclimate|_
@@ -105,9 +118,14 @@ We adhere to `high quality coding standards`_, have an extensive test suite with
 
 Contributions are always welcome, read our `contribution guidelines`_ and visit our `Github repository`_.
 
-.. |build_status_master| image:: https://img.shields.io/travis/Kotti/Kotti/master.svg?style=flat-square
-.. _build_status_master: http://travis-ci.org/Kotti/Kotti
-.. _continuous integration: http://travis-ci.org/Kotti/Kotti
+.. |build_status_master_postgresql| image:: https://github.com/Kotti/Kotti/workflows/PostgreSQL/badge.svg?branch=master
+.. _build_status_master_postgresql: https://github.com/Kotti/Kotti/actions?query=workflow%3APostgreSQL+branch%3Amaster
+
+.. |build_status_master_mysql| image:: https://github.com/Kotti/Kotti/workflows/MySQL/badge.svg?branch=master
+.. _build_status_master_mysql: https://github.com/Kotti/Kotti/actions?query=workflow%3AMySQL+branch%3Amaster
+
+.. |build_status_master_sqlite| image:: https://github.com/Kotti/Kotti/workflows/SQLite/badge.svg?branch=master
+.. _build_status_master_sqlite: https://github.com/Kotti/Kotti/actions?query=workflow%3ASQLite+branch%3Amaster
 
 .. |requires.io| image:: https://img.shields.io/requires/github/Kotti/Kotti.svg?style=flat-square
 .. _requires.io: https://requires.io/github/Kotti/Kotti/requirements/?branch=master
diff --git a/docs/first_steps/overview.rst b/docs/first_steps/overview.rst
index 6c852fb9f..9f72f4a0e 100644
--- a/docs/first_steps/overview.rst
+++ b/docs/first_steps/overview.rst
@@ -67,12 +67,16 @@ Use this command:
 
   git clone git@github.com:Kotti/Kotti
 
-`Continuous testing`_ against different versions of Python and with *PostgreSQL*, *MySQL* and *SQLite* and a complete test coverage make Kotti a **stable** platform to work with.  |build_status|_
+`Continuous testing`_ against different versions of Python and with *PostgreSQL*, *MySQL* and *SQLite* and a complete test coverage make Kotti a **stable** platform to work with.
+
+|build_status_stable_postgresql|_
+|build_status_stable_mysql|_
+|build_status_stable_sqlite|_
 
 Support
 -------
 
-- Python 3.5-3.7
+- Python 3.6-3.9
 - Support for PostgreSQL, MySQL and SQLite (tested regularly), and a list of `other SQL databases`_
 - Support for WSGI and a `variety of web servers`_, including Apache
 
@@ -80,11 +84,15 @@ Support
 .. _repoze.workflow: http://docs.repoze.org/workflow/
 .. _Chameleon: https://chameleon.readthedocs.io/
 .. _Colander: http://docs.pylonsproject.org/projects/colander/en/latest/
-.. _continuous testing: http://travis-ci.org/Kotti/Kotti
+.. _continuous testing: https://github.com/Kotti/Kotti/actions
 .. _Deform: http://docs.pylonsproject.org/projects/deform/en/latest/
 .. _developed on Github: https://github.com/Kotti/Kotti
-.. |build_status| image:: https://secure.travis-ci.org/Kotti/Kotti.png?branch=master
-.. _build_status: http://travis-ci.org/Kotti/Kotti
+.. |build_status_stable_postgresql| image:: https://github.com/Kotti/Kotti/workflows/PostgreSQL/badge.svg?branch=stable
+.. _build_status_stable_postgresql: https://github.com/Kotti/Kotti/actions?query=workflow%3APostgreSQL+branch%3Astable
+.. |build_status_stable_mysql| image:: https://github.com/Kotti/Kotti/workflows/MySQL/badge.svg?branch=stable
+.. _build_status_stable_mysql: https://github.com/Kotti/Kotti/actions?query=workflow%3AMySQL+branch%3Astable
+.. |build_status_stable_sqlite| image:: https://github.com/Kotti/Kotti/workflows/SQLite/badge.svg?branch=stable
+.. _build_status_stable_sqlite: https://github.com/Kotti/Kotti/actions?query=workflow%3ASQLite+branch%3Astable
 .. _installation:
 .. _other SQL databases: http://www.sqlalchemy.org/docs/core/engines.html#supported-databases
 .. _variety of web servers: http://wsgi.org/wsgi/Servers

From 3090b5f997167b898954f70afc858b79d8555018 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 22:45:15 +0100
Subject: [PATCH 563/600] Upgrade to ``pytest>=6``. Replace ``pytest-pep8``
 with ``pytest-flake8``; fix or silence flake8 warnings/error in existing code
 (mostly tests and migrations).

---
 CHANGES.txt                                          | 4 +++-
 kotti/__init__.py                                    | 8 ++++++--
 kotti/alembic/env.py                                 | 2 +-
 kotti/alembic/versions/413fa5fcc581_add_filedepot.py | 2 +-
 kotti/migrate.py                                     | 4 ++--
 kotti/tests/test_httpexceptions.py                   | 2 +-
 kotti/views/cache.py                                 | 2 +-
 kotti/views/util.py                                  | 9 +++++----
 pytest.ini                                           | 8 +++++---
 setup.py                                             | 6 ++----
 10 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 611015024..e189be3f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,9 @@ Change History
 2.0.3 - unreleased
 ------------------
 
-- No changes yet.
+- Upgrade to ``pytest>=6``.
+- Replace ``pytest-pep8`` with ``pytest-flake8``; fix or silence flake8 warnings/errors
+  in existing code (mostly tests and migrations).
 
 2.0.2 - 2020-06-22
 ------------------
diff --git a/kotti/__init__.py b/kotti/__init__.py
index fdf0d5a11..82408b3da 100644
--- a/kotti/__init__.py
+++ b/kotti/__init__.py
@@ -1,3 +1,5 @@
+import os.path
+
 import pkg_resources
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
@@ -167,7 +169,6 @@ def get_settings():
 
 
 def _resolve_dotted(d, keys=conf_dotted):
-
     resolved = d.copy()
 
     for key in keys:
@@ -281,7 +282,10 @@ def includeme(config):
     ]:
         config.override_asset(to_override="kotti", override_with=override)
 
-    config.add_translation_dirs("kotti:locale")
+    config.add_translation_dirs(f"{os.path.dirname(__file__)}/locale")
+    # used to be
+    # config.add_translation_dirs("kotti:locale")
+    # which fails with recent pytest (works in non testing though)
 
     workflow = settings["kotti.use_workflow"]
     if workflow.lower() not in FALSE_VALUES:
diff --git a/kotti/alembic/env.py b/kotti/alembic/env.py
index 47868c411..5e88a9a0a 100755
--- a/kotti/alembic/env.py
+++ b/kotti/alembic/env.py
@@ -25,7 +25,7 @@ def run_migrations_online():
     try:
         context.run_migrations()
         mark_changed(DBSession())
-    except:
+    except:  # noqa: E722
         traceback.print_exc()
         transaction.abort()
     else:
diff --git a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
index e3f51ddda..e89da93ca 100644
--- a/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
+++ b/kotti/alembic/versions/413fa5fcc581_add_filedepot.py
@@ -75,7 +75,7 @@ def process(thing):
     update = files.update().where(files.c.id == bindparam('nodeid')).\
         values({files.c.data: bindparam('data')})
 
-    def chunks(l, n):
+    def chunks(l, n):  # noqa: E741
         for i in range(0, len(l), n):
             yield l[i:i + n]
 
diff --git a/kotti/migrate.py b/kotti/migrate.py
index 8bd0752b7..d2f44cdb7 100644
--- a/kotti/migrate.py
+++ b/kotti/migrate.py
@@ -107,7 +107,7 @@ def _make_script_dir(alembic_cfg: Config) -> ScriptDirectoryWithDefaultEnvPy:
 
 def get_locations() -> List[str]:
     conf_str = get_settings()["kotti.alembic_dirs"]
-    return [l.strip() for l in conf_str.split() if l.strip()]
+    return [line.strip() for line in conf_str.split() if line.strip()]
 
 
 def stamp_head(location: str = DEFAULT_LOCATION, revision: None = None) -> None:
@@ -170,7 +170,7 @@ def upgrade_all():
 
 
 def list_all():
-    pkg_envs = [PackageEnvironment(l) for l in get_locations()]
+    pkg_envs = [PackageEnvironment(location) for location in get_locations()]
     for pkg_env in pkg_envs:
         print(f"{pkg_env.pkg_name}:")
 
diff --git a/kotti/tests/test_httpexceptions.py b/kotti/tests/test_httpexceptions.py
index a60df127e..3c90ea5c8 100644
--- a/kotti/tests/test_httpexceptions.py
+++ b/kotti/tests/test_httpexceptions.py
@@ -8,7 +8,7 @@ def test_404_anon(webtest, root):
 
 
 @pytest.mark.user("admin")
-def test_404_anon(webtest, root):
+def test_404_admin(webtest, root):
 
     resp = webtest.app.get("/non-existent", status=404)
     assert "Not Found" in resp.text
diff --git a/kotti/views/cache.py b/kotti/views/cache.py
index a439bf22e..725fbee3b 100644
--- a/kotti/views/cache.py
+++ b/kotti/views/cache.py
@@ -113,7 +113,7 @@ def set_cache_headers(event):
         # noinspection PyBroadException
         try:
             caching_policy = caching_policy_chooser(context, request, response)
-        except:
+        except:  # noqa: E722
             # We don't want to screw up the response if the
             # caching_policy_chooser raises an exception.
             logger.exception(f"{caching_policy_chooser} raised an exception.")
diff --git a/kotti/views/util.py b/kotti/views/util.py
index bda202910..a8fd7c0f1 100644
--- a/kotti/views/util.py
+++ b/kotti/views/util.py
@@ -354,14 +354,15 @@ def edit_links(self):
         if not hasattr(self.context, "type_info"):
             return []
         return [
-            l
-            for l in self.context.type_info.edit_links
-            if l.visible(self.context, self.request)
+            link
+            for link in self.context.type_info.edit_links
+            if link.visible(self.context, self.request)
         ]
 
     @reify
     def site_setup_links(self):
-        return [l for l in CONTROL_PANEL_LINKS if l.visible(self.root, self.request)]
+        return [link for link in CONTROL_PANEL_LINKS
+                if link.visible(self.root, self.request)]
 
     @staticmethod
     def sanitize(html, sanitizer="default"):
diff --git a/pytest.ini b/pytest.ini
index c093b78b9..4ec7c489b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -11,13 +11,15 @@ addopts =
     --travis-fold=auto
     --doctest-glob='*.txt'
     --doctest-modules
-    --pep8
+    --flake8
     --cov=kotti
     --cov-report=term-missing
     kotti/
 python_files = test_*.py
-pep8ignore = E122 E123 E125 E128 E203 E251 E501 E711 E713 E714 E402 W503
-pep8maxlinelength = 88
+flake8-ignore =
+    *.py E122 E123 E125 E128 E203 E251 E501 E711 E713 E714 E402 F821 W503
+    tests/*.py F841
+flake8-max-line-length = 88
 markers =
     user: mark test to be run as the given user
     slow: mark test to be run only with --runslow option
diff --git a/setup.py b/setup.py
index afa13cae6..6ba15ee89 100644
--- a/setup.py
+++ b/setup.py
@@ -67,14 +67,12 @@
     'WebTest',
     'mock',
     'Pillow',  # thumbnail filter in depot tween tests
-    'py>=1.4.29',
     'pyquery',
-    'pytest>=4.6,<5',  # see #563
+    'pytest>=6',
     'pytest-cov',
-    'pytest-pep8>=1.0.6',
+    'pytest-flake8',
     'pytest-travis-fold',
     'pytest-virtualenv',
-    # 'pytest-xdist',  # currently causes Travis to fail
     'tox',
     'zope.testbrowser>=5.0.0',
     ]

From b74782f04541484677a710ebe907394ed4711c6d Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 22:45:32 +0100
Subject: [PATCH 564/600] Disable doctests.

---
 kotti/tests/{browser-minimal.txt => browser-minimal.txt.disabled} | 0
 .../tests/{browser-workflow.txt => browser-workflow.txt.disabled} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename kotti/tests/{browser-minimal.txt => browser-minimal.txt.disabled} (100%)
 rename kotti/tests/{browser-workflow.txt => browser-workflow.txt.disabled} (100%)

diff --git a/kotti/tests/browser-minimal.txt b/kotti/tests/browser-minimal.txt.disabled
similarity index 100%
rename from kotti/tests/browser-minimal.txt
rename to kotti/tests/browser-minimal.txt.disabled
diff --git a/kotti/tests/browser-workflow.txt b/kotti/tests/browser-workflow.txt.disabled
similarity index 100%
rename from kotti/tests/browser-workflow.txt
rename to kotti/tests/browser-workflow.txt.disabled

From 9d4b03e9188cde357b6ab2462e4aad817d522af1 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 22:50:54 +0100
Subject: [PATCH 565/600] Add default "python-package" Github action.

---
 .github/workflow/python-package.yml | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/workflow/python-package.yml

diff --git a/.github/workflow/python-package.yml b/.github/workflow/python-package.yml
new file mode 100644
index 000000000..7c8fc61ed
--- /dev/null
+++ b/.github/workflow/python-package.yml
@@ -0,0 +1,38 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ $default-branch, "feature/upgrade_testing" ]
+  pull_request:
+    branches: [ $default-branch ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e ".[testing]"
+    # - name: Lint with flake8
+    #   run: |
+    #     # stop the build if there are Python syntax errors or undefined names
+    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From f0a0f0efbe0dfe19105a2b5aeee55e8c2abbb22c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 23:04:00 +0100
Subject: [PATCH 566/600] Remove Github action (added to master in the
 meanwhile).

---
 .github/workflow/python-package.yml | 38 -----------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 .github/workflow/python-package.yml

diff --git a/.github/workflow/python-package.yml b/.github/workflow/python-package.yml
deleted file mode 100644
index 7c8fc61ed..000000000
--- a/.github/workflow/python-package.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python package
-
-on:
-  push:
-    branches: [ $default-branch, "feature/upgrade_testing" ]
-  pull_request:
-    branches: [ $default-branch ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -e ".[testing]"
-    # - name: Lint with flake8
-    #   run: |
-    #     # stop the build if there are Python syntax errors or undefined names
-    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest

From e3e5245ed0f7319326f390071c2c7562bd60a095 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 17 Nov 2020 23:09:19 +0100
Subject: [PATCH 567/600] Remove doctests, travis-autofold.

---
 kotti/tests/browser-minimal.txt.disabled  | 43 -----------------
 kotti/tests/browser-workflow.txt.disabled | 57 -----------------------
 pytest.ini                                |  3 --
 setup.py                                  |  1 -
 4 files changed, 104 deletions(-)
 delete mode 100644 kotti/tests/browser-minimal.txt.disabled
 delete mode 100644 kotti/tests/browser-workflow.txt.disabled

diff --git a/kotti/tests/browser-minimal.txt.disabled b/kotti/tests/browser-minimal.txt.disabled
deleted file mode 100644
index ed1510f33..000000000
--- a/kotti/tests/browser-minimal.txt.disabled
+++ /dev/null
@@ -1,43 +0,0 @@
-Kotti browser tests for a stripped down app
-===========================================
-
-These browser tests use a setup that includes only a selection of
-Kotti's functionality.
-
-  >>> from kotti import testing
-  >>> tools = testing.setUpFunctionalStrippedDownApp()
-  >>> browser = tools['Browser']()
-  >>> ctrl = browser.getControl
-
-Logging in
-----------
-
-  >>> browser.open(testing.BASE_URL)
-  >>> "Welcome, you are not logged in" in browser.contents
-  True
-
-  >>> browser.open(testing.BASE_URL + '/secured')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "You are logged in" in browser.contents
-  True
-
-User management
----------------
-
-  >>> browser.open(testing.BASE_URL)
-  >>> browser.getLink("User Management").click()
-
-  >>> ctrl(name="query").value = "admin"
-  >>> ctrl(name="search").click()
-  >>> ctrl(name="role::admin::role:editor").value
-  []
-  >>> ctrl(name="role::admin::role:admin").value
-  True
-
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/kotti/tests/browser-workflow.txt.disabled b/kotti/tests/browser-workflow.txt.disabled
deleted file mode 100644
index 2c373429a..000000000
--- a/kotti/tests/browser-workflow.txt.disabled
+++ /dev/null
@@ -1,57 +0,0 @@
-Kotti browser tests for the default workflow
-============================================
-
-  >>> from kotti import testing
-  >>> from kotti import DBSession
-  >>> tools = testing.setUpFunctional()
-  >>> browser = tools['Browser']()
-  >>> ctrl = browser.getControl
-  >>> browser_anonymous = tools['Browser']()
-  >>> WELCOME = "Wonder what more you can do with Kotti?"
-
-By default, the front page is published and thus visible to all users:
-
-  >>> browser_anonymous.open(testing.BASE_URL)
-  >>> WELCOME in browser_anonymous.contents
-  True
-
-An administrator (or any user with ``state_change`` permission) can
-make the front page private.  First log in:
-
-  >>> browser.open(testing.BASE_URL + '/edit')
-  >>> ctrl("Username or email", index=0).value = "admin"
-  >>> ctrl("Password").value = "secret"
-  >>> ctrl(name="submit").click()
-  >>> "Welcome, Administrator" in browser.contents
-  True
-
-Now make private:
-
-  >>> browser.getLink("Make Private").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-
-The administrator can still see the page, but the anonymous user
-can't:
-
-  >>> browser.open(testing.BASE_URL)
-  >>> WELCOME in browser.contents
-  True
-  >>> browser_anonymous.open(testing.BASE_URL)
-  >>> WELCOME in browser_anonymous.contents
-  False
-
-Make the front page public again:
-
-  >>> browser.getLink("Make Public").click()
-  >>> "Your changes have been saved" in browser.contents
-  True
-  >>> browser_anonymous.open(testing.BASE_URL)
-  >>> WELCOME in browser_anonymous.contents
-  True
-
-
-TearDown
---------
-
-  >>> testing.tearDown()
diff --git a/pytest.ini b/pytest.ini
index 4ec7c489b..2ed80be9c 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -8,9 +8,6 @@ addopts =
     --capture=no
     --strict
     --tb=native
-    --travis-fold=auto
-    --doctest-glob='*.txt'
-    --doctest-modules
     --flake8
     --cov=kotti
     --cov-report=term-missing
diff --git a/setup.py b/setup.py
index 6ba15ee89..a764e1d30 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,6 @@
     'pytest>=6',
     'pytest-cov',
     'pytest-flake8',
-    'pytest-travis-fold',
     'pytest-virtualenv',
     'tox',
     'zope.testbrowser>=5.0.0',

From c88b1875ab461c1c75d54d86aed8e780c4d54916 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 11:57:23 +0100
Subject: [PATCH 568/600] Bump version.

---
 CHANGES.txt   | 2 +-
 COPYRIGHT.txt | 2 +-
 setup.py      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e189be3f9..b01857927 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-2.0.3 - unreleased
+2.0.3 - 2020-11-18
 ------------------
 
 - Upgrade to ``pytest>=6``.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 5ab7bc3ea..8079a602b 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
-Copyright (c) 2010-2019 Daniel Nouri, Andreas Kaiser and Contributors.
+Copyright (c) 2010-2020 Daniel Nouri, Andreas Kaiser and Contributors.
 All Rights Reserved
diff --git a/setup.py b/setup.py
index a764e1d30..22533ee6f 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.3.dev0'
+version = '2.0.3'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 584bd58d186bf8bd240d1a604e332e6c0bd8d8c3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 12:10:41 +0100
Subject: [PATCH 569/600] Update package metadata.

---
 README.rst | 2 ++
 setup.py   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index ed7b950c3..a175c7c64 100644
--- a/README.rst
+++ b/README.rst
@@ -118,6 +118,8 @@ We adhere to `high quality coding standards`_, have an extensive test suite with
 
 Contributions are always welcome, read our `contribution guidelines`_ and visit our `Github repository`_.
 
+.. _continuous integration: http://travis-ci.org/Kotti/Kotti
+
 .. |build_status_master_postgresql| image:: https://github.com/Kotti/Kotti/workflows/PostgreSQL/badge.svg?branch=master
 .. _build_status_master_postgresql: https://github.com/Kotti/Kotti/actions?query=workflow%3APostgreSQL+branch%3Amaster
 
diff --git a/setup.py b/setup.py
index 22533ee6f..49729488a 100644
--- a/setup.py
+++ b/setup.py
@@ -118,7 +118,9 @@ def read(*parts):
       long_description='\n\n'.join([read('README.rst'),
                                     read('AUTHORS.txt'),
                                     read('CHANGES.txt'), ]),
-      classifiers=[
+      long_description_content_type="text/x-rst",
+
+classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Environment :: Web Environment',
           'Framework :: Pylons',

From 6de3288f5876770a7a525c074b1637d7cd39ad59 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 12:15:25 +0100
Subject: [PATCH 570/600] Bump version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 49729488a..caa5041a5 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.3'
+version = '2.0.4dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From b2208eb4b9c9d5f1439bac38ce562d5b053b7166 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 18 Nov 2020 13:25:59 +0100
Subject: [PATCH 571/600] Update ``requirements.txt``.

---
 requirements.txt | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e2d4b45f2..14d4640cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,24 @@
-alembic==1.4.2
+alembic==1.4.3
+anyascii==0.1.7
 appdirs==1.4.4
-Babel==2.8.0
+Babel==2.9.0
 Beaker==1.11.0
-bleach==3.1.5
-bleach-whitelist==0.0.10
-Chameleon==3.7.4
+bleach==3.2.1
+bleach-whitelist==0.0.11
+Chameleon==3.8.1
 click==7.1.2
-colander==1.7.0
-deform==2.0.8
+colander==1.8.2
+deform==2.0.14
 docopt==0.6.2
 fanstatic==1.1
-filedepot==0.7.1
-FormEncode==2.0.0a1
+filedepot==0.8.0
+FormEncode==2.0.0
 html2text==2020.1.16
 hupper==1.10.2
 iso8601==0.1.11
 js.angular==1.1.4
 js.bootstrap==3.3.4
-js.deform==2.0.3
+js.deform==2.0.14
 js.fineuploader==5.14.0
 js.html5shiv==3.7.3
 js.jquery==1.9.1
@@ -36,14 +37,14 @@ lingua==4.14
 Mako==1.1.3
 MarkupSafe==1.1.1
 packaging==20.4
-PasteDeploy==2.1.0
+PasteDeploy==2.1.1
 peppercorn==0.6
 plaster==1.0
 plaster-pastedeploy==0.7
 polib==1.1.0
 py-bcrypt==0.4
 pyparsing==2.4.7
-pyramid==1.10.4
+pyramid==1.10.5
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
@@ -52,31 +53,31 @@ pyramid-tm==2.4
 pyramid-zcml==1.2.0
 python-dateutil==2.8.1
 python-editor==1.0.4
-pytz==2020.1
+pytz==2020.4
 repoze.lru==0.7
 repoze.sendmail==4.4.1
-repoze.workflow==1.0b1
-repoze.zcml==1.0b1
+repoze.workflow==1.1
+repoze.zcml==1.1
 shutilwhich==1.1.0
 six==1.15.0
-SQLAlchemy==1.3.17
-SQLAlchemy-Utils==0.36.6
+SQLAlchemy==1.3.20
+SQLAlchemy-Utils==0.36.8
 transaction==3.0.0
-translationstring==1.3
+translationstring==1.4
 Unidecode==1.1.1
 usersettings==1.0.7
 venusian==3.0.0
 waitress==1.4.4
 webencodings==0.5.1
 WebOb==1.8.6
-zope.component==4.6.1
+zope.component==4.6.2
 zope.configuration==4.4.0
 zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
-zope.event==4.4
+zope.event==4.5.0
 zope.hookable==5.0.1
 zope.i18nmessageid==5.0.1
-zope.interface==5.1.0
+zope.interface==5.2.0
 zope.proxy==4.3.5
 zope.schema==6.0.0
 zope.sqlalchemy==1.3

From e89be16a086f179be9c9a861806a7d6270029870 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Thu, 19 Nov 2020 18:13:56 +0100
Subject: [PATCH 572/600] - Replace deprecated ``bleach_whitelist`` with its
 successor ``bleach-allowlist``. - Upgrade ``iso8601``.

---
 CHANGES.txt                    |  3 +++
 kotti/sanitizers.py            | 12 ++++++------
 kotti/tests/test_sanitizers.py |  6 +++---
 requirements.txt               |  4 ++--
 setup.py                       |  4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b01857927..b2e7d02ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
 Change History
 ==============
 
+- Replace deprecated ``bleach_whitelist`` with its successor ``bleach-allowlist``.
+- Upgrade ``iso8601``.
+
 2.0.3 - 2020-11-18
 ------------------
 
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index aa819a9ef..f45f83aa9 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -5,12 +5,12 @@
 from typing import Union
 
 from bleach import clean
-from bleach_whitelist.bleach_whitelist import all_styles
-from bleach_whitelist.bleach_whitelist import generally_xss_safe
-from bleach_whitelist.bleach_whitelist import markdown_attrs
-from bleach_whitelist.bleach_whitelist import markdown_tags
-from bleach_whitelist.bleach_whitelist import print_attrs
-from bleach_whitelist.bleach_whitelist import print_tags
+from bleach_allowlist import all_styles
+from bleach_allowlist import generally_xss_safe
+from bleach_allowlist import markdown_attrs
+from bleach_allowlist import markdown_tags
+from bleach_allowlist import print_attrs
+from bleach_allowlist import print_tags
 from pyramid.config import Configurator
 from pyramid.util import DottedNameResolver
 
diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
index a49960992..7d6e3598c 100644
--- a/kotti/tests/test_sanitizers.py
+++ b/kotti/tests/test_sanitizers.py
@@ -29,9 +29,9 @@ def test_no_html():
 
 def _verify_minimal_html(sanitized):
 
-    from bleach_whitelist.bleach_whitelist import all_tags
-    from bleach_whitelist.bleach_whitelist import markdown_tags
-    from bleach_whitelist.bleach_whitelist import print_tags
+    from bleach_allowlist import all_tags
+    from bleach_allowlist import markdown_tags
+    from bleach_allowlist import print_tags
 
     for tag in set(all_tags) - set(markdown_tags) - set(print_tags):
         assert f"<{tag}" not in sanitized
diff --git a/requirements.txt b/requirements.txt
index 14d4640cb..97913e727 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ appdirs==1.4.4
 Babel==2.9.0
 Beaker==1.11.0
 bleach==3.2.1
-bleach-whitelist==0.0.11
+bleach-allowlist==1.0.3
 Chameleon==3.8.1
 click==7.1.2
 colander==1.8.2
@@ -15,7 +15,7 @@ filedepot==0.8.0
 FormEncode==2.0.0
 html2text==2020.1.16
 hupper==1.10.2
-iso8601==0.1.11
+iso8601==0.1.13
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.14
diff --git a/setup.py b/setup.py
index caa5041a5..3ebd4551e 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'alembic>=0.8.0',
     'bleach>=3.1.4',
-    'bleach-whitelist',
+    'bleach-allowlist',
     'colander>=1.3.2',
     'deform>=2.0.5',  # fixes file upload on py3 - uncomment after 2.0.5 is released  # noqa
     'docopt',
@@ -28,7 +28,7 @@
     'filedepot',
     'formencode>=2.0.0a',
     'html2text',
-    'iso8601==0.1.11',  # rq.filter: !=0.1.12
+    'iso8601>=0.1.13',
     'js.angular',
     'js.bootstrap>=3.0.0',
     'js.deform>=2.0.3',

From 8221958a1e4d4b6ec07dc2c222b3f5d03c1de647 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Fri, 20 Nov 2020 16:46:12 +0100
Subject: [PATCH 573/600] Fix mocking issues with ``TestStorage``.

---
 kotti/tests/__init__.py | 51 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index 764557ba6..a372ac719 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -77,7 +77,7 @@ def allwarnings(request):
 
 @fixture(scope="session")
 def custom_settings():
-    """ This is a dummy fixture meant to be overriden in add on package's
+    """This is a dummy fixture meant to be overriden in add on package's
     ``conftest.py``.  It can be used to inject arbitrary settings for third
     party test suites.  The default settings dictionary will be updated
     with the dictionary returned by this fixture.
@@ -116,8 +116,8 @@ def settings(unresolved_settings):
 
 @yield_fixture
 def config(settings):
-    """ returns a Pyramid `Configurator` object initialized
-        with Kotti's default (test) settings.
+    """returns a Pyramid `Configurator` object initialized
+    with Kotti's default (test) settings.
     """
     from pyramid import testing
     from kotti import security
@@ -132,7 +132,7 @@ def config(settings):
 
 @fixture(scope="session")
 def connection(custom_settings):
-    """ sets up a SQLAlchemy engine and returns a connection to the database.
+    """sets up a SQLAlchemy engine and returns a connection to the database.
     The connection string used for testing can be specified via the
     ``KOTTI_TEST_DB_STRING`` environment variable.  The ``custom_settings``
     fixture is needed to allow users to import their models easily instead of
@@ -159,8 +159,7 @@ def connection(custom_settings):
 
 @fixture
 def content(connection, settings):
-    """ sets up some default content using Kotti's testing populator.
-    """
+    """sets up some default content using Kotti's testing populator."""
     import transaction
     from kotti import DBSession
     from kotti import metadata
@@ -193,8 +192,8 @@ def content(connection, settings):
 
 @yield_fixture
 def db_session(config, content, connection):
-    """ returns a db session object and sets up a db transaction
-        savepoint, which will be rolled back after the test.
+    """returns a db session object and sets up a db transaction
+    savepoint, which will be rolled back after the test.
     """
 
     import transaction
@@ -209,9 +208,9 @@ def db_session(config, content, connection):
 
 @fixture
 def dummy_request(config, request, monkeypatch):
-    """ returns a dummy request object after registering it as
-        the currently active request.  This is needed when
-        `pyramid.threadlocal.get_current_request` is used.
+    """returns a dummy request object after registering it as
+    the currently active request.  This is needed when
+    `pyramid.threadlocal.get_current_request` is used.
     """
 
     from kotti.testing import DummyRequest
@@ -236,8 +235,7 @@ def dummy_mailer(monkeypatch):
 
 @yield_fixture
 def events(config):
-    """ sets up Kotti's default event handlers.
-    """
+    """sets up Kotti's default event handlers."""
     from kotti.events import clear
 
     config.include("kotti.events")
@@ -260,9 +258,9 @@ def app(workflow, db_session, dummy_mailer, events, setup_app):
 
 @fixture
 def browser(db_session, request, setup_app):
-    """ returns an instance of `zope.testbrowser`.  The `kotti.testing.user`
-        pytest marker (or `pytest.mark.user`) can be used to pre-authenticate
-        the browser with the given login name: `@user('admin')`.
+    """returns an instance of `zope.testbrowser`.  The `kotti.testing.user`
+    pytest marker (or `pytest.mark.user`) can be used to pre-authenticate
+    the browser with the given login name: `@user('admin')`.
     """
     from zope.testbrowser.wsgi import Browser
     from kotti.testing import BASE_URL
@@ -288,8 +286,7 @@ def browser(db_session, request, setup_app):
 
 @fixture
 def root(db_session):
-    """ returns Kotti's 'root' node.
-    """
+    """returns Kotti's 'root' node."""
     from kotti.resources import get_root
 
     return get_root()
@@ -312,8 +309,7 @@ def webtest(app, monkeypatch, request, filedepot, dummy_mailer):
 
 @fixture
 def workflow(config):
-    """ loads and activates Kotti's default workflow rules.
-    """
+    """loads and activates Kotti's default workflow rules."""
     from zope.configuration import xmlconfig
     import kotti
 
@@ -321,6 +317,10 @@ def workflow(config):
 
 
 class TestStorage(MemoryFileStorage):
+    def __bool__(self):
+        # required for test mocking
+        return True
+
     def get(self, file_or_id):
         f = super().get(file_or_id)
         f.last_modified = datetime(2012, 12, 30)
@@ -329,8 +329,8 @@ def get(self, file_or_id):
 
 @yield_fixture
 def depot_tween(config, dummy_request):
-    """ Sets up the Depot tween and patches Depot's ``set_middleware`` to
-    suppress exceptions on subsequent calls. Yields the ``DepotManager``. """
+    """Sets up the Depot tween and patches Depot's ``set_middleware`` to
+    suppress exceptions on subsequent calls. Yields the ``DepotManager``."""
 
     from depot.manager import DepotManager
     from kotti.filedepot import TweenFactory
@@ -357,7 +357,7 @@ def set_middleware_patched(cls, mw):
 
 @yield_fixture
 def mock_filedepot(depot_tween):
-    """ Configures a mock depot store for :class:`depot.manager.DepotManager`
+    """Configures a mock depot store for :class:`depot.manager.DepotManager`
 
     This filedepot is not integrated with dbsession.
     Can be used in simple, standalone unit tests.
@@ -374,7 +374,7 @@ def mock_filedepot(depot_tween):
 
 @yield_fixture
 def filedepot(db_session, depot_tween):
-    """ Configures a dbsession integrated mock depot store for
+    """Configures a dbsession integrated mock depot store for
     :class:`depot.manager.DepotManager`
     """
     from depot.manager import DepotManager
@@ -390,8 +390,7 @@ def filedepot(db_session, depot_tween):
 
 @yield_fixture
 def no_filedepots(db_session, depot_tween):
-    """ A filedepot fixture to empty and then restore DepotManager configuration
-    """
+    """A filedepot fixture to empty and then restore DepotManager configuration"""
     from depot.manager import DepotManager
 
     DepotManager._depots = {}

From 82246f87fcae3401e2428c2feb9521ecc8c85e0f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Fri, 20 Nov 2020 16:55:57 +0100
Subject: [PATCH 574/600] Bump version.

---
 CHANGES.txt | 3 +++
 setup.py    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b2e7d02ef..b0092de6c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
 Change History
 ==============
 
+2.0.4 - 2020-11-20
+------------------
+
 - Replace deprecated ``bleach_whitelist`` with its successor ``bleach-allowlist``.
 - Upgrade ``iso8601``.
 
diff --git a/setup.py b/setup.py
index 3ebd4551e..13111144f 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.4dev0'
+version = '2.0.4'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From d9c3a4366abd448d8c974bdce7d28e8d469fc60f Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Fri, 20 Nov 2020 16:56:43 +0100
Subject: [PATCH 575/600] Bump version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 13111144f..1187cb5ca 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.4'
+version = '2.0.5dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 8f2363a058c77d5d42adb2d12715e4d0530d5208 Mon Sep 17 00:00:00 2001
From: Ben Burke <glvnst@users.noreply.github.com>
Date: Tue, 8 Dec 2020 16:22:01 +0000
Subject: [PATCH 576/600] remove ancient dep usersettings, which is not used
 (#579)

---
 requirements.txt | 1 -
 setup.py         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 97913e727..0f466d326 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -65,7 +65,6 @@ SQLAlchemy-Utils==0.36.8
 transaction==3.0.0
 translationstring==1.4
 Unidecode==1.1.1
-usersettings==1.0.7
 venusian==3.0.0
 waitress==1.4.4
 webencodings==0.5.1
diff --git a/setup.py b/setup.py
index 1187cb5ca..bdec58e60 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,6 @@
     'sqlalchemy-utils',
     'transaction>=1.1.0',
     'unidecode',
-    'usersettings',
     'waitress',
     'zope.deprecation',
     'zope.interface',

From 42d3331de78e25cbb7e3debe184a2e972b49f196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u=20=28Johnny=20B=2E=29?=
 <bizauionica@gmail.com>
Date: Tue, 23 Feb 2021 18:39:08 +0200
Subject: [PATCH 577/600] =?UTF-8?q?Update=20the=20copyright=20year=20?=
 =?UTF-8?q?=F0=9F=8E=86=20(#580)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ooops. It can, of course!
---
 COPYRIGHT.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 8079a602b..8f060ea28 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
-Copyright (c) 2010-2020 Daniel Nouri, Andreas Kaiser and Contributors.
+Copyright (c) 2010-2021 Daniel Nouri, Andreas Kaiser and Contributors.
 All Rights Reserved

From acdbe1a85cc085e3072280f2ac2ce7f6c1670394 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Mar 2021 14:58:58 +0100
Subject: [PATCH 578/600] Bump bleach from 3.2.1 to 3.3.0 (#581)

Bumps [bleach](https://github.com/mozilla/bleach) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0f466d326..e30cdd31b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ anyascii==0.1.7
 appdirs==1.4.4
 Babel==2.9.0
 Beaker==1.11.0
-bleach==3.2.1
+bleach==3.3.0
 bleach-allowlist==1.0.3
 Chameleon==3.8.1
 click==7.1.2

From dc861235b61220ba9998b2e88ad747529ba8f7d4 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 16 Mar 2021 15:10:01 +0100
Subject: [PATCH 579/600] Fix sanitizer error when values are None (ie nothing
 to sanitize at all).

---
 CHANGES.txt                    | 2 ++
 kotti/sanitizers.py            | 2 ++
 kotti/tests/test_sanitizers.py | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b0092de6c..cbaf64c57 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,8 @@
 Change History
 ==============
 
+- Fix sanitizer error when values are None (ie nothing to sanitize at all).
+
 2.0.4 - 2020-11-20
 ------------------
 
diff --git a/kotti/sanitizers.py b/kotti/sanitizers.py
index f45f83aa9..b2b683556 100644
--- a/kotti/sanitizers.py
+++ b/kotti/sanitizers.py
@@ -138,6 +138,8 @@ def _setup_listeners(settings):
         def _create_handler(attributename, sanitizers):
             def handler(event):
                 value = getattr(event.object, attributename)
+                if value is None:
+                    return
                 for sanitizer_name in sanitizers.split(","):
                     value = settings["kotti.sanitizers"][sanitizer_name](value)
                 setattr(event.object, attributename, value)
diff --git a/kotti/tests/test_sanitizers.py b/kotti/tests/test_sanitizers.py
index 7d6e3598c..ca4bc2674 100644
--- a/kotti/tests/test_sanitizers.py
+++ b/kotti/tests/test_sanitizers.py
@@ -112,6 +112,13 @@ def test_listeners(app, root, db_session):
     _verify_no_html(doc.description)
     _verify_xss_protection(doc.body)
 
+    # Test None title
+    root["e"] = doc = Document(
+        name="test", title=None, description=unsanitized, body=unsanitized
+    )
+    db_session.flush()
+    assert doc.title == None
+
 
 def test_sanitize(app, dummy_request):
 

From 61483bfc130c5b6d4b9740a4623093ca567480c1 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 16 Mar 2021 15:14:07 +0100
Subject: [PATCH 580/600] Pin Pyramid to < 2 (for now).

---
 CHANGES.txt | 1 +
 setup.py    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cbaf64c57..55bb7e2e6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@ Change History
 ==============
 
 - Fix sanitizer error when values are None (ie nothing to sanitize at all).
+- Pin Pyramid to < 2 (for now).
 
 2.0.4 - 2020-11-20
 ------------------
diff --git a/setup.py b/setup.py
index bdec58e60..bc382a933 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@
     'js.jqueryui_tagit',
     'lingua>=1.3',
     'py_bcrypt',
-    'pyramid>=1.9',
+    'pyramid>=1.9,<2',
     'pyramid_beaker',
     'pyramid_chameleon',
     'pyramid_deform>=0.2a3',  # language and template path config includeme

From 4d0fa28efe727cd7a5fa84cea33ff0a54277a95b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 16 Mar 2021 15:23:26 +0100
Subject: [PATCH 581/600] Pin SQLAlchemy to < 1.4 to prevent no longer working
 private import in sqlalchemy-utils.

---
 CHANGES.txt | 1 +
 setup.py    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 55bb7e2e6..7f9d669bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ Change History
 
 - Fix sanitizer error when values are None (ie nothing to sanitize at all).
 - Pin Pyramid to < 2 (for now).
+- Pin SQLAlchemy to < 1.4 to prevent no longer working private import in sqlalchemy-utils.
 
 2.0.4 - 2020-11-20
 ------------------
diff --git a/setup.py b/setup.py
index bc382a933..8e2b22ca0 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@
     'repoze.lru',
     'repoze.workflow>=1.0b1',
     'repoze.zcml>=1.0b1',
-    'sqlalchemy>=1.0.0',
+    'sqlalchemy>=1.0.0,<1.4',  # https://github.com/kvesteri/sqlalchemy-utils/blob/master/sqlalchemy_utils/functions/orm.py#L14 fails on 1.4
     'sqlalchemy-utils',
     'transaction>=1.1.0',
     'unidecode',

From 2d16f4b06ce7ca1ca797177758ded956db7c4cdf Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 16 Mar 2021 15:35:23 +0100
Subject: [PATCH 582/600] Pin deform / js.deform.

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 8e2b22ca0..ac6658455 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@
     'bleach>=3.1.4',
     'bleach-allowlist',
     'colander>=1.3.2',
-    'deform>=2.0.5',  # fixes file upload on py3 - uncomment after 2.0.5 is released  # noqa
+    'deform==2.0.14',  # 2.0.15 breaks js.deform
     'docopt',
     'fanstatic>=1.0.0',
     'filedepot',
@@ -31,7 +31,7 @@
     'iso8601>=0.1.13',
     'js.angular',
     'js.bootstrap>=3.0.0',
-    'js.deform>=2.0.3',
+    'js.deform==2.0.14',  # deform 2.0.15 breaks js.deform
     'js.fineuploader',
     'js.html5shiv',
     'js.jquery<2.0.0.dev',  # rq.filter: <2.0

From abe9c353a0f7ae2525ce9e11903469d28f670acb Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 16 Mar 2021 15:43:02 +0100
Subject: [PATCH 583/600] Bump version.

---
 CHANGES.txt | 3 +++
 setup.py    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7f9d669bf..01b13b2c4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
 Change History
 ==============
 
+2.0.5 - 2021-03-16
+------------------
+
 - Fix sanitizer error when values are None (ie nothing to sanitize at all).
 - Pin Pyramid to < 2 (for now).
 - Pin SQLAlchemy to < 1.4 to prevent no longer working private import in sqlalchemy-utils.
diff --git a/setup.py b/setup.py
index ac6658455..624935dbb 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.5dev0'
+version = '2.0.5'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From fcba2654131fc8607a684620760e9ce52446bffe Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Tue, 16 Mar 2021 15:44:01 +0100
Subject: [PATCH 584/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 01b13b2c4..eef844859 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.6dev0 - unreleased
+----------------------
+
+- No changes yet.
+
 2.0.5 - 2021-03-16
 ------------------
 
diff --git a/setup.py b/setup.py
index 624935dbb..da0585637 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.5'
+version = '2.0.6dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 564096444af2814dd26584a1c5d9eec265fda987 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Wed, 12 May 2021 14:32:19 +0200
Subject: [PATCH 585/600] - Fix performance issue: ``Content._tags`` is
 configured with ``lazy="select"`` now.   This doesn't cause any change in API
 usage, however it speeds up selects on ``Node`` and descendants by 1-2 orders
 of magnitude in some cases at the price of a slight performance degradation
 in scenarios with few tables and heavy tag usage. - Update dependencies to
 their most recent compatible versions.

---
 CHANGES.txt        |  7 +++++++
 kotti/resources.py |  1 -
 requirements.txt   | 51 ++++++++++++++++++++++------------------------
 setup.py           |  3 ++-
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 01b13b2c4..8b7a8c5cd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
 Change History
 ==============
 
+2.0.6 - 2021-05-12
+------------------
+
+- Fix performance issue: ``Content._tags`` is configured with ``lazy="select"`` now.
+  This doesn't cause any change in API usage, however it speeds up selects on ``Node`` and descendants by 1-2 orders of magnitude in some cases at the price of a slight performance degradation in scenarios with few tables and heavy tag usage.
+- Update dependencies to their most recent compatible versions.
+
 2.0.5 - 2021-03-16
 ------------------
 
diff --git a/kotti/resources.py b/kotti/resources.py
index 3341bf992..dd2913f6a 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -632,7 +632,6 @@ def __mapper_args__(cls):
     _tags = relation(
         TagsToContents,
         backref=backref("item"),
-        lazy="joined",
         order_by=[TagsToContents.position],
         collection_class=ordering_list("position"),
         cascade="all, delete-orphan",
diff --git a/requirements.txt b/requirements.txt
index e30cdd31b..13d1613e2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,12 @@
-alembic==1.4.3
-anyascii==0.1.7
-appdirs==1.4.4
-Babel==2.9.0
+alembic==1.6.2
+anyascii==0.2.0
+Babel==2.9.1
 Beaker==1.11.0
 bleach==3.3.0
 bleach-allowlist==1.0.3
-Chameleon==3.8.1
-click==7.1.2
-colander==1.8.2
+Chameleon==3.9.0
+click==8.0.0
+colander==1.8.3
 deform==2.0.14
 docopt==0.6.2
 fanstatic==1.1
@@ -15,7 +14,7 @@ filedepot==0.8.0
 FormEncode==2.0.0
 html2text==2020.1.16
 hupper==1.10.2
-iso8601==0.1.13
+iso8601==0.1.14
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.14
@@ -34,17 +33,17 @@ js.modernizr==2.5.3.1
 js.select2==4.0.4.post1
 js.tinymce==4.5.4
 lingua==4.14
-Mako==1.1.3
-MarkupSafe==1.1.1
-packaging==20.4
+Mako==1.1.4
+MarkupSafe==2.0.0
+packaging==20.9
 PasteDeploy==2.1.1
 peppercorn==0.6
 plaster==1.0
 plaster-pastedeploy==0.7
-polib==1.1.0
+polib==1.1.1
 py-bcrypt==0.4
 pyparsing==2.4.7
-pyramid==1.10.5
+pyramid==1.10.8
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
@@ -53,30 +52,28 @@ pyramid-tm==2.4
 pyramid-zcml==1.2.0
 python-dateutil==2.8.1
 python-editor==1.0.4
-pytz==2020.4
+pytz==2021.1
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.1
 repoze.zcml==1.1
 shutilwhich==1.1.0
-six==1.15.0
-SQLAlchemy==1.3.20
-SQLAlchemy-Utils==0.36.8
-transaction==3.0.0
+six==1.16.0
+SQLAlchemy==1.3.24
+SQLAlchemy-Utils==0.37.2
+transaction==3.0.1
 translationstring==1.4
-Unidecode==1.1.1
+Unidecode==1.2.0
 venusian==3.0.0
-waitress==1.4.4
+waitress==2.0.0
 webencodings==0.5.1
-WebOb==1.8.6
-zope.component==4.6.2
+WebOb==1.8.7
+zope.component==5.0.0
 zope.configuration==4.4.0
-zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
 zope.event==4.5.0
 zope.hookable==5.0.1
 zope.i18nmessageid==5.0.1
-zope.interface==5.2.0
-zope.proxy==4.3.5
-zope.schema==6.0.0
-zope.sqlalchemy==1.3
+zope.interface==5.4.0
+zope.schema==6.1.0
+zope.sqlalchemy==1.4
diff --git a/setup.py b/setup.py
index 624935dbb..bbc83e431 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.5'
+version = '2.0.6'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."
@@ -143,6 +143,7 @@ def read(*parts):
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: Implementation',
           'Programming Language :: Python :: Implementation :: CPython',
           # 'Programming Language :: Python :: Implementation :: PyPy',

From e0ba09f85f4bb686e6d2bbe88fedf22d50ab0264 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Thu, 2 Sep 2021 11:23:02 +0200
Subject: [PATCH 586/600] Fix ``url_normalizer`` tests.

---
 kotti/tests/test_url_normalizer.py | 83 +++++++++++++++---------------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/kotti/tests/test_url_normalizer.py b/kotti/tests/test_url_normalizer.py
index b6df61768..bd74eec00 100644
--- a/kotti/tests/test_url_normalizer.py
+++ b/kotti/tests/test_url_normalizer.py
@@ -1,45 +1,46 @@
 from kotti import get_settings
-from kotti.url_normalizer import url_normalizer
 
 
-class URLNormalizerTests:
-    def test_normalizer(self):
-        assert url_normalizer("simpleandsafe") == "simpleandsafe"
-        assert (
-            url_normalizer(" Whitespace and capital Letters  ")
-            == "whitespace-and-capital-letters"
-        )
-        assert url_normalizer(">here's another!") == "heres-another"
-        assert url_normalizer(">>>here'!--s yet another!!!") == "here-s-yet-another"
-        assert url_normalizer("Doe, Joe") == "doe-joe"
-        assert url_normalizer("umläut.doc") == "umläut.doc"
-        assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zażółć-gęślą-jaźń"
-        assert url_normalizer("zażółć gęślą jaźń") == "zażółć-gęślą-jaźń"
-        assert url_normalizer("quote-this") == "quote-this"
-        assert url_normalizer("quote 'this'!") == "quote-this"
-        assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
-        assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
-        assert url_normalizer("rest `n` peace") == "rest-n-peace"
-        assert (len(url_normalizer("aa" * 2000))) == 255
-        assert url_normalizer("short-hello-version", max_length=10) == "short"
+def test_url_normalizer(config):
+    from kotti.url_normalizer import url_normalizer
+    assert url_normalizer("simpleandsafe") == "simpleandsafe"
+    assert (
+        url_normalizer(" Whitespace and capital Letters  ")
+        == "whitespace-and-capital-letters"
+    )
+    assert url_normalizer(">here's another!") == "heres-another"
+    assert url_normalizer(">>>here'!--s yet another!!!") == "here-s-yet-another"
+    assert url_normalizer("Doe, Joe") == "doe-joe"
+    assert url_normalizer("umläut.doc") == "umlaut.doc"
+    assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zazolc-gesla-jazn"
+    assert url_normalizer("zażółć gęślą jaźń") == "zazolc-gesla-jazn"
+    assert url_normalizer("quote-this") == "quote-this"
+    assert url_normalizer("quote 'this'!") == "quote-this"
+    assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
+    assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
+    assert url_normalizer("rest `n` peace") == "rest-n-peace"
+    assert (len(url_normalizer("aa" * 2000))) == 255
+    assert url_normalizer("short-hello-version", max_length=10) == "short"
 
-    def test_normalizer_map_non_ascii_characters(self):
-        get_settings()["kotti.url_normalizer.map_non_ascii_characters"] = True
-        assert url_normalizer("simpleandsafe") == "simpleandsafe"
-        assert (
-            url_normalizer(" Whitespace and capital Letters  ")
-            == "whitespace-and-capital-letters"
-        )
-        assert url_normalizer(">here's another!") == "heres-another"
-        assert url_normalizer(">>>here'!--s yet another!!!") == "here-s-yet-another"
-        assert url_normalizer("Doe, Joe") == "doe-joe"
-        assert url_normalizer("umläut.doc") == "umlaut.doc"
-        assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zazolc-gesla-jazn"
-        assert url_normalizer("zażółć gęślą jaźń") == "zazolc-gesla-jazn"
-        assert url_normalizer("quote-this") == "quote-this"
-        assert url_normalizer("quote 'this'!") == "quote-this"
-        assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
-        assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
-        assert url_normalizer("rest `n` peace") == "rest-n-peace"
-        assert (len(url_normalizer("aa" * 2000))) == 255
-        assert url_normalizer("short-hello-version", max_length=10) == "short"
+
+def test_url_normalizer_map_non_ascii_characters(config):
+    from kotti.url_normalizer import url_normalizer
+    get_settings()["kotti.url_normalizer.map_non_ascii_characters"] = True
+    assert url_normalizer("simpleandsafe") == "simpleandsafe"
+    assert (
+        url_normalizer(" Whitespace and capital Letters  ")
+        == "whitespace-and-capital-letters"
+    )
+    assert url_normalizer(">here's another!") == "heres-another"
+    assert url_normalizer(">>>here'!--s yet another!!!") == "here-s-yet-another"
+    assert url_normalizer("Doe, Joe") == "doe-joe"
+    assert url_normalizer("umläut.doc") == "umlaut.doc"
+    assert url_normalizer("ZAŻÓŁĆ GĘŚLĄ JAŹŃ") == "zazolc-gesla-jazn"
+    assert url_normalizer("zażółć gęślą jaźń") == "zazolc-gesla-jazn"
+    assert url_normalizer("quote-this") == "quote-this"
+    assert url_normalizer("quote 'this'!") == "quote-this"
+    assert url_normalizer("I'm not a FILE.txt") == "im-not-a-file.txt"
+    assert url_normalizer("I'm a big file.TXT") == "im-a-big-file.txt"
+    assert url_normalizer("rest `n` peace") == "rest-n-peace"
+    assert (len(url_normalizer("aa" * 2000))) == 255
+    assert url_normalizer("short-hello-version", max_length=10) == "short"

From a724922e79aac3974df7f181a9af6f5fb290f20c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Thu, 2 Sep 2021 11:53:46 +0200
Subject: [PATCH 587/600] Add compatibility for (and require) SQLAlchemy 1.4.

---
 CHANGES.txt        |  3 ++-
 kotti/resources.py |  3 ++-
 noxfile.py         |  8 --------
 requirements.txt   | 31 +++++++++++++++----------------
 setup.py           |  4 ++--
 5 files changed, 21 insertions(+), 28 deletions(-)
 delete mode 100644 noxfile.py

diff --git a/CHANGES.txt b/CHANGES.txt
index d997b77b3..452efb352 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Change History
 2.0.7dev0 - unreleased
 ----------------------
 
-- No changes yet.
+- Add compatibility for (and require) SQLAlchemy 1.4.
+- Fix ``url_normalizer`` tests (not picked up before).
 
 2.0.6 - 2021-05-12
 ------------------
diff --git a/kotti/resources.py b/kotti/resources.py
index dd2913f6a..73a8f781a 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -354,7 +354,8 @@ def __ne__(self, other: Any) -> bool:
 
     def clear(self) -> None:
 
-        DBSession.query(Node).filter(Node.parent == self).delete()
+        for node in DBSession.query(Node).filter(Node.parent == self):
+            DBSession.delete(node)
 
     def copy(self, **kwargs) -> "Node":
         """
diff --git a/noxfile.py b/noxfile.py
deleted file mode 100644
index 2389d4782..000000000
--- a/noxfile.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import nox
-
-
-@nox.session(python=["3.8", "3.7", "3.6"])
-def tests(session):
-    args = session.posargs or ["--cov"]
-    session.run("pip", "install", "-e", ".[testing]", external=True)
-    session.run("pytest", *args)
diff --git a/requirements.txt b/requirements.txt
index 13d1613e2..a47efdf6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,21 @@
-alembic==1.6.2
+alembic==1.7.1
 anyascii==0.2.0
 Babel==2.9.1
 Beaker==1.11.0
-bleach==3.3.0
+bleach==4.1.0
 bleach-allowlist==1.0.3
-Chameleon==3.9.0
-click==8.0.0
+Chameleon==3.9.1
+click==8.0.1
 colander==1.8.3
 deform==2.0.14
 docopt==0.6.2
 fanstatic==1.1
 filedepot==0.8.0
 FormEncode==2.0.0
+greenlet==1.1.1
 html2text==2020.1.16
-hupper==1.10.2
-iso8601==0.1.14
+hupper==1.10.3
+iso8601==0.1.16
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.14
@@ -33,9 +34,9 @@ js.modernizr==2.5.3.1
 js.select2==4.0.4.post1
 js.tinymce==4.5.4
 lingua==4.14
-Mako==1.1.4
-MarkupSafe==2.0.0
-packaging==20.9
+Mako==1.1.5
+MarkupSafe==2.0.1
+packaging==21.0
 PasteDeploy==2.1.1
 peppercorn==0.6
 plaster==1.0
@@ -50,8 +51,6 @@ pyramid-deform==0.2
 pyramid-mailer==0.15.1
 pyramid-tm==2.4
 pyramid-zcml==1.2.0
-python-dateutil==2.8.1
-python-editor==1.0.4
 pytz==2021.1
 repoze.lru==0.7
 repoze.sendmail==4.4.1
@@ -59,8 +58,8 @@ repoze.workflow==1.1
 repoze.zcml==1.1
 shutilwhich==1.1.0
 six==1.16.0
-SQLAlchemy==1.3.24
-SQLAlchemy-Utils==0.37.2
+SQLAlchemy==1.4.23
+SQLAlchemy-Utils==0.37.8
 transaction==3.0.1
 translationstring==1.4
 Unidecode==1.2.0
@@ -68,12 +67,12 @@ venusian==3.0.0
 waitress==2.0.0
 webencodings==0.5.1
 WebOb==1.8.7
-zope.component==5.0.0
+zope.component==5.0.1
 zope.configuration==4.4.0
 zope.deprecation==4.4.0
 zope.event==4.5.0
-zope.hookable==5.0.1
+zope.hookable==5.1.0
 zope.i18nmessageid==5.0.1
 zope.interface==5.4.0
 zope.schema==6.1.0
-zope.sqlalchemy==1.4
+zope.sqlalchemy==1.5
diff --git a/setup.py b/setup.py
index 014877d28..a55246cb7 100644
--- a/setup.py
+++ b/setup.py
@@ -52,8 +52,8 @@
     'repoze.lru',
     'repoze.workflow>=1.0b1',
     'repoze.zcml>=1.0b1',
-    'sqlalchemy>=1.0.0,<1.4',  # https://github.com/kvesteri/sqlalchemy-utils/blob/master/sqlalchemy_utils/functions/orm.py#L14 fails on 1.4
-    'sqlalchemy-utils',
+    'sqlalchemy>=1.4.16',
+    'sqlalchemy-utils>=0.37.6',
     'transaction>=1.1.0',
     'unidecode',
     'waitress',

From fba59078ab865980bfea4b9009a8251d7dd9cfef Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Thu, 2 Sep 2021 12:50:39 +0200
Subject: [PATCH 588/600] Optimize traversal for applications with large
 ``Node`` subclass hierarchies.

---
 CHANGES.txt                   |  1 +
 kotti/tests/test_traversal.py | 25 +++++++++++++++++++++++++
 kotti/traversal.py            | 19 ++++++++++++-------
 3 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 kotti/tests/test_traversal.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 452efb352..01f9d9f22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Change History
 
 - Add compatibility for (and require) SQLAlchemy 1.4.
 - Fix ``url_normalizer`` tests (not picked up before).
+- Optimize traversal for applications with large ``Node`` subclass hierarchies.
 
 2.0.6 - 2021-05-12
 ------------------
diff --git a/kotti/tests/test_traversal.py b/kotti/tests/test_traversal.py
new file mode 100644
index 000000000..4af6406aa
--- /dev/null
+++ b/kotti/tests/test_traversal.py
@@ -0,0 +1,25 @@
+import pytest
+
+
+@pytest.mark.user("admin")
+def test_traversal(webtest, root):
+    from kotti.resources import Document
+    d1 = root["d1"] = Document(title="Title 1", body="Body 1")
+    d2 = d1["d2"] = Document(title="Title 2", body="Body 2")
+    d2["d3"] = Document(title="Title 3", body="Body 3")
+    app = webtest.app
+
+    resp = app.get("/d1")
+    assert "Title 1" in resp.text
+    assert "Body 1" in resp.text
+
+    resp = app.get("/d1/d2")
+    assert "Title 1" in resp.text
+    assert "Title 2" in resp.text
+    assert "Body 2" in resp.text
+
+    resp = app.get("/d1/d2/d3")
+    assert "Title 1" in resp.text
+    assert "Title 2" in resp.text
+    assert "Title 3" in resp.text
+    assert "Body 3" in resp.text
diff --git a/kotti/traversal.py b/kotti/traversal.py
index e5e4ed286..7f1294b6a 100644
--- a/kotti/traversal.py
+++ b/kotti/traversal.py
@@ -50,12 +50,12 @@
 
 @implementer(ITraverser)
 class NodeTreeTraverser(ResourceTreeTraverser):
-    """ An optimized resource tree traverser for :class:`kotti.resources.Node`
-    based resource trees. """
+    """An optimized resource tree traverser for :class:`kotti.resources.Node`
+    based resource trees."""
 
     @staticmethod
     def _extract_from_request(request):  # pragma: no cover
-        """ Extract subpath, vpath and vroot_tuple from the request.  The
+        """Extract subpath, vpath and vroot_tuple from the request.  The
         contents of this method is just a copy from the base class'
         implementation.
 
@@ -93,7 +93,7 @@ def _extract_from_request(request):  # pragma: no cover
         return subpath, vpath, vroot_tuple
 
     def __call__(self, request):
-        """ The first part of this function is copied without changes from
+        """The first part of this function is copied without changes from
         :meth:`pyramid.traversal.ResourceTreeTraverser.__call__`.
 
         :param request: Current request
@@ -171,7 +171,12 @@ def traverse(root, vpath_tuple):
             for idx, item in enumerate(vpath_tuple)
         ]
         nodes = (
-            DBSession().query(Node).order_by(Node.path).filter(or_(*conditions)).all()
+            DBSession()
+            .query(Node)
+            .with_polymorphic(Node)
+            .order_by(Node.path)
+            .filter(or_(*conditions))
+            .all()
         )
         for i, node in enumerate(nodes):
             if i == 0:
@@ -183,7 +188,7 @@ def traverse(root, vpath_tuple):
 
     @staticmethod
     def _traverse_cte(root, vpath_tuple):  # pragma: no cover
-        """ Version of the traverse method, that uses a CTE instead of the
+        """Version of the traverse method, that uses a CTE instead of the
         Node.path attribute.  Unfortunately this is **much** slower and works
         only on PostgreSQL.
 
@@ -236,7 +241,7 @@ def _traverse_cte(root, vpath_tuple):  # pragma: no cover
 
 
 def includeme(config):
-    """ Pyramid includeme hook.
+    """Pyramid includeme hook.
 
     :param config: app config
     :type config: :class:`pyramid.config.Configurator`

From 26ec43796853c3c8e8552f90ef7d4a5298808734 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Thu, 2 Sep 2021 15:42:28 +0200
Subject: [PATCH 589/600] Add proper caching for ``get_root``.

---
 CHANGES.txt        |  1 +
 kotti/resources.py | 96 ++++++++++++++++++++++++----------------------
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 01f9d9f22..8ed59726c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Change History
 - Add compatibility for (and require) SQLAlchemy 1.4.
 - Fix ``url_normalizer`` tests (not picked up before).
 - Optimize traversal for applications with large ``Node`` subclass hierarchies.
+- Add proper caching for ``get_root``.
 
 2.0.6 - 2021-05-12
 ------------------
diff --git a/kotti/resources.py b/kotti/resources.py
index 73a8f781a..772b84c69 100644
--- a/kotti/resources.py
+++ b/kotti/resources.py
@@ -39,6 +39,7 @@
 from sqlalchemy import UniqueConstraint
 from sqlalchemy import bindparam
 from sqlalchemy import event
+from sqlalchemy import inspect
 from sqlalchemy.engine.base import Engine
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import DeclarativeMeta
@@ -89,7 +90,7 @@
 
 
 class ContainerMixin(MutableMapping):
-    """ Containers form the API of a Node that's used for subitem
+    """Containers form the API of a Node that's used for subitem
     access and in traversal.
     """
 
@@ -184,7 +185,7 @@ def children(self):
     def children_with_permission(
         self, request: Request, permission: str = "view"
     ) -> "List[Node]":
-        """ Return only those children for which the user initiating the
+        """Return only those children for which the user initiating the
         request has the asked permission.
 
         :param request: current request
@@ -202,7 +203,7 @@ def children_with_permission(
 
 
 class LocalGroup(Base):
-    """ Local groups allow the assignment of groups or roles to principals
+    """Local groups allow the assignment of groups or roles to principals
     (users or groups) **for a certain context** (i.e. a :class:`Node` in the
     content tree).
     """
@@ -250,8 +251,7 @@ class NodeMeta(DeclarativeMeta, abc.ABCMeta):
 
 @implementer(INode)
 class Node(Base, ContainerMixin, PersistentACLMixin, metaclass=NodeMeta):
-    """Basic node in the persistance hierarchy.
-    """
+    """Basic node in the persistance hierarchy."""
 
     __table_args__ = (UniqueConstraint("parent_id", "name"),)
     __mapper_args__ = dict(
@@ -307,7 +307,7 @@ def __init__(
         parent: "Node" = None,
         title: str = "",
         annotations: dict = None,
-        **kwargs
+        **kwargs,
     ):
         """Constructor"""
 
@@ -379,17 +379,17 @@ def copy(self, **kwargs) -> "Node":
 class TypeInfo:
     """TypeInfo instances contain information about the type of a node.
 
-       You can pass arbitrary keyword arguments in the constructor, they
-       will become instance attributes.  The most common are:
-
-            -   name
-            -   title
-            -   add_view
-            -   addable_to
-            -   edit_links
-            -   selectable_default_views
-            -   uploadable_mimetypes
-            -   add_permission
+    You can pass arbitrary keyword arguments in the constructor, they
+    will become instance attributes.  The most common are:
+
+         -   name
+         -   title
+         -   add_view
+         -   addable_to
+         -   edit_links
+         -   selectable_default_views
+         -   uploadable_mimetypes
+         -   add_permission
     """
 
     addable_to = ()
@@ -469,7 +469,7 @@ def add_selectable_default_view(self, name: str, title: str) -> None:
         self.selectable_default_views.append((name, title))
 
     def is_uploadable_mimetype(self, mimetype: str) -> int:
-        """ Check if uploads of the given MIME type are allowed.
+        """Check if uploads of the given MIME type are allowed.
 
         :param mimetype: MIME type
         :type mimetype: str
@@ -519,8 +519,7 @@ def items(self) -> List[Node]:
 
 
 class TagsToContents(Base):
-    """Tags to contents mapping
-    """
+    """Tags to contents mapping"""
 
     __tablename__ = "tags_to_contents"
 
@@ -574,7 +573,6 @@ def _not_root(context: Node, request: Request) -> bool:
     LinkRenderer("default-view-selector"),
 ]
 
-
 default_type_info = TypeInfo(
     name="Content",
     title="type_info title missing",  # BBB
@@ -593,7 +591,7 @@ def _not_root(context: Node, request: Request) -> bool:
 @implementer(IContent)
 class Content(Node):
     """Content adds some attributes to :class:`~kotti.resources.Node` that are
-       useful for content objects in a CMS.
+    useful for content objects in a CMS.
     """
 
     @classproperty
@@ -658,9 +656,8 @@ def __init__(
         modification_date: Optional[datetime.datetime] = None,
         in_navigation: Optional[bool] = True,
         tags: Optional[List[str]] = None,
-        **kwargs
+        **kwargs,
     ):
-
         super().__init__(name, parent, title, annotations, **kwargs)
 
         self.default_view = default_view
@@ -682,10 +679,10 @@ def copy(self, **kwargs) -> "Content":
 @implementer(IDocument, IDefaultWorkflow)
 class Document(Content):
     """Document extends :class:`~kotti.resources.Content` with a body and its
-       mime_type.  In addition Document and its descendants implement
-       :class:`~kotti.interfaces.IDefaultWorkflow` and therefore
-       are associated with the default workflow (at least in
-       unmodified Kotti installations).
+    mime_type.  In addition Document and its descendants implement
+    :class:`~kotti.interfaces.IDefaultWorkflow` and therefore
+    are associated with the default workflow (at least in
+    unmodified Kotti installations).
     """
 
     #: Primary key column in the DB
@@ -710,7 +707,6 @@ class Document(Content):
     def __init__(
         self, body: Optional[str] = "", mime_type: Optional[str] = "text/html", **kwargs
     ):
-
         super().__init__(**kwargs)
 
         self.body = body
@@ -719,11 +715,11 @@ def __init__(
 
 # noinspection PyMethodParameters
 class SaveDataMixin:
-    """ The classmethods must not be implemented on a class that inherits
-        from ``Base`` with ``SQLAlchemy>=1.0``, otherwise that class cannot be
-        subclassed further.
+    """The classmethods must not be implemented on a class that inherits
+    from ``Base`` with ``SQLAlchemy>=1.0``, otherwise that class cannot be
+    subclassed further.
 
-        See http://stackoverflow.com/questions/30433960/how-to-use-declare-last-in-sqlalchemy-1-0  # noqa
+    See http://stackoverflow.com/questions/30433960/how-to-use-declare-last-in-sqlalchemy-1-0  # noqa
     """
 
     #: The filename is used in the attachment view to give downloads
@@ -747,8 +743,8 @@ def data(cls) -> Column:
 
     @classmethod
     def __declare_last__(cls) -> None:
-        """ Unconfigure the event set in _SQLAMutationTracker,
-        we have _save_data """
+        """Unconfigure the event set in _SQLAMutationTracker,
+        we have _save_data"""
 
         mapper = cls._sa_class_manager.mapper
         args = (mapper.attrs["data"], "set", _SQLAMutationTracker._field_set)
@@ -768,7 +764,7 @@ def _save_data(
         oldvalue: Optional[Union[UploadedFile, _symbol]],
         initiator: Event,
     ) -> Optional[UploadedFile]:
-        """ Refresh metadata and save the binary data to the data field.
+        """Refresh metadata and save the binary data to the data field.
 
         :param target: The File instance
         :type target: :class:`kotti.resources.File` or subclass
@@ -799,7 +795,7 @@ def _save_data(
 
     @classmethod
     def from_field_storage(cls, fs):
-        """ Create and return an instance of this class from a file upload
+        """Create and return an instance of this class from a file upload
             through a webbrowser.
 
         :param fs: FieldStorage instance as found in a
@@ -821,7 +817,7 @@ def __init__(
         filename: Optional[str] = None,
         mimetype: Optional[str] = None,
         size: Optional[int] = None,
-        **kwargs
+        **kwargs,
     ) -> None:
 
         super().__init__(**kwargs)
@@ -832,7 +828,7 @@ def __init__(
         self.data = data
 
     def copy(self, **kwargs) -> "File":
-        """ Same as `Content.copy` with additional data support.  ``data`` needs
+        """Same as `Content.copy` with additional data support.  ``data`` needs
         some special attention, because we don't want the same depot file to be
         assigned to multiple content nodes.
         """
@@ -844,7 +840,7 @@ def copy(self, **kwargs) -> "File":
 @implementer(IFile)
 class File(SaveDataMixin, Content):
     """File adds some attributes to :class:`~kotti.resources.Content` that are
-       useful for storing binary data.
+    useful for storing binary data.
     """
 
     #: Primary key column in the DB
@@ -877,12 +873,12 @@ def get_root(request: Optional[Request] = None) -> Node:
 class DefaultRootCache:
     """ Default implementation for :func:`~kotti.resources.get_root` """
 
-    _id = None
+    _root = None
 
     # noinspection PyComparisonWithNone,PyPep8
     @reify
     def root_id(self) -> int:
-        """ Query for the one node without a parent and return its id.
+        """Query for the one node without a parent and return its id.
         :result: The root node's id.
         :rtype: int
         """
@@ -898,16 +894,26 @@ def root_id(self) -> int:
         return query(DBSession()).one().id
 
     def get_root(self) -> Node:
-        """ Query for the root node by its id.  This enables SQLAlchemy's
+        """Query for the root node by its id.  This enables SQLAlchemy's
         session cache (query is executed only once per session).
         :result: The root node.
         :rtype: :class:`Node`.
         """
 
-        return Node.query.get(self.root_id)
+        if self._root is None or inspect(self._root).detached:
+            self._root = (
+                DBSession.query(Node)
+                .with_polymorphic(Node)
+                .enable_eagerloads(False)
+                .enable_eagerloads("local_groups")
+                .filter(Node.id == self.root_id)
+                .one()
+            )
+
+        return self._root
 
     def __call__(self, request: Optional[Request] = None) -> Node:
-        """ Default implementation for :func:`~kotti.resources.get_root`
+        """Default implementation for :func:`~kotti.resources.get_root`
         :param request: Current request (optional)
         :type request: :class:`kotti.request.Request`
         :result: Node in the object tree that has no parent.

From 261e294d94fa0e033843c881af7a3dd7305be59b Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Thu, 2 Sep 2021 16:09:12 +0200
Subject: [PATCH 590/600] Bump version.

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8ed59726c..f1d94dc14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-2.0.7dev0 - unreleased
-----------------------
+2.0.7 - 2021-09-02
+------------------
 
 - Add compatibility for (and require) SQLAlchemy 1.4.
 - Fix ``url_normalizer`` tests (not picked up before).
diff --git a/setup.py b/setup.py
index a55246cb7..80ef6fc17 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.7dev0'
+version = '2.0.7'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 771bc397698183ecba364b7b77635d5c094bbcf5 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <andreas.kaiser@ipn.eu>
Date: Thu, 2 Sep 2021 16:10:37 +0200
Subject: [PATCH 591/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f1d94dc14..f849b171b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.8dev0 - unreleased
+----------------------
+
+- No changes yet.
+
 2.0.7 - 2021-09-02
 ------------------
 
diff --git a/setup.py b/setup.py
index 80ef6fc17..a0d82c335 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.7'
+version = '2.0.8dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From f40e8a1662f32a757ed0ea238d5d34d1ad731509 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 14 Apr 2022 15:12:00 +0200
Subject: [PATCH 592/600] Pin bleach to ``<5`` (incompatible API changes).

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a0d82c335..42af880fb 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'alembic>=0.8.0',
-    'bleach>=3.1.4',
+    'bleach>=4,<5',
     'bleach-allowlist',
     'colander>=1.3.2',
     'deform==2.0.14',  # 2.0.15 breaks js.deform

From 8df8475c3aeed8473bf552f8820989e1cc380645 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 5 May 2022 09:12:11 +0200
Subject: [PATCH 593/600] Replace ``py-bcrypt`` (unmaintained, last release in
 2013) with ``bcrypt``.

---
 CHANGES.txt       |  3 ++-
 kotti/security.py | 12 ++++++++----
 requirements.txt  | 49 ++++++++++++++++++++++++-----------------------
 setup.py          |  2 +-
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f849b171b..4d0e540c7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Change History
 2.0.8dev0 - unreleased
 ----------------------
 
-- No changes yet.
+- Replace ``py-bcrypt`` (unmaintained, last release in 2013) with ``bcrypt``.
+- Pin bleach to ``<5`` (incompatible API changes).
 
 2.0.7 - 2021-09-02
 ------------------
diff --git a/kotti/security.py b/kotti/security.py
index d04d019ee..1c61082bf 100644
--- a/kotti/security.py
+++ b/kotti/security.py
@@ -554,10 +554,14 @@ def search(self, match: Optional[str] = "any", **kwargs) -> Query:
 
     log_rounds = 10
 
-    def hash_password(self, password: str, hashed: Optional[str] = None) -> str:
-        if hashed is None:
-            hashed = bcrypt.gensalt(self.log_rounds)
-        return bcrypt.hashpw(password.encode("utf-8"), hashed.encode("utf-8"))
+    def hash_password(self, password: str, salt: Optional[str] = None) -> str:
+        if salt is None:
+            salt = bcrypt.gensalt(self.log_rounds)
+        if isinstance(password, str):
+            password = password.encode("utf-8")
+        if isinstance(salt, str):
+            salt = salt.encode("utf-8")
+        return bcrypt.hashpw(password, salt).decode("utf-8")
 
     def validate_password(self, clear: str, hashed: str) -> bool:
         try:
diff --git a/requirements.txt b/requirements.txt
index a47efdf6d..f05e6ca1d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,21 +1,22 @@
-alembic==1.7.1
-anyascii==0.2.0
-Babel==2.9.1
+alembic==1.7.7
+anyascii==0.3.1
+Babel==2.10.1
+bcrypt==3.2.2
 Beaker==1.11.0
 bleach==4.1.0
 bleach-allowlist==1.0.3
-Chameleon==3.9.1
-click==8.0.1
+cffi==1.15.0
+Chameleon==3.10.0
+click==8.1.3
 colander==1.8.3
 deform==2.0.14
 docopt==0.6.2
-fanstatic==1.1
+fanstatic==1.2
 filedepot==0.8.0
-FormEncode==2.0.0
-greenlet==1.1.1
+FormEncode==2.0.1
 html2text==2020.1.16
 hupper==1.10.3
-iso8601==0.1.16
+iso8601==1.0.2
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.14
@@ -33,46 +34,46 @@ js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==4.0.4.post1
 js.tinymce==4.5.4
-lingua==4.14
-Mako==1.1.5
-MarkupSafe==2.0.1
-packaging==21.0
+lingua==4.15.0
+Mako==1.2.0
+MarkupSafe==2.1.1
+packaging==21.3
 PasteDeploy==2.1.1
 peppercorn==0.6
 plaster==1.0
 plaster-pastedeploy==0.7
 polib==1.1.1
-py-bcrypt==0.4
-pyparsing==2.4.7
+pycparser==2.21
+pyparsing==3.0.8
 pyramid==1.10.8
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.15.1
-pyramid-tm==2.4
+pyramid-tm==2.5
 pyramid-zcml==1.2.0
-pytz==2021.1
+pytz==2022.1
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.1
 repoze.zcml==1.1
 shutilwhich==1.1.0
 six==1.16.0
-SQLAlchemy==1.4.23
-SQLAlchemy-Utils==0.37.8
+SQLAlchemy==1.4.36
+SQLAlchemy-Utils==0.38.2
 transaction==3.0.1
 translationstring==1.4
-Unidecode==1.2.0
+Unidecode==1.3.4
 venusian==3.0.0
-waitress==2.0.0
+waitress==2.1.1
 webencodings==0.5.1
 WebOb==1.8.7
 zope.component==5.0.1
-zope.configuration==4.4.0
+zope.configuration==4.4.1
 zope.deprecation==4.4.0
 zope.event==4.5.0
 zope.hookable==5.1.0
 zope.i18nmessageid==5.0.1
 zope.interface==5.4.0
-zope.schema==6.1.0
-zope.sqlalchemy==1.5
+zope.schema==6.2.0
+zope.sqlalchemy==1.6
diff --git a/setup.py b/setup.py
index 42af880fb..833e3bf1e 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,7 @@
     'Babel',
     'Chameleon>=2.7.4',  # Fixes error when raising HTTPFound
     'alembic>=0.8.0',
+    'bcrypt',
     'bleach>=4,<5',
     'bleach-allowlist',
     'colander>=1.3.2',
@@ -41,7 +42,6 @@
     'js.jqueryui>=1.8.24',
     'js.jqueryui_tagit',
     'lingua>=1.3',
-    'py_bcrypt',
     'pyramid>=1.9,<2',
     'pyramid_beaker',
     'pyramid_chameleon',

From af6f3437d3cd561403914a4446de3eb6d589594c Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 5 May 2022 09:15:05 +0200
Subject: [PATCH 594/600] Bump version.

---
 CHANGES.txt | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4d0e540c7..54263b313 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-2.0.8dev0 - unreleased
-----------------------
+2.0.8 - 2022-05-05
+------------------
 
 - Replace ``py-bcrypt`` (unmaintained, last release in 2013) with ``bcrypt``.
 - Pin bleach to ``<5`` (incompatible API changes).
diff --git a/setup.py b/setup.py
index 833e3bf1e..5eba14bc0 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.8dev0'
+version = '2.0.8'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From e6dbd832c2fbbdb18394ad236f9f97f5ee9be958 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 5 May 2022 09:15:54 +0200
Subject: [PATCH 595/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 54263b313..44395e124 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.9dev0 - unreleased
+----------------------
+
+- No changes yet.
+
 2.0.8 - 2022-05-05
 ------------------
 
diff --git a/setup.py b/setup.py
index 5eba14bc0..9a450bb9b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.8'
+version = '2.0.9dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From ca2157fa85c1daf1dcc290c0ea421595ff26b309 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 5 May 2022 09:42:05 +0200
Subject: [PATCH 596/600] Fix failing test. Also test against 3.10

---
 .github/workflows/mysql.yml        | 2 +-
 .github/workflows/postgres.yml     | 2 +-
 .github/workflows/sqlite.yml       | 2 +-
 kotti/tests/test_security_views.py | 2 +-
 setup.py                           | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index b1223fbe8..e8c657157 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
 
     # Service containers to run with `runner-job`
     services:
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index d66b6d224..c4491b3d1 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
 
     # Service containers to run with `runner-job`
     services:
diff --git a/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml
index b401a335b..aaf2cf391 100644
--- a/.github/workflows/sqlite.yml
+++ b/.github/workflows/sqlite.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/kotti/tests/test_security_views.py b/kotti/tests/test_security_views.py
index 019e2649b..7de153f7a 100644
--- a/kotti/tests/test_security_views.py
+++ b/kotti/tests/test_security_views.py
@@ -298,7 +298,7 @@ def test_hashed_password_save(self, root):
         view = UserManageFormView(user, request)
         appstruct = {"password": "foo"}
         view.save_success(appstruct)
-        assert user.password.startswith("$2a$10$")
+        assert user.password.startswith("$2b$10$")
 
     def test_hashed_password_empty(self, root):
         from kotti.views.users import UserManageFormView
diff --git a/setup.py b/setup.py
index 9a450bb9b..e36104588 100644
--- a/setup.py
+++ b/setup.py
@@ -143,6 +143,8 @@ def read(*parts):
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: Implementation',
           'Programming Language :: Python :: Implementation :: CPython',
           # 'Programming Language :: Python :: Implementation :: PyPy',

From 381bb3b65333398009062e50511da26b305b1ef2 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 5 May 2022 09:42:05 +0200
Subject: [PATCH 597/600] Fix failing test. Also test against 3.10

---
 .github/workflows/mysql.yml        | 2 +-
 .github/workflows/postgres.yml     | 2 +-
 .github/workflows/sqlite.yml       | 2 +-
 kotti/tests/test_security_views.py | 2 +-
 setup.py                           | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index b1223fbe8..8c4cfc84f 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
 
     # Service containers to run with `runner-job`
     services:
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index d66b6d224..c5c2bd111 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
 
     # Service containers to run with `runner-job`
     services:
diff --git a/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml
index b401a335b..28a98ecbf 100644
--- a/.github/workflows/sqlite.yml
+++ b/.github/workflows/sqlite.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/kotti/tests/test_security_views.py b/kotti/tests/test_security_views.py
index 019e2649b..7de153f7a 100644
--- a/kotti/tests/test_security_views.py
+++ b/kotti/tests/test_security_views.py
@@ -298,7 +298,7 @@ def test_hashed_password_save(self, root):
         view = UserManageFormView(user, request)
         appstruct = {"password": "foo"}
         view.save_success(appstruct)
-        assert user.password.startswith("$2a$10$")
+        assert user.password.startswith("$2b$10$")
 
     def test_hashed_password_empty(self, root):
         from kotti.views.users import UserManageFormView
diff --git a/setup.py b/setup.py
index 9a450bb9b..e36104588 100644
--- a/setup.py
+++ b/setup.py
@@ -143,6 +143,8 @@ def read(*parts):
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: Implementation',
           'Programming Language :: Python :: Implementation :: CPython',
           # 'Programming Language :: Python :: Implementation :: PyPy',

From c8542f8e600d5b2a167c74761528d43bec9fa2d3 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 5 May 2022 09:54:57 +0200
Subject: [PATCH 598/600] Bump version.

---
 CHANGES.txt | 10 +++++-----
 setup.py    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 44395e124..368502351 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,16 +1,16 @@
 Change History
 ==============
 
-2.0.9dev0 - unreleased
-----------------------
+2.0.9 - 2022-05-05
+------------------
 
-- No changes yet.
+- Replace ``py-bcrypt`` (unmaintained, last release in 2013) with ``bcrypt``.
+- Pin bleach to ``<5`` (incompatible API changes).
 
 2.0.8 - 2022-05-05
 ------------------
 
-- Replace ``py-bcrypt`` (unmaintained, last release in 2013) with ``bcrypt``.
-- Pin bleach to ``<5`` (incompatible API changes).
+- Brownbag release (hidden).
 
 2.0.7 - 2021-09-02
 ------------------
diff --git a/setup.py b/setup.py
index e36104588..dae870bc0 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.9dev0'
+version = '2.0.9'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From f5c59cab8283d350b4a082012930a5f648f3f726 Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <ak@ipn.eu>
Date: Thu, 5 May 2022 09:55:43 +0200
Subject: [PATCH 599/600] Bump version.

---
 CHANGES.txt | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 368502351..56e247efb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+2.0.10 - unreleased
+-------------------
+
+- No changes yet.
+
 2.0.9 - 2022-05-05
 ------------------
 
diff --git a/setup.py b/setup.py
index dae870bc0..0b94d9512 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.9'
+version = '2.0.10dev0'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."

From 904f9b67face1dca382f35000a6a9cdb822695ac Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Mon, 4 Jul 2022 04:00:41 +1000
Subject: [PATCH 600/600] docs: Fix a few typos (#585)

---
 docs/developing/advanced/blobs.rst      | 2 +-
 docs/developing/basic/configuration.rst | 2 +-
 kotti/filedepot.py                      | 2 +-
 kotti/tests/__init__.py                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/developing/advanced/blobs.rst b/docs/developing/advanced/blobs.rst
index 6677c9bb0..7ca0c6e19 100644
--- a/docs/developing/advanced/blobs.rst
+++ b/docs/developing/advanced/blobs.rst
@@ -106,7 +106,7 @@ Method 2
 ~~~~~~~~
 
 Often these permission checks do not need to be enforced strictly.
-For such cases Kotti provides a "shortcut" in form of a Pyramid tween, that directly processes all requests under a certain path befor they even reach Kotti.
+For such cases Kotti provides a "shortcut" in form of a Pyramid tween, that directly processes all requests under a certain path before they even reach Kotti.
 This means: no traversal, no view lookup, no permission checks.
 The URL for this method can be created very similarily::
 
diff --git a/docs/developing/basic/configuration.rst b/docs/developing/basic/configuration.rst
index 61bbfa897..4782c3def 100644
--- a/docs/developing/basic/configuration.rst
+++ b/docs/developing/basic/configuration.rst
@@ -295,7 +295,7 @@ URL normalization
 -----------------
 
 Kotti normalizes document titles to URLs by replacing language specific characters like umlauts or accented characters with its ascii equivalents.
-You can change this default behavour by setting ``kotti.url_normalizer.map_non_ascii_characters`` configuration variable to ``False``.
+You can change this default behaviour by setting ``kotti.url_normalizer.map_non_ascii_characters`` configuration variable to ``False``.
 If you do, Kotti will leave national characters in URLs.
 
 You may also replace default component used for url normalization by setting ``kotti.url_normalizer`` configuation variable.
diff --git a/kotti/filedepot.py b/kotti/filedepot.py
index fea99b5b7..251fb9a75 100644
--- a/kotti/filedepot.py
+++ b/kotti/filedepot.py
@@ -630,7 +630,7 @@ def adjust_for_engine(conn: Connection, branch: bool) -> None:
 
     # sqlite's Unicode columns return a buffer which can't be encoded by
     # a json encoder. We have to convert to a unicode string so that the value
-    # can be saved corectly by
+    # can be saved correctly by
     # :class:`depot.fields.sqlalchemy.upload.UploadedFile`
 
     # noinspection PyUnusedLocal
diff --git a/kotti/tests/__init__.py b/kotti/tests/__init__.py
index a372ac719..e33ddf122 100644
--- a/kotti/tests/__init__.py
+++ b/kotti/tests/__init__.py
@@ -77,7 +77,7 @@ def allwarnings(request):
 
 @fixture(scope="session")
 def custom_settings():
-    """This is a dummy fixture meant to be overriden in add on package's
+    """This is a dummy fixture meant to be overridden in add on package's
     ``conftest.py``.  It can be used to inject arbitrary settings for third
     party test suites.  The default settings dictionary will be updated
     with the dictionary returned by this fixture.