diff --git a/.github/workflows/deploytest.yml b/.github/workflows/deploytest.yml
index e3ab41691b..cd2b7f95cc 100644
--- a/.github/workflows/deploytest.yml
+++ b/.github/workflows/deploytest.yml
@@ -82,4 +82,4 @@ jobs:
         sudo apt-get update -y
         sudo apt-get install -y gettext
     - name: Test Django makemessages
-      run: python contentcuration/manage.py makemessages
+      run: python contentcuration/manage.py makemessages --all
diff --git a/Makefile b/Makefile
index 734c628ade..5f0035c334 100644
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,7 @@ i18n-extract-frontend:
 
 i18n-extract-backend:
 	# generate backend messages
-	cd contentcuration && python manage.py makemessages
-	# workaround for Django 1.11 makemessages spitting out an invalid English translation file
-	python bin/fix_django_messages.py
+	cd contentcuration && python manage.py makemessages --all
 
 i18n-extract: i18n-extract-frontend i18n-extract-backend
 
diff --git a/bin/fix_django_messages.py b/bin/fix_django_messages.py
deleted file mode 100644
index 45fb400860..0000000000
--- a/bin/fix_django_messages.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import os
-
-script_dir = os.path.dirname(os.path.abspath(__file__))
-root_dir = os.path.abspath(os.path.join(script_dir, '..'))
-
-
-def fix_django1_11_en_po():
-    """
-    When Django 1.11 creates a new English .po file as a result of a call to makemessages, it generates it with
-    placeholder values for the plural forms definition. This replaces that text with the correct plural forms values,
-    based on the fix used for Django 2.0.
-
-    See here for more info: https://code.djangoproject.com/ticket/28709
-
-    :return:
-    """
-    en_file = os.path.join(root_dir, 'contentcuration', 'locale', 'en', 'LC_MESSAGES', 'django.po')
-    f = open(en_file)
-    data = f.read()
-    f.close()
-
-    data = data.replace(' nplurals=INTEGER; plural=EXPRESSION;', ' nplurals=2; plural=(n != 1);')
-
-    f = open(en_file, 'w')
-    f.write(data)
-    f.close()
-
-if __name__ == '__main__':
-    fix_django1_11_en_po()
diff --git a/contentcuration/contentcuration/api.py b/contentcuration/contentcuration/api.py
index c7fb1c249c..871efcd876 100644
--- a/contentcuration/contentcuration/api.py
+++ b/contentcuration/contentcuration/api.py
@@ -1,8 +1,6 @@
 """
 This module contains utility functions used by API endpoints.
 """
-from future import standard_library
-standard_library.install_aliases()
 import hashlib
 import logging
 import os
diff --git a/contentcuration/contentcuration/catalog_settings.py b/contentcuration/contentcuration/catalog_settings.py
index d1bd6a2b78..cf2fd3f788 100644
--- a/contentcuration/contentcuration/catalog_settings.py
+++ b/contentcuration/contentcuration/catalog_settings.py
@@ -1,7 +1,7 @@
 # flake8: noqa
 from .production_settings import *  # noqa
 
-LANGUAGES += (("ar", ugettext("Arabic")),)  # noqa
+LANGUAGES += (("ar", gettext("Arabic")),)  # noqa
 
 LIBRARY_MODE = True
 SITE_READ_ONLY = True
diff --git a/contentcuration/contentcuration/celery.py b/contentcuration/contentcuration/celery.py
index 1ae0072279..6e13137d64 100644
--- a/contentcuration/contentcuration/celery.py
+++ b/contentcuration/contentcuration/celery.py
@@ -7,7 +7,7 @@
 from contentcuration.utils.celery.app import CeleryApp
 
 # set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'contentcuration.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "contentcuration.settings")
 
 app = CeleryApp('contentcuration')
 
@@ -19,4 +19,4 @@
 
 @app.task(bind=True)
 def debug_task(self):
-    print('Request: {0!r}'.format(self.request))
+    print("Request: {0!r}".format(self.request))
diff --git a/contentcuration/contentcuration/context_processors.py b/contentcuration/contentcuration/context_processors.py
index dca47c14a3..86d372895b 100644
--- a/contentcuration/contentcuration/context_processors.py
+++ b/contentcuration/contentcuration/context_processors.py
@@ -1,6 +1,6 @@
 from django.conf import settings
-from django.core.urlresolvers import get_resolver
 from django.template.loader import render_to_string
+from django.urls import get_resolver
 from django.utils.html import mark_safe
 from django_js_reverse.core import _safe_json
 from django_js_reverse.core import generate_json
@@ -11,14 +11,18 @@
 
 
 def site_variables(request):
-    return {'INCIDENT': settings.INCIDENT,
-            'BETA_MODE': settings.BETA_MODE,
-            'DEPRECATED': "contentworkshop" in request.get_host(),
-            'STORAGE_BASE_URL': "{bucket}/{storage_root}/".format(bucket=settings.AWS_S3_BUCKET_NAME, storage_root=settings.STORAGE_ROOT),
-            'STORAGE_HOST': settings.AWS_S3_ENDPOINT_URL,
-            'DEBUG': settings.DEBUG,
-            'LANG_INFO': json_for_parse_from_data(language_globals()),
-            'LOGGED_IN': not request.user.is_anonymous()}
+    return {
+        "INCIDENT": settings.INCIDENT,
+        "BETA_MODE": settings.BETA_MODE,
+        "DEPRECATED": "contentworkshop" in request.get_host(),
+        "STORAGE_BASE_URL": "{bucket}/{storage_root}/".format(
+            bucket=settings.AWS_S3_BUCKET_NAME, storage_root=settings.STORAGE_ROOT
+        ),
+        "STORAGE_HOST": settings.AWS_S3_ENDPOINT_URL,
+        "DEBUG": settings.DEBUG,
+        "LANG_INFO": json_for_parse_from_data(language_globals()),
+        "LOGGED_IN": not request.user.is_anonymous,
+    }
 
 
 def url_tag(self):
@@ -37,7 +41,7 @@ def url_tag(self):
         context={"data": _safe_json(data), "js_name": "window.Urls"},
     )
     return {
-        'I18N_URLS': mark_safe(
+        "I18N_URLS": mark_safe(
             """<script type="text/javascript">"""
             # Minify the generated Javascript
             + jsmin(js)
diff --git a/contentcuration/contentcuration/db/models/aggregates.py b/contentcuration/contentcuration/db/models/aggregates.py
deleted file mode 100644
index 00733362c2..0000000000
--- a/contentcuration/contentcuration/db/models/aggregates.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.contrib.postgres.aggregates import ArrayAgg as BaseArrayAgg
-
-
-class ArrayAgg(BaseArrayAgg):
-    template = "%(function)s(%(distinct)s%(expressions)s)"
-
-    def __init__(self, *args, **kwargs):
-        kwargs.update(distinct='DISTINCT ' if kwargs.pop('distinct') else '')
-        super(ArrayAgg, self).__init__(*args, **kwargs)
diff --git a/contentcuration/contentcuration/db/models/manager.py b/contentcuration/contentcuration/db/models/manager.py
index c647ac5a0a..602ea24b75 100644
--- a/contentcuration/contentcuration/db/models/manager.py
+++ b/contentcuration/contentcuration/db/models/manager.py
@@ -613,51 +613,3 @@ def _deep_copy(
         self._copy_associated_objects(source_copy_id_map)
 
         return new_nodes
-
-    def build_tree_nodes(self, data, target=None, position="last-child"):
-        """
-        vendored from:
-        https://github.com/django-mptt/django-mptt/blob/fe2b9cc8cfd8f4b764d294747dba2758147712eb/mptt/managers.py#L614
-        """
-        opts = self.model._mptt_meta
-        if target:
-            tree_id = target.tree_id
-            if position in ("left", "right"):
-                level = getattr(target, opts.level_attr)
-                if position == "left":
-                    cursor = getattr(target, opts.left_attr)
-                else:
-                    cursor = getattr(target, opts.right_attr) + 1
-            else:
-                level = getattr(target, opts.level_attr) + 1
-                if position == "first-child":
-                    cursor = getattr(target, opts.left_attr) + 1
-                else:
-                    cursor = getattr(target, opts.right_attr)
-        else:
-            tree_id = self._get_next_tree_id()
-            cursor = 1
-            level = 0
-
-        stack = []
-
-        def treeify(data, cursor=1, level=0):
-            data = dict(data)
-            children = data.pop("children", [])
-            node = self.model(**data)
-            stack.append(node)
-            setattr(node, opts.tree_id_attr, tree_id)
-            setattr(node, opts.level_attr, level)
-            setattr(node, opts.left_attr, cursor)
-            for child in children:
-                cursor = treeify(child, cursor=cursor + 1, level=level + 1)
-            cursor += 1
-            setattr(node, opts.right_attr, cursor)
-            return cursor
-
-        treeify(data, cursor=cursor, level=level)
-
-        if target:
-            self._create_space(2 * len(stack), cursor - 1, tree_id)
-
-        return stack
diff --git a/contentcuration/contentcuration/debug/middleware.py b/contentcuration/contentcuration/debug/middleware.py
index 4d75f1b472..803a94f89b 100644
--- a/contentcuration/contentcuration/debug/middleware.py
+++ b/contentcuration/contentcuration/debug/middleware.py
@@ -4,7 +4,7 @@
 import debug_panel.urls
 from debug_panel.cache import cache
 from debug_panel.middleware import DebugPanelMiddleware
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 class CustomDebugPanelMiddleware(DebugPanelMiddleware):
@@ -12,26 +12,36 @@ class CustomDebugPanelMiddleware(DebugPanelMiddleware):
     Custom version to fix SQL escaping:
     https://github.com/recamshak/django-debug-panel/issues/17#issuecomment-366268893
     """
+
     def process_response(self, request, response):
         """
         Store the DebugToolbarMiddleware rendered toolbar into a cache store.
         The data stored in the cache are then reachable from an URL that is appened
         to the HTTP response header under the 'X-debug-data-url' key.
         """
-        toolbar = self.__class__.debug_toolbars.get(threading.current_thread().ident, None)
+        toolbar = self.__class__.debug_toolbars.get(
+            threading.current_thread().ident, None
+        )
 
         response = super(DebugPanelMiddleware, self).process_response(request, response)
 
         if toolbar:
             # for django-debug-toolbar >= 1.4
             for panel in reversed(toolbar.enabled_panels):
-                if hasattr(panel, 'generate_stats') and not panel.get_stats():  # PATCH HERE
+                if (
+                    hasattr(panel, "generate_stats") and not panel.get_stats()
+                ):  # PATCH HERE
                     panel.generate_stats(request, response)
 
             cache_key = "%f" % time.time()
             cache.set(cache_key, toolbar.render_toolbar())
 
-            response['X-debug-data-url'] = request.build_absolute_uri(
-                reverse('debug_data', urlconf=debug_panel.urls, kwargs={'cache_key': cache_key}))
+            response["X-debug-data-url"] = request.build_absolute_uri(
+                reverse(
+                    "debug_data",
+                    urlconf=debug_panel.urls,
+                    kwargs={"cache_key": cache_key},
+                )
+            )
 
         return response
diff --git a/contentcuration/contentcuration/decorators.py b/contentcuration/contentcuration/decorators.py
index ce39d9677a..6427286f3e 100644
--- a/contentcuration/contentcuration/decorators.py
+++ b/contentcuration/contentcuration/decorators.py
@@ -9,14 +9,14 @@
 
 def browser_is_supported(function):
     def wrap(request, *args, **kwargs):
-        user_agent_string = request.META.get('HTTP_USER_AGENT') or ""
+        user_agent_string = request.META.get("HTTP_USER_AGENT") or ""
 
         # Check if the user agent string matches the Kubernetes agents, Google Health Check agents, or an accepted browser
         for expected_agent in ACCEPTED_BROWSERS:
             if expected_agent in user_agent_string:
                 return function(request, *args, **kwargs)
 
-        return render(request, 'unsupported_browser.html')
+        return render(request, "unsupported_browser.html")
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
@@ -25,10 +25,10 @@ def wrap(request, *args, **kwargs):
 
 def is_admin(function):
     def wrap(request, *args, **kwargs):
-        if not request.user.is_anonymous() and request.user.is_admin:
+        if not request.user.is_anonymous and request.user.is_admin:
             return function(request, *args, **kwargs)
 
-        return render(request, 'unauthorized.html', status=403)
+        return render(request, "unauthorized.html", status=403)
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
@@ -38,17 +38,19 @@ def wrap(request, *args, **kwargs):
 def can_access_channel(function):
     def wrap(request, *args, **kwargs):
         try:
-            channel = Channel.objects.get(pk=kwargs['channel_id'])
+            channel = Channel.objects.get(pk=kwargs["channel_id"])
         except ObjectDoesNotExist:
-            return render(request, 'channel_not_found.html')
-
-        if channel.public or \
-                channel.editors.filter(id=request.user.id).exists() or \
-                channel.viewers.filter(id=request.user.id).exists() or \
-                (not request.user.is_anonymous() and request.user.is_admin):
+            return render(request, "channel_not_found.html")
+
+        if (
+            channel.public
+            or channel.editors.filter(id=request.user.id).exists()
+            or channel.viewers.filter(id=request.user.id).exists()
+            or (not request.user.is_anonymous and request.user.is_admin)
+        ):
             return function(request, *args, **kwargs)
 
-        return render(request, 'channel_not_found.html', status=404)
+        return render(request, "channel_not_found.html", status=404)
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
@@ -58,14 +60,17 @@ def wrap(request, *args, **kwargs):
 def can_edit_channel(function):
     def wrap(request, *args, **kwargs):
         try:
-            channel = Channel.objects.get(pk=kwargs['channel_id'], deleted=False)
+            channel = Channel.objects.get(pk=kwargs["channel_id"], deleted=False)
 
-            if not channel.editors.filter(id=request.user.id).exists() and not request.user.is_admin:
-                return render(request, 'unauthorized.html', status=403)
+            if (
+                not channel.editors.filter(id=request.user.id).exists()
+                and not request.user.is_admin
+            ):
+                return render(request, "unauthorized.html", status=403)
 
             return function(request, *args, **kwargs)
         except ObjectDoesNotExist:
-            return render(request, 'channel_not_found.html')
+            return render(request, "channel_not_found.html")
 
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
diff --git a/contentcuration/contentcuration/dev_urls.py b/contentcuration/contentcuration/dev_urls.py
index 0dbc590662..a302e644d0 100644
--- a/contentcuration/contentcuration/dev_urls.py
+++ b/contentcuration/contentcuration/dev_urls.py
@@ -1,8 +1,9 @@
 from django.conf import settings
-from django.conf.urls import include
-from django.conf.urls import url
 from django.contrib import admin
 from django.http.response import HttpResponseRedirect
+from django.urls import include
+from django.urls import path
+from django.urls import re_path
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
 from rest_framework import permissions
@@ -31,33 +32,33 @@ def webpack_redirect_view(request):
 )
 
 urlpatterns = urlpatterns + [
-    url(r"^__open-in-editor/", webpack_redirect_view),
-    url(r'^admin/', include(admin.site.urls)),
-    url(
+    re_path(r"^__open-in-editor/", webpack_redirect_view),
+    path('admin/', admin.site.urls),
+    re_path(
         r"^swagger(?P<format>\.json|\.yaml)$",
         schema_view.without_ui(cache_timeout=0),
         name="schema-json",
     ),
-    url(
+    re_path(
         r"^api_explorer/$",
         schema_view.with_ui("swagger", cache_timeout=0),
         name="schema-swagger-ui",
     ),
-    url(
+    re_path(
         r"^redoc/$", schema_view.with_ui("redoc", cache_timeout=0), name="schema-redoc"
     ),
-    url(r"^api-auth/", include("rest_framework.urls", namespace="rest_framework")),
-    url(
+    re_path(r"^api-auth/", include("rest_framework.urls", namespace="rest_framework")),
+    re_path(
         r"^" + settings.STORAGE_URL[1:] + "(?P<path>.*)$",
         file_views.debug_serve_file,
         name="debug_serve_file",
     ),
-    url(
+    re_path(
         r"^" + settings.CONTENT_DATABASE_URL[1:] + "(?P<path>.*)$",
         file_views.debug_serve_content_database_file,
         name="content_database_debug_serve_file",
     ),
-    url(
+    re_path(
         r"^" + settings.CSV_URL[1:] + "(?P<path>.*)$",
         file_views.debug_serve_file,
         name="csv_debug_serve_file",
@@ -68,4 +69,4 @@ def webpack_redirect_view(request):
 
     import debug_toolbar
 
-    urlpatterns = [url(r"^__debug__/", include(debug_toolbar.urls))] + urlpatterns
+    urlpatterns = [re_path(r"^__debug__/", include(debug_toolbar.urls))] + urlpatterns
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index 46fabc4b92..5ec186d1a2 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -128,7 +128,7 @@
           };
           return this.login(credentials)
             .then(() => {
-              window.location.assign(this.nextParam || '/channels');
+              window.location.assign(this.nextParam || window.Urls.channels());
             })
             .catch(err => {
               this.busy = false;
diff --git a/contentcuration/contentcuration/frontend/administration/mixins.js b/contentcuration/contentcuration/frontend/administration/mixins.js
index c977f33929..04f3314083 100644
--- a/contentcuration/contentcuration/frontend/administration/mixins.js
+++ b/contentcuration/contentcuration/frontend/administration/mixins.js
@@ -3,7 +3,6 @@ import difference from 'lodash/difference';
 import findKey from 'lodash/findKey';
 import intersection from 'lodash/intersection';
 import transform from 'lodash/transform';
-import omit from 'lodash/omit';
 import pickBy from 'lodash/pickBy';
 
 function _getBooleanVal(value) {
@@ -137,10 +136,10 @@ export const tableMixin = {
           {
             ...this.$route.query,
             page_size: pagination.rowsPerPage,
-            ...omit(pagination, ['rowsPerPage', 'totalItems']),
+            ...pagination,
           },
-          value => {
-            return value !== null;
+          (value, key) => {
+            return value !== null && key !== 'rowsPerPage' && key !== 'totalItems';
           }
         );
 
@@ -156,6 +155,17 @@ export const tableMixin = {
           });
       },
     },
+    fetchParams() {
+      const params = {
+        ...this.$route.query,
+      };
+      if (params.sortBy) {
+        params.ordering = (params.descending ? '-' : '') + params.sortBy;
+        delete params.sortBy;
+        delete params.descending;
+      }
+      return params;
+    },
   },
   watch: {
     '$route.query'() {
@@ -168,7 +178,7 @@ export const tableMixin = {
   methods: {
     _loadItems() {
       this.loading = true;
-      this.fetch(this.$route.query).then(() => {
+      this.fetch(this.fetchParams).then(() => {
         this.loading = false;
       });
     },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue
index d5bf4d9bbd..02bf30037f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue
@@ -78,7 +78,7 @@
           ),
 
           // Channels
-          ...this.channels.map(channelId =>
+          ...this.channel_id__in.map(channelId =>
             createFilter(
               channelId,
               this.getChannelName(channelId),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
index 50b3e1796d..9f9f146bef 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
@@ -13,7 +13,7 @@
       :menu-props="menuProps"
     />
     <MultiSelect
-      v-model="channels"
+      v-model="channel_id__in"
       :label="$tr('channelSourceLabel')"
       :items="channelOptions"
       item-text="name"
@@ -197,8 +197,8 @@
       loadChannels(listType) {
         this.loadingChannels = true;
         this.loadChannelList({ listType }).then(channels => {
-          if (this.channels.length) {
-            this.channels = [];
+          if (this.channel_id__in.length) {
+            this.channel_id__in = [];
           }
 
           this.channelOptions = channels.filter(c => c.id !== this.currentChannelId);
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/mixins.js b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/mixins.js
index b6de96ae54..4932d043e2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/mixins.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/mixins.js
@@ -4,7 +4,7 @@ import { generateSearchMixin } from 'shared/mixins';
 const searchFilters = {
   kinds: filterTypes.MULTISELECT,
   resources: filterTypes.BOOLEAN,
-  channels: filterTypes.MULTISELECT,
+  channel_id__in: filterTypes.MULTISELECT,
   languages: filterTypes.MULTISELECT,
   licenses: filterTypes.MULTISELECT,
   coach: filterTypes.BOOLEAN,
diff --git a/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue b/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue
index 290574fbfb..ebfa6c0407 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue
@@ -78,8 +78,6 @@
       target="_blank"
       rel="noopener noreferrer"
     />
-
-    <PolicyModals />
   </div>
 
 </template>
@@ -88,14 +86,10 @@
 <script>
 
   import { mapActions } from 'vuex';
-  import PolicyModals from 'shared/views/policies/PolicyModals';
   import { policies } from 'shared/constants';
 
   export default {
     name: 'UsingStudio',
-    components: {
-      PolicyModals,
-    },
     methods: {
       ...mapActions('policies', ['openPolicy']),
       showTermsOfService() {
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index c88b0a1931..e29de0ed3d 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -5,9 +5,11 @@ import flatMap from 'lodash/flatMap';
 import get from 'lodash/get';
 import isArray from 'lodash/isArray';
 import isFunction from 'lodash/isFunction';
+import isNumber from 'lodash/isNumber';
 import isString from 'lodash/isString';
 import matches from 'lodash/matches';
 import overEvery from 'lodash/overEvery';
+import pick from 'lodash/pick';
 import sortBy from 'lodash/sortBy';
 import uniq from 'lodash/uniq';
 import uniqBy from 'lodash/uniqBy';
@@ -47,6 +49,8 @@ const QUERY_SUFFIXES = {
   LTE: 'lte',
 };
 
+const ORDER_FIELD = 'ordering';
+
 const VALID_SUFFIXES = new Set(Object.values(QUERY_SUFFIXES));
 
 const SUFFIX_SEPERATOR = '__';
@@ -54,6 +58,60 @@ const validPositions = new Set(Object.values(RELATIVE_TREE_POSITIONS));
 
 const EMPTY_ARRAY = Symbol('EMPTY_ARRAY');
 
+class Paginator {
+  constructor(params) {
+    // Get parameters for page number based pagination
+    Object.assign(this, pick(params, 'page', 'page_size'));
+    // At a minimum, this pagination style requires a page_size
+    // parameter, so we check to see if that exists.
+    if (this.page_size) {
+      this.pageNumberType = true;
+      this.page = this.page || 1;
+    }
+    // Get parameters for limit offset pagination
+    Object.assign(this, pick(params, 'limit', 'offset'));
+    // At a minimum, this pagination style requires a limit
+    // parameter, so we check to see if that exists.
+    if (this.limit) {
+      this.limitOffsetType = true;
+      this.offset = this.offset || 0;
+    }
+    if (this.pageNumberType && this.limitOffsetType) {
+      console.warn(
+        'Specified both page number type pagination and limit offset may get unexpected results'
+      );
+    }
+  }
+  paginate(collection) {
+    let offset;
+    let limit;
+    if (this.pageNumberType) {
+      offset = (this.page - 1) * this.page_size;
+      limit = this.page_size;
+    }
+    if (this.limitOffsetType) {
+      offset = this.offset;
+      limit = this.limit;
+    }
+    if (isNumber(offset) && isNumber(limit)) {
+      const countPromise = collection.count();
+      const resultPromise = collection
+        .offset(offset)
+        .limit(limit)
+        .toArray();
+      return Promise.all([countPromise, resultPromise]).then(([count, results]) => {
+        const out = { count, results };
+        if (this.pageNumberType) {
+          out.total_pages = Math.ceil(count / this.page_size);
+          out.page = this.page;
+        }
+        return out;
+      });
+    }
+    return collection.toArray();
+  }
+}
+
 // Custom uuid4 function to match our dashless uuids on the server side
 export function uuid4() {
   return uuidv4().replace(/-/g, '');
@@ -315,6 +373,12 @@ class IndexedDBResource {
     const arrayParams = {};
     // Suffixed parameters - ones that are filtering by [gt/lt](e)
     const suffixedParams = {};
+    // Field to sort by
+    let sortBy;
+    let reverse;
+
+    // Setup paginator.
+    const paginator = new Paginator(params);
     for (let key of Object.keys(params)) {
       // Partition our parameters
       const [rootParam, suffix] = key.split(SUFFIX_SEPERATOR);
@@ -329,7 +393,16 @@ class IndexedDBResource {
         } else if (!suffix) {
           whereParams[rootParam] = params[key];
         }
-      } else {
+      } else if (key === ORDER_FIELD) {
+        const ordering = params[key];
+        if (ordering.indexOf('-') === 0) {
+          sortBy = ordering.substring(1);
+          reverse = true;
+        } else {
+          sortBy = ordering;
+        }
+      } else if (!paginator[key]) {
+        // Don't filter by parameters that are used for pagination
         filterParams[rootParam] = params[key];
       }
     }
@@ -344,7 +417,8 @@ class IndexedDBResource {
           }
           return Promise.resolve(EMPTY_ARRAY);
         }
-        collection = table.where(Object.keys(arrayParams)[0]).anyOf(Object.values(arrayParams)[0]);
+        const keyPath = Object.keys(arrayParams)[0];
+        collection = table.where(keyPath).anyOf(Object.values(arrayParams)[0]);
         if (process.env.NODE_ENV !== 'production') {
           // Flag a warning if we tried to filter by an Array and other where params
           if (Object.keys(whereParams).length > 1) {
@@ -358,6 +432,9 @@ class IndexedDBResource {
           }
         }
         Object.assign(filterParams, whereParams);
+        if (sortBy === keyPath) {
+          sortBy = null;
+        }
       } else if (Object.keys(arrayParams).length > 1) {
         if (process.env.NODE_ENV !== 'production') {
           // Flag a warning if we tried to filter by an Array and other where params
@@ -372,8 +449,19 @@ class IndexedDBResource {
       }
     } else if (Object.keys(whereParams).length > 0) {
       collection = table.where(whereParams);
+      if (whereParams[sortBy] && Object.keys(whereParams).length === 1) {
+        // If there is only one where parameter, then the collection should already be sorted
+        // by the index that it was queried by.
+        // https://dexie.org/docs/Collection/Collection.sortBy()#remarks
+        sortBy = null;
+      }
     } else {
-      collection = table.toCollection();
+      if (sortBy && this.indexFields.has(sortBy) && !reverse) {
+        collection = table.orderBy(sortBy);
+        sortBy = null;
+      } else {
+        collection = table.toCollection();
+      }
     }
     let filterFn;
     if (Object.keys(filterParams).length !== 0) {
@@ -421,7 +509,13 @@ class IndexedDBResource {
     if (filterFn) {
       collection = collection.filter(filterFn);
     }
-    return collection.toArray();
+    if (sortBy) {
+      if (reverse) {
+        collection = collection.reverse();
+      }
+      collection = collection.sortBy(sortBy);
+    }
+    return paginator.paginate(collection);
   }
 
   get(id) {
@@ -605,7 +699,7 @@ class Resource extends mix(APIResource, IndexedDBResource) {
       if (objs === EMPTY_ARRAY) {
         return [];
       }
-      if (!objs.length) {
+      if (!objs.length && !objs.count) {
         return this.requestCollection(params);
       }
       if (doRefresh) {
diff --git a/contentcuration/contentcuration/frontend/shared/views/ResponsiveDialog.vue b/contentcuration/contentcuration/frontend/shared/views/ResponsiveDialog.vue
deleted file mode 100644
index 89dfbe4ee9..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/ResponsiveDialog.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-
-  <VDialog
-    v-model="dialog"
-    v-resize="handleWindowResize"
-    v-bind="$attrs"
-    :aria-hidden="String(!dialog)"
-  >
-    <template #activator="{ on }">
-      <slot :on="on" name="activator"></slot>
-    </template>
-    <VCard>
-      <VCardTitle class="font-weight-bold pa-4 title" :class="{ overflow }">
-        {{ header }}
-      </VCardTitle>
-      <VCardText ref="content" class="content px-4" :class="overflow ? 'py-3' : 'py-0'">
-        <slot></slot>
-      </VCardText>
-      <VCardActions class="px-4 py-3" :class="{ overflow }">
-        <VLayout align-center justify-space-between row>
-          <div>
-            <slot name="action"></slot>
-          </div>
-          <VBtn color="greyBackground" autofocus @click="onClose">
-            {{ closeButtonLabel || $tr('closeButtonLabel') }}
-          </VBtn>
-        </VLayout>
-      </VCardActions>
-    </VCard>
-  </VDialog>
-
-</template>
-
-<script>
-
-  export default {
-    name: 'ResponsiveDialog',
-    props: {
-      value: {
-        type: Boolean,
-        default: false,
-      },
-      header: {
-        type: String,
-        required: true,
-      },
-      closeButtonLabel: {
-        type: String,
-        required: false,
-      },
-      close: {
-        type: Function,
-        required: false,
-      },
-    },
-    data() {
-      return {
-        overflow: false,
-      };
-    },
-    computed: {
-      dialog: {
-        get() {
-          return this.value;
-        },
-        set(value) {
-          this.$emit('input', value);
-        },
-      },
-    },
-    watch: {
-      value(open) {
-        if (open) {
-          this.$nextTick(this.handleWindowResize);
-        }
-      },
-    },
-    methods: {
-      handleWindowResize() {
-        if (this.dialog) {
-          const contentElement = this.$refs.content;
-          this.overflow = contentElement.clientHeight < contentElement.scrollHeight;
-        }
-      },
-      onClose() {
-        if (this.close) {
-          this.close();
-        } else {
-          this.dialog = false;
-        }
-      },
-    },
-    $trs: {
-      closeButtonLabel: 'Close',
-    },
-  };
-
-</script>
-
-<style lang="less" scoped>
-
-  /deep/ p {
-    font-size: 12pt;
-    color: var(--v-grey-darken3);
-  }
-
-  .content {
-    max-height: calc(90vh - 190px);
-    overflow-y: auto;
-  }
-
-  // Show borders if there's overflow
-  .v-card__title.overflow {
-    border-bottom: 1px solid var(--v-greyBorder-lighten1);
-  }
-  .v-card__actions.overflow {
-    border-top: 1px solid var(--v-greyBorder-lighten1);
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue b/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue
index 94a0bb9f90..31b602150c 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue
@@ -28,6 +28,7 @@
   countries.registerLocale(require('i18n-iso-countries/langs/es.json'));
   countries.registerLocale(require('i18n-iso-countries/langs/ar.json'));
   countries.registerLocale(require('i18n-iso-countries/langs/fr.json'));
+  countries.registerLocale(require('i18n-iso-countries/langs/pt.json'));
 
   export default {
     name: 'CountryField',
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue
index 3caa93a7ef..e861a29652 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue
@@ -1,6 +1,13 @@
 <template>
 
-  <PoliciesModal :policy="policyName" ignoreAcceptance>
+  <PoliciesModal
+    :policy="policy"
+    :title="title"
+    :needsAcceptance="needsAcceptance"
+    data-test="community-standards-modal"
+    @accept="$emit('accept')"
+    @close="$emit('close')"
+  >
     <p>{{ $tr('description') }}</p>
     <p>
       <ActionLink
@@ -41,12 +48,28 @@
     components: {
       PoliciesModal,
     },
+    props: {
+      needsAcceptance: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        policies,
+      };
+    },
     computed: {
-      policyName() {
-        return policies.COMMUNITY_STANDARDS;
+      policy() {
+        return this.policies.COMMUNITY_STANDARDS;
+      },
+      title() {
+        return this.$tr('communityStandardsHeader');
       },
     },
     $trs: {
+      communityStandardsHeader: 'Community Standards',
+
       description:
         'Learning Equality is a nonprofit organization dedicated to enabling equitable access to quality educational experiences. Along with our statement of Core Values, these Community Standards are intended to foster a supportive and inclusive environment for our users.',
       coreValuesLink: "Learn more about Learning Equality's core values",
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/PoliciesModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/PoliciesModal.vue
index a46caaa95a..482ff20925 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/PoliciesModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/PoliciesModal.vue
@@ -1,59 +1,65 @@
 <template>
 
-  <ResponsiveDialog
-    :value="showPolicy === policy"
-    width="600"
-    :persistent="requirePolicyAcceptance"
-    :header="header"
-    :closeButtonLabel="buttonMessage"
-    :close="submit"
-    data-test="policies-modal"
-    @input="closePolicy(policy)"
+  <KModal
+    size="large"
+    :title="title"
   >
     <p class="body-1 mt-2">
       {{ $tr('lastUpdated', { date: $formatDate(date) }) }}
     </p>
+
     <slot></slot>
 
-    <template v-if="requirePolicyAcceptance" #action>
-      <VForm
-        ref="form"
-        lazy-validation
-        @submit.prevent="submit"
-      >
-        <Checkbox
-          v-model="policyAccepted"
-          :label="$tr('checkboxText')"
-          :rules="rules"
-          required
-          :hide-details="false"
-          class="mt-0"
-          data-test="accept"
-        />
-      </VForm>
+    <template slot="actions">
+      <template v-if="needsAcceptance">
+        <KFixedGrid :numCols="2">
+          <KGridItem :layout="{ span: 1 }">
+            <KCheckbox
+              :label="$tr('checkboxText')"
+              :checked="policyAccepted"
+              data-test="accept-checkbox"
+              @change="togglePolicyAccepted"
+            />
+            <div class="red--text" :style="{ height: '14pt' }">
+              <span v-if="showError">{{ $tr('checkboxValidationErrorMessage') }}</span>
+            </div>
+          </KGridItem>
+          <KGridItem :layout="{ span: 1 }">
+            <KButton
+              :text="$tr('continueButton')"
+              :primary="true"
+              :style="{ 'display': 'block', 'margin-left': 'auto' }"
+              data-test="continue-button"
+              @click="onPolicyAccept"
+            />
+          </KGridItem>
+        </KFixedGrid>
+      </template>
+
+      <KButton
+        v-else
+        :text="$tr('closeButton')"
+        data-test="close-button"
+        @click="onPolicyClose"
+      />
     </template>
-  </ResponsiveDialog>
+  </KModal>
 
 </template>
 
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
-  import Checkbox from 'shared/views/form/Checkbox';
-  import ResponsiveDialog from 'shared/views/ResponsiveDialog';
   import { policies, policyDates } from 'shared/constants';
 
   export default {
     name: 'PoliciesModal',
-    components: {
-      Checkbox,
-      ResponsiveDialog,
-    },
     props: {
-      ignoreAcceptance: {
-        type: Boolean,
-        default: false,
-      },
+      /**
+       * A policy constant
+       * - policies.TERMS_OF_SERVICE
+       * - policies.PRIVACY
+       * - policies.COMMUNITY_STANDARDS
+       */
       policy: {
         type: String,
         required: true,
@@ -61,68 +67,53 @@
           return Object.values(policies).includes(p);
         },
       },
+      /**
+       * A policy title
+       */
+      title: {
+        type: String,
+        required: true,
+      },
+      /**
+       * Accept checkbox will be displayed
+       * and it won't be possible to close
+       * the modal until a policy is accepted
+       */
+      needsAcceptance: {
+        type: Boolean,
+        default: false,
+      },
     },
     data() {
       return {
         policyAccepted: false,
+        showError: false,
       };
     },
     computed: {
-      ...mapGetters('policies', ['getPolicyAcceptedData', 'isPolicyUnaccepted', 'showPolicy']),
-      header() {
-        if (this.policy === policies.TERMS_OF_SERVICE) {
-          return this.requirePolicyAcceptance
-            ? this.$tr('updatedToSHeader')
-            : this.$tr('ToSHeader');
-        } else if (this.policy === policies.PRIVACY) {
-          return this.requirePolicyAcceptance
-            ? this.$tr('updatedPrivacyHeader')
-            : this.$tr('privacyHeader');
-        } else if (this.policy === policies.COMMUNITY_STANDARDS) {
-          return this.$tr('communityStandardsHeader');
-        }
-        return '';
-      },
       date() {
         return policyDates[this.policy];
       },
-      buttonMessage() {
-        if (this.requirePolicyAcceptance) {
-          return this.$tr('continueButton');
-        } else {
-          return this.$tr('closeButton');
-        }
+    },
+    methods: {
+      togglePolicyAccepted() {
+        this.policyAccepted = !this.policyAccepted;
+        this.validate();
       },
-      rules() {
-        return [v => v || this.$tr('checkboxValidationErrorMessage')];
+      onPolicyClose() {
+        this.$emit('close');
       },
-      requirePolicyAcceptance() {
-        return !this.ignoreAcceptance && this.isPolicyUnaccepted(this.policy);
+      validate() {
+        this.showError = !this.policyAccepted;
+        return this.policyAccepted;
       },
-    },
-    methods: {
-      ...mapActions('policies', ['acceptPolicy', 'closePolicy']),
-      submit() {
-        if (this.requirePolicyAcceptance) {
-          if (this.$refs.form.validate()) {
-            // Submit policy acceptance
-            const policyData = this.getPolicyAcceptedData(this.policy);
-            this.acceptPolicy(policyData);
-          }
-        } else {
-          this.closePolicy(this.policy);
+      onPolicyAccept() {
+        if (this.validate()) {
+          this.$emit('accept');
         }
-        return Promise.resolve();
       },
     },
     $trs: {
-      // Policy titles
-      ToSHeader: 'Terms of Service',
-      updatedToSHeader: 'Updated terms of service',
-      privacyHeader: 'Privacy policy',
-      updatedPrivacyHeader: 'Updated privacy policy',
-      communityStandardsHeader: 'Community Standards',
-
       lastUpdated: 'Last updated {date}',
       closeButton: 'Close',
       continueButton: 'Continue',
@@ -132,14 +123,3 @@
   };
 
 </script>
-
-<style scoped lang="less">
-
-  /deep/ .v-input__slot {
-    margin-bottom: 4px !important;
-    label {
-      color: black !important;
-    }
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue b/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue
index d3ffd19fa7..08ffc30646 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue
@@ -1,17 +1,36 @@
 <template>
 
   <div style="position: absolute; width: 0; height: 0">
-    <TermsOfServiceModal />
-    <PrivacyPolicyModal />
-    <CommunityStandardsModal />
+    <TermsOfServiceModal
+      v-if="showTermsOfService"
+      :needsAcceptance="isPolicyUnaccepted(policies.TERMS_OF_SERVICE)"
+      @accept="acceptPolicy(getPolicyAcceptedData(policies.TERMS_OF_SERVICE))"
+      @close="closePolicy(policies.TERMS_OF_SERVICE)"
+      @open="policy => openPolicy(policy)"
+    />
+    <PrivacyPolicyModal
+      v-if="showPrivacyPolicy"
+      :needsAcceptance="isPolicyUnaccepted(policies.PRIVACY)"
+      @accept="acceptPolicy(getPolicyAcceptedData(policies.PRIVACY))"
+      @close="closePolicy(policies.PRIVACY)"
+      @open="policy => openPolicy(policy)"
+    />
+    <CommunityStandardsModal
+      v-if="showCommunityStandards"
+      :needsAcceptance="false"
+      @close="closePolicy(policies.COMMUNITY_STANDARDS)"
+    />
   </div>
 
 </template>
+
 <script>
 
+  import { mapActions, mapGetters } from 'vuex';
   import PrivacyPolicyModal from './PrivacyPolicyModal';
   import TermsOfServiceModal from './TermsOfServiceModal';
   import CommunityStandardsModal from './CommunityStandardsModal';
+  import { policies } from 'shared/constants';
 
   export default {
     name: 'PolicyModals',
@@ -20,6 +39,37 @@
       PrivacyPolicyModal,
       TermsOfServiceModal,
     },
+    data() {
+      return {
+        policies,
+      };
+    },
+    computed: {
+      ...mapGetters('policies', [
+        'selectedPolicy',
+        'getPolicyAcceptedData',
+        'isPolicyUnaccepted',
+        'firstUnacceptedPolicy',
+      ]),
+      showTermsOfService() {
+        return (
+          this.selectedPolicy === policies.TERMS_OF_SERVICE ||
+          (!this.selectedPolicy && this.firstUnacceptedPolicy === policies.TERMS_OF_SERVICE)
+        );
+      },
+      showPrivacyPolicy() {
+        return (
+          this.selectedPolicy === policies.PRIVACY ||
+          (!this.selectedPolicy && this.firstUnacceptedPolicy === policies.PRIVACY)
+        );
+      },
+      showCommunityStandards() {
+        return this.selectedPolicy === policies.COMMUNITY_STANDARDS;
+      },
+    },
+    methods: {
+      ...mapActions('policies', ['acceptPolicy', 'openPolicy', 'closePolicy']),
+    },
   };
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue
index d2755d7366..016cdbbbfd 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue
@@ -1,6 +1,13 @@
 <template>
 
-  <PoliciesModal :policy="policyName" data-test="privacy-modal">
+  <PoliciesModal
+    :policy="policy"
+    :title="title"
+    :needsAcceptance="needsAcceptance"
+    data-test="privacy-modal"
+    @accept="$emit('accept')"
+    @close="$emit('close')"
+  >
     <div class="privacy-wrapper" dir="auto">
       <p class="emphasis">
         {{ $untranslated('introductionHeader') }}
@@ -9,7 +16,7 @@
         {{ $untranslated('introductionP1Part1') }}
         <ActionLink
           :text="$untranslated('introductionP1TC')"
-          @click="showTermsOfService"
+          @click="$emit('open', policies.TERMS_OF_SERVICE)"
         />
         {{ $untranslated('introductionP1Part2') }}
         <b>{{ $untranslated('introductionP1TU') }}</b>
@@ -197,7 +204,7 @@
           {{ $untranslated('expectationOfPrivacyP1') }}
           <ActionLink
             :text="$untranslated('expectationOfPrivacyP1TC')"
-            @click="showTermsOfService"
+            @click="$emit('open', policies.TERMS_OF_SERVICE)"
           />
         </p>
       </div>
@@ -302,10 +309,10 @@
 </template>
 <script>
 
-  import { mapActions } from 'vuex';
   import PoliciesModal from './PoliciesModal';
   import { policies } from 'shared/constants';
 
+  // We don't translate the following strings on purpose currently
   const $untranslateds = {
     // Introduction
     introductionHeader: 'Introduction',
@@ -518,20 +525,34 @@
     components: {
       PoliciesModal,
     },
+    props: {
+      needsAcceptance: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        policies,
+      };
+    },
     computed: {
-      policyName() {
-        return policies.PRIVACY;
+      policy() {
+        return this.policies.PRIVACY;
+      },
+      title() {
+        return this.needsAcceptance ? this.$tr('updatedPrivacyHeader') : this.$tr('privacyHeader');
       },
     },
     methods: {
-      ...mapActions('policies', ['openPolicy']),
-      showTermsOfService() {
-        this.openPolicy(policies.TERMS_OF_SERVICE);
-      },
       $untranslated(key) {
         return $untranslateds[key];
       },
     },
+    $trs: {
+      privacyHeader: 'Privacy policy',
+      updatedPrivacyHeader: 'Updated privacy policy',
+    },
   };
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue
index 87926ad065..a216bb6e7b 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue
@@ -1,6 +1,13 @@
 <template>
 
-  <PoliciesModal :policy="policyName" data-test="tos-modal">
+  <PoliciesModal
+    :policy="policy"
+    :title="title"
+    :needsAcceptance="needsAcceptance"
+    data-test="tos-modal"
+    @accept="$emit('accept')"
+    @close="$emit('close')"
+  >
     <div class="tos-wrapper">
       <p class="emphasis">
         {{ $tr('prompt') }}
@@ -179,7 +186,7 @@
         <p>
           <ActionLink
             :text="$tr('communityStandardsLink')"
-            @click="showCommunityStandards"
+            @click="$emit('open', policies.COMMUNITY_STANDARDS)"
           />
         </p>
       </div>
@@ -191,7 +198,7 @@
         <p>
           <ActionLink
             :text="$tr('yourPrivacyLink')"
-            @click="showPrivacyPolicy"
+            @click="$emit('open', policies.PRIVACY)"
           />
         </p>
       </div>
@@ -282,7 +289,6 @@
 </template>
 <script>
 
-  import { mapActions } from 'vuex';
   import PoliciesModal from './PoliciesModal';
   import { policies } from 'shared/constants';
 
@@ -291,21 +297,29 @@
     components: {
       PoliciesModal,
     },
-    computed: {
-      policyName() {
-        return policies.TERMS_OF_SERVICE;
+    props: {
+      needsAcceptance: {
+        type: Boolean,
+        default: false,
       },
     },
-    methods: {
-      ...mapActions('policies', ['openPolicy']),
-      showCommunityStandards() {
-        this.openPolicy(policies.COMMUNITY_STANDARDS);
+    data() {
+      return {
+        policies,
+      };
+    },
+    computed: {
+      policy() {
+        return this.policies.TERMS_OF_SERVICE;
       },
-      showPrivacyPolicy() {
-        this.openPolicy(policies.PRIVACY);
+      title() {
+        return this.needsAcceptance ? this.$tr('updatedToSHeader') : this.$tr('ToSHeader');
       },
     },
     $trs: {
+      ToSHeader: 'Terms of Service',
+      updatedToSHeader: 'Updated terms of service',
+
       prompt: 'Please read these terms and conditions carefully',
       disclaimerP1:
         'Before using this website, you should read the following important information relating to it. These Terms of Service ("Terms") govern your use of this website and form a legally binding agreement between you and us regarding your use of our website.',
@@ -500,6 +514,7 @@
   };
 
 </script>
+
 <style scoped>
   .emphasis {
     text-transform: uppercase;
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policiesModal.spec.js b/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policiesModal.spec.js
index 82703429a7..7dadb02723 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policiesModal.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policiesModal.spec.js
@@ -1,109 +1,123 @@
 import { mount } from '@vue/test-utils';
+
 import PoliciesModal from '../PoliciesModal.vue';
-import { policies } from 'shared/constants';
-
-const testPolicyData = {
-  [`${policies.TERMS_OF_SERVICE}_2000_1_1`]: '01/01/2000 12:00',
-};
-window.user = {};
-
-function makeWrapper({ propsData = {}, computedValues = {}, methods = {} }) {
-  const { showPolicy, isPolicyUnaccepted = true } = computedValues;
-
-  return mount(PoliciesModal, {
-    propsData: {
-      ignoreAcceptance: false,
-      policy: policies.TERMS_OF_SERVICE,
-      ...propsData,
-    },
-    computed: {
-      getPolicyAcceptedData() {
-        return () => testPolicyData;
-      },
-      isPolicyUnaccepted() {
-        return () => isPolicyUnaccepted;
-      },
-      showPolicy() {
-        return showPolicy ? policies.TERMS_OF_SERVICE : null;
+import { policies, policyDates } from 'shared/constants';
+
+describe('PoliciesModal', () => {
+  it('smoke test', () => {
+    const wrapper = mount(PoliciesModal);
+
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  it('renders a policy title', () => {
+    const wrapper = mount(PoliciesModal, {
+      propsData: {
+        title: 'Updated Terms Of Service',
       },
-    },
-    methods,
+    });
+
+    expect(wrapper.text()).toContain('Updated Terms Of Service');
   });
-}
 
-describe('policiesModal', () => {
-  let wrapper;
+  it("renders a date of a policy's last update", () => {
+    const wrapper = mount(PoliciesModal, {
+      propsData: {
+        policy: policies.TERMS_OF_SERVICE,
+      },
+    });
+    const formattedDate = wrapper.vm.$formatDate(policyDates[policies.TERMS_OF_SERVICE]);
+
+    expect(wrapper.text()).toContain(`Last updated ${formattedDate}`);
+  });
 
-  describe('when policy is not required', () => {
-    let closePolicy = null;
+  describe("when a policy doesn't need acceptance", () => {
+    let wrapper;
 
     beforeEach(() => {
-      closePolicy = jest.fn();
-      wrapper = makeWrapper({
-        computedValues: {
-          isPolicyUnaccepted: false,
-          showPolicy: true,
-        },
-        methods: {
-          closePolicy,
+      wrapper = mount(PoliciesModal, {
+        propsData: {
+          needsAcceptance: false,
         },
       });
     });
 
-    it('modal shows', () => {
-      expect(wrapper.find('[data-test="policies-modal"]').exists()).toBe(true);
+    it("accept checkbox shouldn't show", () => {
+      expect(wrapper.find('[data-test="accept-checkbox"]').exists()).toBe(false);
     });
-    it('checkbox should be hidden', () => {
-      expect(wrapper.find('[data-test="accept"]').exists()).toBe(false);
+
+    it("continue button shouldn't show", () => {
+      expect(wrapper.find('[data-test="continue-button"]').exists()).toBe(false);
     });
-    it('closing modal should just close the dialog', () => {
-      expect(closePolicy).not.toHaveBeenCalled();
-      wrapper.vm.submit().then(() => {
-        expect(closePolicy).toHaveBeenCalled();
-      });
+
+    it('close button should show', () => {
+      expect(wrapper.find('[data-test="close-button"]').exists()).toBe(true);
+      expect(wrapper.find('[data-test="close-button"]').isVisible()).toBe(true);
+    });
+
+    it('clicking close button should emit close event', () => {
+      wrapper.find('[data-test="close-button"]').trigger('click');
+
+      expect(wrapper.emitted().close).toBeTruthy();
+      expect(wrapper.emitted().close.length).toBe(1);
     });
   });
-  describe('when policy is required', () => {
-    let acceptPolicy;
+
+  describe('when a policy needs acceptance', () => {
+    let wrapper;
 
     beforeEach(() => {
-      acceptPolicy = jest.fn().mockReturnValue(Promise.resolve());
-      wrapper = makeWrapper({
-        propsData: { requirePolicyAcceptance: true },
-        methods: {
-          acceptPolicy,
+      wrapper = mount(PoliciesModal, {
+        propsData: {
+          needsAcceptance: true,
         },
       });
     });
-    it('checkbox should be visible', () => {
-      expect(wrapper.find('[data-test="accept"]').exists()).toBe(true);
+
+    it("close button shouldn't show", () => {
+      expect(wrapper.find('[data-test="close-button"]').exists()).toBe(false);
     });
-    it('closing modal should not close the dialog if checkbox is not checked', () => {
-      wrapper.vm.submit().then(() => {
-        expect(acceptPolicy).not.toHaveBeenCalled();
-      });
+
+    it('accept checkbox should show', () => {
+      expect(wrapper.find('[data-test="accept-checkbox"]').exists()).toBe(true);
+      expect(wrapper.find('[data-test="accept-checkbox"]').isVisible()).toBe(true);
     });
-    it('closing modal should not call acceptPolicy if checkbox is not checked', () => {
-      wrapper.vm.submit().then(() => {
-        expect(acceptPolicy).not.toHaveBeenCalled();
-      });
+
+    it('continue button should show', () => {
+      expect(wrapper.find('[data-test="continue-button"]').exists()).toBe(true);
+      expect(wrapper.find('[data-test="continue-button"]').isVisible()).toBe(true);
     });
-    it('closing modal should close the dialog if checkbox is checked', () => {
-      wrapper.setData({ policyAccepted: true });
-      wrapper.vm.submit().then(() => {
-        expect(acceptPolicy).toHaveBeenCalled();
+
+    describe('when accept policy checkbox is not checked', () => {
+      it('clicking continue button should display validation error', () => {
+        wrapper.find('[data-test="continue-button"]').trigger('click');
+
+        expect(wrapper.text()).toContain('Field is required');
       });
-    });
-    it('closing modal should call acceptPolicy if checkbox is checked', () => {
-      wrapper.setData({ policyAccepted: true });
-      wrapper.vm.submit().then(() => {
-        expect(acceptPolicy).toHaveBeenCalled();
+
+      it("clicking continue button shouldn't emit accept event", () => {
+        wrapper.find('[data-test="continue-button"]').trigger('click');
+
+        expect(wrapper.emitted().accept).toBeFalsy();
       });
     });
-    it('closing modal should call acceptPolicy with policy data', () => {
-      wrapper.setData({ policyAccepted: true });
-      wrapper.vm.submit().then(() => {
-        expect(acceptPolicy).toHaveBeenCalledWith(testPolicyData);
+
+    describe('when accept policy checkbox is checked', () => {
+      beforeEach(() => {
+        wrapper.find('[data-test="accept-checkbox"]').vm.$emit('change');
+      });
+
+      it("clicking continue button shouldn't display validation error", () => {
+        wrapper.find('[data-test="continue-button"]').trigger('click');
+
+        expect(wrapper.text()).not.toContain('Field is required');
+      });
+
+      it('clicking continue button should emit accept event', () => {
+        wrapper.find('[data-test="continue-button"]').trigger('click');
+
+        expect(wrapper.emitted().accept).toBeTruthy();
+        expect(wrapper.emitted().accept.length).toBe(1);
       });
     });
   });
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js b/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js
index 0201af7f99..0415bc141a 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js
@@ -1,81 +1,128 @@
 import { mount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
+import cloneDeep from 'lodash/cloneDeep';
 
 import PolicyModals from '../PolicyModals.vue';
-import PrivacyPolicyModal from '../PrivacyPolicyModal.vue';
-import TermsOfServiceModal from '../TermsOfServiceModal.vue';
-import CommunityStandardsModal from '../CommunityStandardsModal.vue';
 import storeFactory from 'shared/vuex/baseStore';
 import { policies } from 'shared/constants';
+import POLICIES_MODULE_CONFIG from 'shared/vuex/policies';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
-const makeWrapper = ({ getters = {} } = {}) => {
-  const store = storeFactory({
-    modules: {
-      policies: {
-        namespaced: true,
-        getters: {
-          showPolicy: () => null,
-          isPolicyUnaccepted: () => jest.fn(),
-          getPolicyAcceptedData: () => jest.fn(),
-          nonAcceptedPolicies: () => [],
-          ...getters,
-        },
-      },
-    },
-  });
+function getTermsOfServiceModal(wrapper) {
+  return wrapper.find('[data-test="tos-modal"]');
+}
+
+function getPrivacyModal(wrapper) {
+  return wrapper.find('[data-test="privacy-modal"]');
+}
+
+function getCommunityStandardsModal(wrapper) {
+  return wrapper.find('[data-test="community-standards-modal"]');
+}
 
+function makeWrapper({ propsData, store }) {
   return mount(PolicyModals, {
+    propsData,
     localVue,
     store,
   });
-};
+}
 
 describe('policyModals', () => {
   it('smoke test', () => {
-    const wrapper = makeWrapper();
+    const store = storeFactory();
+    const wrapper = makeWrapper({ store });
+
     expect(wrapper.isVueInstance()).toBe(true);
     expect(wrapper.is(PolicyModals)).toBe(true);
-    expect(wrapper.contains(PrivacyPolicyModal)).toBe(true);
-    expect(wrapper.contains(TermsOfServiceModal)).toBe(true);
-    expect(wrapper.contains(CommunityStandardsModal)).toBe(true);
   });
 
-  describe('when mounted', () => {
-    let wrapper;
-    it('should show the correct policy modal', () => {
-      wrapper = makeWrapper({
-        getters: {
-          showPolicy: () => policies.PRIVACY,
-        },
-      });
-      expect(wrapper.find(PrivacyPolicyModal).attributes('aria-hidden')).toBe('false');
-      expect(wrapper.find(TermsOfServiceModal).attributes('aria-hidden')).toBe('true');
-      expect(wrapper.find(CommunityStandardsModal).attributes('aria-hidden')).toBe('true');
-    });
-    it('should show terms of service policy modal if it has not been accepted', () => {
-      wrapper = makeWrapper({
-        getters: {
-          isPolicyUnaccepted: () => () => policies.TERMS_OF_SERVICE,
-          showPolicy: () => policies.TERMS_OF_SERVICE,
-        },
-      });
-      expect(wrapper.find(TermsOfServiceModal).attributes('persistent')).toBe('terms_of_service');
-      expect(wrapper.find(TermsOfServiceModal).attributes('aria-hidden')).toBe('false');
-      expect(wrapper.find(PrivacyPolicyModal).attributes('aria-hidden')).toBe('true');
-    });
-    it('should show privacy policy modal if it has not been accepted', () => {
-      wrapper = makeWrapper({
-        getters: {
-          isPolicyUnaccepted: () => () => policies.PRIVACY,
-          showPolicy: () => policies.PRIVACY,
-        },
-      });
-      expect(wrapper.find(PrivacyPolicyModal).attributes('persistent')).toBe('privacy_policy');
-      expect(wrapper.find(PrivacyPolicyModal).attributes('aria-hidden')).toBe('false');
-      expect(wrapper.find(TermsOfServiceModal).attributes('aria-hidden')).toBe('true');
-    });
+  it(`should show only terms of service modal
+    when terms of service policy is selected`, () => {
+    const store = storeFactory();
+    store.commit('policies/SET_SELECTED_POLICY', policies.TERMS_OF_SERVICE);
+    const wrapper = makeWrapper({ store });
+
+    expect(getTermsOfServiceModal(wrapper).exists()).toBe(true);
+    expect(getTermsOfServiceModal(wrapper).isVisible()).toBe(true);
+    expect(getPrivacyModal(wrapper).exists()).toBe(false);
+    expect(getCommunityStandardsModal(wrapper).exists()).toBe(false);
+  });
+
+  it(`should show only terms of service modal
+    when terms of service policy is the first unaccepted policy
+    and there is no other selected policy`, () => {
+    const policiesModule = cloneDeep(POLICIES_MODULE_CONFIG);
+    jest
+      .spyOn(policiesModule.getters, 'firstUnacceptedPolicy')
+      .mockReturnValue(policies.TERMS_OF_SERVICE);
+    const store = storeFactory({ modules: { policies: policiesModule } });
+    const wrapper = makeWrapper({ store });
+    // make sure that no policy is selected
+    expect(wrapper.vm.$store.getters['policies/selectedPolicy']).toBeNull();
+
+    expect(getTermsOfServiceModal(wrapper).exists()).toBe(true);
+    expect(getTermsOfServiceModal(wrapper).isVisible()).toBe(true);
+    expect(getPrivacyModal(wrapper).exists()).toBe(false);
+    expect(getCommunityStandardsModal(wrapper).exists()).toBe(false);
+  });
+
+  it(`should show only privacy policy modal
+    when privacy policy is selected`, () => {
+    const store = storeFactory();
+    store.commit('policies/SET_SELECTED_POLICY', policies.PRIVACY);
+    const wrapper = makeWrapper({ store });
+
+    expect(getPrivacyModal(wrapper).exists()).toBe(true);
+    expect(getPrivacyModal(wrapper).isVisible()).toBe(true);
+    expect(getTermsOfServiceModal(wrapper).exists()).toBe(false);
+    expect(getCommunityStandardsModal(wrapper).exists()).toBe(false);
+  });
+
+  it(`should show only privacy policy modal
+    when privacy policy is the first unaccepted policy
+    and there is no other selected policy`, () => {
+    const policiesModule = cloneDeep(POLICIES_MODULE_CONFIG);
+    jest.spyOn(policiesModule.getters, 'firstUnacceptedPolicy').mockReturnValue(policies.PRIVACY);
+    const store = storeFactory({ modules: { policies: policiesModule } });
+    const wrapper = makeWrapper({ store });
+    // make sure that no policy is selected
+    expect(wrapper.vm.$store.getters['policies/selectedPolicy']).toBeNull();
+
+    expect(getPrivacyModal(wrapper).exists()).toBe(true);
+    expect(getPrivacyModal(wrapper).isVisible()).toBe(true);
+    expect(getTermsOfServiceModal(wrapper).exists()).toBe(false);
+    expect(getCommunityStandardsModal(wrapper).exists()).toBe(false);
+  });
+
+  it(`should should show only community standards modal
+    when community standards policy is selected`, () => {
+    const store = storeFactory();
+    store.commit('policies/SET_SELECTED_POLICY', policies.COMMUNITY_STANDARDS);
+    const wrapper = makeWrapper({ store });
+
+    expect(getCommunityStandardsModal(wrapper).exists()).toBe(true);
+    expect(getCommunityStandardsModal(wrapper).isVisible()).toBe(true);
+    expect(getTermsOfServiceModal(wrapper).exists()).toBe(false);
+    expect(getPrivacyModal(wrapper).exists()).toBe(false);
+  });
+
+  it(`a selected policy should have higher priority
+    than the first unaccepted policy`, () => {
+    // for example, when terms of service policy has been accepted already,
+    // and is selected (user wants to preview it), terms of service modal
+    // should be displayed, even when privacy policy has not been accepted yet
+    const policiesModule = cloneDeep(POLICIES_MODULE_CONFIG);
+    jest.spyOn(policiesModule.getters, 'firstUnacceptedPolicy').mockReturnValue(policies.PRIVACY);
+    const store = storeFactory({ modules: { policies: policiesModule } });
+    store.commit('policies/SET_SELECTED_POLICY', policies.TERMS_OF_SERVICE);
+    const wrapper = makeWrapper({ store });
+
+    expect(getTermsOfServiceModal(wrapper).exists()).toBe(true);
+    expect(getTermsOfServiceModal(wrapper).isVisible()).toBe(true);
+    expect(getPrivacyModal(wrapper).exists()).toBe(false);
+    expect(getCommunityStandardsModal(wrapper).exists()).toBe(false);
   });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js
index cd2386a172..ccd5955cc7 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js
@@ -2,111 +2,139 @@ import Vue from 'vue';
 import { policyDates, policyKeys, createPolicyKey, policies } from 'shared/constants';
 import client from 'shared/client';
 
-const acceptOrder = [policies.TERMS_OF_SERVICE, policies.PRIVACY];
+const ACCEPT_ORDER = [policies.TERMS_OF_SERVICE, policies.PRIVACY];
 
-export default {
-  namespaced: true,
-  state() {
-    return {
-      policies: {},
-      selectedPolicy: null,
+export const getters = {
+  /**
+   * Generate an object with information about policy, its version,
+   * and current datetime as user acceptance date
+   *
+   * @returns Object in the format
+   * { policy_year_month_day: day/month/year hour:minute' }
+   * where key is a policy + its version, and value is the current UTC datetime
+   */
+  getPolicyAcceptedData() {
+    return policyName => {
+      // Get current date string
+      const date = new Date();
+      // this data is what we send to the server,
+      // and converting it to a string makes it lose
+      // timezone data. Ensure that we standardize on
+      // UTC before sending that to the server.
+      // part of the fix for issue #2508 and #2317.
+      const day = ('0' + date.getUTCDate()).slice(-2);
+      const month = ('0' + (date.getUTCMonth() + 1)).slice(-2);
+      const year = String(date.getUTCFullYear()).slice(-2);
+      const hour = ('0' + (date.getUTCHours() + 1)).slice(-2);
+      const minute = ('0' + (date.getUTCMinutes() + 1)).slice(-2);
+      const dateStr = `${day}/${month}/${year} ${hour}:${minute}`;
+
+      // Get policy string
+      const policyDate = policyDates[policyName];
+      return { [createPolicyKey(policyName, policyDate)]: dateStr };
     };
   },
-  getters: {
-    getPolicyAcceptedData() {
-      return policyName => {
-        // what should the format be?
-        // {policy_name}_{year}_{month}_{day}
-        // Get current date string
-        const date = new Date();
-        // this data is what we send to the server,
-        // and converting it to a string makes it lose
-        // timezone data. Ensure that we standardize on
-        // UTC before sending that to the server.
-        // part of the fix for issue #2508 and #2317.
-        const day = ('0' + date.getUTCDate()).slice(-2);
-        const month = ('0' + (date.getUTCMonth() + 1)).slice(-2);
-        const year = String(date.getUTCFullYear()).slice(-2);
-        const hour = ('0' + (date.getUTCHours() + 1)).slice(-2);
-        const minute = ('0' + (date.getUTCMinutes() + 1)).slice(-2);
-        const dateStr = `${day}/${month}/${year} ${hour}:${minute}`;
-
-        // Get policy string
-        const policyDate = policyDates[policyName];
-        return { [createPolicyKey(policyName, policyDate)]: dateStr };
-      };
-    },
-    // returns a list of policy constants (e.g. policies.PRIVACY)
-    // that have not been signed by the user.
-    nonAcceptedPolicies(state) {
-      return policyKeys
-        .filter(key => !state.policies[key])
-        .map(key =>
-          key
-            .split('_')
-            .slice(0, -3)
-            .join('_')
-        );
-    },
-    isPolicyUnaccepted(state, getters, rootState, rootGetters) {
-      return function(policy) {
-        if (!rootGetters.loggedIn) {
-          return false;
-        }
-
-        return getters.nonAcceptedPolicies.includes(policy);
-      };
-    },
-    showPolicy(state, getters, rootState, rootGetters) {
-      if (state.selectedPolicy) {
-        return state.selectedPolicy;
-      }
-
+  /**
+   * @returns A list of policy constants (e.g. policies.PRIVACY)
+   * that have not been signed by the user
+   */
+  nonAcceptedPolicies(state) {
+    return policyKeys
+      .filter(key => !state.policies[key])
+      .map(key =>
+        key
+          .split('_')
+          .slice(0, -3)
+          .join('_')
+      );
+  },
+  /**
+   * @returns `true` if a policy hasn't been
+   * accepted yet. Otherwise `false`.
+   * Always returns `false` for logged out users.
+   */
+  isPolicyUnaccepted(state, getters, rootState, rootGetters) {
+    return function(policy) {
       if (!rootGetters.loggedIn) {
-        return null;
+        return false;
       }
 
-      const unacceptedPolicies = getters.nonAcceptedPolicies;
-      if (unacceptedPolicies.length) {
-        return acceptOrder.find(policy => unacceptedPolicies.includes(policy));
-      }
-    },
+      return getters.nonAcceptedPolicies.includes(policy);
+    };
   },
-  actions: {
-    setPolicies(context, policies) {
-      context.commit('SET_POLICIES', policies);
-    },
-    openPolicy(context, policy) {
-      context.commit('SET_SELECTED_POLICY', policy);
-    },
-    closePolicy(context, policy) {
-      if (context.state.selectedPolicy === policy) {
-        context.commit('SET_SELECTED_POLICY', null);
-      }
-    },
-    acceptPolicy(context, policyData) {
-      return client
-        .post(window.Urls.policy_update(), { policy: JSON.stringify(policyData) })
-        .then(() => {
-          return context
-            .dispatch('setPolicies', policyData)
-            .then(() => context.dispatch('closePolicy'));
-        });
-    },
+  selectedPolicy(state) {
+    return state.selectedPolicy;
   },
-  mutations: {
-    SET_SELECTED_POLICY(state, policy) {
-      state.selectedPolicy = policy;
-    },
-    /**
-     * @param state
-     * @param {Object} policies
-     * @constructor
-     */
-    SET_POLICIES(state, policies) {
-      for (let policy in policies) {
-        Vue.set(state.policies, policy, policies[policy]);
-      }
-    },
+  /**
+   * @returns There can be more unaccepted policies.
+   * This getter returns the first of them when sorted
+   * by predefined order (see ACCEPT_ORDER).
+   * Always returns `null` for logged out users.
+   */
+  firstUnacceptedPolicy(state, getters, rootState, rootGetters) {
+    // acceptance information is only relevant to logged in users
+    if (!rootGetters.loggedIn) {
+      return null;
+    }
+    const unacceptedPolicies = getters.nonAcceptedPolicies;
+    if (!unacceptedPolicies.length) {
+      return null;
+    }
+    return ACCEPT_ORDER.find(policy => unacceptedPolicies.includes(policy));
+  },
+};
+
+export const mutations = {
+  SET_SELECTED_POLICY(state, policy) {
+    state.selectedPolicy = policy;
+  },
+  SET_POLICIES(state, policies) {
+    for (let policy in policies) {
+      Vue.set(state.policies, policy, policies[policy]);
+    }
+  },
+};
+
+export const actions = {
+  setPolicies(context, policies) {
+    context.commit('SET_POLICIES', policies);
+  },
+  openPolicy(context, policy) {
+    context.commit('SET_SELECTED_POLICY', policy);
+  },
+  closePolicy(context, policy) {
+    if (context.state.selectedPolicy === policy) {
+      context.commit('SET_SELECTED_POLICY', null);
+    }
+  },
+  /**
+   * Accept a policy
+   *
+   * @param {Object} policyAcceptedData Object with information about policy,
+   * its version, and user acceptance date in the format
+   * { policy_year_month_day: day/month/year hour:minute' }
+   * @returns {Promise}
+   */
+  acceptPolicy(context, policyAcceptedData) {
+    return client
+      .post(window.Urls.policy_update(), { policy: JSON.stringify(policyAcceptedData) })
+      .then(() => {
+        return context
+          .dispatch('setPolicies', policyAcceptedData)
+          .then(() => context.dispatch('closePolicy'));
+      });
+  },
+};
+
+export default {
+  namespaced: true,
+  state() {
+    return {
+      policies: {},
+      selectedPolicy: null,
+    };
   },
+  getters,
+  actions,
+  mutations,
 };
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js
index eed13b9109..04f92031ad 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js
@@ -1,84 +1,147 @@
-import transform from 'lodash/transform';
-import storeFactory from 'shared/vuex/baseStore';
+import { actions, getters } from './index';
 import { policies, policyDates } from 'shared/constants';
 import client from 'shared/client';
 
 jest.mock('shared/client');
-jest.mock('shared/vuex/connectionPlugin');
 
 describe('policies store', () => {
-  let store;
-  beforeEach(() => {
-    window.user = {};
-    store = storeFactory();
+  afterEach(() => {
+    jest.resetAllMocks();
   });
 
-  describe('nonAcceptedPolicies getter', () => {
-    it('should return empty array if all policies have been accepted', () => {
-      const allPolicies = transform(
-        policyDates,
-        (result, value, key) => {
-          const policyKey = `${key}_${value.getUTCFullYear()}_${value.getUTCMonth() +
-            1}_${value.getUTCDate()}`;
-          return (result[policyKey] = '01/01/2000 12:12');
-        },
-        {}
-      );
-      store.state.policies = {
-        policies: allPolicies,
-        selectedPolicy: null,
-      };
-
-      expect(store.getters['policies/nonAcceptedPolicies']).toEqual([]);
-    });
-    it('should return array of all policies that still need to be accepted', () => {
-      expect(store.getters['policies/nonAcceptedPolicies']).toEqual(Object.values(policies));
+  describe('getters', () => {
+    describe('nonAcceptedPolicies', () => {
+      it('should return empty array if all policies have been accepted', () => {
+        const state = {
+          policies: {
+            privacy_policy_2020_12_10: '01/01/2000 12:12',
+            terms_of_service_2020_12_10: '01/01/2000 12:12',
+            community_standards_2020_8_30: '01/01/2000 12:12',
+          },
+        };
+
+        expect(getters.nonAcceptedPolicies(state)).toEqual([]);
+      });
+
+      it('should return array of all policies that still need to be accepted', () => {
+        const state = {
+          policies: {
+            privacy_policy_2020_12_10: undefined,
+            terms_of_service_2020_12_10: undefined,
+            community_standards_2020_8_30: '01/01/2000 12:12',
+          },
+        };
+
+        expect(getters.nonAcceptedPolicies(state)).toEqual(['privacy_policy', 'terms_of_service']);
+      });
+
+      it('should return array of policies that have been updated since they were last accepted', () => {
+        const state = {
+          policies: {
+            terms_of_service_1900_2_2: '01/01/1901 12:12',
+            terms_of_service_2020_12_10: undefined,
+            privacy_policy_1900_2_2: '01/01/1901 12:12',
+            privacy_policy_2020_12_10: '01/01/2021 12:12',
+            community_standards_1900_2_2: '01/01/1901 12:12',
+            community_standards_2020_8_30: '01/01/2021 12:12',
+          },
+        };
+
+        expect(getters.nonAcceptedPolicies(state)).toEqual(['terms_of_service']);
+      });
     });
-    it('should return array of policies that have been updated since they were last accepted', () => {
-      const testTOSPolicyData = {
-        [`${policies.TERMS_OF_SERVICE}_1900_2_2`]: '01/01/2000 12:12',
-      };
-      store.commit('policies/SET_POLICIES', testTOSPolicyData);
-      expect(store.getters['policies/nonAcceptedPolicies']).toContain(policies.TERMS_OF_SERVICE);
+
+    describe('firstUnacceptedPolicy', () => {
+      it(`should return null when a user is logged in
+        and all policies are accepted`, () => {
+        expect(
+          getters.firstUnacceptedPolicy(
+            {}, // state
+            { nonAcceptedPolicies: [] }, // getters
+            {}, // rootState
+            { loggedIn: true } // rootGetters
+          )
+        ).toBeNull();
+      });
+
+      it(`should return terms of service when a user is logged in
+        and both terms of service and privacy policy are not accepted`, () => {
+        expect(
+          getters.firstUnacceptedPolicy(
+            {}, // state
+            { nonAcceptedPolicies: ['privacy_policy', 'terms_of_service'] }, // getters
+            {}, // rootState
+            { loggedIn: true } // rootGetters
+          )
+        ).toEqual('terms_of_service');
+      });
+
+      it('should return null when a user is logged out', () => {
+        expect(
+          getters.firstUnacceptedPolicy(
+            {}, // state
+            { nonAcceptedPolicies: ['privacy_policy', 'terms_of_service'] }, // getters
+            {}, // rootState
+            { loggedIn: false } // rootGetters
+          )
+        ).toBeNull();
+      });
     });
-  });
-  describe('getPolicyAcceptedData getter', () => {
-    it('should return data in the format {policy_year_month_date: day/month/year hour:minute', () => {
-      const testKey = policies.PRIVACY;
-      const date = policyDates[testKey];
-      const now = new Date();
-      const day = ('0' + now.getUTCDate()).slice(-2);
-      const month = ('0' + (now.getUTCMonth() + 1)).slice(-2);
-      const year = String(now.getUTCFullYear()).slice(-2);
-      const hour = ('0' + (now.getUTCHours() + 1)).slice(-2);
-      const minute = ('0' + (now.getUTCMinutes() + 1)).slice(-2);
-
-      const expectedKey = `${testKey}_${date.getUTCFullYear()}_${date.getUTCMonth() +
-        1}_${date.getUTCDate()}`;
-      const expectedValue = `${day}/${month}/${year} ${hour}:${minute}`;
-      expect(store.getters['policies/getPolicyAcceptedData'](policies.PRIVACY)).toEqual({
-        [expectedKey]: expectedValue,
+
+    describe('getPolicyAcceptedData', () => {
+      it(`should return data in the format {policy_year_month_day: day/month/year hour:minute
+        where key is a policy and value is the current UTC datetime`, () => {
+        // an example of the expected object:
+        // { privacy_policy_2020_12_10: '30/04/21 16:45' }
+
+        const testKey = policies.PRIVACY;
+        const date = policyDates[testKey];
+        const now = new Date();
+        const day = ('0' + now.getUTCDate()).slice(-2);
+        const month = ('0' + (now.getUTCMonth() + 1)).slice(-2);
+        const year = String(now.getUTCFullYear()).slice(-2);
+        const hour = ('0' + (now.getUTCHours() + 1)).slice(-2);
+        const minute = ('0' + (now.getUTCMinutes() + 1)).slice(-2);
+
+        const expectedKey = `${testKey}_${date.getUTCFullYear()}_${date.getUTCMonth() +
+          1}_${date.getUTCDate()}`;
+        const expectedValue = `${day}/${month}/${year} ${hour}:${minute}`;
+
+        expect(getters.getPolicyAcceptedData()(policies.PRIVACY)).toEqual({
+          [expectedKey]: expectedValue,
+        });
       });
     });
   });
-  describe('acceptPolicy action', () => {
-    const testData = { testpolicy: 'test' };
-    it('should call policy_update endpoint', () => {
-      client.post.mockResolvedValue(Promise.resolve());
-      return store.dispatch('policies/acceptPolicy', testData).then(() => {
-        expect(client.post.mock.calls[0][0]).toBe('policy_update');
-        expect(client.post.mock.calls[0][1]).toEqual({ policy: JSON.stringify(testData) });
+
+  describe('actions', () => {
+    describe('acceptPolicy', () => {
+      let dispatch;
+
+      beforeEach(() => {
+        client.post.mockResolvedValue(Promise.resolve());
+        dispatch = jest.fn().mockResolvedValue();
       });
-    });
-    it('should update window.user with the new data', () => {
-      window.user.policies = { policy: 'signed' };
-      client.post.mockResolvedValue(Promise.resolve());
-      return store.dispatch('policies/acceptPolicy', testData).then(() => {
-        expect(window.user.policies).toEqual({
-          policy: 'signed',
-          ...testData,
+
+      it('should call policy_update endpoint', async () => {
+        const policyAcceptedData = { privacy_policy_2020_12_10: '12/05/2021 09:56' };
+        await actions.acceptPolicy({ getters, dispatch }, policyAcceptedData);
+
+        expect(client.post.mock.calls.length).toBe(1);
+        expect(client.post.mock.calls[0][0]).toBe('policy_update');
+        expect(client.post.mock.calls[0][1]).toEqual({
+          policy: JSON.stringify(policyAcceptedData),
         });
       });
+
+      it('should call setPolicies with the new data and closePolicy', async () => {
+        const policyAcceptedData = { privacy_policy_2020_12_10: '12/05/2021 09:56' };
+        await actions.acceptPolicy({ getters, dispatch }, policyAcceptedData);
+
+        expect(dispatch.mock.calls.length).toBe(2);
+        expect(dispatch.mock.calls[0]).toEqual(['setPolicies', policyAcceptedData]);
+        expect(dispatch.mock.calls[1]).toEqual(['closePolicy']);
+      });
     });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/policies/plugin.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/policies/plugin.spec.js
new file mode 100644
index 0000000000..d341860dd8
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/vuex/policies/plugin.spec.js
@@ -0,0 +1,38 @@
+import { Store } from 'vuex';
+
+import PoliciesPlugin from './plugin';
+
+const store = new Store({
+  modules: {
+    policies: {
+      namespaced: true,
+      actions: {
+        setPolicies: jest.fn(),
+      },
+      mutations: {
+        SET_POLICIES: jest.fn(),
+      },
+    },
+  },
+  plugins: [PoliciesPlugin],
+});
+
+describe('PoliciesPlugin', () => {
+  beforeEach(() => {
+    window.user = {};
+  });
+
+  afterEach(() => {
+    window.user = {};
+  });
+
+  it('should update `window.user` with new data on policies store update', () => {
+    window.user.policies = { terms_of_service_2020_12_10: '01/01/2000 12:12' };
+    store.dispatch('policies/setPolicies', { privacy_policy_2020_12_10: '12/05/2021 09:56' });
+
+    expect(window.user.policies).toEqual({
+      terms_of_service_2020_12_10: '01/01/2000 12:12',
+      privacy_policy_2020_12_10: '12/05/2021 09:56',
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/management/commands/loadconstants.py b/contentcuration/contentcuration/management/commands/loadconstants.py
index 77fc7e69ba..46de83a0ce 100644
--- a/contentcuration/contentcuration/management/commands/loadconstants.py
+++ b/contentcuration/contentcuration/management/commands/loadconstants.py
@@ -1,4 +1,5 @@
 from future import standard_library
+
 standard_library.install_aliases()
 from builtins import str
 from builtins import object
@@ -30,7 +31,8 @@ def generate_list(self):
                 "model": self.model,
                 "pk": self.id_field,
                 "fields": self.get_dict(constant),
-            } for constant in self.default_list
+            }
+            for constant in self.default_list
         ]
 
     def get_dict(self, constant):
@@ -160,14 +162,12 @@ def get_dict(self, constant):
 
 
 class EarlyExit(BaseException):
-
     def __init__(self, message, db_path):
         self.message = message
         self.db_path = db_path
 
 
 class Command(BaseCommand):
-
     def add_arguments(self, parser):
         pass
 
@@ -178,19 +178,31 @@ def handle(self, *args, **options):
                 current_model = ""
                 new_model_count = 0
                 for constant in constant_list:
-                    current_model = constant['model'].__name__
+                    current_model = constant["model"].__name__
                     if current_model in cache:
                         cache.delete(current_model)
-                    obj, isNew = constant['model'].objects.update_or_create(**{constant['pk']: constant['fields'][constant['pk']]})
+                    obj, isNew = constant["model"].objects.update_or_create(
+                        **{constant["pk"]: constant["fields"][constant["pk"]]}
+                    )
                     new_model_count += 1 if isNew else 0
-                    for attr, value in list(constant['fields'].items()):
-                        setattr(obj, attr, value)
+                    for attr, value in list(constant["fields"].items()):
+                        field = obj._meta.get_field(attr)
+                        if field.many_to_many:
+                            getattr(obj, attr).set(value)
+                        else:
+                            setattr(obj, attr, value)
 
                     obj.save()
-                self.stdout.write("{0}: {1} constants saved ({2} new)".format(str(current_model), len(constant_list), new_model_count))
+                self.stdout.write(
+                    "{0}: {1} constants saved ({2} new)".format(
+                        str(current_model), len(constant_list), new_model_count
+                    )
+                )
 
             # Create garbage node
-            garbage_node, _new = models.ContentNode.objects.get_or_create(pk=settings.ORPHANAGE_ROOT_ID, kind_id=content_kinds.TOPIC)
+            garbage_node, _new = models.ContentNode.objects.get_or_create(
+                pk=settings.ORPHANAGE_ROOT_ID, kind_id=content_kinds.TOPIC
+            )
             garbage_node.title = "Garbage Node Root"
             garbage_node.description = "This node as the default parent for nodes not associated with a channel"
             garbage_node.save()
@@ -201,7 +213,7 @@ def handle(self, *args, **options):
             logging.warning("DB is in read-only mode, skipping loadconstants")
 
         except EarlyExit as e:
-            logging.warning("Exited early due to {message}.".format(
-                message=e.message))
-            self.stdout.write("You can find your database in {path}".format(
-                path=e.db_path))
+            logging.warning("Exited early due to {message}.".format(message=e.message))
+            self.stdout.write(
+                "You can find your database in {path}".format(path=e.db_path)
+            )
diff --git a/contentcuration/contentcuration/middleware/db_readonly.py b/contentcuration/contentcuration/middleware/db_readonly.py
index 917cf8bf87..34c3c077e0 100644
--- a/contentcuration/contentcuration/middleware/db_readonly.py
+++ b/contentcuration/contentcuration/middleware/db_readonly.py
@@ -1,5 +1,5 @@
 from django.http import HttpResponseBadRequest
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 try:
     # Django 1.10+
diff --git a/contentcuration/contentcuration/migrations/0001_initial.py b/contentcuration/contentcuration/migrations/0001_initial.py
deleted file mode 100644
index 81e7c9d2db..0000000000
--- a/contentcuration/contentcuration/migrations/0001_initial.py
+++ /dev/null
@@ -1,299 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-12 17:33
-from __future__ import unicode_literals
-
-import uuid
-
-import django.db.models.deletion
-import django.db.models.manager
-import mptt.fields
-from django.conf import settings
-from django.db import migrations
-from django.db import models
-
-import contentcuration.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='User',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('email', models.EmailField(max_length=100, unique=True)),
-                ('first_name', models.CharField(max_length=100)),
-                ('last_name', models.CharField(max_length=100)),
-                ('is_admin', models.BooleanField(default=False)),
-                ('is_active', models.BooleanField(default=False)),
-            ],
-            options={
-                'verbose_name': 'User',
-                'verbose_name_plural': 'Users',
-            },
-        ),
-        migrations.CreateModel(
-            name='AssessmentItem',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('type', models.CharField(default='multiplechoice', max_length=50)),
-                ('question', models.TextField(blank=True)),
-                ('answers', models.TextField(default='[]')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Channel',
-            fields=[
-                ('id', contentcuration.models.UUIDField(default=uuid.uuid4, max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=200)),
-                ('description', models.CharField(blank=True, max_length=400)),
-                ('version', models.IntegerField(default=0)),
-                ('thumbnail', models.TextField(blank=True)),
-                ('deleted', models.BooleanField(default=False)),
-                ('public', models.BooleanField(default=False)),
-                ('bookmarked_by', models.ManyToManyField(related_name='bookmarked_channels', to=settings.AUTH_USER_MODEL, verbose_name='bookmarked by')),
-            ],
-            options={
-                'verbose_name': 'Channel',
-                'verbose_name_plural': 'Channels',
-            },
-        ),
-        migrations.CreateModel(
-            name='ContentKind',
-            fields=[
-                ('kind', models.CharField(choices=[('topic', 'Topic'), ('video', 'Video'), ('audio', 'Audio'), ('exercise',
-                                                                                                                   'Exercise'), ('document', 'Document'), ('image', 'Image')], max_length=200, primary_key=True, serialize=False)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='ContentNode',
-            fields=[
-                ('id', contentcuration.models.UUIDField(default=uuid.uuid4, max_length=32, primary_key=True, serialize=False)),
-                ('content_id', contentcuration.models.UUIDField(default=uuid.uuid4, editable=False, max_length=32)),
-                ('title', models.CharField(max_length=200)),
-                ('description', models.CharField(blank=True, max_length=400)),
-                ('sort_order', models.FloatField(default=0, help_text='Ascending, lowest number shown first', max_length=50, verbose_name='sort order')),
-                ('license_owner', models.CharField(blank=True, help_text='Organization of person who holds the essential rights', max_length=200)),
-                ('author', models.CharField(blank=True, help_text='Person who created content', max_length=200)),
-                ('created', models.DateTimeField(auto_now_add=True, verbose_name='created')),
-                ('modified', models.DateTimeField(auto_now=True, verbose_name='modified')),
-                ('changed', models.BooleanField(default=True)),
-                ('lft', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('rght', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('level', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('cloned_source', mptt.fields.TreeForeignKey(blank=True, null=True,
-                                                             on_delete=django.db.models.deletion.SET_NULL, related_name='clones', to='contentcuration.ContentNode')),
-            ],
-            options={
-                'verbose_name': 'Topic',
-                'verbose_name_plural': 'Topics',
-            },
-        ),
-        migrations.CreateModel(
-            name='ContentTag',
-            fields=[
-                ('id', contentcuration.models.UUIDField(default=uuid.uuid4, max_length=32, primary_key=True, serialize=False)),
-                ('tag_name', models.CharField(max_length=30)),
-                ('channel', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tags', to='contentcuration.Channel')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Exercise',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(default='Title', help_text='Title of the content item', max_length=50, verbose_name='title')),
-                ('description', models.TextField(default='Description', help_text='Brief description of what this content item is', max_length=200, verbose_name='description')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='File',
-            fields=[
-                ('id', contentcuration.models.UUIDField(default=uuid.uuid4, max_length=32, primary_key=True, serialize=False)),
-                ('checksum', models.CharField(blank=True, max_length=400)),
-                ('file_size', models.IntegerField(blank=True, null=True)),
-                ('file_on_disk', models.FileField(blank=True, max_length=500,
-                                                  storage=contentcuration.models.FileOnDiskStorage(), upload_to=contentcuration.models.file_on_disk_name)),
-                ('original_filename', models.CharField(blank=True, max_length=255)),
-                ('contentnode', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='files', to='contentcuration.ContentNode')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='FileFormat',
-            fields=[
-                ('extension', models.CharField(choices=[('mp4', 'mp4'), ('vtt', 'vtt'), ('srt', 'srt'),
-                                                        ('mp3', 'mp3'), ('pdf', 'pdf')], max_length=40, primary_key=True, serialize=False)),
-                ('mimetype', models.CharField(blank=True, max_length=200)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='FormatPreset',
-            fields=[
-                ('id', models.CharField(choices=[('high_res_video', 'High resolution video'), ('low_res_video', 'Low resolution video'), ('vector_video', 'Vertor video'), (
-                    'thumbnail', 'Thumbnail'), ('thumbnail', 'Thumbnail'), ('caption', 'Caption')], max_length=150, primary_key=True, serialize=False)),
-                ('readable_name', models.CharField(max_length=400)),
-                ('multi_language', models.BooleanField(default=False)),
-                ('supplementary', models.BooleanField(default=False)),
-                ('order', models.IntegerField()),
-                ('allowed_formats', models.ManyToManyField(blank=True, to='contentcuration.FileFormat')),
-                ('kind', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='format_presets', to='contentcuration.ContentKind')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Invitation',
-            fields=[
-                ('id', contentcuration.models.UUIDField(default=uuid.uuid4, max_length=32, primary_key=True, serialize=False)),
-                ('email', models.EmailField(max_length=100)),
-                ('first_name', models.CharField(default='Guest', max_length=100)),
-                ('last_name', models.CharField(blank=True, max_length=100, null=True)),
-                ('channel', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pending_editors', to='contentcuration.Channel')),
-                ('invited', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sent_to', to=settings.AUTH_USER_MODEL)),
-                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sent_by', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Invitation',
-                'verbose_name_plural': 'Invitations',
-            },
-        ),
-        migrations.CreateModel(
-            name='Language',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('lang_code', models.CharField(db_index=True, max_length=2)),
-                ('lang_subcode', models.CharField(db_index=True, max_length=2)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='License',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('license_name', models.CharField(max_length=50)),
-                ('license_url', models.URLField(blank=True)),
-                ('license_description', models.TextField(blank=True)),
-                ('exists', models.BooleanField(default=False, help_text='Tells whether or not a content item is licensed to share', verbose_name='license exists')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='PrerequisiteContentRelationship',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('prerequisite', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
-                                                   related_name='contentcuration_prerequisitecontentrelationship_prerequisite', to='contentcuration.ContentNode')),
-                ('target_node', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
-                                                  related_name='contentcuration_prerequisitecontentrelationship_target_node', to='contentcuration.ContentNode')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='RelatedContentRelationship',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('contentnode_1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
-                                                    related_name='contentcuration_relatedcontentrelationship_1', to='contentcuration.ContentNode')),
-                ('contentnode_2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
-                                                    related_name='contentcuration_relatedcontentrelationship_2', to='contentcuration.ContentNode')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='file',
-            name='file_format',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='files', to='contentcuration.FileFormat'),
-        ),
-        migrations.AddField(
-            model_name='file',
-            name='lang',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='contentcuration.Language'),
-        ),
-        migrations.AddField(
-            model_name='file',
-            name='preset',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='files', to='contentcuration.FormatPreset'),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='is_related',
-            field=models.ManyToManyField(blank=True, related_name='relate_to',
-                                         through='contentcuration.RelatedContentRelationship', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='kind',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='contentnodes', to='contentcuration.ContentKind'),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='license',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='contentcuration.License'),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='original_node',
-            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
-                                             related_name='duplicates', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='parent',
-            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                             related_name='children', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='prerequisite',
-            field=models.ManyToManyField(blank=True, related_name='is_prerequisite_of',
-                                         through='contentcuration.PrerequisiteContentRelationship', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='tags',
-            field=models.ManyToManyField(blank=True, related_name='tagged_content', to='contentcuration.ContentTag'),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='clipboard_tree',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='channel_clipboard', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='editors',
-            field=models.ManyToManyField(help_text='Users with edit rights', related_name='editable_channels',
-                                         to=settings.AUTH_USER_MODEL, verbose_name='editors'),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='main_tree',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='channel_main', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='trash_tree',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='channel_trash', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='exercise',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_assessment_items', to='contentcuration.Exercise'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='relatedcontentrelationship',
-            unique_together=set([('contentnode_1', 'contentnode_2')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='prerequisitecontentrelationship',
-            unique_together=set([('target_node', 'prerequisite')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='contenttag',
-            unique_together=set([('tag_name', 'channel')]),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0001_squashed_0094_auto_20180910_2342.py b/contentcuration/contentcuration/migrations/0001_squashed_0094_auto_20180910_2342.py
index 5427978f72..f09d96d66c 100644
--- a/contentcuration/contentcuration/migrations/0001_squashed_0094_auto_20180910_2342.py
+++ b/contentcuration/contentcuration/migrations/0001_squashed_0094_auto_20180910_2342.py
@@ -17,9 +17,6 @@
 
 class Migration(migrations.Migration):
 
-    replaces = [('contentcuration', '0001_initial'), ('contentcuration', '0002_language_readable_name'), ('contentcuration', '0003_user_clipboard_tree'), ('contentcuration', '0004_auto_20160720_1220'), ('contentcuration', '0005_auto_20160816_1720'), ('contentcuration', '0006_contentnode_published'), ('contentcuration', '0005_formatpreset_thumbnail'), ('contentcuration', '0007_merge'), ('contentcuration', '0008_channel_published'), ('contentcuration', '0009_remove_channel_published'), ('contentcuration', '0010_auto_20160830_1740'), ('contentcuration', '0011_file_source_url'), ('contentcuration', '0012_auto_20160907_1444'), ('contentcuration', '0013_contentnode_node_id'), ('contentcuration', '0014_channel_language'), ('contentcuration', '0015_auto_20160914_1640'), ('contentcuration', '0016_auto_20160915_1206'), ('contentcuration', '0015_auto_20160916_1349'), ('contentcuration', '0017_merge'), ('contentcuration', '0018_auto_20160919_1533'), ('contentcuration', '0019_auto_20160919_1559'), ('contentcuration', '0020_auto_20160919_1617'), ('contentcuration', '0021_auto_20160919_1620'), ('contentcuration', '0022_auto_20160920_1119'), ('contentcuration', '0023_contentnode_extra_fields'), ('contentcuration', '0024_auto_20160920_1136'), ('contentcuration', '0025_auto_20160921_1356'), ('contentcuration', '0026_merge'), ('contentcuration', '0027_auto_20160926_0945'), ('contentcuration', '0028_auto_20160926_1527'), ('contentcuration', '0029_auto_20161005_0933'), ('contentcuration', '0030_auto_20161005_0935'), ('contentcuration', '0031_auto_20161010_1143'), ('contentcuration', '0032_auto_20161010_1202'), ('contentcuration', '0033_auto_20161012_1344'), ('contentcuration', '0034_auto_20161014_1509'), ('contentcuration', '0035_auto_20161018_1438'), ('contentcuration', '0036_auto_20161018_1536'), ('contentcuration', '0037_remove_contentnode_author'), ('contentcuration', '0038_contentnode_author'), ('contentcuration', '0039_auto_20161101_1555'), ('contentcuration', '0040_file_assessment_item'), ('contentcuration', '0041_channel_previous_tree'), ('contentcuration', '0042_auto_20161206_1641'), ('contentcuration', '0043_channel_viewers'), ('contentcuration', '0042_auto_20161205_1622'), ('contentcuration', '0044_merge'), ('contentcuration', '0045_invitation_viewonly'), ('contentcuration', '0046_auto_20161222_1210'), ('contentcuration', '0042_auto_20161130_1446'), ('contentcuration', '0043_merge'), ('contentcuration', '0044_auto_20170119_1033'), ('contentcuration', '0045_auto_20170119_1429'), ('contentcuration', '0047_merge'), ('contentcuration', '0048_auto_20170119_1732'), ('contentcuration',
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            '0049_merge'), ('contentcuration', '0050_auto_20170125_1018'), ('contentcuration', '0051_auto_20170126_1633'), ('contentcuration', '0052_auto_20170201_1155'), ('contentcuration', '0051_auto_20170126_1012'), ('contentcuration', '0053_merge'), ('contentcuration', '0054_language_native_name'), ('contentcuration', '0052_auto_20170130_0931'), ('contentcuration', '0055_merge'), ('contentcuration', '0056_assessmentitem_randomize'), ('contentcuration', '0057_auto_20170223_1558'), ('contentcuration', '0058_auto_20170223_1636'), ('contentcuration', '0057_assessmentitem_deleted'), ('contentcuration', '0059_merge'), ('contentcuration', '0059_channelresourcesize'), ('contentcuration', '0059_auto_20170402_1504'), ('contentcuration', '0060_merge'), ('contentcuration', '0061_auto_20170327_1344'), ('contentcuration', '0062_merge'), ('contentcuration', '0063_auto_20170411_1249'), ('contentcuration', '0064_auto_20170411_1328'), ('contentcuration', '0065_auto_20170411_1609'), ('contentcuration', '0066_auto_20170412_0015'), ('contentcuration', '0067_auto_20170427_1442'), ('contentcuration', '0068_auto_20170519_1337'), ('contentcuration', '0069_channel_preferences'), ('contentcuration', '0068_auto_20170509_1456'), ('contentcuration', '0070_merge'), ('contentcuration', '0069_auto_20170605_2122'), ('contentcuration', '0071_merge'), ('contentcuration', '0072_contentnode_language'), ('contentcuration', '0072_auto_20170731_2153'), ('contentcuration', '0073_merge'), ('contentcuration', '0074_channel_priority'), ('contentcuration', '0073_auto_20170911_1837'), ('contentcuration', '0075_merge'), ('contentcuration', '0076_auto_20171003_1847'), ('contentcuration', '0076_auto_20170927_1817'), ('contentcuration', '0077_merge'), ('contentcuration', '0078_auto_20171024_1207'), ('contentcuration', '0079_contentnode_publishing'), ('contentcuration', '0080_user_information'), ('contentcuration', '0081_auto_20180314_1631'), ('contentcuration', '0080_auto_20180314_1756'), ('contentcuration', '0082_merge'), ('contentcuration', '0079_auto_20180326_1448'), ('contentcuration', '0083_merge'), ('contentcuration', '0084_auto_20180329_1051'), ('contentcuration', '0085_user_policies'), ('contentcuration', '0086_auto_20180626_1055'), ('contentcuration', '0085_auto_20180605_1714'), ('contentcuration', '0087_merge'), ('contentcuration', '0088_auto_20180705_2007'), ('contentcuration', '0089_auto_20180706_2242'), ('contentcuration', '0091_auto_20180724_2243'), ('contentcuration', '0092_auto_20180731_1024'), ('contentcuration', '0093_auto_20180831_0745'), ('contentcuration', '0094_auto_20180910_2342')]
-
     initial = True
 
     dependencies = [
@@ -859,4 +856,15 @@ class Migration(migrations.Migration):
             field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('gif', 'GIF Image'), (
                 'json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('graphie', 'Graphie Exercise'), ('zip', 'HTML5 Zip'), ('epub', 'ePub Document')], max_length=40, primary_key=True, serialize=False),
         ),
+        migrations.CreateModel(
+            name='ChannelSet',
+            fields=[
+                ('id', contentcuration.models.UUIDField(default=uuid.uuid4, max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(blank=True, max_length=200)),
+                ('description', models.CharField(blank=True, max_length=400)),
+                ('public', models.BooleanField(db_index=True, default=False)),
+                ('editors', models.ManyToManyField(blank=True, help_text='Users with edit rights', related_name='channel_sets', to=settings.AUTH_USER_MODEL, verbose_name='editors')),
+                ('secret_token', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_sets', to='contentcuration.SecretToken')),
+            ],
+        ),
     ]
diff --git a/contentcuration/contentcuration/migrations/0002_language_readable_name.py b/contentcuration/contentcuration/migrations/0002_language_readable_name.py
deleted file mode 100644
index 7c54d0f196..0000000000
--- a/contentcuration/contentcuration/migrations/0002_language_readable_name.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-12 17:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='language',
-            name='readable_name',
-            field=models.CharField(blank=True, max_length=50),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0003_user_clipboard_tree.py b/contentcuration/contentcuration/migrations/0003_user_clipboard_tree.py
deleted file mode 100644
index 49e5413c99..0000000000
--- a/contentcuration/contentcuration/migrations/0003_user_clipboard_tree.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-20 00:11
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0002_language_readable_name'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='clipboard_tree',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='user_clipboard', to='contentcuration.ContentNode'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0004_auto_20160720_1220.py b/contentcuration/contentcuration/migrations/0004_auto_20160720_1220.py
deleted file mode 100644
index d7fbb111ad..0000000000
--- a/contentcuration/contentcuration/migrations/0004_auto_20160720_1220.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-20 19:20
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0003_user_clipboard_tree'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='contentnode',
-            old_name='license_owner',
-            new_name='copyright_holder',
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0005_auto_20160816_1720.py b/contentcuration/contentcuration/migrations/0005_auto_20160816_1720.py
deleted file mode 100644
index 2c89a413cb..0000000000
--- a/contentcuration/contentcuration/migrations/0005_auto_20160816_1720.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-17 00:20
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0004_auto_20160720_1220'),
-    ]
-
-    operations = [
-        migrations.AlterModelManagers(
-            name='contentnode',
-            managers=[
-            ],
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0005_formatpreset_thumbnail.py b/contentcuration/contentcuration/migrations/0005_formatpreset_thumbnail.py
deleted file mode 100644
index a2a42ec5c6..0000000000
--- a/contentcuration/contentcuration/migrations/0005_formatpreset_thumbnail.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-29 21:57
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0004_auto_20160720_1220'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='formatpreset',
-            name='thumbnail',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0006_contentnode_published.py b/contentcuration/contentcuration/migrations/0006_contentnode_published.py
deleted file mode 100644
index 123f102c1a..0000000000
--- a/contentcuration/contentcuration/migrations/0006_contentnode_published.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-18 17:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0005_auto_20160816_1720'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='published',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0007_merge.py b/contentcuration/contentcuration/migrations/0007_merge.py
deleted file mode 100644
index 5a683c84d0..0000000000
--- a/contentcuration/contentcuration/migrations/0007_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-23 22:12
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0005_formatpreset_thumbnail'),
-        ('contentcuration', '0006_contentnode_published'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0008_channel_published.py b/contentcuration/contentcuration/migrations/0008_channel_published.py
deleted file mode 100644
index 512fe60ce3..0000000000
--- a/contentcuration/contentcuration/migrations/0008_channel_published.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-24 17:18
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0007_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='published',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0009_remove_channel_published.py b/contentcuration/contentcuration/migrations/0009_remove_channel_published.py
deleted file mode 100644
index 6039848961..0000000000
--- a/contentcuration/contentcuration/migrations/0009_remove_channel_published.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-24 17:45
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0008_channel_published'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='channel',
-            name='published',
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0010_auto_20160830_1740.py b/contentcuration/contentcuration/migrations/0010_auto_20160830_1740.py
deleted file mode 100644
index adb68c1b7a..0000000000
--- a/contentcuration/contentcuration/migrations/0010_auto_20160830_1740.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-31 00:40
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0009_remove_channel_published'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contentnode',
-            name='sort_order',
-            field=models.FloatField(default=1, help_text='Ascending, lowest number shown first', max_length=50, verbose_name='sort order'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0011_file_source_url.py b/contentcuration/contentcuration/migrations/0011_file_source_url.py
deleted file mode 100644
index e51a71f647..0000000000
--- a/contentcuration/contentcuration/migrations/0011_file_source_url.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-07 00:09
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0010_auto_20160830_1740'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='file',
-            name='source_url',
-            field=models.CharField(blank=True, max_length=400),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0012_auto_20160907_1444.py b/contentcuration/contentcuration/migrations/0012_auto_20160907_1444.py
deleted file mode 100644
index 492adfa63c..0000000000
--- a/contentcuration/contentcuration/migrations/0012_auto_20160907_1444.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-07 21:44
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0011_file_source_url'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='staging_tree',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='channel_staging', to='contentcuration.ContentNode'),
-        ),
-        migrations.AlterField(
-            model_name='channel',
-            name='editors',
-            field=models.ManyToManyField(blank=True, help_text='Users with edit rights', related_name='editable_channels',
-                                         to=settings.AUTH_USER_MODEL, verbose_name='editors'),
-        ),
-        migrations.AlterField(
-            model_name='contentkind',
-            name='kind',
-            field=models.CharField(choices=[('topic', 'Topic'), ('video', 'Video'), ('audio', 'Audio'), ('exercise',
-                                                                                                            'Exercise'), ('document', 'Document')], max_length=200, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'mp4'), ('vtt', 'vtt'), ('srt', 'srt'), ('mp3', 'mp3'), ('wav', 'wav'), ('pdf', 'pdf'),
-                                            ('jpg', 'jpg'), ('jpeg', 'jpeg'), ('png', 'png'), ('perseus', 'perseus')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High resolution video'), ('low_res_video', 'Low resolution video'), ('vector_video', 'Vector video'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), (
-                'aud', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('doc', 'Document'), ('document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0013_contentnode_node_id.py b/contentcuration/contentcuration/migrations/0013_contentnode_node_id.py
deleted file mode 100644
index 250272ca0d..0000000000
--- a/contentcuration/contentcuration/migrations/0013_contentnode_node_id.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-07 22:06
-from __future__ import unicode_literals
-
-import contentcuration.models
-from django.db import migrations
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0012_auto_20160907_1444'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='node_id',
-            field=contentcuration.models.UUIDField(default=uuid.uuid4, editable=False, max_length=32),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0014_channel_language.py b/contentcuration/contentcuration/migrations/0014_channel_language.py
deleted file mode 100644
index f66a4da7dd..0000000000
--- a/contentcuration/contentcuration/migrations/0014_channel_language.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-07 22:22
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0013_contentnode_node_id'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='language',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='channel_language', to='contentcuration.Language'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0015_auto_20160914_1640.py b/contentcuration/contentcuration/migrations/0015_auto_20160914_1640.py
deleted file mode 100644
index f716f3a290..0000000000
--- a/contentcuration/contentcuration/migrations/0015_auto_20160914_1640.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-14 23:40
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0014_channel_language'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='channel',
-            name='thumbnail',
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0015_auto_20160916_1349.py b/contentcuration/contentcuration/migrations/0015_auto_20160916_1349.py
deleted file mode 100644
index 89e0f5f3db..0000000000
--- a/contentcuration/contentcuration/migrations/0015_auto_20160916_1349.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-16 20:49
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0014_channel_language'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='assessmentitem',
-            name='exercise',
-        ),
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='contentnode',
-            field=models.ForeignKey(default='5451535d4e6341acba2c4261471b7c1f', on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='assessment_items', to='contentcuration.ContentNode'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0016_auto_20160915_1206.py b/contentcuration/contentcuration/migrations/0016_auto_20160915_1206.py
deleted file mode 100644
index d7f8ce11ca..0000000000
--- a/contentcuration/contentcuration/migrations/0016_auto_20160915_1206.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-15 19:06
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0015_auto_20160914_1640'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invitation',
-            name='email',
-            field=models.EmailField(max_length=100, null=True),
-        ),
-        migrations.AlterField(
-            model_name='invitation',
-            name='sender',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sent_by', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0017_merge.py b/contentcuration/contentcuration/migrations/0017_merge.py
deleted file mode 100644
index b6cd6cb17f..0000000000
--- a/contentcuration/contentcuration/migrations/0017_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-19 22:31
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0016_auto_20160915_1206'),
-        ('contentcuration', '0015_auto_20160916_1349'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0018_auto_20160919_1533.py b/contentcuration/contentcuration/migrations/0018_auto_20160919_1533.py
deleted file mode 100644
index 267285b092..0000000000
--- a/contentcuration/contentcuration/migrations/0018_auto_20160919_1533.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-19 22:33
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0017_merge'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='assessmentitem',
-            name='contentnode',
-        ),
-        migrations.RemoveField(
-            model_name='exercise',
-            name='description',
-        ),
-        migrations.RemoveField(
-            model_name='exercise',
-            name='title',
-        ),
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='exercise',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='all_assessment_items', to='contentcuration.Exercise'),
-        ),
-        migrations.AddField(
-            model_name='exercise',
-            name='contentnode',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='exercise', to='contentcuration.ContentNode'),
-        ),
-        migrations.AddField(
-            model_name='exercise',
-            name='mastery_model',
-            field=models.CharField(default='do-all', max_length=200),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0019_auto_20160919_1559.py b/contentcuration/contentcuration/migrations/0019_auto_20160919_1559.py
deleted file mode 100644
index c666024057..0000000000
--- a/contentcuration/contentcuration/migrations/0019_auto_20160919_1559.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-19 22:59
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0018_auto_20160919_1533'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exercise',
-            name='mastery_model',
-            field=models.CharField(choices=[('do-all', 'Do all'), ('num_correct_in_a_row_10', '10 in a row'), ('num_correct_in_a_row_3',
-                                                                                                                   '3 in a row'), ('num_correct_in_a_row_5', '5 in a row'), ('skill-check', 'Skill check')], default='do-all', max_length=200),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0020_auto_20160919_1617.py b/contentcuration/contentcuration/migrations/0020_auto_20160919_1617.py
deleted file mode 100644
index b11efaf248..0000000000
--- a/contentcuration/contentcuration/migrations/0020_auto_20160919_1617.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-19 23:17
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0019_auto_20160919_1559'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='assessmentitem',
-            name='exercise',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_assessment_items', to='contentcuration.Exercise'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0021_auto_20160919_1620.py b/contentcuration/contentcuration/migrations/0021_auto_20160919_1620.py
deleted file mode 100644
index 8d43a3ed45..0000000000
--- a/contentcuration/contentcuration/migrations/0021_auto_20160919_1620.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-19 23:20
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0020_auto_20160919_1617'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='assessmentitem',
-            name='exercise',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='all_assessment_items', to='contentcuration.Exercise'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0022_auto_20160920_1119.py b/contentcuration/contentcuration/migrations/0022_auto_20160920_1119.py
deleted file mode 100644
index f555f725c3..0000000000
--- a/contentcuration/contentcuration/migrations/0022_auto_20160920_1119.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-20 18:19
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0021_auto_20160919_1620'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='assessmentitem',
-            name='exercise',
-        ),
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='contentnode',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='assessment_items', to='contentcuration.ContentNode'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0023_contentnode_extra_fields.py b/contentcuration/contentcuration/migrations/0023_contentnode_extra_fields.py
deleted file mode 100644
index 4fad4139be..0000000000
--- a/contentcuration/contentcuration/migrations/0023_contentnode_extra_fields.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-20 18:34
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0022_auto_20160920_1119'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='extra_fields',
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0024_auto_20160920_1136.py b/contentcuration/contentcuration/migrations/0024_auto_20160920_1136.py
deleted file mode 100644
index 24fc812208..0000000000
--- a/contentcuration/contentcuration/migrations/0024_auto_20160920_1136.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-20 18:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0023_contentnode_extra_fields'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='help_text',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='order',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0025_auto_20160921_1356.py b/contentcuration/contentcuration/migrations/0025_auto_20160921_1356.py
deleted file mode 100644
index c9879aa7bc..0000000000
--- a/contentcuration/contentcuration/migrations/0025_auto_20160921_1356.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-21 20:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0024_auto_20160920_1136'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='assessmentitem',
-            name='order',
-            field=models.IntegerField(default=1),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0026_merge.py b/contentcuration/contentcuration/migrations/0026_merge.py
deleted file mode 100644
index 53cc249aab..0000000000
--- a/contentcuration/contentcuration/migrations/0026_merge.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-26 16:21
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0025_auto_20160921_1356'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0027_auto_20160926_0945.py b/contentcuration/contentcuration/migrations/0027_auto_20160926_0945.py
deleted file mode 100644
index 7969ab99ab..0000000000
--- a/contentcuration/contentcuration/migrations/0027_auto_20160926_0945.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-26 16:45
-from __future__ import unicode_literals
-
-import contentcuration.models
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0026_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='assessment_id',
-            field=contentcuration.models.UUIDField(default=uuid.uuid4, editable=False, max_length=32),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='license',
-            field=models.ForeignKey(default=1, null=True, on_delete=django.db.models.deletion.CASCADE, to='contentcuration.License'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0028_auto_20160926_1527.py b/contentcuration/contentcuration/migrations/0028_auto_20160926_1527.py
deleted file mode 100644
index 60f4cf950f..0000000000
--- a/contentcuration/contentcuration/migrations/0028_auto_20160926_1527.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-26 22:27
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0027_auto_20160926_0945'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exercise',
-            name='mastery_model',
-            field=models.CharField(choices=[('do_all', 'Do all'), ('num_correct_in_a_row_10', '10 in a row'), ('num_correct_in_a_row_3',
-                                                                                                                   '3 in a row'), ('num_correct_in_a_row_5', '5 in a row'), ('skill_check', 'Skill check')], default='do_all', max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High resolution video'), ('low_res_video', 'Low resolution video'), ('vector_video', 'Vector video'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), (
-                'audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0029_auto_20161005_0933.py b/contentcuration/contentcuration/migrations/0029_auto_20161005_0933.py
deleted file mode 100644
index c9abe73fc2..0000000000
--- a/contentcuration/contentcuration/migrations/0029_auto_20161005_0933.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-05 16:33
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0028_auto_20160926_1527'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='formatpreset',
-            name='display',
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='kind',
-            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='format_presets', to='contentcuration.ContentKind'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0030_auto_20161005_0935.py b/contentcuration/contentcuration/migrations/0030_auto_20161005_0935.py
deleted file mode 100644
index 4d9c5041c7..0000000000
--- a/contentcuration/contentcuration/migrations/0030_auto_20161005_0935.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-05 16:35
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0029_auto_20161005_0933'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='kind',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='format_presets', to='contentcuration.ContentKind'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0031_auto_20161010_1143.py b/contentcuration/contentcuration/migrations/0031_auto_20161010_1143.py
deleted file mode 100644
index c4a0e74e8c..0000000000
--- a/contentcuration/contentcuration/migrations/0031_auto_20161010_1143.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-10 18:43
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0030_auto_20161005_0935'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='raw_data',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), (
-                'audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0032_auto_20161010_1202.py b/contentcuration/contentcuration/migrations/0032_auto_20161010_1202.py
deleted file mode 100644
index 32eb10849e..0000000000
--- a/contentcuration/contentcuration/migrations/0032_auto_20161010_1202.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-10 19:02
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0031_auto_20161010_1143'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='assessmentitem',
-            old_name='help_text',
-            new_name='hint',
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0033_auto_20161012_1344.py b/contentcuration/contentcuration/migrations/0033_auto_20161012_1344.py
deleted file mode 100644
index 52f944ba85..0000000000
--- a/contentcuration/contentcuration/migrations/0033_auto_20161012_1344.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-12 20:44
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0032_auto_20161010_1202'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='assessmentitem',
-            name='hint',
-        ),
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='hints',
-            field=models.TextField(default='[]'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0034_auto_20161014_1509.py b/contentcuration/contentcuration/migrations/0034_auto_20161014_1509.py
deleted file mode 100644
index 4d40ca93a7..0000000000
--- a/contentcuration/contentcuration/migrations/0034_auto_20161014_1509.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-14 22:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0033_auto_20161012_1344'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exercise',
-            name='mastery_model',
-            field=models.CharField(choices=[('do_all', 'Do all'), ('num_correct_in_a_row_10', '10 in a row'), ('num_correct_in_a_row_3', '3 in a row'), (
-                'num_correct_in_a_row_5', '5 in a row'), ('skill_check', 'Skill check'), ('m_of_n', 'M out of N')], default='do_all', max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'mp4'), ('vtt', 'vtt'), ('srt', 'srt'), ('mp3', 'mp3'), ('wav', 'wav'), ('pdf', 'pdf'), ('jpg', 'jpg'), (
-                'jpeg', 'jpeg'), ('png', 'png'), ('json', 'json'), ('svg', 'svg'), ('perseus', 'perseus')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), (
-                'document', 'Document'), ('document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie')], max_length=150, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='order',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0035_auto_20161018_1438.py b/contentcuration/contentcuration/migrations/0035_auto_20161018_1438.py
deleted file mode 100644
index 65d6a3b1d4..0000000000
--- a/contentcuration/contentcuration/migrations/0035_auto_20161018_1438.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-18 21:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0034_auto_20161014_1509'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='file',
-            name='source_url',
-            field=models.CharField(blank=True, max_length=400, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0036_auto_20161018_1536.py b/contentcuration/contentcuration/migrations/0036_auto_20161018_1536.py
deleted file mode 100644
index d3ddd2f151..0000000000
--- a/contentcuration/contentcuration/migrations/0036_auto_20161018_1536.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-18 22:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0035_auto_20161018_1438'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contentnode',
-            name='author',
-            field=models.CharField(blank=True, help_text='Person who created content', max_length=200, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0037_remove_contentnode_author.py b/contentcuration/contentcuration/migrations/0037_remove_contentnode_author.py
deleted file mode 100644
index 519a69b272..0000000000
--- a/contentcuration/contentcuration/migrations/0037_remove_contentnode_author.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-18 22:37
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0036_auto_20161018_1536'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='contentnode',
-            name='author',
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0038_contentnode_author.py b/contentcuration/contentcuration/migrations/0038_contentnode_author.py
deleted file mode 100644
index c85cab00cd..0000000000
--- a/contentcuration/contentcuration/migrations/0038_contentnode_author.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-10-19 01:07
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0037_remove_contentnode_author'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='author',
-            field=models.CharField(blank=True, help_text='Person who created content', max_length=200, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0039_auto_20161101_1555.py b/contentcuration/contentcuration/migrations/0039_auto_20161101_1555.py
deleted file mode 100644
index 855c2d7d80..0000000000
--- a/contentcuration/contentcuration/migrations/0039_auto_20161101_1555.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-11-01 22:55
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0038_contentnode_author'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), (
-                'document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0040_file_assessment_item.py b/contentcuration/contentcuration/migrations/0040_file_assessment_item.py
deleted file mode 100644
index 09553abb1d..0000000000
--- a/contentcuration/contentcuration/migrations/0040_file_assessment_item.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-11-07 22:29
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0039_auto_20161101_1555'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='file',
-            name='assessment_item',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='files', to='contentcuration.AssessmentItem'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0041_channel_previous_tree.py b/contentcuration/contentcuration/migrations/0041_channel_previous_tree.py
deleted file mode 100644
index a349653759..0000000000
--- a/contentcuration/contentcuration/migrations/0041_channel_previous_tree.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-11-09 00:32
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0040_file_assessment_item'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='previous_tree',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='channel_previous', to='contentcuration.ContentNode'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0042_auto_20161130_1446.py b/contentcuration/contentcuration/migrations/0042_auto_20161130_1446.py
deleted file mode 100644
index 5f882e348c..0000000000
--- a/contentcuration/contentcuration/migrations/0042_auto_20161130_1446.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-11-30 22:46
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0041_channel_previous_tree'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='channel',
-            name='name',
-            field=models.CharField(blank=True, max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='contentkind',
-            name='kind',
-            field=models.CharField(choices=[('topic', 'Topic'), ('video', 'Video'), ('audio', 'Audio'), ('exercise', 'Exercise'),
-                                            ('document', 'Document'), ('html5', 'HTML5 App')], max_length=200, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('srt', 'SRT Subtitle'), ('mp3', 'MP3 Audio'), ('wav', 'WAV Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), (
-                'jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('zip', 'HTML5 Zip')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), (
-                'document_thumbnail', 'Thumbnail'), ('exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('html5_zip', 'HTML5 Zip')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0042_auto_20161205_1622.py b/contentcuration/contentcuration/migrations/0042_auto_20161205_1622.py
deleted file mode 100644
index 8dcfd135ca..0000000000
--- a/contentcuration/contentcuration/migrations/0042_auto_20161205_1622.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-12-06 00:22
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0041_channel_previous_tree'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='channel',
-            name='name',
-            field=models.CharField(blank=True, max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='contentkind',
-            name='kind',
-            field=models.CharField(choices=[('topic', 'Topic'), ('video', 'Video'), ('audio', 'Audio'), ('exercise', 'Exercise'),
-                                            ('document', 'Document'), ('html5', 'HTML5 App')], max_length=200, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='description',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('srt', 'SRT Subtitle'), ('mp3', 'MP3 Audio'), ('wav', 'WAV Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), (
-                'jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('zip', 'HTML5 Zip')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0042_auto_20161206_1641.py b/contentcuration/contentcuration/migrations/0042_auto_20161206_1641.py
deleted file mode 100644
index 2c0f8d6af5..0000000000
--- a/contentcuration/contentcuration/migrations/0042_auto_20161206_1641.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-12-07 00:41
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0041_channel_previous_tree'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='channel',
-            name='name',
-            field=models.CharField(blank=True, max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='contentkind',
-            name='kind',
-            field=models.CharField(choices=[('topic', 'Topic'), ('video', 'Video'), ('audio', 'Audio'), ('exercise', 'Exercise'),
-                                            ('document', 'Document'), ('html5', 'HTML5 App')], max_length=200, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('srt', 'SRT Subtitle'), ('mp3', 'MP3 Audio'), ('wav', 'WAV Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), (
-                'jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('zip', 'HTML5 Zip')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0043_channel_viewers.py b/contentcuration/contentcuration/migrations/0043_channel_viewers.py
deleted file mode 100644
index b3ba0bcd63..0000000000
--- a/contentcuration/contentcuration/migrations/0043_channel_viewers.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-12-22 17:53
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0042_auto_20161206_1641'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='viewers',
-            field=models.ManyToManyField(blank=True, help_text='Users with view only rights', related_name='view_only_channels',
-                                         to=settings.AUTH_USER_MODEL, verbose_name='viewers'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0043_merge.py b/contentcuration/contentcuration/migrations/0043_merge.py
deleted file mode 100644
index 5fc529ebc5..0000000000
--- a/contentcuration/contentcuration/migrations/0043_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-13 00:47
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0042_auto_20161130_1446'),
-        ('contentcuration', '0042_auto_20161205_1622'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0044_auto_20170119_1033.py b/contentcuration/contentcuration/migrations/0044_auto_20170119_1033.py
deleted file mode 100644
index b6864f2cb2..0000000000
--- a/contentcuration/contentcuration/migrations/0044_auto_20170119_1033.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-19 18:33
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0043_merge'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0044_merge.py b/contentcuration/contentcuration/migrations/0044_merge.py
deleted file mode 100644
index aa8d04e3e3..0000000000
--- a/contentcuration/contentcuration/migrations/0044_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-12-22 19:47
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0042_auto_20161205_1622'),
-        ('contentcuration', '0043_channel_viewers'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0045_auto_20170119_1429.py b/contentcuration/contentcuration/migrations/0045_auto_20170119_1429.py
deleted file mode 100644
index 217e5a84a5..0000000000
--- a/contentcuration/contentcuration/migrations/0045_auto_20170119_1429.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-19 22:29
-from __future__ import unicode_literals
-
-import contentcuration.models
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0044_auto_20170119_1033'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='original_channel_id',
-            field=contentcuration.models.UUIDField(editable=False, max_length=32, null=True),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='source_channel_id',
-            field=contentcuration.models.UUIDField(editable=False, max_length=32, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0045_invitation_viewonly.py b/contentcuration/contentcuration/migrations/0045_invitation_viewonly.py
deleted file mode 100644
index 93b393b4e5..0000000000
--- a/contentcuration/contentcuration/migrations/0045_invitation_viewonly.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-12-22 19:47
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0044_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invitation',
-            name='viewonly',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0046_auto_20161222_1210.py b/contentcuration/contentcuration/migrations/0046_auto_20161222_1210.py
deleted file mode 100644
index 33c7b801c8..0000000000
--- a/contentcuration/contentcuration/migrations/0046_auto_20161222_1210.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-12-22 20:10
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0045_invitation_viewonly'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='invitation',
-            name='viewonly',
-        ),
-        migrations.AddField(
-            model_name='invitation',
-            name='share_mode',
-            field=models.CharField(default='edit', max_length=50),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0047_merge.py b/contentcuration/contentcuration/migrations/0047_merge.py
deleted file mode 100644
index eac1ba7667..0000000000
--- a/contentcuration/contentcuration/migrations/0047_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-20 22:27
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0046_auto_20161222_1210'),
-        ('contentcuration', '0045_auto_20170119_1429'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0048_auto_20170119_1732.py b/contentcuration/contentcuration/migrations/0048_auto_20170119_1732.py
deleted file mode 100644
index 36c818f434..0000000000
--- a/contentcuration/contentcuration/migrations/0048_auto_20170119_1732.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-20 01:32
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0047_merge'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0049_merge.py b/contentcuration/contentcuration/migrations/0049_merge.py
deleted file mode 100644
index 20c07f6df6..0000000000
--- a/contentcuration/contentcuration/migrations/0049_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-20 19:42
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0048_auto_20170119_1732'),
-        ('contentcuration', '0045_auto_20170119_1429'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0050_auto_20170125_1018.py b/contentcuration/contentcuration/migrations/0050_auto_20170125_1018.py
deleted file mode 100644
index ca12dcfd0e..0000000000
--- a/contentcuration/contentcuration/migrations/0050_auto_20170125_1018.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-25 18:18
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0049_merge'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='file',
-            old_name='lang',
-            new_name='language',
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='author',
-            field=models.CharField(blank=True, default='', help_text='Person who created content', max_length=200, null=True),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='copyright_holder',
-            field=models.CharField(blank=True, default='', help_text='Organization of person who holds the essential rights', max_length=200),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0051_auto_20170126_1012.py b/contentcuration/contentcuration/migrations/0051_auto_20170126_1012.py
deleted file mode 100644
index 67bda31053..0000000000
--- a/contentcuration/contentcuration/migrations/0051_auto_20170126_1012.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-26 18:12
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0050_auto_20170125_1018'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='formatpreset',
-            name='subtitle',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='file',
-            name='language',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='files', to='contentcuration.Language'),
-        ),
-        migrations.AlterField(
-            model_name='language',
-            name='id',
-            field=models.CharField(max_length=7, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='language',
-            name='lang_code',
-            field=models.CharField(db_index=True, max_length=3),
-        ),
-        migrations.AlterField(
-            model_name='language',
-            name='lang_subcode',
-            field=models.CharField(blank=True, db_index=True, max_length=3, null=True),
-        ),
-        migrations.AlterField(
-            model_name='language',
-            name='readable_name',
-            field=models.CharField(blank=True, max_length=100),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0051_auto_20170126_1633.py b/contentcuration/contentcuration/migrations/0051_auto_20170126_1633.py
deleted file mode 100644
index 88ae44d23a..0000000000
--- a/contentcuration/contentcuration/migrations/0051_auto_20170126_1633.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-27 00:33
-from __future__ import unicode_literals
-
-import contentcuration.models
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0050_auto_20170125_1018'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='original_source_node_id',
-            field=contentcuration.models.UUIDField(editable=False, max_length=32, null=True),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='source_node_id',
-            field=contentcuration.models.UUIDField(editable=False, max_length=32, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0052_auto_20170130_0931.py b/contentcuration/contentcuration/migrations/0052_auto_20170130_0931.py
deleted file mode 100644
index e85f8d5d59..0000000000
--- a/contentcuration/contentcuration/migrations/0052_auto_20170130_0931.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-01-30 17:31
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0051_auto_20170126_1633'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='ricecooker_version',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='source_domain',
-            field=models.CharField(blank=True, max_length=300, null=True),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='source_id',
-            field=models.CharField(blank=True, max_length=200, null=True),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='source_domain',
-            field=models.CharField(blank=True, max_length=300, null=True),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='source_id',
-            field=models.CharField(blank=True, max_length=200, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0052_auto_20170201_1155.py b/contentcuration/contentcuration/migrations/0052_auto_20170201_1155.py
deleted file mode 100644
index 1c2c3db7c3..0000000000
--- a/contentcuration/contentcuration/migrations/0052_auto_20170201_1155.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-01 19:55
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0051_auto_20170126_1633'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='source_url',
-            field=models.CharField(blank=True, max_length=400, null=True),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('srt', 'SRT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), (
-                'png', 'PNG Image'), ('gif', 'GIF Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('zip', 'HTML5 Zip')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0053_merge.py b/contentcuration/contentcuration/migrations/0053_merge.py
deleted file mode 100644
index 98175eb89a..0000000000
--- a/contentcuration/contentcuration/migrations/0053_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-07 02:05
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0051_auto_20170126_1012'),
-        ('contentcuration', '0052_auto_20170201_1155'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0054_language_native_name.py b/contentcuration/contentcuration/migrations/0054_language_native_name.py
deleted file mode 100644
index 293c9bd95b..0000000000
--- a/contentcuration/contentcuration/migrations/0054_language_native_name.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-07 02:05
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0053_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='language',
-            name='native_name',
-            field=models.CharField(blank=True, max_length=100),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0055_merge.py b/contentcuration/contentcuration/migrations/0055_merge.py
deleted file mode 100644
index bf84ba3ca5..0000000000
--- a/contentcuration/contentcuration/migrations/0055_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-09 04:23
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0054_language_native_name'),
-        ('contentcuration', '0052_auto_20170130_0931'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0056_assessmentitem_randomize.py b/contentcuration/contentcuration/migrations/0056_assessmentitem_randomize.py
deleted file mode 100644
index 6b4a0c8cfa..0000000000
--- a/contentcuration/contentcuration/migrations/0056_assessmentitem_randomize.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-16 20:24
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0055_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='randomize',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0057_assessmentitem_deleted.py b/contentcuration/contentcuration/migrations/0057_assessmentitem_deleted.py
deleted file mode 100644
index 60fd689d6d..0000000000
--- a/contentcuration/contentcuration/migrations/0057_assessmentitem_deleted.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-17 01:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0056_assessmentitem_randomize'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='assessmentitem',
-            name='deleted',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0057_auto_20170223_1558.py b/contentcuration/contentcuration/migrations/0057_auto_20170223_1558.py
deleted file mode 100644
index be27dad5c6..0000000000
--- a/contentcuration/contentcuration/migrations/0057_auto_20170223_1558.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-23 23:58
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0056_assessmentitem_randomize'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invitation',
-            name='channel',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='pending_editors', to='contentcuration.Channel'),
-        ),
-        migrations.AlterField(
-            model_name='invitation',
-            name='invited',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sent_to', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='invitation',
-            name='sender',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sent_by', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0058_auto_20170223_1636.py b/contentcuration/contentcuration/migrations/0058_auto_20170223_1636.py
deleted file mode 100644
index 392976efee..0000000000
--- a/contentcuration/contentcuration/migrations/0058_auto_20170223_1636.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-02-24 00:36
-from __future__ import unicode_literals
-
-import contentcuration.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0057_auto_20170223_1558'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='channel',
-            name='deleted',
-            field=models.BooleanField(db_index=True, default=False),
-        ),
-        migrations.AlterField(
-            model_name='channel',
-            name='public',
-            field=models.BooleanField(db_index=True, default=False),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='changed',
-            field=models.BooleanField(db_index=True, default=True),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='original_channel_id',
-            field=contentcuration.models.UUIDField(db_index=True, editable=False, max_length=32, null=True),
-        ),
-        migrations.AlterField(
-            model_name='file',
-            name='checksum',
-            field=models.CharField(blank=True, db_index=True, max_length=400),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0059_auto_20170402_1504.py b/contentcuration/contentcuration/migrations/0059_auto_20170402_1504.py
deleted file mode 100644
index 1a1e4d6ce7..0000000000
--- a/contentcuration/contentcuration/migrations/0059_auto_20170402_1504.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-02 22:04
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0058_auto_20170223_1636'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ChannelResourceSize',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tree_id', models.IntegerField()),
-                ('resource_size', models.IntegerField()),
-            ],
-            options={
-                'db_table': 'contentcuration_channel_resource_sizes',
-                'managed': False,
-            },
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0059_channelresourcesize.py b/contentcuration/contentcuration/migrations/0059_channelresourcesize.py
deleted file mode 100644
index 689f03528f..0000000000
--- a/contentcuration/contentcuration/migrations/0059_channelresourcesize.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-03-10 23:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0058_auto_20170223_1636'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ChannelResourceSize',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tree_id', models.IntegerField()),
-                ('resource_size', models.IntegerField()),
-            ],
-            options={
-                'db_table': 'contentcuration_channel_resource_sizes',
-                'managed': False,
-            },
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0059_merge.py b/contentcuration/contentcuration/migrations/0059_merge.py
deleted file mode 100644
index 496d668dab..0000000000
--- a/contentcuration/contentcuration/migrations/0059_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-03-29 19:12
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0058_auto_20170223_1636'),
-        ('contentcuration', '0057_assessmentitem_deleted'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0060_merge.py b/contentcuration/contentcuration/migrations/0060_merge.py
deleted file mode 100644
index 859bf0c1da..0000000000
--- a/contentcuration/contentcuration/migrations/0060_merge.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-03 17:45
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0059_auto_20170402_1504'),
-        ('contentcuration', '0059_merge'),
-        ('contentcuration', '0057_assessmentitem_deleted'),
-        ('contentcuration', '0059_channelresourcesize'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0061_auto_20170327_1344.py b/contentcuration/contentcuration/migrations/0061_auto_20170327_1344.py
deleted file mode 100644
index 724afe4629..0000000000
--- a/contentcuration/contentcuration/migrations/0061_auto_20170327_1344.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2017-03-27 20:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0060_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='preferences',
-            field=models.TextField(default='{"auto_derive_video_thumbnail": true, "auto_randomize_questions": true, "copyright_holder": null, "auto_derive_document_thumbnail": true, "mastery_model": "num_correct_in_a_row_5", "m_value": 5, "license": "CC BY", "language": null, "author": null, "auto_derive_exercise_thumbnail": true, "auto_derive_html5_thumbnail": true, "auto_derive_audio_thumbnail": true, "n_value": 5}'),
-        ),
-        migrations.AlterField(
-            model_name='exercise',
-            name='mastery_model',
-            field=models.CharField(choices=[('num_correct_in_a_row_3', '3 in a row'), ('num_correct_in_a_row_5', '5 in a row'), (
-                'num_correct_in_a_row_10', '10 in a row'), ('do_all', '100% Correct'), ('m_of_n', 'M out of N')], default='do_all', max_length=200),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0062_merge.py b/contentcuration/contentcuration/migrations/0062_merge.py
deleted file mode 100644
index 350e9f5040..0000000000
--- a/contentcuration/contentcuration/migrations/0062_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-06 20:10
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0059_merge'),
-        ('contentcuration', '0061_auto_20170327_1344'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0063_auto_20170411_1249.py b/contentcuration/contentcuration/migrations/0063_auto_20170411_1249.py
deleted file mode 100644
index 8d14cf1670..0000000000
--- a/contentcuration/contentcuration/migrations/0063_auto_20170411_1249.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-11 19:49
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0062_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='license_description',
-            field=models.CharField(blank=True, max_length=400, null=True),
-        ),
-        migrations.AlterField(
-            model_name='exercise',
-            name='mastery_model',
-            field=models.CharField(choices=[('do_all', 'Do all'), ('num_correct_in_a_row_10', '10 in a row'), ('num_correct_in_a_row_3', '3 in a row'), (
-                'num_correct_in_a_row_5', '5 in a row'), ('skill_check', 'Skill check'), ('m_of_n', 'M out of N')], default='do_all', max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0064_auto_20170411_1328.py b/contentcuration/contentcuration/migrations/0064_auto_20170411_1328.py
deleted file mode 100644
index 74610d8fee..0000000000
--- a/contentcuration/contentcuration/migrations/0064_auto_20170411_1328.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-11 20:28
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0063_auto_20170411_1249'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contentnode',
-            name='copyright_holder',
-            field=models.CharField(blank=True, default='', help_text='Organization of person who holds the essential rights', max_length=200, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0065_auto_20170411_1609.py b/contentcuration/contentcuration/migrations/0065_auto_20170411_1609.py
deleted file mode 100644
index 4958c85626..0000000000
--- a/contentcuration/contentcuration/migrations/0065_auto_20170411_1609.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-11 23:09
-from __future__ import unicode_literals
-
-import django.utils.timezone
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('auth', '0007_alter_validators_add_error_messages'),
-        ('contentcuration', '0064_auto_20170411_1328'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='date_joined',
-            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='groups',
-            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.',
-                                         related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='is_staff',
-            field=models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='is_superuser',
-            field=models.BooleanField(
-                default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='user_permissions',
-            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set',
-                                         related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='is_active',
-            field=models.BooleanField(default=False, help_text='Designates whether this user should be treated as active.', verbose_name='active'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0066_auto_20170412_0015.py b/contentcuration/contentcuration/migrations/0066_auto_20170412_0015.py
deleted file mode 100644
index 7da3e6be9b..0000000000
--- a/contentcuration/contentcuration/migrations/0066_auto_20170412_0015.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-12 07:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0065_auto_20170411_1609'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='preferences',
-            field=models.TextField(default='{"auto_derive_video_thumbnail": true, "auto_randomize_questions": true, "copyright_holder": null, "auto_derive_document_thumbnail": true, "license_description": null, "mastery_model": "num_correct_in_a_row_5", "m_value": 5, "license": "CC BY", "language": null, "author": null, "auto_derive_exercise_thumbnail": true, "auto_derive_html5_thumbnail": true, "auto_derive_audio_thumbnail": true, "n_value": 5}'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0067_auto_20170427_1442.py b/contentcuration/contentcuration/migrations/0067_auto_20170427_1442.py
deleted file mode 100644
index 5a2bfb677b..0000000000
--- a/contentcuration/contentcuration/migrations/0067_auto_20170427_1442.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-04-27 21:42
-from __future__ import unicode_literals
-
-import contentcuration.models
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0066_auto_20170412_0015'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contentnode',
-            name='original_source_node_id',
-            field=contentcuration.models.UUIDField(db_index=True, editable=False, max_length=32, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0068_auto_20170509_1456.py b/contentcuration/contentcuration/migrations/0068_auto_20170509_1456.py
deleted file mode 100644
index 3e1a10449d..0000000000
--- a/contentcuration/contentcuration/migrations/0068_auto_20170509_1456.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.12 on 2017-05-09 21:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0067_auto_20170427_1442'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='thumbnail_encoding',
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='thumbnail_encoding',
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0068_auto_20170519_1337.py b/contentcuration/contentcuration/migrations/0068_auto_20170519_1337.py
deleted file mode 100644
index 69bd8fe498..0000000000
--- a/contentcuration/contentcuration/migrations/0068_auto_20170519_1337.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-05-19 20:37
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0067_auto_20170427_1442'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='chef_tree',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='channel_chef', to='contentcuration.ContentNode'),
-        ),
-        migrations.AlterField(
-            model_name='exercise',
-            name='mastery_model',
-            field=models.CharField(choices=[('do_all', 'Do all'), ('num_correct_in_a_row_2', '2 in a row'), ('num_correct_in_a_row_10', '10 in a row'), (
-                'num_correct_in_a_row_3', '3 in a row'), ('num_correct_in_a_row_5', '5 in a row'), ('skill_check', 'Skill check'), ('m_of_n', 'M out of N')], default='do_all', max_length=200),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0069_auto_20170605_2122.py b/contentcuration/contentcuration/migrations/0069_auto_20170605_2122.py
deleted file mode 100644
index 3719e55598..0000000000
--- a/contentcuration/contentcuration/migrations/0069_auto_20170605_2122.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-06-06 04:22
-from __future__ import unicode_literals
-
-import contentcuration.models
-from django.db import migrations
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0068_auto_20170519_1337'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contentnode',
-            name='content_id',
-            field=contentcuration.models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, max_length=32),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0069_channel_preferences.py b/contentcuration/contentcuration/migrations/0069_channel_preferences.py
deleted file mode 100644
index 9df7703a62..0000000000
--- a/contentcuration/contentcuration/migrations/0069_channel_preferences.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-06-24 00:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0068_auto_20170519_1337'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='preferences',
-            field=models.TextField(default='{"auto_derive_video_thumbnail": true, "auto_randomize_questions": true, "copyright_holder": null, "auto_derive_document_thumbnail": true, "license_description": null, "mastery_model": "num_correct_in_a_row_5", "m_value": 5, "license": "CC BY", "language": null, "author": null, "auto_derive_exercise_thumbnail": true, "auto_derive_html5_thumbnail": true, "auto_derive_audio_thumbnail": true, "n_value": 5}'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0070_merge.py b/contentcuration/contentcuration/migrations/0070_merge.py
deleted file mode 100644
index 046b44b725..0000000000
--- a/contentcuration/contentcuration/migrations/0070_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-07-11 17:04
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0069_channel_preferences'),
-        ('contentcuration', '0068_auto_20170509_1456'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0071_merge.py b/contentcuration/contentcuration/migrations/0071_merge.py
deleted file mode 100644
index d7e6096f48..0000000000
--- a/contentcuration/contentcuration/migrations/0071_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-07-23 00:51
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0070_merge'),
-        ('contentcuration', '0069_auto_20170605_2122'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0072_auto_20170731_2153.py b/contentcuration/contentcuration/migrations/0072_auto_20170731_2153.py
deleted file mode 100644
index c9f7a6d4ed..0000000000
--- a/contentcuration/contentcuration/migrations/0072_auto_20170731_2153.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-07-31 21:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0071_merge'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SecretToken',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('token', models.CharField(max_length=100, unique=True)),
-                ('is_primary', models.BooleanField(default=False)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='secret_tokens',
-            field=models.ManyToManyField(blank=True, related_name='channels', to='contentcuration.SecretToken', verbose_name='secret tokens'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0072_contentnode_language.py b/contentcuration/contentcuration/migrations/0072_contentnode_language.py
deleted file mode 100644
index 0c5bef60cf..0000000000
--- a/contentcuration/contentcuration/migrations/0072_contentnode_language.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-07-27 18:33
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0071_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='language',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='content_language', to='contentcuration.Language'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0073_auto_20170911_1837.py b/contentcuration/contentcuration/migrations/0073_auto_20170911_1837.py
deleted file mode 100644
index 5d6e446b94..0000000000
--- a/contentcuration/contentcuration/migrations/0073_auto_20170911_1837.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-09-12 01:37
-from __future__ import unicode_literals
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0072_contentnode_language'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='StagedFile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('checksum', models.CharField(blank=True, db_index=True, max_length=400)),
-                ('file_size', models.IntegerField(blank=True, null=True)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='file',
-            name='uploaded_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='files', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='disk_space',
-            field=models.IntegerField(default=524288000, help_text='How many bytes a user can upload'),
-        ),
-        migrations.AddField(
-            model_name='stagedfile',
-            name='uploaded_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
-                                    related_name='staged_files', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0073_merge.py b/contentcuration/contentcuration/migrations/0073_merge.py
deleted file mode 100644
index 5152516f89..0000000000
--- a/contentcuration/contentcuration/migrations/0073_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-08-18 21:38
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0072_auto_20170731_2153'),
-        ('contentcuration', '0072_contentnode_language'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0074_channel_priority.py b/contentcuration/contentcuration/migrations/0074_channel_priority.py
deleted file mode 100644
index b3d042e1ed..0000000000
--- a/contentcuration/contentcuration/migrations/0074_channel_priority.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-08-21 19:59
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0073_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='priority',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0075_merge.py b/contentcuration/contentcuration/migrations/0075_merge.py
deleted file mode 100644
index 1986f96dd8..0000000000
--- a/contentcuration/contentcuration/migrations/0075_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-09-13 16:29
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0073_auto_20170911_1837'),
-        ('contentcuration', '0074_channel_priority'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0076_auto_20170927_1817.py b/contentcuration/contentcuration/migrations/0076_auto_20170927_1817.py
deleted file mode 100644
index 5e4f4474f0..0000000000
--- a/contentcuration/contentcuration/migrations/0076_auto_20170927_1817.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-09-28 01:17
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0075_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='icon_encoding',
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='last_published',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='channel',
-            name='priority',
-            field=models.IntegerField(default=0, help_text='Order to display public channels'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='disk_space',
-            field=models.FloatField(default=524288000, help_text='How many bytes a user can upload'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0076_auto_20171003_1847.py b/contentcuration/contentcuration/migrations/0076_auto_20171003_1847.py
deleted file mode 100644
index 992d84db35..0000000000
--- a/contentcuration/contentcuration/migrations/0076_auto_20171003_1847.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-10-04 01:47
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0075_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='freeze_authoring_data',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='license',
-            name='copyright_holder_required',
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AddField(
-            model_name='license',
-            name='is_custom',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='channel',
-            name='preferences',
-            field=models.TextField(default='{"auto_derive_video_thumbnail": true, "auto_randomize_questions": true, "copyright_holder": null, "auto_derive_document_thumbnail": true, "license_description": null, "mastery_model": "num_correct_in_a_row_5", "m_value": 5, "license": null, "language": null, "author": null, "auto_derive_exercise_thumbnail": true, "auto_derive_html5_thumbnail": true, "auto_derive_audio_thumbnail": true, "n_value": 5}'),
-        ),
-        migrations.AlterField(
-            model_name='channel',
-            name='priority',
-            field=models.IntegerField(default=0, help_text='Order to display public channels'),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='license',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='contentcuration.License'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='disk_space',
-            field=models.FloatField(default=524288000, help_text='How many bytes a user can upload'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='preferences',
-            field=models.TextField(default='{"auto_derive_video_thumbnail": true, "auto_randomize_questions": true, "copyright_holder": null, "auto_derive_document_thumbnail": true, "license_description": null, "mastery_model": "num_correct_in_a_row_5", "m_value": 5, "license": null, "language": null, "author": null, "auto_derive_exercise_thumbnail": true, "auto_derive_html5_thumbnail": true, "auto_derive_audio_thumbnail": true, "n_value": 5}'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0077_merge.py b/contentcuration/contentcuration/migrations/0077_merge.py
deleted file mode 100644
index 598653f613..0000000000
--- a/contentcuration/contentcuration/migrations/0077_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-10-10 18:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0076_auto_20171003_1847'),
-        ('contentcuration', '0076_auto_20170927_1817'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0078_auto_20171024_1207.py b/contentcuration/contentcuration/migrations/0078_auto_20171024_1207.py
deleted file mode 100644
index f16f906d8a..0000000000
--- a/contentcuration/contentcuration/migrations/0078_auto_20171024_1207.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-10-24 19:07
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0077_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='included_languages',
-            field=models.ManyToManyField(blank=True, related_name='channels', to='contentcuration.Language', verbose_name='languages'),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='published_kind_count',
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='published_size',
-            field=models.FloatField(default=0),
-        ),
-        migrations.AddField(
-            model_name='channel',
-            name='total_resource_count',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0079_auto_20180326_1448.py b/contentcuration/contentcuration/migrations/0079_auto_20180326_1448.py
deleted file mode 100644
index 3fc4af870a..0000000000
--- a/contentcuration/contentcuration/migrations/0079_auto_20180326_1448.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-03-26 21:48
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0078_auto_20171024_1207'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='role_visibility',
-            field=models.CharField(choices=[('coach', 'Coach'), ('learner', 'Learner')], default='learner', max_length=50),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('srt', 'SRT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), (
-                'png', 'PNG Image'), ('gif', 'GIF Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('zip', 'HTML5 Zip'), ('epub', 'ePub Document')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('epub', 'ePub Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0079_contentnode_publishing.py b/contentcuration/contentcuration/migrations/0079_contentnode_publishing.py
deleted file mode 100644
index d284e80941..0000000000
--- a/contentcuration/contentcuration/migrations/0079_contentnode_publishing.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-01-30 23:39
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0078_auto_20171024_1207'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='publishing',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0080_auto_20180314_1756.py b/contentcuration/contentcuration/migrations/0080_auto_20180314_1756.py
deleted file mode 100644
index 58f0cdd7a9..0000000000
--- a/contentcuration/contentcuration/migrations/0080_auto_20180314_1756.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-03-15 00:56
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0079_contentnode_publishing'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('srt', 'SRT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), (
-                'png', 'PNG Image'), ('gif', 'GIF Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('zip', 'HTML5 Zip'), ('epub', 'ePub Document')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('epub', 'ePub Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-        migrations.AlterIndexTogether(
-            name='channel',
-            index_together=set([('deleted', 'public')]),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0080_user_information.py b/contentcuration/contentcuration/migrations/0080_user_information.py
deleted file mode 100644
index e0b4041d4f..0000000000
--- a/contentcuration/contentcuration/migrations/0080_user_information.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-03-14 19:18
-from __future__ import unicode_literals
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0079_contentnode_publishing'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='information',
-            field=jsonfield.fields.JSONField(null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0081_auto_20180314_1631.py b/contentcuration/contentcuration/migrations/0081_auto_20180314_1631.py
deleted file mode 100644
index 4d1c848583..0000000000
--- a/contentcuration/contentcuration/migrations/0081_auto_20180314_1631.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-03-14 23:31
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0080_user_information'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='language',
-            name='lang_direction',
-            field=models.CharField(choices=[('ltr', 'Left to Right'), ('rtl', 'Right to Left')], default='ltr', max_length=3),
-        ),
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('srt', 'SRT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), (
-                'png', 'PNG Image'), ('gif', 'GIF Image'), ('json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('zip', 'HTML5 Zip'), ('epub', 'ePub Document')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('epub', 'ePub Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='language',
-            name='id',
-            field=models.CharField(max_length=14, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='language',
-            name='lang_subcode',
-            field=models.CharField(blank=True, db_index=True, max_length=10, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0082_merge.py b/contentcuration/contentcuration/migrations/0082_merge.py
deleted file mode 100644
index 73a8152f12..0000000000
--- a/contentcuration/contentcuration/migrations/0082_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-03-15 01:10
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0080_auto_20180314_1756'),
-        ('contentcuration', '0081_auto_20180314_1631'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0083_merge.py b/contentcuration/contentcuration/migrations/0083_merge.py
deleted file mode 100644
index 825a0994d8..0000000000
--- a/contentcuration/contentcuration/migrations/0083_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-03-27 21:08
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0082_merge'),
-        ('contentcuration', '0079_auto_20180326_1448'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0084_auto_20180329_1051.py b/contentcuration/contentcuration/migrations/0084_auto_20180329_1051.py
deleted file mode 100644
index 92b5da40f7..0000000000
--- a/contentcuration/contentcuration/migrations/0084_auto_20180329_1051.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-03-29 17:51
-from __future__ import unicode_literals
-
-import jsonfield.fields
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0083_merge'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='channel',
-            name='content_defaults',
-            field=jsonfield.fields.JSONField(default={b'author': None, 'auto_derive_audio_thumbnail': True, 'auto_derive_document_thumbnail': True, 'auto_derive_exercise_thumbnail': True, 'auto_derive_html5_thumbnail': True,
-                                                      'auto_derive_video_thumbnail': True, 'auto_randomize_questions': True, 'copyright_holder': None, 'language': None, 'license': None, 'license_description': None, 'm_value': 5, 'mastery_model': 'num_correct_in_a_row_5', 'n_value': 5}),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='content_defaults',
-            field=jsonfield.fields.JSONField(default={b'author': None, 'auto_derive_audio_thumbnail': True, 'auto_derive_document_thumbnail': True, 'auto_derive_exercise_thumbnail': True, 'auto_derive_html5_thumbnail': True,
-                                                      'auto_derive_video_thumbnail': True, 'auto_randomize_questions': True, 'copyright_holder': None, 'language': None, 'license': None, 'license_description': None, 'm_value': 5, 'mastery_model': 'num_correct_in_a_row_5', 'n_value': 5}),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0085_auto_20180605_1714.py b/contentcuration/contentcuration/migrations/0085_auto_20180605_1714.py
deleted file mode 100644
index 82efeee754..0000000000
--- a/contentcuration/contentcuration/migrations/0085_auto_20180605_1714.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-06-06 00:14
-from __future__ import unicode_literals
-
-import jsonfield.fields
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0084_auto_20180329_1051'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contentnode',
-            name='aggregator',
-            field=models.CharField(blank=True, help_text='Who gathered this content together?', max_length=200, null=True),
-        ),
-        migrations.AddField(
-            model_name='contentnode',
-            name='provider',
-            field=models.CharField(blank=True, help_text='Who distributed this content?', max_length=200, null=True),
-        ),
-        migrations.AlterField(
-            model_name='channel',
-            name='content_defaults',
-            field=jsonfield.fields.JSONField(default={b'aggregator': None, 'author': None, 'auto_derive_audio_thumbnail': True, 'auto_derive_document_thumbnail': True, 'auto_derive_exercise_thumbnail': True, 'auto_derive_html5_thumbnail': True,
-                                                      'auto_derive_video_thumbnail': True, 'auto_randomize_questions': True, 'copyright_holder': None, 'language': None, 'license': None, 'license_description': None, 'm_value': 5, 'mastery_model': 'num_correct_in_a_row_5', 'n_value': 5, 'provider': None}),
-        ),
-        migrations.AlterField(
-            model_name='channel',
-            name='preferences',
-            field=models.TextField(default='{"auto_derive_exercise_thumbnail": true, "auto_derive_video_thumbnail": true, "m_value": 5, "language": null, "license": null, "author": null, "aggregator": null, "auto_randomize_questions": true, "auto_derive_document_thumbnail": true, "copyright_holder": null, "auto_derive_html5_thumbnail": true, "provider": null, "auto_derive_audio_thumbnail": true, "license_description": null, "n_value": 5, "mastery_model": "num_correct_in_a_row_5"}'),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='author',
-            field=models.CharField(blank=True, default='', help_text='Who created this content?', max_length=200, null=True),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='content_defaults',
-            field=jsonfield.fields.JSONField(default={b'aggregator': None, 'author': None, 'auto_derive_audio_thumbnail': True, 'auto_derive_document_thumbnail': True, 'auto_derive_exercise_thumbnail': True, 'auto_derive_html5_thumbnail': True,
-                                                      'auto_derive_video_thumbnail': True, 'auto_randomize_questions': True, 'copyright_holder': None, 'language': None, 'license': None, 'license_description': None, 'm_value': 5, 'mastery_model': 'num_correct_in_a_row_5', 'n_value': 5, 'provider': None}),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='preferences',
-            field=models.TextField(default='{"auto_derive_exercise_thumbnail": true, "auto_derive_video_thumbnail": true, "m_value": 5, "language": null, "license": null, "author": null, "aggregator": null, "auto_randomize_questions": true, "auto_derive_document_thumbnail": true, "copyright_holder": null, "auto_derive_html5_thumbnail": true, "provider": null, "auto_derive_audio_thumbnail": true, "license_description": null, "n_value": 5, "mastery_model": "num_correct_in_a_row_5"}'),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0085_user_policies.py b/contentcuration/contentcuration/migrations/0085_user_policies.py
deleted file mode 100644
index 5ea87249e1..0000000000
--- a/contentcuration/contentcuration/migrations/0085_user_policies.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-05-18 19:21
-from __future__ import unicode_literals
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0084_auto_20180329_1051'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='policies',
-            field=jsonfield.fields.JSONField(default=dict),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0086_auto_20180626_1055.py b/contentcuration/contentcuration/migrations/0086_auto_20180626_1055.py
deleted file mode 100644
index 9b69a6667f..0000000000
--- a/contentcuration/contentcuration/migrations/0086_auto_20180626_1055.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-06-26 17:55
-from __future__ import unicode_literals
-
-import django.contrib.postgres.fields.jsonb
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0085_user_policies'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='channel',
-            name='content_defaults',
-            field=django.contrib.postgres.fields.jsonb.JSONField(default={b'author': None, 'auto_derive_audio_thumbnail': True, 'auto_derive_document_thumbnail': True, 'auto_derive_exercise_thumbnail': True, 'auto_derive_html5_thumbnail': True,
-                                                                          'auto_derive_video_thumbnail': True, 'auto_randomize_questions': True, 'copyright_holder': None, 'language': None, 'license': None, 'license_description': None, 'm_value': 5, 'mastery_model': 'num_correct_in_a_row_5', 'n_value': 5}),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='content_defaults',
-            field=django.contrib.postgres.fields.jsonb.JSONField(default={b'author': None, 'auto_derive_audio_thumbnail': True, 'auto_derive_document_thumbnail': True, 'auto_derive_exercise_thumbnail': True, 'auto_derive_html5_thumbnail': True,
-                                                                          'auto_derive_video_thumbnail': True, 'auto_randomize_questions': True, 'copyright_holder': None, 'language': None, 'license': None, 'license_description': None, 'm_value': 5, 'mastery_model': 'num_correct_in_a_row_5', 'n_value': 5}),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='information',
-            field=django.contrib.postgres.fields.jsonb.JSONField(null=True),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='policies',
-            field=django.contrib.postgres.fields.jsonb.JSONField(default=dict),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0087_merge.py b/contentcuration/contentcuration/migrations/0087_merge.py
deleted file mode 100644
index f9ceb99342..0000000000
--- a/contentcuration/contentcuration/migrations/0087_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-07-02 18:25
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0086_auto_20180626_1055'),
-        ('contentcuration', '0085_auto_20180605_1714'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0088_auto_20180705_2007.py b/contentcuration/contentcuration/migrations/0088_auto_20180705_2007.py
deleted file mode 100644
index 98acbaa330..0000000000
--- a/contentcuration/contentcuration/migrations/0088_auto_20180705_2007.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-07-05 20:07
-from __future__ import unicode_literals
-
-import django.contrib.postgres.fields.jsonb
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0087_merge'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='policies',
-            field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0089_auto_20180706_2242.py b/contentcuration/contentcuration/migrations/0089_auto_20180706_2242.py
deleted file mode 100644
index c428b484b9..0000000000
--- a/contentcuration/contentcuration/migrations/0089_auto_20180706_2242.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-07-06 22:42
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0088_auto_20180705_2007'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contentnode',
-            name='aggregator',
-            field=models.CharField(blank=True, default='', help_text='Who gathered this content together?', max_length=200, null=True),
-        ),
-        migrations.AlterField(
-            model_name='contentnode',
-            name='provider',
-            field=models.CharField(blank=True, default='', help_text='Who distributed this content?', max_length=200, null=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0091_auto_20180724_2243.py b/contentcuration/contentcuration/migrations/0091_auto_20180724_2243.py
deleted file mode 100644
index 2df727e813..0000000000
--- a/contentcuration/contentcuration/migrations/0091_auto_20180724_2243.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-07-24 22:43
-from __future__ import unicode_literals
-
-import django.contrib.postgres.fields.jsonb
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0089_auto_20180706_2242'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='channel',
-            name='content_defaults',
-            field=django.contrib.postgres.fields.jsonb.JSONField(default=dict),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='content_defaults',
-            field=django.contrib.postgres.fields.jsonb.JSONField(default=dict),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0092_auto_20180731_1024.py b/contentcuration/contentcuration/migrations/0092_auto_20180731_1024.py
deleted file mode 100644
index f070f03c82..0000000000
--- a/contentcuration/contentcuration/migrations/0092_auto_20180731_1024.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-07-31 17:24
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0091_auto_20180724_2243'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contentnode',
-            name='changed',
-            field=models.BooleanField(default=True),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0093_auto_20180831_0745.py b/contentcuration/contentcuration/migrations/0093_auto_20180831_0745.py
deleted file mode 100644
index 808aa6ebd7..0000000000
--- a/contentcuration/contentcuration/migrations/0093_auto_20180831_0745.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-08-31 07:45
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-import contentcuration.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0092_auto_20180731_1024'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='file',
-            name='file_on_disk',
-            field=models.FileField(blank=True, max_length=500, upload_to=contentcuration.models.object_storage_name),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0094_auto_20180910_2342.py b/contentcuration/contentcuration/migrations/0094_auto_20180910_2342.py
deleted file mode 100644
index d6048beed8..0000000000
--- a/contentcuration/contentcuration/migrations/0094_auto_20180910_2342.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-10 23:42
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0093_auto_20180831_0745'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='fileformat',
-            name='extension',
-            field=models.CharField(choices=[('mp4', 'MP4 Video'), ('vtt', 'VTT Subtitle'), ('mp3', 'MP3 Audio'), ('pdf', 'PDF Document'), ('jpg', 'JPG Image'), ('jpeg', 'JPEG Image'), ('png', 'PNG Image'), ('gif', 'GIF Image'), (
-                'json', 'JSON'), ('svg', 'SVG Image'), ('perseus', 'Perseus Exercise'), ('graphie', 'Graphie Exercise'), ('zip', 'HTML5 Zip'), ('epub', 'ePub Document')], max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='formatpreset',
-            name='id',
-            field=models.CharField(choices=[('high_res_video', 'High Resolution'), ('low_res_video', 'Low Resolution'), ('vector_video', 'Vectorized'), ('video_thumbnail', 'Thumbnail'), ('video_subtitle', 'Subtitle'), ('video_dependency', 'Video (dependency)'), ('audio', 'Audio'), ('audio_thumbnail', 'Thumbnail'), ('document', 'Document'), ('epub', 'ePub Document'), ('document_thumbnail', 'Thumbnail'), (
-                'exercise', 'Exercise'), ('exercise_thumbnail', 'Thumbnail'), ('exercise_image', 'Exercise Image'), ('exercise_graphie', 'Exercise Graphie'), ('channel_thumbnail', 'Channel Thumbnail'), ('topic_thumbnail', 'Thumbnail'), ('html5_zip', 'HTML5 Zip'), ('html5_dependency', 'HTML5 Dependency (Zip format)'), ('html5_thumbnail', 'HTML5 Thumbnail')], max_length=150, primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0095_channelset.py b/contentcuration/contentcuration/migrations/0095_channelset.py
deleted file mode 100644
index 5df3b37e23..0000000000
--- a/contentcuration/contentcuration/migrations/0095_channelset.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-12-03 22:10
-from __future__ import unicode_literals
-
-import uuid
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations
-from django.db import models
-
-import contentcuration.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0094_auto_20180910_2342'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ChannelSet',
-            fields=[
-                ('id', contentcuration.models.UUIDField(default=uuid.uuid4, max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(blank=True, max_length=200)),
-                ('description', models.CharField(blank=True, max_length=400)),
-                ('public', models.BooleanField(db_index=True, default=False)),
-                ('editors', models.ManyToManyField(blank=True, help_text='Users with edit rights', related_name='channel_sets', to=settings.AUTH_USER_MODEL, verbose_name='editors')),
-                ('secret_token', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_sets', to='contentcuration.SecretToken')),
-            ],
-        ),
-    ]
diff --git a/contentcuration/contentcuration/migrations/0096_merge_20181222_0008.py b/contentcuration/contentcuration/migrations/0096_merge_20181222_0008.py
deleted file mode 100644
index b389753ab4..0000000000
--- a/contentcuration/contentcuration/migrations/0096_merge_20181222_0008.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-12-22 00:08
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contentcuration', '0004_remove_rename_json_field'),
-        ('contentcuration', '0095_channelset'),
-    ]
-
-    operations = [
-    ]
diff --git a/contentcuration/contentcuration/migrations/0097_task.py b/contentcuration/contentcuration/migrations/0097_task.py
index 47337ecfd0..5e411b2076 100644
--- a/contentcuration/contentcuration/migrations/0097_task.py
+++ b/contentcuration/contentcuration/migrations/0097_task.py
@@ -2,18 +2,21 @@
 # Generated by Django 1.11.15 on 2019-02-28 20:19
 from __future__ import unicode_literals
 
-import contentcuration.models
-from django.conf import settings
+import uuid
+
 import django.contrib.postgres.fields.jsonb
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import uuid
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+import contentcuration.models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ('contentcuration', '0096_merge_20181222_0008'),
+        ('contentcuration', '0004_remove_rename_json_field'),
     ]
 
     operations = [
diff --git a/contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py b/contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py
index 65e3220801..6ce83097b8 100644
--- a/contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py
+++ b/contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py
@@ -2,9 +2,9 @@
 # Generated by Django 1.11.29 on 2021-01-28 16:46
 from __future__ import unicode_literals
 
-from django.db import migrations
-
 import contentcuration.models
+from django.db import migrations, models
+import django.db.models.functions.text
 
 
 class Migration(migrations.Migration):
@@ -16,9 +16,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddIndex(
             model_name='user',
-            index=contentcuration.models.UniqueActiveUsername(
-                fields=['email'],
-                name='contentcura_email_d4d492_idx'
-            ),
+            index=contentcuration.models.UniqueActiveUserIndex(django.db.models.functions.text.Lower('email'), condition=models.Q(('is_active', True)), name='contentcura_email_d4d492_idx'),
         ),
     ]
diff --git a/contentcuration/contentcuration/migrations/0129_auto_20210519_2213.py b/contentcuration/contentcuration/migrations/0129_auto_20210519_2213.py
new file mode 100644
index 0000000000..e46b0d2cac
--- /dev/null
+++ b/contentcuration/contentcuration/migrations/0129_auto_20210519_2213.py
@@ -0,0 +1,159 @@
+# Generated by Django 3.2.3 on 2021-05-19 22:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentcuration', '0128_auto_20210511_1605'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='channel',
+            name='chef_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_chef', to='contentcuration.contentnode'),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='clipboard_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_clipboard', to='contentcuration.contentnode'),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='content_defaults',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='language',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_language', to='contentcuration.language'),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='main_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_main', to='contentcuration.contentnode'),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='previous_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_previous', to='contentcuration.contentnode'),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='published_data',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='staging_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_staging', to='contentcuration.contentnode'),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='thumbnail_encoding',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='trash_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='channel_trash', to='contentcuration.contentnode'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='complete',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='extra_fields',
+            field=models.JSONField(blank=True, default=dict, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='kind',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contentnodes', to='contentcuration.contentkind'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='language',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='content_language', to='contentcuration.language'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='level',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='lft',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='license',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contentcuration.license'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='rght',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='file_format',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='files', to='contentcuration.fileformat'),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='language',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='files', to='contentcuration.language'),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='preset',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='files', to='contentcuration.formatpreset'),
+        ),
+        migrations.AlterField(
+            model_name='formatpreset',
+            name='kind',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='format_presets', to='contentcuration.contentkind'),
+        ),
+        migrations.AlterField(
+            model_name='slideshowslide',
+            name='metadata',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='metadata',
+            field=models.JSONField(),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='clipboard_tree',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='user_clipboard', to='contentcuration.contentnode'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='content_defaults',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='feature_flags',
+            field=models.JSONField(default=dict, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='information',
+            field=models.JSONField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='policies',
+            field=models.JSONField(default=dict, null=True),
+        ),
+    ]
diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index 04b1969dad..688caaf163 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -1,8 +1,3 @@
-from future import standard_library
-standard_library.install_aliases()
-from builtins import filter
-from builtins import str
-from builtins import range
 import functools
 import hashlib
 import json
@@ -17,7 +12,6 @@
 from django.contrib.auth.base_user import AbstractBaseUser
 from django.contrib.auth.base_user import BaseUserManager
 from django.contrib.auth.models import PermissionsMixin
-from django.contrib.postgres.fields import JSONField
 from django.core.cache import cache
 from django.core.exceptions import MultipleObjectsReturned
 from django.core.exceptions import ObjectDoesNotExist
@@ -31,21 +25,27 @@
 from django.db import models
 from django.db.models import Count
 from django.db.models import Exists
+from django.db.models import Index
+from django.db.models import IntegerField
+from django.db.models import JSONField
 from django.db.models import Max
 from django.db.models import OuterRef
 from django.db.models import Q
-from django.db.models import Sum
 from django.db.models import Subquery
-from django.db.models import Value
+from django.db.models import Sum
 from django.db.models import UUIDField as DjangoUUIDField
-from django.db.models.indexes import Index
+from django.db.models import Value
 from django.db.models.expressions import RawSQL
+from django.db.models.expressions import ExpressionList
+from django.db.models.functions import Cast
+from django.db.models.functions import Lower
+from django.db.models.indexes import IndexExpression
 from django.db.models.query_utils import DeferredAttribute
+from django.db.models.sql import Query
 from django.dispatch import receiver
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django_cte import With
-from model_utils import FieldTracker
 from le_utils import proquint
 from le_utils.constants import content_kinds
 from le_utils.constants import exercises
@@ -53,6 +53,7 @@
 from le_utils.constants import format_presets
 from le_utils.constants import languages
 from le_utils.constants import roles
+from model_utils import FieldTracker
 from mptt.models import MPTTModel
 from mptt.models import raise_if_unsaved
 from mptt.models import TreeForeignKey
@@ -61,10 +62,10 @@
 from rest_framework.authtoken.models import Token
 
 from contentcuration.db.models.expressions import Array
-from contentcuration.db.models.functions import Unnest
 from contentcuration.db.models.functions import ArrayRemove
-from contentcuration.db.models.manager import CustomManager
+from contentcuration.db.models.functions import Unnest
 from contentcuration.db.models.manager import CustomContentNodeTreeManager
+from contentcuration.db.models.manager import CustomManager
 from contentcuration.statistics import record_channel_stats
 from contentcuration.utils.cache import delete_public_channel_cache_keys
 from contentcuration.utils.parser import load_json_string
@@ -117,16 +118,52 @@ def create_superuser(self, email, first_name, last_name, password=None):
         return new_user
 
 
-class UniqueActiveUsername(Index):
-    """
-    TODO: Can replace WHERE addition in newer Django using `condition`
-    """
-    sql_create_index = "CREATE UNIQUE INDEX %(name)s ON %(table)s%(using)s (%(columns)s)%(extra)s WHERE is_active"
+class UniqueActiveUserIndex(Index):
+    def create_sql(self, model, schema_editor, using='', **kwargs):
+        """
+        This is a vendored and modified version of the Django create_sql method
+        We do this so that we can monkey patch in the unique index statement onto the schema_editor
+        while we create the statement for this index, and then revert it to normal.
 
-    def create_sql(self, model, schema_editor, using=''):
-        sql_parameters = self.get_sql_create_template_values(model, schema_editor, using)
-        sql_parameters.update(columns='LOWER(email)')
-        return self.sql_create_index % sql_parameters
+        We should remove this as soon as Django natively supports UniqueConstraints with Expressions.
+        This should hopefully be the case in Django 3.3.
+        """
+        include = [model._meta.get_field(field_name).column for field_name in self.include]
+        condition = self._get_condition_sql(model, schema_editor)
+        if self.expressions:
+            index_expressions = []
+            for expression in self.expressions:
+                index_expression = IndexExpression(expression)
+                index_expression.set_wrapper_classes(schema_editor.connection)
+                index_expressions.append(index_expression)
+            expressions = ExpressionList(*index_expressions).resolve_expression(
+                Query(model, alias_cols=False),
+            )
+            fields = None
+            col_suffixes = None
+        else:
+            fields = [
+                model._meta.get_field(field_name)
+                for field_name, _ in self.fields_orders
+            ]
+            col_suffixes = [order[1] for order in self.fields_orders]
+            expressions = None
+        sql = "CREATE UNIQUE INDEX %(name)s ON %(table)s (%(columns)s)%(include)s%(condition)s"
+        # Store the normal SQL statement for indexes
+        old_create_index_sql = schema_editor.sql_create_index
+        # Replace it with our own unique index so that this index actually adds a constraint
+        schema_editor.sql_create_index = sql
+        # Generate the SQL staetment that we want to return
+        return_statement = schema_editor._create_index_sql(
+            model, fields=fields, name=self.name, using=using,
+            db_tablespace=self.db_tablespace, col_suffixes=col_suffixes,
+            opclasses=self.opclasses, condition=condition, include=include,
+            expressions=expressions, **kwargs,
+        )
+        # Reinstate the previous index SQL statement so that we have done no harm
+        schema_editor.sql_create_index = old_create_index_sql
+        # Return our SQL statement
+        return return_statement
 
 
 class User(AbstractBaseUser, PermissionsMixin):
@@ -139,7 +176,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     is_staff = models.BooleanField('staff status', default=False,
                                    help_text='Designates whether the user can log into this admin site.')
     date_joined = models.DateTimeField('date joined', default=timezone.now)
-    clipboard_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='user_clipboard')
+    clipboard_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='user_clipboard', on_delete=models.SET_NULL)
     preferences = models.TextField(default=DEFAULT_USER_PREFERENCES)
     disk_space = models.FloatField(default=524288000, help_text='How many bytes a user can upload')
     disk_space_used = models.FloatField(default=0, help_text='How many bytes a user has uploaded')
@@ -308,12 +345,12 @@ class Meta:
         verbose_name = "User"
         verbose_name_plural = "Users"
         indexes = [
-            UniqueActiveUsername(fields=['email'])
+            UniqueActiveUserIndex(Lower('email'), condition=Q(is_active=True), name="contentcura_email_d4d492_idx")
         ]
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
-        if user.is_anonymous():
+        if user.is_anonymous:
             return queryset.none()
 
         if user.is_admin:
@@ -339,7 +376,7 @@ def filter_view_queryset(cls, queryset, user):
 
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
-        if user.is_anonymous():
+        if user.is_anonymous:
             return queryset.none()
 
         if user.is_admin:
@@ -665,13 +702,13 @@ class Channel(models.Model):
         help_text="Users with view only rights",
         blank=True,
     )
-    language = models.ForeignKey('Language', null=True, blank=True, related_name='channel_language')
-    trash_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_trash')
-    clipboard_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_clipboard')
-    main_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_main')
-    staging_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_staging')
-    chef_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_chef')
-    previous_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_previous')
+    language = models.ForeignKey('Language', null=True, blank=True, related_name='channel_language', on_delete=models.SET_NULL)
+    trash_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_trash', on_delete=models.SET_NULL)
+    clipboard_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_clipboard', on_delete=models.SET_NULL)
+    main_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_main', on_delete=models.SET_NULL)
+    staging_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_staging', on_delete=models.SET_NULL)
+    chef_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_chef', on_delete=models.SET_NULL)
+    previous_tree = models.ForeignKey('ContentNode', null=True, blank=True, related_name='channel_previous', on_delete=models.SET_NULL)
     bookmarked_by = models.ManyToManyField(
         settings.AUTH_USER_MODEL,
         related_name='bookmarked_channels',
@@ -732,7 +769,7 @@ def get_editable(cls, user, channel_id):
 
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
 
         # it won't return anything
         if not user_id:
@@ -747,8 +784,8 @@ def filter_edit_queryset(cls, queryset, user):
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
-        user_email = not user.is_anonymous() and user.email
+        user_id = not user.is_anonymous and user.id
+        user_email = not user.is_anonymous and user.email
 
         if user_id:
             filters = dict(user_id=user_id, channel_id=OuterRef("id"))
@@ -972,9 +1009,9 @@ class ChannelSet(models.Model):
 
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
-        if user.is_anonymous():
+        if user.is_anonymous:
             return queryset.none()
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
         edit = Exists(User.channel_sets.through.objects.filter(user_id=user_id, channelset_id=OuterRef("id")))
         queryset = queryset.annotate(edit=edit)
         if user.is_admin:
@@ -1094,15 +1131,15 @@ class ContentNode(MPTTModel, models.Model):
 
     title = models.CharField(max_length=200, blank=True)
     description = models.TextField(blank=True)
-    kind = models.ForeignKey('ContentKind', related_name='contentnodes', db_index=True)
-    license = models.ForeignKey('License', null=True, blank=True)
+    kind = models.ForeignKey('ContentKind', related_name='contentnodes', db_index=True, null=True, blank=True, on_delete=models.SET_NULL)
+    license = models.ForeignKey('License', null=True, blank=True, on_delete=models.SET_NULL)
     license_description = models.CharField(max_length=400, null=True, blank=True)
     prerequisite = models.ManyToManyField('self', related_name='is_prerequisite_of',
                                           through='PrerequisiteContentRelationship', symmetrical=False, blank=True)
     is_related = models.ManyToManyField('self', related_name='relate_to', through='RelatedContentRelationship',
                                         symmetrical=False, blank=True)
-    language = models.ForeignKey('Language', null=True, blank=True, related_name='content_language')
-    parent = TreeForeignKey('self', null=True, blank=True, related_name='children', db_index=True)
+    language = models.ForeignKey('Language', null=True, blank=True, related_name='content_language', on_delete=models.SET_NULL)
+    parent = TreeForeignKey('self', null=True, blank=True, related_name='children', db_index=True, on_delete=models.CASCADE)
     tags = models.ManyToManyField(ContentTag, symmetrical=False, related_name='tagged_content', blank=True)
     # No longer used
     sort_order = models.FloatField(max_length=50, default=1, verbose_name="sort order",
@@ -1119,7 +1156,7 @@ class ContentNode(MPTTModel, models.Model):
     modified = models.DateTimeField(auto_now=True, verbose_name="modified")
     published = models.BooleanField(default=False)
     publishing = models.BooleanField(default=False)
-    complete = models.NullBooleanField()
+    complete = models.BooleanField(null=True)
 
     changed = models.BooleanField(default=True)
     """
@@ -1160,13 +1197,15 @@ def _annotate_channel_id(cls, queryset):
 
     @classmethod
     def _orphan_tree_id_subquery(cls):
-        return cls.objects.filter(
+        # For some reason this now requires an explicit type cast
+        # or it gets interpreted as a varchar
+        return Cast(cls.objects.filter(
             pk=settings.ORPHANAGE_ROOT_ID
-        ).values_list("tree_id", flat=True)[:1]
+        ).values_list("tree_id", flat=True)[:1], output_field=IntegerField())
 
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
 
         queryset = queryset.exclude(pk=settings.ORPHANAGE_ROOT_ID)
 
@@ -1186,7 +1225,7 @@ def filter_edit_queryset(cls, queryset, user):
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
 
         queryset = queryset.annotate(
             public=Exists(
@@ -1765,7 +1804,7 @@ class FormatPreset(models.Model):
     subtitle = models.BooleanField(default=False)
     display = models.BooleanField(default=True)  # Render on client side
     order = models.IntegerField(default=0)
-    kind = models.ForeignKey(ContentKind, related_name='format_presets', null=True)
+    kind = models.ForeignKey(ContentKind, related_name='format_presets', null=True, on_delete=models.SET_NULL)
     allowed_formats = models.ManyToManyField(FileFormat, blank=True)
 
     def __str__(self):
@@ -1826,7 +1865,7 @@ class AssessmentItem(models.Model):
     answers = models.TextField(default="[]")
     order = models.IntegerField(default=1)
     contentnode = models.ForeignKey('ContentNode', related_name="assessment_items", blank=True, null=True,
-                                    db_index=True)
+                                    db_index=True, on_delete=models.CASCADE)
     # Note this field is indexed, but we are using the Index API to give it an explicit name, see the model Meta
     assessment_id = UUIDField(primary_key=False, default=uuid.uuid4, editable=False)
     raw_data = models.TextField(blank=True)
@@ -1852,7 +1891,7 @@ class Meta:
 
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
 
         if not user_id:
             return queryset.none()
@@ -1870,7 +1909,7 @@ def filter_edit_queryset(cls, queryset, user):
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
 
         queryset = queryset.annotate(
             public=Exists(
@@ -1899,9 +1938,9 @@ def filter_view_queryset(cls, queryset, user):
 
 class SlideshowSlide(models.Model):
     contentnode = models.ForeignKey('ContentNode', related_name="slideshow_slides", blank=True, null=True,
-                                    db_index=True)
+                                    db_index=True, on_delete=models.CASCADE)
     sort_order = models.FloatField(default=1.0)
-    metadata = JSONField(default={})
+    metadata = JSONField(default=dict)
 
 
 class StagedFile(models.Model):
@@ -1910,7 +1949,7 @@ class StagedFile(models.Model):
     """
     checksum = models.CharField(max_length=400, blank=True, db_index=True)
     file_size = models.IntegerField(blank=True, null=True)
-    uploaded_by = models.ForeignKey(User, related_name='staged_files', blank=True, null=True)
+    uploaded_by = models.ForeignKey(User, related_name='staged_files', blank=True, null=True, on_delete=models.CASCADE)
 
 
 FILE_DISTINCT_INDEX_NAME = "file_checksum_file_size_idx"
@@ -1927,12 +1966,12 @@ class File(models.Model):
     file_size = models.IntegerField(blank=True, null=True)
     file_on_disk = models.FileField(upload_to=object_storage_name, storage=default_storage, max_length=500,
                                     blank=True)
-    contentnode = models.ForeignKey(ContentNode, related_name='files', blank=True, null=True, db_index=True)
-    assessment_item = models.ForeignKey(AssessmentItem, related_name='files', blank=True, null=True, db_index=True)
-    slideshow_slide = models.ForeignKey(SlideshowSlide, related_name='files', blank=True, null=True, db_index=True)
-    file_format = models.ForeignKey(FileFormat, related_name='files', blank=True, null=True, db_index=True)
-    preset = models.ForeignKey(FormatPreset, related_name='files', blank=True, null=True, db_index=True)
-    language = models.ForeignKey(Language, related_name='files', blank=True, null=True)
+    contentnode = models.ForeignKey(ContentNode, related_name='files', blank=True, null=True, db_index=True, on_delete=models.CASCADE)
+    assessment_item = models.ForeignKey(AssessmentItem, related_name='files', blank=True, null=True, db_index=True, on_delete=models.CASCADE)
+    slideshow_slide = models.ForeignKey(SlideshowSlide, related_name='files', blank=True, null=True, db_index=True, on_delete=models.CASCADE)
+    file_format = models.ForeignKey(FileFormat, related_name='files', blank=True, null=True, db_index=True, on_delete=models.SET_NULL)
+    preset = models.ForeignKey(FormatPreset, related_name='files', blank=True, null=True, db_index=True, on_delete=models.SET_NULL)
+    language = models.ForeignKey(Language, related_name='files', blank=True, null=True, on_delete=models.SET_NULL)
     original_filename = models.CharField(max_length=255, blank=True)
     source_url = models.CharField(max_length=400, blank=True, null=True)
     uploaded_by = models.ForeignKey(User, related_name='files', blank=True, null=True, on_delete=models.SET_NULL)
@@ -1945,7 +1984,7 @@ class File(models.Model):
 
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
 
         if not user_id:
             return queryset.none()
@@ -1962,7 +2001,7 @@ def filter_edit_queryset(cls, queryset, user):
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
-        user_id = not user.is_anonymous() and user.id
+        user_id = not user.is_anonymous and user.id
 
         queryset = queryset.annotate(
             public=Exists(
@@ -2076,8 +2115,8 @@ class PrerequisiteContentRelationship(models.Model):
     """
     Predefine the prerequisite relationship between two ContentNode objects.
     """
-    target_node = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_target_node')
-    prerequisite = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_prerequisite')
+    target_node = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_target_node', on_delete=models.CASCADE)
+    prerequisite = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_prerequisite', on_delete=models.CASCADE)
 
     class Meta:
         unique_together = ['target_node', 'prerequisite']
@@ -2109,8 +2148,8 @@ class RelatedContentRelationship(models.Model):
     """
     Predefine the related relationship between two ContentNode objects.
     """
-    contentnode_1 = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_1')
-    contentnode_2 = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_2')
+    contentnode_1 = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_1', on_delete=models.CASCADE)
+    contentnode_2 = models.ForeignKey(ContentNode, related_name='%(app_label)s_%(class)s_2', on_delete=models.CASCADE)
 
     class Meta:
         unique_together = ['contentnode_1', 'contentnode_2']
@@ -2127,7 +2166,7 @@ def save(self, *args, **kwargs):
 
 
 class Exercise(models.Model):
-    contentnode = models.ForeignKey('ContentNode', related_name="exercise", null=True)
+    contentnode = models.ForeignKey('ContentNode', related_name="exercise", null=True, on_delete=models.CASCADE)
     mastery_model = models.CharField(max_length=200, default=exercises.DO_ALL, choices=exercises.MASTERY_MODELS)
 
 
@@ -2140,8 +2179,8 @@ class Invitation(models.Model):
     invited = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True, related_name='sent_to')
     share_mode = models.CharField(max_length=50, default=EDIT_ACCESS)
     email = models.EmailField(max_length=100, null=True)
-    sender = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='sent_by', null=True)
-    channel = models.ForeignKey('Channel', null=True, related_name='pending_editors')
+    sender = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='sent_by', null=True, on_delete=models.CASCADE)
+    channel = models.ForeignKey('Channel', null=True, related_name='pending_editors', on_delete=models.CASCADE)
     first_name = models.CharField(max_length=100, blank=True)
     last_name = models.CharField(max_length=100, blank=True, null=True)
 
@@ -2162,7 +2201,7 @@ def accept(self):
 
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
-        if user.is_anonymous():
+        if user.is_anonymous:
             return queryset.none()
 
         if user.is_admin:
@@ -2176,7 +2215,7 @@ def filter_edit_queryset(cls, queryset, user):
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
-        if user.is_anonymous():
+        if user.is_anonymous:
             return queryset.none()
 
         if user.is_admin:
@@ -2196,6 +2235,6 @@ class Task(models.Model):
     created = models.DateTimeField(default=timezone.now)
     status = models.CharField(max_length=10)
     is_progress_tracking = models.BooleanField(default=False)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="task")
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="task", on_delete=models.CASCADE)
     metadata = JSONField()
     channel_id = DjangoUUIDField(db_index=True, null=True, blank=True)
diff --git a/contentcuration/contentcuration/sandbox_settings.py b/contentcuration/contentcuration/sandbox_settings.py
index 710619c096..2ca766f4ef 100644
--- a/contentcuration/contentcuration/sandbox_settings.py
+++ b/contentcuration/contentcuration/sandbox_settings.py
@@ -5,6 +5,6 @@
 
 DEFAULT_FILE_STORAGE = "contentcuration.utils.gcs_storage.GoogleCloudStorage"
 
-LANGUAGES += (("ar", ugettext("Arabic")),)  # noqa
+LANGUAGES += (("ar", gettext("Arabic")),)  # noqa
 
 AWS_AUTO_CREATE_BUCKET = True
diff --git a/contentcuration/contentcuration/settings.py b/contentcuration/contentcuration/settings.py
index 7aafc423d0..ec5b181457 100644
--- a/contentcuration/contentcuration/settings.py
+++ b/contentcuration/contentcuration/settings.py
@@ -128,7 +128,6 @@
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.http.ConditionalGetMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
@@ -278,16 +277,17 @@
 )
 
 
-def ugettext(s):
+def gettext(s):
     return s
 
 
 LANGUAGES = (
-    ('en', ugettext('English')),
-    ('es-es', ugettext('Spanish')),
-    ('ar', ugettext('Arabic')),
-    ('fr-fr', ugettext('French')),
-    # ('en-PT', ugettext('English - Pirate')),
+    ('en', gettext('English')),
+    ('es-es', gettext('Spanish')),
+    ('ar', gettext('Arabic')),
+    ('fr-fr', gettext('French')),
+    ('pt-br', gettext('Portuguese')),
+    # ('en-PT', gettext('English - Pirate')),
 )
 
 
@@ -423,3 +423,6 @@ def ugettext(s):
     )
 
     SENTRY_ACTIVE = True
+
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
diff --git a/contentcuration/contentcuration/tasks.py b/contentcuration/contentcuration/tasks.py
index 82b1eee719..0fc3905b24 100644
--- a/contentcuration/contentcuration/tasks.py
+++ b/contentcuration/contentcuration/tasks.py
@@ -12,8 +12,8 @@
 from django.db import IntegrityError
 from django.db.utils import OperationalError
 from django.template.loader import render_to_string
-from django.utils import translation
-from django.utils.translation import ugettext as _
+from django.utils.translation import override
+from django.utils.translation import gettext as _
 
 from contentcuration.celery import app
 from contentcuration.models import Channel
@@ -154,7 +154,7 @@ def duplicate_nodes_task(
 
 @app.task(bind=True, name="export_channel_task", track_progress=True)
 def export_channel_task(self, user_id, channel_id, version_notes="", language=settings.LANGUAGE_CODE):
-    with translation.override(language):
+    with override(language):
         channel = publish_channel(
             user_id,
             channel_id,
@@ -222,7 +222,7 @@ def attach(self, filename=None, content=None, mimetype=None):
 
 @app.task(name="generateusercsv_task")
 def generateusercsv_task(user_id, language=settings.LANGUAGE_CODE):
-    with translation.override(language):
+    with override(language):
         user = User.objects.get(pk=user_id)
         csv_path = write_user_csv(user)
         subject = render_to_string("export/user_csv_email_subject.txt", {})
diff --git a/contentcuration/contentcuration/templates/accounts.html b/contentcuration/contentcuration/templates/accounts.html
index 8131b6be88..1a7416f180 100644
--- a/contentcuration/contentcuration/templates/accounts.html
+++ b/contentcuration/contentcuration/templates/accounts.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load render_bundle_css from translation_tags %}
 {% load render_bundle from webpack_loader %}
diff --git a/contentcuration/contentcuration/templates/administration.html b/contentcuration/contentcuration/templates/administration.html
index 99d508a02f..a8effa919f 100644
--- a/contentcuration/contentcuration/templates/administration.html
+++ b/contentcuration/contentcuration/templates/administration.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load render_bundle_css from translation_tags %}
 {% load render_bundle from webpack_loader %}
diff --git a/contentcuration/contentcuration/templates/base.html b/contentcuration/contentcuration/templates/base.html
index 69d58905d9..b758c6be70 100644
--- a/contentcuration/contentcuration/templates/base.html
+++ b/contentcuration/contentcuration/templates/base.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% load cache %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load render_bundle from webpack_loader %}
 {% load render_bundle_css from translation_tags %}
diff --git a/contentcuration/contentcuration/templates/channel_edit.html b/contentcuration/contentcuration/templates/channel_edit.html
index 20077e8c6d..b4942b84c2 100644
--- a/contentcuration/contentcuration/templates/channel_edit.html
+++ b/contentcuration/contentcuration/templates/channel_edit.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load render_bundle_css from translation_tags %}
 {% load render_bundle from webpack_loader %}
diff --git a/contentcuration/contentcuration/templates/channel_list.html b/contentcuration/contentcuration/templates/channel_list.html
index d8c00e7d33..97b4dee1e3 100644
--- a/contentcuration/contentcuration/templates/channel_list.html
+++ b/contentcuration/contentcuration/templates/channel_list.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load render_bundle_css from translation_tags %}
 {% load render_bundle from webpack_loader %}
diff --git a/contentcuration/contentcuration/templates/channel_not_found.html b/contentcuration/contentcuration/templates/channel_not_found.html
index dd7f685677..dd1f762b25 100644
--- a/contentcuration/contentcuration/templates/channel_not_found.html
+++ b/contentcuration/contentcuration/templates/channel_not_found.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% block nav %}{% endblock nav %}
 
diff --git a/contentcuration/contentcuration/templates/exercise_edit.html b/contentcuration/contentcuration/templates/exercise_edit.html
index 196e2ae02f..5cddce86f8 100644
--- a/contentcuration/contentcuration/templates/exercise_edit.html
+++ b/contentcuration/contentcuration/templates/exercise_edit.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
 
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block head %} {{ block.super }}
diff --git a/contentcuration/contentcuration/templates/exercise_list.html b/contentcuration/contentcuration/templates/exercise_list.html
index 703edd21e7..5c64a26641 100644
--- a/contentcuration/contentcuration/templates/exercise_list.html
+++ b/contentcuration/contentcuration/templates/exercise_list.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
 
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block head %} {{ block.super }}
diff --git a/contentcuration/contentcuration/templates/export/channel_detail_pdf.html b/contentcuration/contentcuration/templates/export/channel_detail_pdf.html
index a2f5bea86e..daf9fe6d76 100644
--- a/contentcuration/contentcuration/templates/export/channel_detail_pdf.html
+++ b/contentcuration/contentcuration/templates/export/channel_detail_pdf.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-{% load staticfiles %}
+{% load static %}
 {% load export_tags %}
 {% load license_tags %}
 {% load i18n %}
diff --git a/contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html b/contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html
index 37db588fb2..904359299b 100644
--- a/contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html
+++ b/contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-{% load staticfiles %}
+{% load static %}
 {% load export_tags %}
 {% load license_tags %}
 {% load mathfilters %}
diff --git a/contentcuration/contentcuration/templates/export/channels_pdf.html b/contentcuration/contentcuration/templates/export/channels_pdf.html
index e4ba94e0be..0f73410bd5 100644
--- a/contentcuration/contentcuration/templates/export/channels_pdf.html
+++ b/contentcuration/contentcuration/templates/export/channels_pdf.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-{% load staticfiles %}
+{% load static %}
 {% load export_tags %}
 
 <html>
diff --git a/contentcuration/contentcuration/templates/permissions/open_channel_fail.html b/contentcuration/contentcuration/templates/permissions/open_channel_fail.html
index 9379b1e272..300e600bc4 100644
--- a/contentcuration/contentcuration/templates/permissions/open_channel_fail.html
+++ b/contentcuration/contentcuration/templates/permissions/open_channel_fail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% block nav %}{% endblock nav %}
 
diff --git a/contentcuration/contentcuration/templates/permissions/permissions_email.html b/contentcuration/contentcuration/templates/permissions/permissions_email.html
index 45b75e0605..d85f929799 100644
--- a/contentcuration/contentcuration/templates/permissions/permissions_email.html
+++ b/contentcuration/contentcuration/templates/permissions/permissions_email.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -120,4 +120,4 @@ <h3>{% trans "Hello" %} <strong>{% if is_new %}{{ user.email }}{% else %}{{ user
 		</div>
 		{% endautoescape %}
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/contentcuration/contentcuration/templates/registration/activation_email.html b/contentcuration/contentcuration/templates/registration/activation_email.html
index 46a8849d1d..6958865735 100644
--- a/contentcuration/contentcuration/templates/registration/activation_email.html
+++ b/contentcuration/contentcuration/templates/registration/activation_email.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
diff --git a/contentcuration/contentcuration/templates/registration/getting_started.html b/contentcuration/contentcuration/templates/registration/getting_started.html
index 886dc56106..cf6a812cf6 100644
--- a/contentcuration/contentcuration/templates/registration/getting_started.html
+++ b/contentcuration/contentcuration/templates/registration/getting_started.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
 
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block nav %}{% endblock nav %}
diff --git a/contentcuration/contentcuration/templates/registration/password_reset_confirm.html b/contentcuration/contentcuration/templates/registration/password_reset_confirm.html
index c3019b9a8c..2f96d4bf3f 100644
--- a/contentcuration/contentcuration/templates/registration/password_reset_confirm.html
+++ b/contentcuration/contentcuration/templates/registration/password_reset_confirm.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% block nav %}{% endblock nav %}
 
diff --git a/contentcuration/contentcuration/templates/registration/password_reset_email.html b/contentcuration/contentcuration/templates/registration/password_reset_email.html
index 8b9745deb1..21b2c498fa 100644
--- a/contentcuration/contentcuration/templates/registration/password_reset_email.html
+++ b/contentcuration/contentcuration/templates/registration/password_reset_email.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -114,5 +114,3 @@ <h3>{% trans "Hello" %} <strong>{{ user.first_name }}</strong>,</h3>
         {% endautoescape %}
     </body>
 </html>
-
-
diff --git a/contentcuration/contentcuration/templates/registration/password_reset_form.html b/contentcuration/contentcuration/templates/registration/password_reset_form.html
index 98f628e14a..df986c0ab7 100644
--- a/contentcuration/contentcuration/templates/registration/password_reset_form.html
+++ b/contentcuration/contentcuration/templates/registration/password_reset_form.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% block nav %}{% endblock nav %}
 
@@ -26,4 +26,4 @@ <h2>{% trans "Password Reset" %}</h2>
 		</form>
 	</div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/contentcuration/contentcuration/templates/sandbox.html b/contentcuration/contentcuration/templates/sandbox.html
index c87ef845e7..7076230eb4 100644
--- a/contentcuration/contentcuration/templates/sandbox.html
+++ b/contentcuration/contentcuration/templates/sandbox.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load render_bundle_css from translation_tags %}
 {% load render_bundle from webpack_loader %}
diff --git a/contentcuration/contentcuration/templates/settings.html b/contentcuration/contentcuration/templates/settings.html
index b2fd83ab15..7bf8210ca6 100644
--- a/contentcuration/contentcuration/templates/settings.html
+++ b/contentcuration/contentcuration/templates/settings.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load render_bundle_css from translation_tags %}
 {% load render_bundle from webpack_loader %}
diff --git a/contentcuration/contentcuration/templates/staging_not_found.html b/contentcuration/contentcuration/templates/staging_not_found.html
index 8f7b5f7aa6..de486d07a0 100644
--- a/contentcuration/contentcuration/templates/staging_not_found.html
+++ b/contentcuration/contentcuration/templates/staging_not_found.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% block nav %}{% endblock nav %}
 
diff --git a/contentcuration/contentcuration/templates/test.html b/contentcuration/contentcuration/templates/test.html
index 825667533f..7e8d054fca 100644
--- a/contentcuration/contentcuration/templates/test.html
+++ b/contentcuration/contentcuration/templates/test.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 <h2>Test for Exercise Creation Framework</h2>
 <br>
@@ -56,4 +56,4 @@ <h3>Use this page to render your code for your handlebars templates as you devel
 <p>After your template is finished, create a new .handlebars file, copy your code into it, and place it in the respective hbtemplates folder. There's a sample in the hbtemplates folder.</p>
 <p>Make all of your styles inside of styles.less. At this stage, the styling does not have to completely look like the mockups, so don't worry about perfection (yet) :) </p>
 
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/contentcuration/contentcuration/templates/unauthorized.html b/contentcuration/contentcuration/templates/unauthorized.html
index 5680d52320..cd4bebd3da 100644
--- a/contentcuration/contentcuration/templates/unauthorized.html
+++ b/contentcuration/contentcuration/templates/unauthorized.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% block nav %}{% endblock nav %}
 
diff --git a/contentcuration/contentcuration/templatetags/license_tags.py b/contentcuration/contentcuration/templatetags/license_tags.py
index 328fdedc3a..dd68ca07fa 100644
--- a/contentcuration/contentcuration/templatetags/license_tags.py
+++ b/contentcuration/contentcuration/templatetags/license_tags.py
@@ -1,7 +1,8 @@
-from contentcuration.models import License
 from django import template
 from django.template.defaultfilters import stringfilter
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
+
+from contentcuration.models import License
 
 register = template.Library()
 
@@ -55,7 +56,7 @@
 def get_license_url(value):
     global LICENSE_MAPPING
     if not LICENSE_MAPPING:
-        LICENSE_MAPPING = {l.license_name: l.license_url for l in License.objects.all()}
+        LICENSE_MAPPING = {lic.license_name: lic.license_url for lic in License.objects.all()}
 
     return LICENSE_MAPPING.get(value)
 
diff --git a/contentcuration/contentcuration/templatetags/translation_tags.py b/contentcuration/contentcuration/templatetags/translation_tags.py
index 385cdbc519..f2242faaa5 100644
--- a/contentcuration/contentcuration/templatetags/translation_tags.py
+++ b/contentcuration/contentcuration/templatetags/translation_tags.py
@@ -4,7 +4,7 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language
 from django.utils.translation import get_language_info
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from webpack_loader import utils
 
 from contentcuration.utils.format import format_size as fsize
diff --git a/contentcuration/contentcuration/tests/base.py b/contentcuration/contentcuration/tests/base.py
index 721cb9a686..b1cade8ce0 100644
--- a/contentcuration/contentcuration/tests/base.py
+++ b/contentcuration/contentcuration/tests/base.py
@@ -7,11 +7,11 @@
 from django.conf import settings
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.management import call_command
-from django.core.urlresolvers import reverse_lazy
 from django.db import connection
 from django.db.migrations.executor import MigrationExecutor
 from django.test import TestCase
 from django.test import TransactionTestCase
+from django.urls import reverse_lazy
 from rest_framework.authtoken.models import Token
 from rest_framework.test import APIClient
 from rest_framework.test import APIRequestFactory
diff --git a/contentcuration/contentcuration/tests/db/test_advisory_lock.py b/contentcuration/contentcuration/tests/db/test_advisory_lock.py
index e7bc955de3..63a3650b46 100644
--- a/contentcuration/contentcuration/tests/db/test_advisory_lock.py
+++ b/contentcuration/contentcuration/tests/db/test_advisory_lock.py
@@ -129,6 +129,8 @@ class AdvisoryLockDatabaseTest(SimpleTestCase):
     # this test manages its own transactions
     allow_database_queries = True
 
+    databases = ["default"]
+
     @contextmanager
     def child_lock(self, shared=False):
         parent_conn, child_conn = Pipe()
diff --git a/contentcuration/contentcuration/tests/test_asynctask.py b/contentcuration/contentcuration/tests/test_asynctask.py
index e49e058715..15097fe3a1 100644
--- a/contentcuration/contentcuration/tests/test_asynctask.py
+++ b/contentcuration/contentcuration/tests/test_asynctask.py
@@ -6,10 +6,10 @@
 
 import pytest
 from celery import states
-from django.core.urlresolvers import reverse
 from django.db import connection
 from django.db.utils import OperationalError
 from django.test import TransactionTestCase
+from django.urls import reverse
 
 from .base import BaseAPITestCase
 from contentcuration.models import ContentNode
diff --git a/contentcuration/contentcuration/tests/test_authentication.py b/contentcuration/contentcuration/tests/test_authentication.py
index fdc9d6f28d..25f45032b9 100644
--- a/contentcuration/contentcuration/tests/test_authentication.py
+++ b/contentcuration/contentcuration/tests/test_authentication.py
@@ -1,22 +1,23 @@
 from __future__ import absolute_import
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import urllib.parse
 
 from .base import BaseTestCase
 
 
 class AuthenticationTestCase(BaseTestCase):
-
     def setUp(self):
         super(AuthenticationTestCase, self).setUp()
         self.base_url = reverse("channel", kwargs={"channel_id": self.channel.pk})
 
     def test_channel_admin_access(self):
-        admin_url = '/en/administration/'
+        admin_url = "/en/administration/"
 
         response = self.get(admin_url, follow=True)
-        assert "/en/accounts/?next={}".format(admin_url) == urllib.parse.unquote(response.redirect_chain[-1][0])
+        assert "/en/accounts/?next={}".format(admin_url) == urllib.parse.unquote(
+            response.redirect_chain[-1][0]
+        )
         assert response.status_code == 200
 
         self.sign_in()
@@ -38,7 +39,9 @@ def test_unathenticated_channel_access(self):
         # now test that when we are redirected we get taken to the login page since we're not signed in,
         # and that after sign in we'll get sent to the right place.
         response = self.get(self.base_url, follow=True)
-        assert "/en/accounts/?next={}".format(self.base_url) == urllib.parse.unquote(response.redirect_chain[-1][0])
+        assert "/en/accounts/?next={}".format(self.base_url) == urllib.parse.unquote(
+            response.redirect_chain[-1][0]
+        )
         assert response.status_code == 200
 
     def test_no_rights_channel_access(self):
diff --git a/contentcuration/contentcuration/tests/test_channel_model.py b/contentcuration/contentcuration/tests/test_channel_model.py
index 6f99b10654..f4a79d2386 100755
--- a/contentcuration/contentcuration/tests/test_channel_model.py
+++ b/contentcuration/contentcuration/tests/test_channel_model.py
@@ -4,7 +4,7 @@
 import json
 from datetime import datetime
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from past.utils import old_div
 
 from .base import BaseAPITestCase
@@ -20,7 +20,6 @@
 
 
 class PublicChannelsTestCase(StudioTestCase):
-
     def test_channel_get_public_channels_only_returns_public_channels(self):
         """
         Check that Channel.get_public_channels() only returns public channels.
@@ -33,12 +32,12 @@ def test_channel_make_public_makes_the_current_channel_public(self):
         assert not c.public
         c.make_public()
         assert c.public
+
     # TODO(aron): test the bypass_signals arg to make_public
     #
 
 
 class ChannelTokenTestCase(StudioTestCase):
-
     def setUp(self):
         super(ChannelTokenTestCase, self).setUp()
 
@@ -91,11 +90,7 @@ def test_increments_when_we_add_a_new_content_node(self):
         # add a new video node
         node(
             parent=tree,
-            data={
-                "title": "New cat video",
-                "kind_id": "video",
-                "node_id": "nice"
-            }
+            data={"title": "New cat video", "kind_id": "video", "node_id": "nice"},
         )
 
         assert self.channel.get_resource_count() == count + 1
@@ -115,7 +110,7 @@ def test_does_not_increment_when_we_add_a_topic(self):
                 "title": "topic node",
                 "node_id": "nice",
                 "children": [],
-            }
+            },
         )
 
         # should be no difference in count
@@ -150,11 +145,7 @@ def test_returns_date_newer_when_node_added(self):
         # add a new node
         node(
             parent=self.channel.main_tree,
-            data={
-                "node_id": "nodez",
-                "title": "new child",
-                "kind_id": "video",
-            }
+            data={"node_id": "nodez", "title": "new child", "kind_id": "video",},
         )
         # check that the returned date is newer
         assert self.channel.get_date_modified() > old_date
@@ -188,7 +179,9 @@ class ChannelSetTestCase(BaseAPITestCase):
     def setUp(self):
         super(ChannelSetTestCase, self).setUp()
         self.channelset = mixer.blend(ChannelSet, editors=[self.user])
-        self.channels = mixer.cycle(10).blend(Channel, secret_tokens=[self.channelset.secret_token], editors=[self.user])
+        self.channels = mixer.cycle(10).blend(
+            Channel, secret_tokens=[self.channelset.secret_token], editors=[self.user]
+        )
 
     def test_get_user_channel_sets(self):
         """ Make sure get_user_channel_sets returns the correct sets """
@@ -196,8 +189,8 @@ def test_get_user_channel_sets(self):
         response = self.get(reverse_lazy("channelset-list"))
         self.assertEqual(response.status_code, 200)
         channelsets = json.loads(response.content)
-        self.assertTrue(any(c['id'] == self.channelset.pk for c in channelsets))
-        self.assertFalse(any(c['id'] == other_channelset.pk for c in channelsets))
+        self.assertTrue(any(c["id"] == self.channelset.pk for c in channelsets))
+        self.assertFalse(any(c["id"] == other_channelset.pk for c in channelsets))
 
     def test_token_created_on_save(self):
         """ Make sure tokens are created on save only if the channel set is new """
@@ -210,16 +203,22 @@ def test_token_created_on_save(self):
     def test_channelset_deletion(self):
         """ Make sure channels are preserved and tokens are deleted """
         token = self.channelset.secret_token.token
-        channels = list(self.channelset.secret_token.channels.values_list('pk', flat=True))
+        channels = list(
+            self.channelset.secret_token.channels.values_list("pk", flat=True)
+        )
         self.channelset.delete()
         self.assertFalse(SecretToken.objects.filter(token=token).exists())
-        self.assertTrue(Channel.objects.filter(pk__in=channels).count() == len(channels))
+        self.assertTrue(
+            Channel.objects.filter(pk__in=channels).count() == len(channels)
+        )
 
     def test_save_channels_to_token(self):
         """ Check endpoint will assign token to channels """
         token = self.channelset.secret_token
         channels = mixer.cycle(5).blend(Channel)
-        channels = Channel.objects.filter(pk__in=[c.pk for c in channels])  # Make this a queryset
+        channels = Channel.objects.filter(
+            pk__in=[c.pk for c in channels]
+        )  # Make this a queryset
         token.channels.set(channels)
 
         # Old channels should not be included here
@@ -234,13 +233,18 @@ def test_save_channels_to_token(self):
 
     def test_public_endpoint(self):
         """ Make sure public endpoint returns all the channels under the token """
-        published_channel_count = int(old_div(len(self.channels),2))
+        published_channel_count = int(old_div(len(self.channels), 2))
         for c in self.channels[:published_channel_count]:
             c.main_tree.published = True
             c.main_tree.save()
 
         token = self.channelset.secret_token.token
-        response = self.get(reverse_lazy('get_public_channel_lookup', kwargs={'version': 'v1', 'identifier': token}))
+        response = self.get(
+            reverse_lazy(
+                "get_public_channel_lookup",
+                kwargs={"version": "v1", "identifier": token},
+            )
+        )
         self.assertEqual(response.status_code, 200)
         channels = json.loads(response.content)
         self.assertEqual(len(channels), published_channel_count)
@@ -327,7 +331,7 @@ def test_change_public(self):
 
 class ChannelGettersTestCase(BaseAPITestCase):
     def test_get_channel_thumbnail_default(self):
-        default_thumbnail = '/static/img/kolibri_placeholder.png'
+        default_thumbnail = "/static/img/kolibri_placeholder.png"
         thumbnail = self.channel.get_thumbnail()
         assert thumbnail == default_thumbnail
 
@@ -337,7 +341,7 @@ def test_get_channel_thumbnail_base64(self):
         assert self.channel.get_thumbnail() == base64encoding()
 
     def test_get_channel_thumbnail_file(self):
-        thumbnail_url = '/path/to/thumbnail.png'
+        thumbnail_url = "/path/to/thumbnail.png"
         self.channel.thumbnail = thumbnail_url
 
         assert self.channel.get_thumbnail() == generate_storage_url(thumbnail_url)
diff --git a/contentcuration/contentcuration/tests/test_channel_views.py b/contentcuration/contentcuration/tests/test_channel_views.py
index 0500af4d75..5ca54b28a3 100644
--- a/contentcuration/contentcuration/tests/test_channel_views.py
+++ b/contentcuration/contentcuration/tests/test_channel_views.py
@@ -2,9 +2,9 @@
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
 from django.db import connection
 from django.db import reset_queries
+from django.urls import reverse
 
 from .base import BaseAPITestCase
 
diff --git a/contentcuration/contentcuration/tests/test_chef_pipeline.py b/contentcuration/contentcuration/tests/test_chef_pipeline.py
index 0dabeba98b..27637c49e3 100644
--- a/contentcuration/contentcuration/tests/test_chef_pipeline.py
+++ b/contentcuration/contentcuration/tests/test_chef_pipeline.py
@@ -17,30 +17,29 @@
     "id": "aronasaurusrex",  # why is ID a required field for this call?
     "name": "Aron's cool channel",
     "description": "coolest channel this side of the Pacific",
-    "thumbnail": ":)"
+    "thumbnail": ":)",
 }
 
 
-
-
 class EndpointNamesTestCase(BaseAPITestCase):
     """
     Make sure the API endpoints defined in Ricecooker are the the expected ones.
     """
+
     # checks
-    assert '/api/internal/authenticate_user_internal' == reverse('authenticate_user_internal')
-    assert '/api/internal/check_version' == reverse('check_version')
+    assert "/api/internal/authenticate_user_internal" == reverse(
+        "authenticate_user_internal"
+    )
+    assert "/api/internal/check_version" == reverse("check_version")
     # File upload
-    assert '/api/internal/file_diff' == reverse('file_diff')
-    assert '/api/internal/file_upload' == reverse('api_file_upload')
+    assert "/api/internal/file_diff" == reverse("file_diff")
+    assert "/api/internal/file_upload" == reverse("api_file_upload")
     # Metadata upload
-    assert '/api/internal/create_channel' == reverse('api_create_channel')
-    assert '/api/internal/add_nodes' == reverse('api_add_nodes_to_tree')
-    assert '/api/internal/finish_channel' == reverse('api_finish_channel')
+    assert "/api/internal/create_channel" == reverse("api_create_channel")
+    assert "/api/internal/add_nodes" == reverse("api_add_nodes_to_tree")
+    assert "/api/internal/finish_channel" == reverse("api_finish_channel")
     # Publish (optional)
-    assert '/api/internal/publish_channel' == reverse('api_publish_channel')
-
-
+    assert "/api/internal/publish_channel" == reverse("api_publish_channel")
 
 
 class ChefTestCase(BaseAPITestCase):
@@ -55,26 +54,26 @@ def setUp(self):
         self.client.force_authenticate(user=None)
         # To set the header 'Authorization' in the HTTP request made by the API
         # client, we must pass HTTP_AUTHORIZATION keyword to `client.credentials`
-        self.client.credentials(HTTP_AUTHORIZATION='Token {0}'.format(self.token))
+        self.client.credentials(HTTP_AUTHORIZATION="Token {0}".format(self.token))
         # these token credentials will be presisted for all tests...
         #
-        self.authenticate_user_internal_url = reverse('authenticate_user_internal')
-        self.check_version_url = reverse('check_version')
-        self.file_diff_url = reverse('file_diff')
-        self.file_upload_url = reverse('api_file_upload')
-        self.create_channel_url = reverse('api_create_channel')
-        self.add_nodes_url = reverse('api_add_nodes_to_tree')
-        self.finish_channel_url = reverse('api_finish_channel')
+        self.authenticate_user_internal_url = reverse("authenticate_user_internal")
+        self.check_version_url = reverse("check_version")
+        self.file_diff_url = reverse("file_diff")
+        self.file_upload_url = reverse("api_file_upload")
+        self.create_channel_url = reverse("api_create_channel")
+        self.add_nodes_url = reverse("api_add_nodes_to_tree")
+        self.finish_channel_url = reverse("api_finish_channel")
 
     def test_authenticate_user_internal_bad_token(self):
         # clear previously set credentials good credentials
         self.client.credentials()
-        badtoken = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        self.client.credentials(HTTP_AUTHORIZATION='Token {0}'.format(badtoken))
+        badtoken = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        self.client.credentials(HTTP_AUTHORIZATION="Token {0}".format(badtoken))
         response = self.post(self.authenticate_user_internal_url, None)
         assert response.status_code == 401
         # restore good credentials so rest of tests in this class will be OK
-        self.client.credentials(HTTP_AUTHORIZATION='Token {0}'.format(self.token))
+        self.client.credentials(HTTP_AUTHORIZATION="Token {0}".format(self.token))
 
     def test_authenticate_user_internal_no_token(self):
         # clear previously set credentials good credentials
@@ -82,31 +81,31 @@ def test_authenticate_user_internal_no_token(self):
         response = self.post(self.authenticate_user_internal_url, None)
         assert response.status_code == 401
         # restore good credentials so rest of tests in this class will be OK
-        self.client.credentials(HTTP_AUTHORIZATION='Token {0}'.format(self.token))
+        self.client.credentials(HTTP_AUTHORIZATION="Token {0}".format(self.token))
 
     def test_authenticate_user_internal(self):
         # No need to set headers since the Authorization Token was added in setUp
         response = self.post(self.authenticate_user_internal_url, None)
         assert response.status_code == 200
         data = json.loads(response.content)
-        assert data['success'] == True
-        assert data['username'] == user().email
+        assert data["success"] == True
+        assert data["username"] == user().email
 
     def test_check_version_bad_request(self):
         response = self.post(self.check_version_url, {})
         assert response.status_code == 500
 
     def test_check_version(self):
-        response = self.post(self.check_version_url, data={'version': '1000'})
+        response = self.post(self.check_version_url, data={"version": "1000"})
         assert response.status_code == 200
         data = json.loads(response.content)
-        assert data['status'] == 0
+        assert data["status"] == 0
 
         # TODO: Add tests for the soft and hard warning versions
-        response = self.post(self.check_version_url, data={'version': '0'})
+        response = self.post(self.check_version_url, data={"version": "0"})
         assert response.status_code == 200
         data = json.loads(response.content)
-        assert data['status'] == 3
+        assert data["status"] == 3
 
     def test_file_upload_bad_request(self):
         response = self.post(self.file_upload_url, {})
@@ -114,72 +113,101 @@ def test_file_upload_bad_request(self):
 
     def test_file_upload_no_data(self):
         f = SimpleUploadedFile("myfile.txt", None)
-        response = self.post(self.file_upload_url, {'file': f}, format='multipart')
-        assert response.status_code == 500
+        response = self.post(self.file_upload_url, {"file": f}, format="multipart")
+        assert response.status_code == 400
 
     def test_file_upload_bad_hash(self):
         file_data = create_test_file(b"Just some data.")
-        f = SimpleUploadedFile("myfile.txt", file_data['data'])
-        response = self.post(self.file_upload_url, {'file': f}, format='multipart')
+        f = SimpleUploadedFile("myfile.txt", file_data["data"])
+        response = self.post(self.file_upload_url, {"file": f}, format="multipart")
         # shoulf fail because api_file_upload calls write_file_to_storage with check_valid=True
-        assert response.status_code == 500
+        assert response.status_code == 400
 
     def test_file_upload(self):
         file_data = create_test_file(b"Just some data.")
-        f = SimpleUploadedFile(file_data['name'], file_data['data'])
-        response = self.post(self.file_upload_url, {'file': f}, format='multipart')
+        f = SimpleUploadedFile(file_data["name"], file_data["data"])
+        response = self.post(self.file_upload_url, {"file": f}, format="multipart")
         # TODO: check file content saved to storage
-        assert response.status_code == 200, "Call failed:\n output: {}".format(response.content)
+        assert response.status_code == 200, "Call failed:\n output: {}".format(
+            response.content
+        )
 
     def test_create_channel_bad_request(self):
         response = self.post(self.create_channel_url, {})
         assert response.status_code == 400
 
     def test_create_channel(self):
-        response = self.post(self.create_channel_url, {'channel_data': channel_metadata})
+        response = self.post(
+            self.create_channel_url, {"channel_data": channel_metadata}
+        )
         # FIXME: we aren't returning the proper REST HTTP status for creating a new item
-        assert response.status_code == 200, "Call failed:\n output: {}".format(response.content)
+        assert response.status_code == 200, "Call failed:\n output: {}".format(
+            response.content
+        )
 
     def test_add_nodes_bad_request(self):
         response = self.post(self.add_nodes_url, {})
         assert response.status_code == 400
 
     def test_add_nodes_invalid_file(self):
-        response = self.post(self.create_channel_url, {'channel_data': channel_metadata})
+        response = self.post(
+            self.create_channel_url, {"channel_data": channel_metadata}
+        )
         assert response.status_code == 200
         data = json.loads(response.content)
-        assert 'root' in data
+        assert "root" in data
 
-        invalid_file_json[0]['license'] = cc.License.objects.all()[0].license_name
+        invalid_file_json[0]["license"] = cc.License.objects.all()[0].license_name
 
         # Ensure that sending a node with an invalid file reference returns a 500 error
-        response = self.post(self.add_nodes_url, {'root_id': data['root'], 'content_data': invalid_file_json})
+        response = self.post(
+            self.add_nodes_url,
+            {"root_id": data["root"], "content_data": invalid_file_json},
+        )
         assert response.status_code == 500
 
     def test_add_nodes(self):
-        response = self.post(self.create_channel_url, {'channel_data': channel_metadata})
+        response = self.post(
+            self.create_channel_url, {"channel_data": channel_metadata}
+        )
         assert response.status_code == 200
         data = json.loads(response.content)
-        assert 'root' in data
-
-        node_data = node_json({'kind': 'topic', 'license': cc.License.objects.all()[0].license_name})
-        response = self.post(self.add_nodes_url, {'root_id': data['root'], 'content_data': [node_data]})
-        assert response.status_code == 200, "Call failed:\n output: {}".format(response.content)
+        assert "root" in data
+
+        node_data = node_json(
+            {"kind": "topic", "license": cc.License.objects.all()[0].license_name}
+        )
+        response = self.post(
+            self.add_nodes_url, {"root_id": data["root"], "content_data": [node_data]}
+        )
+        assert response.status_code == 200, "Call failed:\n output: {}".format(
+            response.content
+        )
 
     def test_finish_channel_bad_request(self):
         response = self.post(self.finish_channel_url, {})
         assert response.status_code == 400
 
     def test_finish_channel(self):
-        response = self.post(self.create_channel_url, {'channel_data': channel_metadata})
+        response = self.post(
+            self.create_channel_url, {"channel_data": channel_metadata}
+        )
         assert response.status_code == 200
         data = json.loads(response.content)
-        assert 'root' in data
-        assert 'channel_id' in data
-
-        node_data = node_json({'kind': 'topic', 'license': cc.License.objects.all()[0].license_name})
-        response = self.post(self.add_nodes_url, {'root_id': data['root'], 'content_data': [node_data]})
-        assert response.status_code == 200, "Call failed:\n output: {}".format(response.content)
-
-        response = self.post(self.finish_channel_url, {'channel_id': data['channel_id']})
+        assert "root" in data
+        assert "channel_id" in data
+
+        node_data = node_json(
+            {"kind": "topic", "license": cc.License.objects.all()[0].license_name}
+        )
+        response = self.post(
+            self.add_nodes_url, {"root_id": data["root"], "content_data": [node_data]}
+        )
+        assert response.status_code == 200, "Call failed:\n output: {}".format(
+            response.content
+        )
+
+        response = self.post(
+            self.finish_channel_url, {"channel_id": data["channel_id"]}
+        )
         assert response.status_code == 200
diff --git a/contentcuration/contentcuration/tests/test_contentnodes.py b/contentcuration/contentcuration/tests/test_contentnodes.py
index 0c476d84ed..7f88f041f3 100644
--- a/contentcuration/contentcuration/tests/test_contentnodes.py
+++ b/contentcuration/contentcuration/tests/test_contentnodes.py
@@ -9,7 +9,6 @@
 from builtins import zip
 
 import pytest
-from django.db import IntegrityError
 from django.db.utils import DataError
 from le_utils.constants import content_kinds
 from mixer.backend.django import mixer
@@ -860,14 +859,6 @@ def test_content_tag_creation(self):
                 tag_name=random.sample(string.printable, random.randint(51, 80)),
             )
 
-    def test_create_node_that_already_exists_no_integrity_error(self):
-        obj = ContentNode.objects.first()
-        new_obj = ContentNode(id=obj.id, kind_id=content_kinds.TOPIC)
-        try:
-            new_obj.save()
-        except IntegrityError:
-            self.fail("Caused an IntegrityError")
-
     def test_create_node_null_complete(self):
         new_obj = ContentNode(kind_id=content_kinds.TOPIC)
         try:
diff --git a/contentcuration/contentcuration/tests/test_createchannel.py b/contentcuration/contentcuration/tests/test_createchannel.py
index bf24a7f2b5..693d181ee2 100644
--- a/contentcuration/contentcuration/tests/test_createchannel.py
+++ b/contentcuration/contentcuration/tests/test_createchannel.py
@@ -5,7 +5,7 @@
 from builtins import str
 
 import requests
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from .base import BaseTestCase
 from .testdata import create_studio_file
@@ -27,8 +27,9 @@ def add_field_defaults_to_node(node):
             "license_description": None,
             "copyright_holder": "",
             "questions": [],
-            "extra_fields": {}
-        })
+            "extra_fields": {},
+        }
+    )
     if "files" not in node:
         node["files"] = []
     if "description" not in node:
@@ -43,8 +44,8 @@ def add_field_defaults_to_node(node):
 # Tests
 ###
 
-class CreateChannelTestCase(BaseTestCase):
 
+class CreateChannelTestCase(BaseTestCase):
     @classmethod
     def setUpClass(cls):
         super(CreateChannelTestCase, cls).setUpClass()
@@ -59,7 +60,7 @@ def setUpClass(cls):
 
     def setUp(self):
         super(CreateChannelTestCase, self).setUp()
-        self.topic = cc.ContentKind.objects.get(kind='topic')
+        self.topic = cc.ContentKind.objects.get(kind="topic")
         self.license = cc.License.objects.all()[0]
         self.fileinfo_audio = create_studio_file("abc", preset='audio', ext='mp3')
         self.fileinfo_video = create_studio_file("def", preset='high_res_video', ext='mp4')
@@ -68,12 +69,14 @@ def setUp(self):
         self.fileinfo_exercise = create_studio_file("mno", preset='exercise', ext='perseus')
 
     def create_channel(self):
-        create_channel_url = str(reverse_lazy('api_create_channel'))
+        create_channel_url = str(reverse_lazy("api_create_channel"))
         payload = {
-            'channel_data': self.channel_metadata,
+            "channel_data": self.channel_metadata,
         }
         client = self.admin_client()
-        response = client.post(create_channel_url, data=json.dumps(payload), content_type='text/json')
+        response = client.post(
+            create_channel_url, data=json.dumps(payload), content_type="text/json"
+        )
         return response
 
     def test_api_file_upload_status(self):
@@ -83,13 +86,17 @@ def test_api_file_upload_status(self):
     def test_channel_create_channel_created(self):
         response = self.create_channel()
         assert response.status_code == requests.codes.ok
-        channel_id = json.loads(response.content)['channel_id']
-
-        name_check = self.channel_metadata['name']
-        description_check = self.channel_metadata['description']
-        thumbnail_check = self.channel_metadata['thumbnail']
-        results = models.Channel.objects.filter(pk=channel_id, name=name_check, description=description_check,
-                                                thumbnail=thumbnail_check)
+        channel_id = json.loads(response.content)["channel_id"]
+
+        name_check = self.channel_metadata["name"]
+        description_check = self.channel_metadata["description"]
+        thumbnail_check = self.channel_metadata["thumbnail"]
+        results = models.Channel.objects.filter(
+            pk=channel_id,
+            name=name_check,
+            description=description_check,
+            thumbnail=thumbnail_check,
+        )
         assert results.exists()
         channel = results.first()
         assert channel.main_tree.get_channel() == channel
@@ -98,7 +105,7 @@ def test_channel_create_staging_tree_is_none(self):
         """
         Tests that staging_tree is None after channel creation and before sushi chef starts
         """
-        channel_id = json.loads(self.create_channel().content)['channel_id']
+        channel_id = json.loads(self.create_channel().content)["channel_id"]
         channel = models.Channel.objects.get(pk=channel_id)
         assert channel.staging_tree is None
 
@@ -106,7 +113,7 @@ def test_channel_create_chef_tree_is_set(self):
         """
         Tests that chef_tree is set after channel creation and before sushi chef starts.
         """
-        channel_id = json.loads(self.create_channel().content)['channel_id']
+        channel_id = json.loads(self.create_channel().content)["channel_id"]
         channel = models.Channel.objects.get(pk=channel_id)
         assert channel.chef_tree is not None
 
@@ -117,16 +124,27 @@ def test_nodes_created(self):
         self.add_nodes()
 
         def check_tree_node(n, parent=None):
-            node = models.ContentNode.objects.get(node_id=n['node_id'])
-            assert node.title == n['title'] and node.description == n['description'] and node.author == n[
-                'author'] and node.kind.pk == n['kind']
-            assert node.license.license_name == n['license'] if node.license else n['license'] is None
-            parent_id = ''
+            node = models.ContentNode.objects.get(node_id=n["node_id"])
+            assert (
+                node.title == n["title"]
+                and node.description == n["description"]
+                and node.author == n["author"]
+                and node.kind.pk == n["kind"]
+            )
+            assert (
+                node.license.license_name == n["license"]
+                if node.license
+                else n["license"] is None
+            )
+            parent_id = ""
             if parent:
-                parent_id = parent['node_id']
-            assert node.parent.node_id == parent_id or node.parent.node_id == self.channel_metadata['id']
-            if 'children' in n:
-                for child in n['children']:
+                parent_id = parent["node_id"]
+            assert (
+                node.parent.node_id == parent_id
+                or node.parent.node_id == self.channel_metadata["id"]
+            )
+            if "children" in n:
+                for child in n["children"]:
                     check_tree_node(child, n)
 
         for n in self.topic_tree_data():
@@ -139,15 +157,20 @@ def test_files_created(self):
         self.add_nodes()
 
         def check_tree_files(n):
-            if 'files' in n:
-                node = models.ContentNode.objects.get(node_id=n['node_id'])
-                assert len(n['files']) == node.files.all().count()
+            if "files" in n:
+                node = models.ContentNode.objects.get(node_id=n["node_id"])
+                assert len(n["files"]) == node.files.all().count()
                 for file_obj in node.files.all():
-                    for afile in n['files']:
-                        assert str(file_obj.checksum + '.' + file_obj.file_format.extension) in afile['filename']
-
-            if 'children' in n:
-                for child in n['children']:
+                    for afile in n["files"]:
+                        assert (
+                            str(
+                                file_obj.checksum + "." + file_obj.file_format.extension
+                            )
+                            in afile["filename"]
+                        )
+
+            if "children" in n:
+                for child in n["children"]:
                     check_tree_files(child)
 
         for n in self.topic_tree_data():
@@ -158,7 +181,7 @@ def test_channel_create_main_tree_unset(self):
         When a newly created channel is saved to the database, main_tree will be set to a new ContentNode if it doesn't already
         exist. Ensure main_tree is created.
         """
-        channel_id = json.loads(self.create_channel().content)['channel_id']
+        channel_id = json.loads(self.create_channel().content)["channel_id"]
         channel = models.Channel.objects.get(pk=channel_id)
         assert channel.main_tree is not None
 
@@ -166,7 +189,7 @@ def test_channel_create_version_not_incremented(self):
         """
         Channel version should not be incremented until a cheffing or publishing operation is committed.
         """
-        channel_id = json.loads(self.create_channel().content)['channel_id']
+        channel_id = json.loads(self.create_channel().content)["channel_id"]
         channel = models.Channel.objects.get(pk=channel_id)
         assert channel.version == 0
 
@@ -178,11 +201,11 @@ def topic_tree_data(self):
         # outside of this data structure to ascertain that the proper values were created.
 
         def get_file_data(fileinfo):
-            fileobj = fileinfo['db_file']
+            fileobj = fileinfo["db_file"]
             return {
-                'filename': fileinfo['name'],
-                'size': fileobj.file_size,
-                'preset': None
+                "filename": fileinfo["name"],
+                "size": fileobj.file_size,
+                "preset": None,
             }
 
         data = [
@@ -203,7 +226,7 @@ def get_file_data(fileinfo):
                         "description": "The Nicomachean Ethics is the name normally given to ...",
                         "files": [get_file_data(self.fileinfo_document)],
                         "license": self.license.license_name,
-                        "kind": self.fileinfo_document['db_file'].preset.kind.pk,
+                        "kind": self.fileinfo_document["db_file"].preset.kind.pk,
                     },
                     {
                         "title": "The Critique of Pure Reason",
@@ -222,7 +245,7 @@ def get_file_data(fileinfo):
                                 "files": [get_file_data(self.fileinfo_video)],
                                 "author": "Immanuel Kant",
                                 "license": self.license.license_name,
-                                "kind": self.fileinfo_video['db_file'].preset.kind.pk,
+                                "kind": self.fileinfo_video["db_file"].preset.kind.pk,
                             },
                             {
                                 "title": "02 - Preface to the Second Edition",
@@ -240,11 +263,11 @@ def get_file_data(fileinfo):
                                         "license": self.license.license_name,
                                         "kind": self.topic.pk,
                                     }
-                                ]
-                            }
-                        ]
+                                ],
+                            },
+                        ],
                     },
-                ]
+                ],
             },
             {
                 "title": "Recipes",
@@ -262,7 +285,7 @@ def get_file_data(fileinfo):
                         "author": "Bradley Smoker",
                         "files": [get_file_data(self.fileinfo_audio)],
                         "license": self.license.license_name,
-                        "kind": self.fileinfo_audio['db_file'].preset.kind.pk,
+                        "kind": self.fileinfo_audio["db_file"].preset.kind.pk,
                     },
                     {
                         "title": "Food Mob Bites 10: Garlic Bread",
@@ -272,9 +295,9 @@ def get_file_data(fileinfo):
                         "description": "Basic garlic bread recipe.",
                         "files": [get_file_data(self.fileinfo_exercise)],
                         "license": self.license.license_name,
-                        "kind": self.fileinfo_exercise['db_file'].preset.kind.pk,
-                    }
-                ]
+                        "kind": self.fileinfo_exercise["db_file"].preset.kind.pk,
+                    },
+                ],
             },
         ]
 
@@ -284,15 +307,17 @@ def get_file_data(fileinfo):
         return data
 
     def add_nodes(self):
-        root_id = json.loads(self.create_channel().content)['root']
+        root_id = json.loads(self.create_channel().content)["root"]
 
         def upload_nodes(root_id, nodes):
-            add_nodes_url = str(reverse_lazy('api_add_nodes_to_tree'))
+            add_nodes_url = str(reverse_lazy("api_add_nodes_to_tree"))
             payload = {
-                'root_id': root_id,
-                'content_data': nodes,
+                "root_id": root_id,
+                "content_data": nodes,
             }
-            response = self.admin_client().post(add_nodes_url, data=json.dumps(payload), content_type='text/json')
+            response = self.admin_client().post(
+                add_nodes_url, data=json.dumps(payload), content_type="text/json"
+            )
             data = json.loads(response.content)
             for node in nodes:
                 if "children" in node:
diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index aff369c3cc..4ff3e3e341 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -6,7 +6,10 @@
 import tempfile
 
 import pytest
+from django.core.management import call_command
+from django.db import connections
 from kolibri_content import models as kolibri_models
+from kolibri_content.router import get_active_content_database
 from kolibri_content.router import set_active_content_database
 from mock import patch
 
@@ -22,7 +25,6 @@
 from contentcuration.utils.publish import fill_published_fields
 from contentcuration.utils.publish import map_prerequisites
 from contentcuration.utils.publish import MIN_SCHEMA_VERSION
-from contentcuration.utils.publish import prepare_export_database
 from contentcuration.utils.publish import set_channel_icon_encoding
 from contentcuration.utils.publish import wait_for_async_tasks
 
@@ -73,6 +75,9 @@ def setUp(self):
         set_active_content_database(self.tempdb)
 
     def tearDown(self):
+        # Clean up datbase connection after the test
+        connections[self.tempdb].close()
+        del connections.databases[self.tempdb]
         super(ExportChannelTestCase, self).tearDown()
         set_active_content_database(None)
         if os.path.exists(self.tempdb):
@@ -160,9 +165,15 @@ def setUp(self):
         fh, output_db = tempfile.mkstemp(suffix=".sqlite3")
         self.output_db = output_db
         set_active_content_database(self.output_db)
-        prepare_export_database(self.output_db)
+        call_command("migrate",
+                     "content",
+                     database=get_active_content_database(),
+                     no_input=True)
 
     def tearDown(self):
+        # Clean up datbase connection after the test
+        connections[self.output_db].close()
+        del connections.databases[self.output_db]
         super(ChannelExportUtilityFunctionTestCase, self).tearDown()
         set_active_content_database(None)
         if os.path.exists(self.output_db):
@@ -238,9 +249,15 @@ def setUp(self):
         fh, output_db = tempfile.mkstemp(suffix=".sqlite3")
         self.output_db = output_db
         set_active_content_database(self.output_db)
-        prepare_export_database(self.output_db)
+        call_command("migrate",
+                     "content",
+                     database=get_active_content_database(),
+                     no_input=True)
 
     def tearDown(self):
+        # Clean up datbase connection after the test
+        connections[self.output_db].close()
+        del connections.databases[self.output_db]
         super(ChannelExportPrerequisiteTestCase, self).tearDown()
         set_active_content_database(None)
         if os.path.exists(self.output_db):
diff --git a/contentcuration/contentcuration/tests/test_extra_fields_json_field_migration.py b/contentcuration/contentcuration/tests/test_extra_fields_json_field_migration.py
deleted file mode 100644
index 537da6f25d..0000000000
--- a/contentcuration/contentcuration/tests/test_extra_fields_json_field_migration.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import json
-
-from .base import MigrationTestCase
-
-
-class TestForwardJSONMigration(MigrationTestCase):
-    migrate_from = '0100_calculate_included_languages'
-    migrate_to = '0101_extra_fields_json_field'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        self.ContentNode = apps.get_model(self.app, 'ContentNode')
-        ContentKind = apps.get_model(self.app, 'ContentKind')
-        topic, _created = ContentKind.objects.get_or_create(kind="Topic")
-        misc = {
-            'kind': topic,
-            'lft': 0,
-            'rght': 1,
-            'tree_id': 0,
-            'level': 0
-        }
-
-        make_content_node = self.ContentNode.objects.create
-
-        self.test_json = {'a': 1, 'b': 'c'}
-
-        make_content_node(id='empty', **misc)
-        make_content_node(id='None', extra_fields=None, **misc)
-        make_content_node(id='null', extra_fields='null', **misc)
-        make_content_node(id='json', extra_fields=json.dumps(self.test_json), **misc)
-
-        self.assertEqual(self.ContentNode._meta.get_field('extra_fields').get_internal_type(), 'TextField')
-
-    def test_json(self):
-        self.assertEqual(self.test_json, self.ContentNode.objects.get(id='json').extra_fields)
-        self.assertEqual(None, self.ContentNode.objects.get(id='None').extra_fields)
-
-    def test_null_string(self):
-        self.assertEqual(None, self.ContentNode.objects.get(id='null').extra_fields)
-
-
-class TestBackwardJSONMigration(MigrationTestCase):
-
-    migrate_from = '0101_extra_fields_json_field'
-    migrate_to = '0100_calculate_included_languages'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        self.ContentNode = apps.get_model(self.app, 'ContentNode')
-        ContentKind = apps.get_model(self.app, 'ContentKind')
-        topic, _created = ContentKind.objects.get_or_create(kind="Topic")
-        misc = {
-            'kind': topic,
-            'lft': 0,
-            'rght': 1,
-            'tree_id': 0,
-            'level': 0
-        }
-
-        make_content_node = self.ContentNode.objects.create
-
-        self.test_json = {'a': 1, 'b': 'c'}
-
-        make_content_node(id='json', extra_fields=self.test_json, **misc)
-
-    def test_json(self):
-        self.assertEqual(json.dumps(self.test_json), self.ContentNode.objects.get(id='json').extra_fields)
diff --git a/contentcuration/contentcuration/tests/test_files.py b/contentcuration/contentcuration/tests/test_files.py
index 56aa680fa6..215743e93d 100755
--- a/contentcuration/contentcuration/tests/test_files.py
+++ b/contentcuration/contentcuration/tests/test_files.py
@@ -2,12 +2,12 @@
 from __future__ import absolute_import
 
 import json
+from builtins import str
 
 import pytest
-from builtins import str
 from django.core.files.storage import default_storage
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from le_utils.constants import content_kinds
 from le_utils.constants import format_presets
 from mock import patch
@@ -33,21 +33,24 @@
 
 
 class FileThumbnailTestCase(BaseAPITestCase):
-
     def setUp(self):
         super(FileThumbnailTestCase, self).setUp()
         self.thumbnail_fobj = create_thumbnail_from_base64(base64encoding())
-        filepath = generate_object_storage_name(self.thumbnail_fobj.checksum, str(self.thumbnail_fobj))
-        with default_storage.open(filepath, 'rb') as fobj:
+        filepath = generate_object_storage_name(
+            self.thumbnail_fobj.checksum, str(self.thumbnail_fobj)
+        )
+        with default_storage.open(filepath, "rb") as fobj:
             self.thumbnail_contents = fobj.read()
 
     def test_get_thumbnail_encoding(self):
         encoding = get_thumbnail_encoding(str(self.thumbnail_fobj))
         self.assertEqual(encoding, generated_base64encoding())
 
-    @patch('contentcuration.api.default_storage.save')
-    @patch('contentcuration.api.default_storage.exists', return_value=True)
-    def test_existing_thumbnail_is_not_created(self, storage_exists_mock, storage_save_mock):
+    @patch("contentcuration.api.default_storage.save")
+    @patch("contentcuration.api.default_storage.exists", return_value=True)
+    def test_existing_thumbnail_is_not_created(
+        self, storage_exists_mock, storage_save_mock
+    ):
         create_thumbnail_from_base64(base64encoding())
         storage_exists_mock.assert_called()
         storage_save_mock.assert_not_called()
@@ -57,16 +60,18 @@ def test_internal_thumbnail(self):
         node = ContentNode(title="Test Node", kind_id=content_kinds.VIDEO)
         node.save()
 
-        file_data = [{
-            "preset": None,
-            "filename": str(self.thumbnail_fobj),
-            "language": "en",
-            "size": self.thumbnail_fobj.file_size,
-        }]
+        file_data = [
+            {
+                "preset": None,
+                "filename": str(self.thumbnail_fobj),
+                "language": "en",
+                "size": self.thumbnail_fobj.file_size,
+            }
+        ]
         map_files_to_node(self.user, node, file_data)
         self.assertTrue(isinstance(node.thumbnail_encoding, basestring))
         thumbnail_data = json.loads(node.thumbnail_encoding)
-        self.assertEqual(thumbnail_data['base64'], generated_base64encoding())
+        self.assertEqual(thumbnail_data["base64"], generated_base64encoding())
 
     def test_exportchannel_thumbnail(self):
         node = ContentNode(title="Test Node", kind_id=content_kinds.VIDEO)
@@ -74,13 +79,14 @@ def test_exportchannel_thumbnail(self):
         newfile = create_associated_thumbnail(node, self.thumbnail_fobj)
         self.assertTrue(isinstance(newfile, File))
         thumbnail_data = json.loads(node.thumbnail_encoding)
-        self.assertEqual(thumbnail_data['base64'], generated_base64encoding())
+        self.assertEqual(thumbnail_data["base64"], generated_base64encoding())
 
 
 class NodeFileDeletionTestCase(StudioTestCase):
-
     def test_delete_empty_file_reference(self):
-        checksum, _, storage_path = write_raw_content_to_storage(b'some fake PDF data', ext='.pdf')
-        assert default_storage.exists(storage_path), 'file should be saved'
-        delete_empty_file_reference(checksum, 'pdf')
-        assert not default_storage.exists(storage_path), 'file should be deleted'
+        checksum, _, storage_path = write_raw_content_to_storage(
+            b"some fake PDF data", ext=".pdf"
+        )
+        assert default_storage.exists(storage_path), "file should be saved"
+        delete_empty_file_reference(checksum, "pdf")
+        assert not default_storage.exists(storage_path), "file should be deleted"
diff --git a/contentcuration/contentcuration/tests/test_garbage_collection.py b/contentcuration/contentcuration/tests/test_garbage_collection.py
index 769209f2fd..e8fc482fab 100644
--- a/contentcuration/contentcuration/tests/test_garbage_collection.py
+++ b/contentcuration/contentcuration/tests/test_garbage_collection.py
@@ -4,7 +4,7 @@
 
 import pytest
 from django.conf import settings
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from le_utils.constants import content_kinds
 
 from .base import BaseAPITestCase
diff --git a/contentcuration/contentcuration/tests/test_included_languages_migration.py b/contentcuration/contentcuration/tests/test_included_languages_migration.py
deleted file mode 100644
index 902dfe9165..0000000000
--- a/contentcuration/contentcuration/tests/test_included_languages_migration.py
+++ /dev/null
@@ -1,121 +0,0 @@
-import datetime
-
-from le_utils.constants import content_kinds
-
-from .base import MigrationTestCase
-
-included_languages_deploy_date = datetime.datetime(2017, 11, 30)
-included_languages_should_up_date = datetime.datetime(2016, 11, 30)
-
-
-class TestForwardIncludedLanguagesMigrationPublishedChannel(MigrationTestCase):
-
-    migrate_from = '0099_auto_20190715_2201'
-    migrate_to = '0100_calculate_included_languages'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        Channel = apps.get_model(self.app, 'Channel')
-        self.channel = Channel.objects.create(last_published=included_languages_should_up_date)
-        self.unpublished_channel = Channel.objects.create()
-        ContentKind = apps.get_model(self.app, 'ContentKind')
-        topic, _created = ContentKind.objects.get_or_create(kind=content_kinds.TOPIC)
-        ContentNode = apps.get_model(self.app, 'ContentNode')
-        self.channel.main_tree = ContentNode.objects.create(lft=1, rght=4, tree_id=3, level=0, kind=topic)
-        self.channel.save()
-        Language = apps.get_model(self.app, 'Language')
-        self.language = Language.objects.create(id="tes_t", lang_code="tes", lang_subcode="t")
-        ContentNode.objects.create(tree_id=self.channel.main_tree.tree_id, language=self.language, lft=2, rght=3, level=1, kind=topic, published=True)
-        unpublished_language = Language.objects.create(id="nes_t", lang_code="nes", lang_subcode="t")
-        ContentNode.objects.create(tree_id=self.channel.main_tree.tree_id, language=unpublished_language, lft=2, rght=3, level=1, kind=topic, published=False)
-
-    def test_include_language(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        included_languages = Channel.objects.filter(last_published__isnull=False).first().included_languages
-        self.assertEqual(included_languages.count(), 1)
-        self.assertEqual(included_languages.first().id, self.language.id)
-        self.assertEqual(included_languages.first().lang_code, self.language.lang_code)
-        self.assertEqual(included_languages.first().lang_subcode, self.language.lang_subcode)
-
-
-class TestForwardIncludedLanguagesMigrationNewlyPublishedChannel(MigrationTestCase):
-
-    migrate_from = '0099_auto_20190715_2201'
-    migrate_to = '0100_calculate_included_languages'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        Channel = apps.get_model(self.app, 'Channel')
-        self.channel = Channel.objects.create(last_published=included_languages_deploy_date)
-        self.unpublished_channel = Channel.objects.create()
-        ContentKind = apps.get_model(self.app, 'ContentKind')
-        topic, _created = ContentKind.objects.get_or_create(kind=content_kinds.TOPIC)
-        ContentNode = apps.get_model(self.app, 'ContentNode')
-        self.channel.main_tree = ContentNode.objects.create(lft=1, rght=4, tree_id=3, level=0, kind=topic)
-        self.channel.save()
-        Language = apps.get_model(self.app, 'Language')
-        self.language = Language.objects.create(id="tes_t", lang_code="tes", lang_subcode="t")
-        ContentNode.objects.create(tree_id=self.channel.main_tree.tree_id, language=self.language, lft=2, rght=3, level=1, kind=topic, published=True)
-        unpublished_language = Language.objects.create(id="nes_t", lang_code="nes", lang_subcode="t")
-        ContentNode.objects.create(tree_id=self.channel.main_tree.tree_id, language=unpublished_language, lft=2, rght=3, level=1, kind=topic, published=False)
-
-    def test_include_language_no_changes(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        included_languages = Channel.objects.filter(last_published__isnull=True).first().included_languages
-        self.assertEqual(included_languages.count(), 0)
-
-
-class TestForwardIncludedLanguagesMigrationUnpublishedChannel(MigrationTestCase):
-
-    migrate_from = '0099_auto_20190715_2201'
-    migrate_to = '0100_calculate_included_languages'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        Channel = apps.get_model(self.app, 'Channel')
-        self.unpublished_channel = Channel.objects.create()
-        ContentKind = apps.get_model(self.app, 'ContentKind')
-        topic, _created = ContentKind.objects.get_or_create(kind=content_kinds.TOPIC)
-        ContentNode = apps.get_model(self.app, 'ContentNode')
-        self.unpublished_channel.main_tree = ContentNode.objects.create(lft=1, rght=4, tree_id=3, level=0, kind=topic)
-        self.unpublished_channel.save()
-        Language = apps.get_model(self.app, 'Language')
-        self.language = Language.objects.create(id="tes_t", lang_code="tes", lang_subcode="t")
-        ContentNode.objects.create(
-            tree_id=self.unpublished_channel.main_tree.tree_id,
-            language=self.language, lft=2, rght=3, level=1, kind=topic, published=True)
-
-    def test_unpublished_no_include_language(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        included_languages = Channel.objects.filter(last_published__isnull=True).first().included_languages
-        self.assertEqual(included_languages.count(), 0)
-
-
-class TestForwardIncludedLanguagesMigrationFile(MigrationTestCase):
-
-    migrate_from = '0099_auto_20190715_2201'
-    migrate_to = '0100_calculate_included_languages'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        Channel = apps.get_model(self.app, 'Channel')
-        self.channel = Channel.objects.create(last_published=included_languages_should_up_date)
-        self.unpublished_channel = Channel.objects.create()
-        ContentKind = apps.get_model(self.app, 'ContentKind')
-        topic, _created = ContentKind.objects.get_or_create(kind=content_kinds.TOPIC)
-        ContentNode = apps.get_model(self.app, 'ContentNode')
-        self.channel.main_tree = ContentNode.objects.create(lft=1, rght=4, tree_id=3, level=0, kind=topic)
-        self.channel.save()
-        Language = apps.get_model(self.app, 'Language')
-        self.language = Language.objects.create(id="tes_t", lang_code="tes", lang_subcode="t")
-        published_node = ContentNode.objects.create(tree_id=self.channel.main_tree.tree_id, lft=2, rght=3, level=1, kind=topic, published=True)
-        File = apps.get_model(self.app, 'File')
-        File.objects.create(contentnode=published_node, language=self.language)
-
-    def test_include_language(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        included_languages = Channel.objects.filter(last_published__isnull=False).first().included_languages
-        self.assertEqual(included_languages.count(), 1)
-        self.assertEqual(included_languages.first().id, self.language.id)
-        self.assertEqual(included_languages.first().lang_code, self.language.lang_code)
-        self.assertEqual(included_languages.first().lang_subcode, self.language.lang_subcode)
diff --git a/contentcuration/contentcuration/tests/test_models.py b/contentcuration/contentcuration/tests/test_models.py
index 793f072d32..ef10cb0c36 100644
--- a/contentcuration/contentcuration/tests/test_models.py
+++ b/contentcuration/contentcuration/tests/test_models.py
@@ -662,7 +662,7 @@ def test_filter_edit_queryset__private_channel__anonymous(self):
 
 class UserTestCase(StudioTestCase):
     def _create_user(self, email, password='password', is_active=True):
-        user, _ = User.objects.get_or_create(email=email)
+        user = User.objects.create(email=email)
         user.set_password(password)
         user.is_active = is_active
         user.save()
diff --git a/contentcuration/contentcuration/tests/test_public_api.py b/contentcuration/contentcuration/tests/test_public_api.py
index 9cd106318a..9d36cfae19 100644
--- a/contentcuration/contentcuration/tests/test_public_api.py
+++ b/contentcuration/contentcuration/tests/test_public_api.py
@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from .base import BaseAPITestCase
 from .testdata import generated_base64encoding
@@ -17,7 +17,9 @@ class PublicAPITestCase(BaseAPITestCase):
 
     def setUp(self):
         super(PublicAPITestCase, self).setUp()
-        self.channel_list_url = reverse('get_public_channel_list', kwargs={'version': 'v1'})
+        self.channel_list_url = reverse(
+            "get_public_channel_list", kwargs={"version": "v1"}
+        )
         cache.clear()
 
     def test_info_endpoint(self):
@@ -25,9 +27,9 @@ def test_info_endpoint(self):
         Test that the public info endpoint returns the correct identifying information
         about Studio.
         """
-        response = self.client.get(reverse('info'))
-        self.assertEqual(response.data['application'], 'studio')
-        self.assertEqual(response.data['device_name'], 'Kolibri Studio')
+        response = self.client.get(reverse("info"))
+        self.assertEqual(response.data["application"], "studio")
+        self.assertEqual(response.data["device_name"], "Kolibri Studio")
 
     def test_empty_public_channels(self):
         """
@@ -38,7 +40,10 @@ def test_empty_public_channels(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 0)
 
-        self.assertEqual(response['Cache-Control'], 'max-age={}'.format(settings.PUBLIC_CHANNELS_CACHE_DURATION))
+        self.assertEqual(
+            response["Cache-Control"],
+            "max-age={}".format(settings.PUBLIC_CHANNELS_CACHE_DURATION),
+        )
         # we can't test the Vary header, because it will not match what we set it to
         # see info in contentcuration.decorators.cache_no_user_data notes.
 
@@ -54,7 +59,7 @@ def test_public_channels_endpoint(self):
         self.assertEqual(len(response.data), 0)
 
         self.channel.public = True
-        self.channel.thumbnail_encoding = {'base64': generated_base64encoding()}
+        self.channel.thumbnail_encoding = {"base64": generated_base64encoding()}
         self.channel.main_tree.published = True
         self.channel.main_tree.save()
         # this will clear the channel cache, so the next call should return the updated version
@@ -65,6 +70,6 @@ def test_public_channels_endpoint(self):
 
         assert len(response.data) == 1
         first_channel = response.data[0]
-        self.assertEqual(first_channel['name'], self.channel.name)
-        self.assertEqual(first_channel['id'], self.channel.id)
-        self.assertEqual(first_channel['icon_encoding'], generated_base64encoding())
+        self.assertEqual(first_channel["name"], self.channel.name)
+        self.assertEqual(first_channel["id"], self.channel.id)
+        self.assertEqual(first_channel["icon_encoding"], generated_base64encoding())
diff --git a/contentcuration/contentcuration/tests/test_rest_framework.py b/contentcuration/contentcuration/tests/test_rest_framework.py
index 2e92719e8c..6cb0acfd6a 100644
--- a/contentcuration/contentcuration/tests/test_rest_framework.py
+++ b/contentcuration/contentcuration/tests/test_rest_framework.py
@@ -3,7 +3,7 @@
 import json
 
 import pytest
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from le_utils.constants import content_kinds
 from le_utils.constants import exercises
 
@@ -17,30 +17,36 @@
 
 
 class ChannelTestCase(BaseAPITestCase):
-
     def setUp(self):
         super(ChannelTestCase, self).setUp()
         self.channel.editors.add(self.user)
         self.channel.save()
 
     def test_authorized_get(self):
-        url = reverse_lazy('channel-list') + "/" + self.channel.pk
+        url = reverse_lazy("channel-list") + "/" + self.channel.pk
         response = self.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_unauthorized_get(self):
-        newuser = User.objects.create(email='unauthorized@test.com')
-        newuser.set_password('password')
+        newuser = User.objects.create(email="unauthorized@test.com")
+        newuser.set_password("password")
         newuser.save()
         self.client.force_authenticate(newuser)
-        url = reverse_lazy('channel-list') + "/" + self.channel.pk
+        url = reverse_lazy("channel-list") + "/" + self.channel.pk
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
 
     def test_readonly_fields(self):
         original_version = self.channel.version
-        url = reverse_lazy('channel-list') + "/" + self.channel.pk
-        response = self.put(url, {'version': original_version + 1, 'content_defaults': {}, 'pending_editors': []})
+        url = reverse_lazy("channel-list") + "/" + self.channel.pk
+        response = self.put(
+            url,
+            {
+                "version": original_version + 1,
+                "content_defaults": {},
+                "pending_editors": [],
+            },
+        )
         self.channel.refresh_from_db()
         self.assertEqual(original_version, self.channel.version)
 
@@ -48,7 +54,6 @@ def test_readonly_fields(self):
 # TODO: rtibbles - update tests to test sync behaviour.
 @pytest.mark.skip
 class AssessmentItemTestCase(BaseAPITestCase):
-
     def test_bulk_update(self):
         exercise = ContentNode.objects.filter(kind=content_kinds.EXERCISE).first()
         item1 = AssessmentItem.objects.create(contentnode=exercise)
@@ -60,20 +65,24 @@ def test_bulk_update(self):
         for field in AssessmentItem._meta.fields:
             attname = field.attname
             set_attname = attname
-            if attname == 'contentnode_id':
-                set_attname = 'contentnode'
+            if attname == "contentnode_id":
+                set_attname = "contentnode"
             item1dict[set_attname] = getattr(item1, attname)
             item2dict[set_attname] = getattr(item2, attname)
             item3dict[set_attname] = getattr(item3, attname)
         item1dict["question"] = "test"
         item2dict["type"] = "test"
-        self.client.put(reverse_lazy('assessmentitem-list'), json.dumps([item1dict, item2dict, item3dict]), content_type="application/json")
+        self.client.put(
+            reverse_lazy("assessmentitem-list"),
+            json.dumps([item1dict, item2dict, item3dict]),
+            content_type="application/json",
+        )
         item1.refresh_from_db()
-        self.assertEqual(item1.question, 'test')
+        self.assertEqual(item1.question, "test")
         item2.refresh_from_db()
-        self.assertEqual(item2.type, 'test')
+        self.assertEqual(item2.type, "test")
         item3.refresh_from_db()
-        self.assertEqual(item3.question, item3dict['question'])
+        self.assertEqual(item3.question, item3dict["question"])
 
     def test_bulk_update_non_existent_item(self):
         exercise = ContentNode.objects.filter(kind=content_kinds.EXERCISE).first()
@@ -84,15 +93,19 @@ def test_bulk_update_non_existent_item(self):
         for field in AssessmentItem._meta.fields:
             attname = field.attname
             set_attname = attname
-            if attname == 'contentnode_id':
-                set_attname = 'contentnode'
+            if attname == "contentnode_id":
+                set_attname = "contentnode"
             item1dict[set_attname] = getattr(item1, attname)
             item2dict[set_attname] = getattr(item1, attname)
             item3dict[set_attname] = getattr(item1, attname)
-        item2dict['id'] = 10000
-        item3dict['id'] = 10001
+        item2dict["id"] = 10000
+        item3dict["id"] = 10001
         item1dict["question"] = "test"
-        response = self.client.put(reverse_lazy('assessmentitem-list'), json.dumps([item1dict, item2dict, item3dict]), content_type="application/json")
+        response = self.client.put(
+            reverse_lazy("assessmentitem-list"),
+            json.dumps([item1dict, item2dict, item3dict]),
+            content_type="application/json",
+        )
         self.assertEqual(response.status_code, 400)
 
     def test_bulk_update_checksum_file_not_associated_create_new_file_object(self):
@@ -102,13 +115,21 @@ def test_bulk_update_checksum_file_not_associated_create_new_file_object(self):
         for field in AssessmentItem._meta.fields:
             attname = field.attname
             set_attname = attname
-            if attname == 'contentnode_id':
-                set_attname = 'contentnode'
+            if attname == "contentnode_id":
+                set_attname = "contentnode"
             item1dict[set_attname] = getattr(item1, attname)
         checksum = "b6d83d66859b0cf095ef81120ef98e1f"
-        item1dict["question"] = "![I'm an image!]($" + exercises.IMG_PLACEHOLDER + "/{checksum}.gif)".format(checksum=checksum)
+        item1dict["question"] = (
+            "![I'm an image!]($"
+            + exercises.IMG_PLACEHOLDER
+            + "/{checksum}.gif)".format(checksum=checksum)
+        )
         File.objects.create(checksum=checksum)
-        self.client.put(reverse_lazy('assessmentitem-list'), json.dumps([item1dict]), content_type="application/json")
+        self.client.put(
+            reverse_lazy("assessmentitem-list"),
+            json.dumps([item1dict]),
+            content_type="application/json",
+        )
         self.assertEqual(File.objects.filter(checksum=checksum).count(), 2)
 
     def test_bulk_update_checksum_file_associated_use_existing_file_object(self):
@@ -118,11 +139,19 @@ def test_bulk_update_checksum_file_associated_use_existing_file_object(self):
         for field in AssessmentItem._meta.fields:
             attname = field.attname
             set_attname = attname
-            if attname == 'contentnode_id':
-                set_attname = 'contentnode'
+            if attname == "contentnode_id":
+                set_attname = "contentnode"
             item1dict[set_attname] = getattr(item1, attname)
         checksum = "b6d83d66859b0cf095ef81120ef98e1f"
-        item1dict["question"] = "![I'm an image!]($" + exercises.IMG_PLACEHOLDER + "/{checksum}.gif)".format(checksum=checksum)
+        item1dict["question"] = (
+            "![I'm an image!]($"
+            + exercises.IMG_PLACEHOLDER
+            + "/{checksum}.gif)".format(checksum=checksum)
+        )
         File.objects.create(checksum=checksum, assessment_item=item1)
-        self.client.put(reverse_lazy('assessmentitem-list'), json.dumps([item1dict]), content_type="application/json")
+        self.client.put(
+            reverse_lazy("assessmentitem-list"),
+            json.dumps([item1dict]),
+            content_type="application/json",
+        )
         self.assertEqual(File.objects.filter(checksum=checksum).count(), 1)
diff --git a/contentcuration/contentcuration/tests/test_settings.py b/contentcuration/contentcuration/tests/test_settings.py
index 1c004a9d14..c216f088a2 100644
--- a/contentcuration/contentcuration/tests/test_settings.py
+++ b/contentcuration/contentcuration/tests/test_settings.py
@@ -1,6 +1,6 @@
 import json
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from .base import BaseAPITestCase
 from contentcuration.models import User
@@ -10,17 +10,29 @@
 
 class SettingsTestCase(BaseAPITestCase):
     def test_username_change(self):
-        data = json.dumps({"first_name": 'New firstname',
-                           "last_name": 'New lastname',
-                           })
-        request = self.create_post_request(reverse_lazy("update_user_full_name"), data=data, content_type='application/json')
+        data = json.dumps({"first_name": "New firstname", "last_name": "New lastname",})
+        request = self.create_post_request(
+            reverse_lazy("update_user_full_name"),
+            data=data,
+            content_type="application/json",
+        )
         response = UsernameChangeView.as_view()(request)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(User.objects.filter(email=self.user.email, first_name='New firstname', last_name='New lastname').exists())
+        self.assertTrue(
+            User.objects.filter(
+                email=self.user.email,
+                first_name="New firstname",
+                last_name="New lastname",
+            ).exists()
+        )
 
     def test_delete_account_invalid(self):
-        data = json.dumps({"email": 'not the right email'})
-        request = self.create_post_request(reverse_lazy("delete_user_account"), data=data, content_type='application/json')
+        data = json.dumps({"email": "not the right email"})
+        request = self.create_post_request(
+            reverse_lazy("delete_user_account"),
+            data=data,
+            content_type="application/json",
+        )
         try:
             DeleteAccountView.as_view()(request)
             self.assertTrue(False)
@@ -30,7 +42,11 @@ def test_delete_account_invalid(self):
     def test_delete_account(self):
         # TODO: send_email causes connection errors
         data = json.dumps({"email": self.user.email})
-        self.create_post_request(reverse_lazy("delete_user_account"), data=data, content_type='application/json')
+        self.create_post_request(
+            reverse_lazy("delete_user_account"),
+            data=data,
+            content_type="application/json",
+        )
         # response = DeleteAccountView.as_view()(request)
         # self.assertEqual(response.status_code, 200)
         # self.assertFalse(User.objects.filter(email=self.user.email).exists())
diff --git a/contentcuration/contentcuration/tests/test_sushibar_endpoints.py b/contentcuration/contentcuration/tests/test_sushibar_endpoints.py
index 3780682831..d7bcb6f157 100644
--- a/contentcuration/contentcuration/tests/test_sushibar_endpoints.py
+++ b/contentcuration/contentcuration/tests/test_sushibar_endpoints.py
@@ -4,10 +4,10 @@
 import functools
 import json
 import os
-
 from builtins import str
 from builtins import zip
-from django.core.urlresolvers import reverse_lazy
+
+from django.urls import reverse_lazy
 
 from .base import BaseAPITestCase
 from contentcuration import models as cc
@@ -19,9 +19,11 @@ def rgetattr(obj, attr, *args):
     like `license.license_name` for use in tree comparisons attribute mappings.
     via https://stackoverflow.com/a/31174427
     """
+
     def _getattr(obj, attr):
         return getattr(obj, attr, *args)
-    return functools.reduce(_getattr, [obj] + attr.split('.'))
+
+    return functools.reduce(_getattr, [obj] + attr.split("."))
 
 
 def _get_node_attr(node, attr, attr_map={}):
@@ -47,10 +49,12 @@ def _get_children_list(node):
     if isinstance(node, cc.ContentNode):
         return list(node.children.all())
     else:
-        return node.get('children', [])
+        return node.get("children", [])
 
 
-def compare_trees_children(nodeA, nodeB, attrs=['title'], mapA={}, mapB={}, recursive=True):
+def compare_trees_children(
+    nodeA, nodeB, attrs=["title"], mapA={}, mapB={}, recursive=True
+):
     """
     Check children of nodeA and nodeB are identical.
     Args:
@@ -65,20 +69,29 @@ def compare_trees_children(nodeA, nodeB, attrs=['title'], mapA={}, mapB={}, recu
     if not childrenA and not childrenB:
         return []
     if childrenA and not childrenB or not childrenA and childrenB:
-        return ['different children']
+        return ["different children"]
     elif childrenA and childrenB:
         children_pairs = list(zip(childrenA, childrenB))
         for children_pair in children_pairs:
             childA, childB = children_pair
-            children_attr_diff = compare_node_attrs(childA, childB, attrs=attrs, mapA=mapA, mapB=mapB)
+            children_attr_diff = compare_node_attrs(
+                childA, childB, attrs=attrs, mapA=mapA, mapB=mapB
+            )
             diff.extend(children_attr_diff)
             if recursive:
-                children_diff = compare_trees_children(childA, childB, attrs=attrs, mapA=mapA, mapB=mapB, recursive=recursive)
+                children_diff = compare_trees_children(
+                    childA,
+                    childB,
+                    attrs=attrs,
+                    mapA=mapA,
+                    mapB=mapB,
+                    recursive=recursive,
+                )
                 diff.extend(children_diff)
     return diff
 
 
-def get_tree_fixture(fixture_name='tree.json'):
+def get_tree_fixture(fixture_name="tree.json"):
     filepath = os.path.join(os.path.dirname(__file__), "fixtures", fixture_name)
     with open(filepath, "rb") as jsonfile:
         data = json.load(jsonfile)
@@ -86,21 +99,23 @@ def get_tree_fixture(fixture_name='tree.json'):
 
 
 class SushibarEndpointsTestCase(BaseAPITestCase):
-
     def setUp(self):
         super(SushibarEndpointsTestCase, self).setUp()
-        self.expected_tree = get_tree_fixture(fixture_name='tree.json')
+        self.expected_tree = get_tree_fixture(fixture_name="tree.json")
         # alternatively can check against real tree of `cc.ContentNode`s:
         # self.expected_tree = self.channel.main_tree
 
     def test_get_tree_data_method(self):
         main_tree = self.channel.main_tree
         tree_data = main_tree.get_tree_data()
-        assert tree_data, 'No tree_data returned'
-        diff = compare_trees_children(tree_data, self.expected_tree,
-                                      attrs=['title', 'node_id', 'kind'],
-                                      mapB={'kind': 'kind_id'})
-        assert not diff, 'Found difference in tree structures:' + str(diff)
+        assert tree_data, "No tree_data returned"
+        diff = compare_trees_children(
+            tree_data,
+            self.expected_tree,
+            attrs=["title", "node_id", "kind"],
+            mapB={"kind": "kind_id"},
+        )
+        assert not diff, "Found difference in tree structures:" + str(diff)
 
     def test_get_tree_data_method_alt(self):
         """
@@ -108,70 +123,91 @@ def test_get_tree_data_method_alt(self):
         """
         main_tree = self.channel.main_tree
         tree_data = main_tree.get_tree_data()
-        assert tree_data, 'No tree_data returned'
-        diff = compare_trees_children(tree_data, main_tree,
-                                      attrs=['title', 'node_id', 'kind'],
-                                      mapB={'kind': 'kind.pk'})
-        assert not diff, 'Found difference in tree structures:' + str(diff)
+        assert tree_data, "No tree_data returned"
+        diff = compare_trees_children(
+            tree_data,
+            main_tree,
+            attrs=["title", "node_id", "kind"],
+            mapB={"kind": "kind.pk"},
+        )
+        assert not diff, "Found difference in tree structures:" + str(diff)
 
     def test_get_tree_data_endpoint(self):
         channel_id = self.channel.id
-        url = reverse_lazy('get_tree_data')
-        response = self.post(url, {'channel_id': channel_id})
+        url = reverse_lazy("get_tree_data")
+        response = self.post(url, {"channel_id": channel_id})
         assert response.status_code == 200
         response_json = response.json()
-        response_json['children'] = response_json['tree']  # hack because diff function checks 'children'
-        del response_json['tree']
-        diff = compare_trees_children(response_json, self.expected_tree,
-                                      attrs=['title', 'node_id', 'kind'],
-                                      mapB={'kind': 'kind_id'})
-        assert not diff, 'Found difference in tree structures:' + str(diff)
+        response_json["children"] = response_json[
+            "tree"
+        ]  # hack because diff function checks 'children'
+        del response_json["tree"]
+        diff = compare_trees_children(
+            response_json,
+            self.expected_tree,
+            attrs=["title", "node_id", "kind"],
+            mapB={"kind": "kind_id"},
+        )
+        assert not diff, "Found difference in tree structures:" + str(diff)
 
     def test_get_tree_data_endpoint_errors(self):
-        url = reverse_lazy('get_tree_data')
+        url = reverse_lazy("get_tree_data")
         response = self.post(url, {})
         assert response.status_code == 400
-        response = self.post(url, {'channel_id': 'NONEXISTENT'})
+        response = self.post(url, {"channel_id": "NONEXISTENT"})
         assert response.status_code == 404
         channel_id = self.channel.id
-        response = self.post(url, {'channel_id': channel_id, 'tree': 'NONEXISTENT'})
+        response = self.post(url, {"channel_id": channel_id, "tree": "NONEXISTENT"})
         assert response.status_code == 404
 
     def test_get_tree_data_method_onelevel(self):
         main_tree = self.channel.main_tree
         tree_data = main_tree.get_tree_data(levels=1)
-        assert tree_data, 'No tree_data returned'
-        diff = compare_trees_children(tree_data, main_tree,
-                                      attrs=['title', 'node_id', 'kind'],
-                                      mapB={'kind': 'kind_id'},
-                                      recursive=False)
-        assert not diff, 'Found difference in tree structures:' + str(diff)
+        assert tree_data, "No tree_data returned"
+        diff = compare_trees_children(
+            tree_data,
+            main_tree,
+            attrs=["title", "node_id", "kind"],
+            mapB={"kind": "kind_id"},
+            recursive=False,
+        )
+        assert not diff, "Found difference in tree structures:" + str(diff)
 
     def test_get_node_tree_data_endpoint(self):
         channel_id = self.channel.id
-        url = reverse_lazy('get_node_tree_data')
-        response = self.post(url, {'channel_id': channel_id})
+        url = reverse_lazy("get_node_tree_data")
+        response = self.post(url, {"channel_id": channel_id})
         assert response.status_code == 200
         response_json = response.json()
-        response_json['children'] = response_json['tree']  # hack because diff function checks 'children'
-        del response_json['tree']
-        diff = compare_trees_children(response_json, self.expected_tree,
-                                      attrs=['title', 'node_id', 'kind'],
-                                      mapB={'kind': 'kind_id'},
-                                      recursive=False)
-        assert not diff, 'Found difference in tree structures:' + str(diff)
+        response_json["children"] = response_json[
+            "tree"
+        ]  # hack because diff function checks 'children'
+        del response_json["tree"]
+        diff = compare_trees_children(
+            response_json,
+            self.expected_tree,
+            attrs=["title", "node_id", "kind"],
+            mapB={"kind": "kind_id"},
+            recursive=False,
+        )
+        assert not diff, "Found difference in tree structures:" + str(diff)
 
     def test_get_node_tree_data_endpoint_nonroot(self):
         channel_id = self.channel.id
         node = self.channel.main_tree.children.all()[0]
-        url = reverse_lazy('get_node_tree_data')
-        response = self.post(url, {'channel_id': channel_id, 'node_id': node.node_id})
+        url = reverse_lazy("get_node_tree_data")
+        response = self.post(url, {"channel_id": channel_id, "node_id": node.node_id})
         assert response.status_code == 200
         response_json = response.json()
-        response_json['children'] = response_json['tree']  # hack because diff function checks 'children'
-        del response_json['tree']
-        diff = compare_trees_children(response_json, node,
-                                      attrs=['title', 'node_id', 'kind'],
-                                      mapB={'kind': 'kind_id'},
-                                      recursive=False)
-        assert not diff, 'Found difference in tree structures:' + str(diff)
+        response_json["children"] = response_json[
+            "tree"
+        ]  # hack because diff function checks 'children'
+        del response_json["tree"]
+        diff = compare_trees_children(
+            response_json,
+            node,
+            attrs=["title", "node_id", "kind"],
+            mapB={"kind": "kind_id"},
+            recursive=False,
+        )
+        assert not diff, "Found difference in tree structures:" + str(diff)
diff --git a/contentcuration/contentcuration/tests/test_task_api.py b/contentcuration/contentcuration/tests/test_task_api.py
index 3ff65a3350..3169f4d9c4 100644
--- a/contentcuration/contentcuration/tests/test_task_api.py
+++ b/contentcuration/contentcuration/tests/test_task_api.py
@@ -2,7 +2,7 @@
 
 import mock
 from celery import states
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from .base import BaseAPITestCase
 from contentcuration.models import Task
diff --git a/contentcuration/contentcuration/tests/test_thumbnail_encoding_json_migration.py b/contentcuration/contentcuration/tests/test_thumbnail_encoding_json_migration.py
deleted file mode 100644
index f17f56d25b..0000000000
--- a/contentcuration/contentcuration/tests/test_thumbnail_encoding_json_migration.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import json
-
-from .base import MigrationTestCase
-
-
-class TestForwardJSONMigration(MigrationTestCase):
-
-    migrate_from = '0001_squashed_0094_auto_20180910_2342'
-    migrate_to = '0004_remove_rename_json_field'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        Channel = apps.get_model(self.app, 'Channel')
-        channel_no_endcoding = Channel.objects.create()
-        self.no_encoding_id = channel_no_endcoding.id
-        channel_encoding = Channel.objects.create(thumbnail_encoding=json.dumps({'base64': 'base64string'}))
-        self.encoding_id = channel_encoding.id
-        channel_encoding_single_quotes = Channel.objects.create(thumbnail_encoding="{'base64': 'base64string'}")
-        self.single_quotes_id = channel_encoding_single_quotes.id
-
-    def test_no_encoding_empty_dict(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        self.assertEqual({}, Channel.objects.get(id=self.no_encoding_id).thumbnail_encoding)
-
-    def test_encoding_dict(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        self.assertEqual({'base64': 'base64string'}, Channel.objects.get(id=self.encoding_id).thumbnail_encoding)
-
-    def test_encoding_bad_json(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        self.assertEqual({'base64': 'base64string'}, Channel.objects.get(id=self.single_quotes_id).thumbnail_encoding)
-
-
-class TestBackwardJSONMigration(MigrationTestCase):
-
-    migrate_from = '0004_remove_rename_json_field'
-    migrate_to = '0001_squashed_0094_auto_20180910_2342'
-    app = 'contentcuration'
-
-    def setUpBeforeMigration(self, apps):
-        Channel = apps.get_model(self.app, 'Channel')
-        channel_no_endcoding = Channel.objects.create()
-        self.no_encoding_id = channel_no_endcoding.id
-        channel_encoding = Channel.objects.create(thumbnail_encoding={'base64': 'base64string'})
-        self.encoding_id = channel_encoding.id
-
-    def test_no_encoding_empty_dict(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        self.assertEqual(None, Channel.objects.get(id=self.no_encoding_id).thumbnail_encoding)
-
-    def test_encoding_dict(self):
-        Channel = self.apps.get_model(self.app, 'Channel')
-        self.assertEqual(json.dumps({'base64': 'base64string'}), Channel.objects.get(id=self.encoding_id).thumbnail_encoding)
diff --git a/contentcuration/contentcuration/tests/test_urlendpoints.py b/contentcuration/contentcuration/tests/test_urlendpoints.py
index 78a122d4f4..46750925e0 100644
--- a/contentcuration/contentcuration/tests/test_urlendpoints.py
+++ b/contentcuration/contentcuration/tests/test_urlendpoints.py
@@ -4,7 +4,7 @@
 from builtins import str
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from .base import StudioTestCase
 
@@ -56,7 +56,8 @@ def check_urls(urlpatterns, prefix=""):
                     check_urls(pattern.url_patterns, prefix=new_prefix)
                 params = {}
                 skip = False
-                regex = pattern.regex
+
+                regex = pattern.pattern.regex
                 for url in url_blacklist:
                     if regex.match(url):
                         skip = True
diff --git a/contentcuration/contentcuration/tests/test_user.py b/contentcuration/contentcuration/tests/test_user.py
index 4dd7e37f9f..f9995fb48c 100644
--- a/contentcuration/contentcuration/tests/test_user.py
+++ b/contentcuration/contentcuration/tests/test_user.py
@@ -7,11 +7,11 @@
 import json
 import sys
 import tempfile
-
 from builtins import range
+
 from django.core.management import call_command
-from django.core.urlresolvers import reverse_lazy
 from django.test import TransactionTestCase
+from django.urls import reverse_lazy
 
 from .base import BaseAPITestCase
 from .testdata import fileobj_video
@@ -26,7 +26,6 @@
 
 
 class UserPoliciesCreationTestCase(TransactionTestCase):
-
     def setUp(self):
         call_command("loadconstants")
 
@@ -69,11 +68,18 @@ def test_user_invitation_case_insensitivity(self):
             date_joined=datetime.datetime.now(),
             policies=None,
         )
-        data = json.dumps({"user_email": "MRtest@testy.com",
-                           "channel_id": self.channel.pk,
-                           "share_mode": "edit",
-                           })
-        request = self.create_post_request(reverse_lazy("send_invitation_email"), data=data, content_type='application/json')
+        data = json.dumps(
+            {
+                "user_email": "MRtest@testy.com",
+                "channel_id": self.channel.pk,
+                "share_mode": "edit",
+            }
+        )
+        request = self.create_post_request(
+            reverse_lazy("send_invitation_email"),
+            data=data,
+            content_type="application/json",
+        )
         response = send_invitation_email(request)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(User.objects.filter(email="mrtest@testy.com").exists())
@@ -86,23 +92,24 @@ def test_editors_can_access_invitations(self):
         guestuser = User.objects.create(email="guest@test.com")
         testuser = User.objects.create(email="testuser@test.com")
         testviewonlyuser = User.objects.create(email="testviewonlyuser@test.com")
-        invitation = mixer.blend(Invitation, channel=self.channel, sender=self.user, invited=guestuser)
+        invitation = mixer.blend(
+            Invitation, channel=self.channel, sender=self.user, invited=guestuser
+        )
         self.channel.editors.add(testuser)
         self.channel.viewers.add(testviewonlyuser)
 
         # Editors should have access
         self.client.force_authenticate(testuser)
-        response = self.get('/api/invitation/{}'.format(invitation.pk))
+        response = self.get("/api/invitation/{}".format(invitation.pk))
         self.assertEqual(response.status_code, 200)
 
         # Viewers shoudl have access
         self.client.force_authenticate(testviewonlyuser)
-        response = self.get('/api/invitation/{}'.format(invitation.pk))
+        response = self.get("/api/invitation/{}".format(invitation.pk))
         self.assertEqual(response.status_code, 200)
 
 
 class UserAccountTestCase(BaseAPITestCase):
-
     def create_user(self):
         return User.objects.create(
             email="mrtest@testy.com",
@@ -124,18 +131,32 @@ def test_user_csv_export(self):
         with tempfile.NamedTemporaryFile(suffix=".csv") as tempf:
             write_user_csv(self.user, path=tempf.name)
 
-            mode = 'rb'
+            mode = "rb"
             encoding = None
             if sys.version_info.major == 3:
-                mode = 'r'
-                encoding = 'utf-8'
+                mode = "r"
+                encoding = "utf-8"
             with io.open(tempf.name, mode, encoding=encoding) as csv_file:
-                reader = csv.reader(csv_file, delimiter=',')
+                reader = csv.reader(csv_file, delimiter=",")
                 for index, row in enumerate(reader):
                     if index == 0:
-                        self.assertEqual(row, ['Channel', 'Title', 'Kind', 'Filename', 'File Size',
-                                               'URL', 'Description', 'Author', 'Language',
-                                               'License', 'License Description', 'Copyright Holder'])
+                        self.assertEqual(
+                            row,
+                            [
+                                "Channel",
+                                "Title",
+                                "Kind",
+                                "Filename",
+                                "File Size",
+                                "URL",
+                                "Description",
+                                "Author",
+                                "Language",
+                                "License",
+                                "License Description",
+                                "Copyright Holder",
+                            ],
+                        )
                     else:
                         self.assertIn(videos[index - 1].original_filename, row)
                         self.assertIn(_format_size(videos[index - 1].file_size), row)
diff --git a/contentcuration/contentcuration/tests/views/test_views_base.py b/contentcuration/contentcuration/tests/views/test_views_base.py
index 0b14a549b2..3c00ca58ed 100644
--- a/contentcuration/contentcuration/tests/views/test_views_base.py
+++ b/contentcuration/contentcuration/tests/views/test_views_base.py
@@ -2,7 +2,7 @@
 """
 Tests for contentcuration.views.internal functions.
 """
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from ..base import BaseAPITestCase
 from contentcuration.models import Channel
diff --git a/contentcuration/contentcuration/tests/views/test_views_internal.py b/contentcuration/contentcuration/tests/views/test_views_internal.py
index 709b25068c..8f0718443e 100644
--- a/contentcuration/contentcuration/tests/views/test_views_internal.py
+++ b/contentcuration/contentcuration/tests/views/test_views_internal.py
@@ -5,7 +5,8 @@
 import json
 import uuid
 
-from django.core.urlresolvers import reverse_lazy
+from django.db import connections
+from django.urls import reverse_lazy
 from le_utils.constants import format_presets
 from mixer.main import mixer
 from mock import patch
@@ -356,7 +357,7 @@ class PublishEndpointTestCase(BaseAPITestCase):
     @classmethod
     def setUpClass(cls):
         super(PublishEndpointTestCase, cls).setUpClass()
-        cls.patch_copy_db = patch('contentcuration.utils.publish.save_export_database')
+        cls.patch_copy_db = patch("contentcuration.utils.publish.save_export_database")
         cls.patch_copy_db.start()
 
     @classmethod
@@ -377,6 +378,12 @@ def test_200_publish_successful(self):
         )
         self.assertEqual(response.status_code, 200)
         self.assertTrue(response.json()["success"])
+        # Clean up temporary database connections from publishing
+        aliases = list(connections)
+        for alias in aliases:
+            if alias != "default":
+                connections[alias].close()
+                del connections.databases[alias]
 
     def test_404_not_authorized(self):
         new_channel = Channel.objects.create()
diff --git a/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py b/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py
index bcb7ea52ae..0a2d000276 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py
@@ -2,7 +2,7 @@
 
 import uuid
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from le_utils.constants import content_kinds
 from le_utils.constants import exercises
 
diff --git a/contentcuration/contentcuration/tests/viewsets/test_channel.py b/contentcuration/contentcuration/tests/viewsets/test_channel.py
index 4473be6943..4ba5ae57c0 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_channel.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_channel.py
@@ -2,7 +2,7 @@
 
 import uuid
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from contentcuration import models
 from contentcuration.tests import testdata
diff --git a/contentcuration/contentcuration/tests/viewsets/test_channelset.py b/contentcuration/contentcuration/tests/viewsets/test_channelset.py
index 5e18cacc5c..6871eb4ff1 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_channelset.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_channelset.py
@@ -2,7 +2,7 @@
 
 import uuid
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from contentcuration import models
 from contentcuration.tests import testdata
diff --git a/contentcuration/contentcuration/tests/viewsets/test_clipboard.py b/contentcuration/contentcuration/tests/viewsets/test_clipboard.py
index 4dba2b70fa..9dcbac8c4b 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_clipboard.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_clipboard.py
@@ -3,7 +3,7 @@
 import uuid
 
 from django.core.management import call_command
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from le_utils.constants import content_kinds
 
 from contentcuration import models
diff --git a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
index f74a17aafa..55872a58e4 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
@@ -6,10 +6,10 @@
 import pytest
 from django.conf import settings
 from django.core.management import call_command
-from django.core.urlresolvers import reverse
 from django.db.utils import OperationalError
 from django.test.testcases import TestCase
 from django.test.testcases import TransactionTestCase
+from django.urls import reverse
 from django_concurrent_tests.errors import WrappedError
 from django_concurrent_tests.helpers import call_concurrently
 from django_concurrent_tests.helpers import make_concurrent_calls
@@ -1264,7 +1264,7 @@ def test_fetch_contentnode__by_parent(self):
         channel.save()
 
         metadata = self.contentnode_db_metadata
-        metadata.update(parent=channel.main_tree)
+        metadata.update(parent_id=channel.main_tree_id)
         contentnode = models.ContentNode.objects.create(**metadata)
 
         response = self.client.get(
@@ -1283,7 +1283,7 @@ def test_fetch_contentnode__by_node_id_channel_id(self):
         channel.save()
 
         metadata = self.contentnode_db_metadata
-        metadata.update(parent=channel.main_tree)
+        metadata.update(parent_id=channel.main_tree_id)
         contentnode = models.ContentNode.objects.create(**metadata)
 
         params = {
diff --git a/contentcuration/contentcuration/tests/viewsets/test_file.py b/contentcuration/contentcuration/tests/viewsets/test_file.py
index 5f73e24cfa..32f475aac3 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_file.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_file.py
@@ -2,7 +2,7 @@
 
 import uuid
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from le_utils.constants import content_kinds
 from le_utils.constants import file_formats
 from le_utils.constants import format_presets
diff --git a/contentcuration/contentcuration/tests/viewsets/test_invitation.py b/contentcuration/contentcuration/tests/viewsets/test_invitation.py
index 0aeb091109..bbe4fe788d 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_invitation.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_invitation.py
@@ -2,7 +2,7 @@
 
 import uuid
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from contentcuration import models
 from contentcuration.tests import testdata
diff --git a/contentcuration/contentcuration/tests/viewsets/test_user.py b/contentcuration/contentcuration/tests/viewsets/test_user.py
index e88b60dd85..8588138e3e 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_user.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_user.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from contentcuration.tests import testdata
 from contentcuration.tests.base import StudioAPITestCase
diff --git a/contentcuration/contentcuration/urls.py b/contentcuration/contentcuration/urls.py
index 1acb12f0fe..816f8e6884 100644
--- a/contentcuration/contentcuration/urls.py
+++ b/contentcuration/contentcuration/urls.py
@@ -5,19 +5,20 @@
 Examples:
 Function views
     1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+    2. Add a URL to urlpatterns:  re_path(r'^$', views.home, name='home')
 Class-based views
     1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+    2. Add a URL to urlpatterns:  re_path(r'^$', Home.as_view(), name='home')
 Including another URLconf
     1. Add an import:  from blog import urls as blog_urls
-    2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
+    2. Add a URL to urlpatterns:  re_path(r'^blog/', include(blog_urls))
 """
 import django_js_reverse.views as django_js_reverse_views
 from django.conf import settings
-from django.conf.urls import include
-from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
+from django.urls import include
+from django.urls import path
+from django.urls import re_path
 from django.views.generic.base import RedirectView
 from rest_framework import routers
 
@@ -68,79 +69,79 @@ def get_redirect_url(self, *args, **kwargs):
 router.register(r'clipboard', ClipboardViewSet, basename='clipboard')
 
 urlpatterns = [
-    url(r'^api/', include(router.urls)),
-    url(r'^serviceWorker.js$', pwa.ServiceWorkerView.as_view(), name="service_worker"),
-    url(r'^api/activate_channel$', views.activate_channel_endpoint, name='activate_channel'),
-    url(r'^healthz$', views.health, name='health'),
-    url(r'^stealthz$', views.stealth, name='stealth'),
-    url(r'^api/search/', include('search.urls'), name='search'),
-    url(r'^api/download_channel_content_csv/(?P<channel_id>[^/]{32})$', views.download_channel_content_csv, name='download_channel_content_csv'),
-    url(r'^api/probers/get_prober_channel', views.get_prober_channel, name='get_prober_channel'),
-    url(r'^api/sync/$', sync, name="sync"),
+    re_path(r'^api/', include(router.urls)),
+    re_path(r'^serviceWorker.js$', pwa.ServiceWorkerView.as_view(), name="service_worker"),
+    re_path(r'^api/activate_channel$', views.activate_channel_endpoint, name='activate_channel'),
+    re_path(r'^healthz$', views.health, name='health'),
+    re_path(r'^stealthz$', views.stealth, name='stealth'),
+    re_path(r'^api/search/', include('search.urls'), name='search'),
+    re_path(r'^api/download_channel_content_csv/(?P<channel_id>[^/]{32})$', views.download_channel_content_csv, name='download_channel_content_csv'),
+    re_path(r'^api/probers/get_prober_channel', views.get_prober_channel, name='get_prober_channel'),
+    re_path(r'^api/sync/$', sync, name="sync"),
 ]
 
 # if activated, turn on django prometheus urls
 if "django_prometheus" in settings.INSTALLED_APPS:
     urlpatterns += [
-        url('', include('django_prometheus.urls')),
+        re_path('', include('django_prometheus.urls')),
     ]
 
 
 # Add public api endpoints
 urlpatterns += [
-    url(r'^api/public/channel/(?P<channel_id>[^/]+)', public_views.get_channel_name_by_id, name='get_channel_name_by_id'),
-    url(r'^api/public/(?P<version>[^/]+)/channels$', public_views.get_public_channel_list, name='get_public_channel_list'),
-    url(r'^api/public/(?P<version>[^/]+)/channels/lookup/(?P<identifier>[^/]+)', public_views.get_public_channel_lookup, name='get_public_channel_lookup'),
-    url(r'^api/public/info', public_views.InfoViewSet.as_view({'get': 'list'}), name='info'),
+    re_path(r'^api/public/channel/(?P<channel_id>[^/]+)', public_views.get_channel_name_by_id, name='get_channel_name_by_id'),
+    re_path(r'^api/public/(?P<version>[^/]+)/channels$', public_views.get_public_channel_list, name='get_public_channel_list'),
+    re_path(r'^api/public/(?P<version>[^/]+)/channels/lookup/(?P<identifier>[^/]+)', public_views.get_public_channel_lookup, name='get_public_channel_lookup'),
+    re_path(r'^api/public/info', public_views.InfoViewSet.as_view({'get': 'list'}), name='info'),
 ]
 
 # Add node api enpoints
 urlpatterns += [
-    url(r'^api/get_channel_details/(?P<channel_id>[^/]*)$', node_views.get_channel_details, name='get_channel_details'),
-    url(r'^api/get_node_details/(?P<node_id>[^/]*)$', node_views.get_node_details, name='get_node_details'),
-    url(r'^api/get_node_diff/(?P<updated_id>[^/]*)/(?P<original_id>[^/]*)$', node_views.get_node_diff, name='get_node_diff'),
-    url(r'^api/generate_node_diff/(?P<updated_id>[^/]*)/(?P<original_id>[^/]*)$', node_views.generate_node_diff, name='generate_node_diff'),
+    re_path(r'^api/get_channel_details/(?P<channel_id>[^/]*)$', node_views.get_channel_details, name='get_channel_details'),
+    re_path(r'^api/get_node_details/(?P<node_id>[^/]*)$', node_views.get_node_details, name='get_node_details'),
+    re_path(r'^api/get_node_diff/(?P<updated_id>[^/]*)/(?P<original_id>[^/]*)$', node_views.get_node_diff, name='get_node_diff'),
+    re_path(r'^api/generate_node_diff/(?P<updated_id>[^/]*)/(?P<original_id>[^/]*)$', node_views.generate_node_diff, name='generate_node_diff'),
 ]
 
 # Add file api enpoints
 urlpatterns += [
-    url(r'^zipcontent/(?P<zipped_filename>[^/]+)/(?P<embedded_filepath>.*)', zip_views.ZipContentView.as_view(), {}, "zipcontent"),
+    re_path(r'^zipcontent/(?P<zipped_filename>[^/]+)/(?P<embedded_filepath>.*)', zip_views.ZipContentView.as_view(), {}, "zipcontent"),
 ]
 
 # Add settings endpoints
 urlpatterns += [
-    url(r'^api/delete_user_account/$', settings_views.DeleteAccountView.as_view(), name='delete_user_account'),
-    url(r'^api/export_user_data/$', settings_views.export_user_data, name='export_user_data'),
-    url(r'^api/change_password/$', settings_views.UserPasswordChangeView.as_view(), name='change_password'),
-    url(r'^api/update_user_full_name/$', settings_views.UsernameChangeView.as_view(), name='update_user_full_name'),
-    url(r'^settings/issues', settings_views.IssuesSettingsView.as_view(), name='issues_settings'),
-    url(r'^settings/request_storage', settings_views.StorageSettingsView.as_view(), name='request_storage'),
-    url(r'^policies/update', settings_views.PolicyAcceptView.as_view(), name='policy_update'),
+    re_path(r'^api/delete_user_account/$', settings_views.DeleteAccountView.as_view(), name='delete_user_account'),
+    re_path(r'^api/export_user_data/$', settings_views.export_user_data, name='export_user_data'),
+    re_path(r'^api/change_password/$', settings_views.UserPasswordChangeView.as_view(), name='change_password'),
+    re_path(r'^api/update_user_full_name/$', settings_views.UsernameChangeView.as_view(), name='update_user_full_name'),
+    re_path(r'^settings/issues', settings_views.IssuesSettingsView.as_view(), name='issues_settings'),
+    re_path(r'^settings/request_storage', settings_views.StorageSettingsView.as_view(), name='request_storage'),
+    re_path(r'^policies/update', settings_views.PolicyAcceptView.as_view(), name='policy_update'),
 ]
 
 # Add internal endpoints
 urlpatterns += [
-    url(r'^api/internal/authenticate_user_internal$', internal_views.authenticate_user_internal, name="authenticate_user_internal"),
-    url(r'^api/internal/check_version$', internal_views.check_version, name="check_version"),
-    url(r'^api/internal/file_diff$', internal_views.file_diff, name="file_diff"),
-    url(r'^api/internal/file_upload$', internal_views.api_file_upload, name="api_file_upload"),
-    url(r'^api/internal/publish_channel$', internal_views.api_publish_channel, name="api_publish_channel"),
-    url(r'^api/internal/activate_channel_internal$', internal_views.activate_channel_internal, name='activate_channel_internal'),
-    url(r'^api/internal/check_user_is_editor$', internal_views.check_user_is_editor, name='check_user_is_editor'),
-    url(r'^api/internal/get_tree_data$', internal_views.get_tree_data, name='get_tree_data'),
-    url(r'^api/internal/get_node_tree_data$', internal_views.get_node_tree_data, name='get_node_tree_data'),
-    url(r'^api/internal/create_channel$', internal_views.api_create_channel_endpoint, name="api_create_channel"),
-    url(r'^api/internal/add_nodes$', internal_views.api_add_nodes_to_tree, name="api_add_nodes_to_tree"),
-    url(r'^api/internal/finish_channel$', internal_views.api_commit_channel, name="api_finish_channel"),
-    url(r'^api/internal/get_channel_status_bulk$', internal_views.get_channel_status_bulk, name="get_channel_status_bulk"),
+    re_path(r'^api/internal/authenticate_user_internal$', internal_views.authenticate_user_internal, name="authenticate_user_internal"),
+    re_path(r'^api/internal/check_version$', internal_views.check_version, name="check_version"),
+    re_path(r'^api/internal/file_diff$', internal_views.file_diff, name="file_diff"),
+    re_path(r'^api/internal/file_upload$', internal_views.api_file_upload, name="api_file_upload"),
+    re_path(r'^api/internal/publish_channel$', internal_views.api_publish_channel, name="api_publish_channel"),
+    re_path(r'^api/internal/activate_channel_internal$', internal_views.activate_channel_internal, name='activate_channel_internal'),
+    re_path(r'^api/internal/check_user_is_editor$', internal_views.check_user_is_editor, name='check_user_is_editor'),
+    re_path(r'^api/internal/get_tree_data$', internal_views.get_tree_data, name='get_tree_data'),
+    re_path(r'^api/internal/get_node_tree_data$', internal_views.get_node_tree_data, name='get_node_tree_data'),
+    re_path(r'^api/internal/create_channel$', internal_views.api_create_channel_endpoint, name="api_create_channel"),
+    re_path(r'^api/internal/add_nodes$', internal_views.api_add_nodes_to_tree, name="api_add_nodes_to_tree"),
+    re_path(r'^api/internal/finish_channel$', internal_views.api_commit_channel, name="api_finish_channel"),
+    re_path(r'^api/internal/get_channel_status_bulk$', internal_views.get_channel_status_bulk, name="get_channel_status_bulk"),
 ]
 
 # Add admin endpoints
 urlpatterns += [
-    url(r'^api/send_custom_email/$', admin_views.send_custom_email, name='send_custom_email'),
+    re_path(r'^api/send_custom_email/$', admin_views.send_custom_email, name='send_custom_email'),
 ]
 
-urlpatterns += [url(r'^jsreverse/$', django_js_reverse_views.urls_js, name='js_reverse')]
+urlpatterns += [re_path(r'^jsreverse/$', django_js_reverse_views.urls_js, name='js_reverse')]
 
 # I18N Endpoints
 js_info_dict = {
@@ -148,31 +149,30 @@ def get_redirect_url(self, *args, **kwargs):
 }
 
 urlpatterns += [
-    url(r'^i18n/', include('django.conf.urls.i18n')),
+    re_path(r'^i18n/', include('django.conf.urls.i18n')),
 ]
 
 # Include all URLS prefixed by language
 urlpatterns += i18n_patterns(
-    url(r'^$', views.base, name='base'),
-    url(r"^i18n/setlang/$", views.set_language, name="set_language"),
-    url(r'^channels/$', views.channel_list, name='channels'),
+    re_path(r'^$', views.base, name='base'),
+    re_path(r"^i18n/setlang/$", views.set_language, name="set_language"),
+    re_path(r'^channels/$', views.channel_list, name='channels'),
     # Redirect deprecated staging URL to new URL
-    url(r'^channels/(?P<channel_id>[^/]{32})/staging/$', StagingPageRedirectView.as_view(), name='staging_redirect'),
-    url(r'^channels/(?P<channel_id>[^/]{32})/$', views.channel, name='channel'),
-    url(r'^accessible_channels/(?P<channel_id>[^/]{32})$', views.accessible_channels, name='accessible_channels'),
-    url(r'^accounts/login/$', registration_views.login, name='login'),
-    url(r'^accounts/logout/$', registration_views.logout, name='logout'),
-    url(r'^accounts/request_activation_link/$', registration_views.request_activation_link, name='request_activation_link'),
-    url(r"^accounts/$", views.accounts, name="accounts"),
-    url(r'^accounts/password/reset/$', registration_views.UserPasswordResetView.as_view(), name='auth_password_reset'),
-    url(r'^accounts/password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
-        registration_views.UserPasswordResetConfirmView.as_view(), name='auth_password_reset_confirm'),
-    url(r'^accounts/register/$', registration_views.UserRegistrationView.as_view(), name='register'),
-    url(r'^activate/(?P<activation_key>[-:\w]+)/$', registration_views.UserActivationView.as_view(), name='registration_activate'),
-    url(r'^api/send_invitation_email/$', registration_views.send_invitation_email, name='send_invitation_email'),
-    url(r'^new/accept_invitation/(?P<email>[^/]+)/', registration_views.new_user_redirect, name="accept_invitation_and_registration"),
-    url(r'^api/deferred_user_data/$', registration_views.deferred_user_data, name="deferred_user_data"),
-    url(r'^settings/$', settings_views.settings, name='settings'),
-    url(r'^administration/', admin_views.administration, name='administration'),
-    url(r'^manifest.webmanifest$', pwa.ManifestView.as_view(), name="manifest"),
+    re_path(r'^channels/(?P<channel_id>[^/]{32})/staging/$', StagingPageRedirectView.as_view(), name='staging_redirect'),
+    re_path(r'^channels/(?P<channel_id>[^/]{32})/$', views.channel, name='channel'),
+    re_path(r'^accessible_channels/(?P<channel_id>[^/]{32})$', views.accessible_channels, name='accessible_channels'),
+    re_path(r'^accounts/login/$', registration_views.login, name='login'),
+    re_path(r'^accounts/logout/$', registration_views.logout, name='logout'),
+    re_path(r'^accounts/request_activation_link/$', registration_views.request_activation_link, name='request_activation_link'),
+    re_path(r"^accounts/$", views.accounts, name="accounts"),
+    path(r'accounts/password/reset/', registration_views.UserPasswordResetView.as_view(), name='auth_password_reset'),
+    path(r'accounts/password/reset/confirm/<uidb64>/<token>/', registration_views.UserPasswordResetConfirmView.as_view(), name='auth_password_reset_confirm'),
+    re_path(r'^accounts/register/$', registration_views.UserRegistrationView.as_view(), name='register'),
+    re_path(r'^activate/(?P<activation_key>[-:\w]+)/$', registration_views.UserActivationView.as_view(), name='registration_activate'),
+    re_path(r'^api/send_invitation_email/$', registration_views.send_invitation_email, name='send_invitation_email'),
+    re_path(r'^new/accept_invitation/(?P<email>[^/]+)/', registration_views.new_user_redirect, name="accept_invitation_and_registration"),
+    re_path(r'^api/deferred_user_data/$', registration_views.deferred_user_data, name="deferred_user_data"),
+    re_path(r'^settings/$', settings_views.settings, name='settings'),
+    re_path(r'^administration/', admin_views.administration, name='administration'),
+    re_path(r'^manifest.webmanifest$', pwa.ManifestView.as_view(), name="manifest"),
 )
diff --git a/contentcuration/contentcuration/utils/csv_writer.py b/contentcuration/contentcuration/utils/csv_writer.py
index 80ff66c4d9..07dfe4797d 100644
--- a/contentcuration/contentcuration/utils/csv_writer.py
+++ b/contentcuration/contentcuration/utils/csv_writer.py
@@ -16,17 +16,13 @@
 from django.db.models import Q
 from django.db.models import Subquery
 from django.db.models import Sum
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from le_utils.constants import content_kinds
 from le_utils.constants import exercises
 
 from contentcuration.models import Channel
 from contentcuration.models import generate_storage_url
 
-if sys.version_info.major == 2:
-    reload(sys)
-    sys.setdefaultencoding('UTF8')
-
 if not os.path.exists(settings.CSV_ROOT):
     os.makedirs(settings.CSV_ROOT)
 
diff --git a/contentcuration/contentcuration/utils/format.py b/contentcuration/contentcuration/utils/format.py
index 319b71cfb9..5a1a5c9502 100644
--- a/contentcuration/contentcuration/utils/format.py
+++ b/contentcuration/contentcuration/utils/format.py
@@ -1,6 +1,6 @@
 from __future__ import division
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from past.utils import old_div
 
 
diff --git a/contentcuration/contentcuration/utils/i18n.py b/contentcuration/contentcuration/utils/i18n.py
index 793328f6e9..dd60689ce6 100644
--- a/contentcuration/contentcuration/utils/i18n.py
+++ b/contentcuration/contentcuration/utils/i18n.py
@@ -16,6 +16,7 @@
     "en",
     "es-es",
     "fr-fr",
+    "pt-br",
 ]
 
 
diff --git a/contentcuration/contentcuration/utils/incidents.py b/contentcuration/contentcuration/utils/incidents.py
index 508b828876..ae48033556 100644
--- a/contentcuration/contentcuration/utils/incidents.py
+++ b/contentcuration/contentcuration/utils/incidents.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 INCIDENTS = {
     # General message to display when readonly mode is off
diff --git a/contentcuration/contentcuration/utils/messages.py b/contentcuration/contentcuration/utils/messages.py
index 74869c3028..eb48a4ffa2 100644
--- a/contentcuration/contentcuration/utils/messages.py
+++ b/contentcuration/contentcuration/utils/messages.py
@@ -1,18 +1,15 @@
 import json
 import os
-import re
 
 from django.conf import settings
 from django.utils.translation import get_language
 from django.utils.translation import to_locale
-from django.urls.resolvers import RegexURLResolver
-from django.utils.translation.trans_real import get_supported_language_variant
 
 _JSON_MESSAGES_FILE_CACHE = {}
 
 
 def locale_data_file(locale):
-    path = getattr(settings, 'LOCALE_PATHS')[0]
+    path = getattr(settings, "LOCALE_PATHS")[0]
     return os.path.join(path, locale, "LC_MESSAGES", "contentcuration-messages.json")
 
 
@@ -23,7 +20,7 @@ def get_messages():
 
     if locale not in _JSON_MESSAGES_FILE_CACHE:
         try:
-            with open(locale_data_file(locale), 'rb') as data:
+            with open(locale_data_file(locale), "rb") as data:
                 message_json = json.load(data)
                 translation_dict = {}
                 for key, value in list(message_json.items()):
@@ -35,4 +32,3 @@ def get_messages():
             _JSON_MESSAGES_FILE_CACHE[locale] = {}
 
     return _JSON_MESSAGES_FILE_CACHE[locale]
-
diff --git a/contentcuration/contentcuration/utils/pagination.py b/contentcuration/contentcuration/utils/pagination.py
index 155d31dbe5..9865f54025 100644
--- a/contentcuration/contentcuration/utils/pagination.py
+++ b/contentcuration/contentcuration/utils/pagination.py
@@ -1,47 +1,88 @@
 import hashlib
 
 from django.core.cache import cache
+from django.core.exceptions import EmptyResultSet
 from django.core.paginator import InvalidPage
+from django.core.paginator import Page
+from django.core.paginator import Paginator
+from django.db.models import QuerySet
+from django.utils.functional import cached_property
 from rest_framework.pagination import NotFound
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.response import Response
 
 
-class CachedListPagination(PageNumberPagination):
-    def paginate_queryset(self, queryset, request, view=None):
-        """
-        Overrides paginate_queryset from PageNumberPagination
-        to assign the records count to the paginator.
-        This count has been previously obtained in a less complex query,
-        thus it has a better performance.
+class ValuesPage(Page):
+    def __init__(self, object_list, number, paginator):
+        self.queryset = object_list
+        self.object_list = object_list
+        self.number = number
+        self.paginator = paginator
 
-        """
 
-        def cached_count(queryset):
+class ValuesViewsetPaginator(Paginator):
+    def __init__(self, object_list, *args, **kwargs):
+        if not isinstance(object_list, QuerySet):
+            raise TypeError("ValuesViewsetPaginator is only intended for use with Querysets")
+        self.queryset = object_list
+        object_list = object_list.values_list("pk", flat=True).distinct()
+        return super(ValuesViewsetPaginator, self).__init__(object_list, *args, **kwargs)
+
+    def _get_page(self, object_list, *args, **kwargs):
+        pks = list(object_list)
+        return ValuesPage(self.queryset.filter(pk__in=pks).distinct(), *args, **kwargs)
+
+
+class CachedValuesViewsetPaginator(ValuesViewsetPaginator):
+    @cached_property
+    def count(self):
+        """
+        The count is implemented with this 'double cache' so as to cache the empty results
+        as well. Because the cache key is dependent on the query string, and that cannot be
+        generated in the instance that the query_string produces an EmptyResultSet exception.
+        """
+        try:
+            query_string = str(self.object_list.query).encode("utf8")
             cache_key = (
                 "query-count:"
-                + hashlib.md5(str(queryset.query).encode("utf8")).hexdigest()
+                + hashlib.md5(query_string).hexdigest()
             )
             value = cache.get(cache_key)
             if value is None:
-                value = queryset.values("id").count()
+                value = super(CachedValuesViewsetPaginator, self).count
                 cache.set(cache_key, value, 300)  # save the count for 5 minutes
-            return value
+        except EmptyResultSet:
+            # If the query is an empty result set, then this error will be raised by
+            # Django - this happens, for example when doing a pk__in=[] query
+            # In this case, we know the value is just 0!
+            value = 0
+        return value
+
 
+class ValuesViewsetPageNumberPagination(PageNumberPagination):
+    django_paginator_class = ValuesViewsetPaginator
+
+    def paginate_queryset(self, queryset, request, view=None):
+        """
+        Paginate a queryset if required, either returning a
+        the queryset of a page object so that it can be further annotated for serialization,
+        or `None` if pagination is not configured for this view.
+        This is vendored and modified from:
+        https://github.com/encode/django-rest-framework/blob/master/rest_framework/pagination.py#L191
+        """
         page_size = self.get_page_size(request)
         if not page_size:
             return None
 
         paginator = self.django_paginator_class(queryset, page_size)
-        paginator.count = cached_count(queryset)
-        page_number = request.query_params.get(self.page_query_param, 1)
-        if page_number in self.last_page_strings:
-            page_number = paginator.num_pages
+        page_number = self.get_page_number(request, paginator)
 
         try:
             self.page = paginator.page(page_number)
         except InvalidPage as exc:
-            msg = self.invalid_page_message.format(page_number=page_number, message=exc)
+            msg = self.invalid_page_message.format(
+                page_number=page_number, message=str(exc)
+            )
             raise NotFound(msg)
 
         if paginator.num_pages > 1 and self.template is not None:
@@ -49,36 +90,42 @@ def cached_count(queryset):
             self.display_page_controls = True
 
         self.request = request
-        return list(self.page)
+        # This is the only difference between the original function and this implementation
+        # here, instead of returning the page coerced to a list, we explicitly return the queryset
+        # of the page, so that we can do further annotations on it - otherwise, once it is coerced
+        # to a list, the DB read has already occurred.
+        return self.page.queryset
 
     def get_paginated_response(self, data):
         return Response(
             {
-                "next": self.get_next_link(),
-                "previous": self.get_previous_link(),
-                "page_number": self.page.number,
+                "page": self.page.number,
                 "count": self.page.paginator.count,
                 "total_pages": self.page.paginator.num_pages,
                 "results": data,
             }
         )
 
-
-def get_order_queryset(request, queryset, field_map):
-    """
-    Function used to extract the field the queryset must be ordered by,
-    and apply it correctly to the queryset
-    """
-    order = request.GET.get("sortBy", "")
-    if not order:
-        order = "undefined"
-
-    if order in field_map and type(field_map[order]) is str:
-        order = field_map[order]
-
-    if request.GET.get("descending", "true") == "false" and order != "undefined":
-        order = "-" + order
-
-    queryset = queryset.distinct().order_by() if order == "undefined" else queryset.distinct().order_by(order)
-
-    return (order, queryset)
+    def get_paginated_response_schema(self, schema):
+        return {
+            'type': 'object',
+            'properties': {
+                'count': {
+                    'type': 'integer',
+                    'example': 123,
+                },
+                'results': schema,
+                'page': {
+                    'type': 'integer',
+                    'example': 123,
+                },
+                'total_pages': {
+                    'type': 'integer',
+                    'example': 123,
+                },
+            },
+        }
+
+
+class CachedListPagination(ValuesViewsetPageNumberPagination):
+    django_paginator_class = CachedValuesViewsetPaginator
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 3b6ecc0793..409070bd22 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -24,7 +24,7 @@
 from django.db.models import Sum
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from kolibri_content import models as kolibrimodels
 from kolibri_content.router import get_active_content_database
 from kolibri_content.router import using_content_database
@@ -83,10 +83,12 @@ def create_content_database(channel, force, user_id, force_exercises, progress_t
         channel.main_tree.publishing = True
         channel.main_tree.save()
 
-        prepare_export_database(tempdb)
+        call_command("migrate",
+                     "content",
+                     database=get_active_content_database(),
+                     no_input=True)
         if progress_tracker:
             progress_tracker.track(10)
-        map_channel_to_kolibri_channel(channel)
         map_content_nodes(
             channel.main_tree,
             channel.language,
@@ -96,6 +98,7 @@ def create_content_database(channel, force, user_id, force_exercises, progress_t
             force_exercises=force_exercises,
             progress_tracker=progress_tracker,
         )
+        map_channel_to_kolibri_channel(channel)
         # It should be at this percent already, but just in case.
         if progress_tracker:
             progress_tracker.track(90)
@@ -424,6 +427,8 @@ def create_perseus_zip(ccnode, exercise_data, write_to_path):
             exercise_result = render_to_string('perseus/exercise.json', exercise_context)
             write_to_zipfile("exercise.json", exercise_result, zf)
 
+            channel_id = ccnode.get_channel_id()
+
             for question in ccnode.assessment_items.prefetch_related('files').all().order_by('order'):
                 try:
                     for image in question.files.filter(preset_id=format_presets.EXERCISE_IMAGE).order_by('checksum'):
@@ -442,15 +447,18 @@ def create_perseus_zip(ccnode, exercise_data, write_to_path):
                                 content = content.split(exercises.GRAPHIE_DELIMITER.encode('ascii'))
                                 write_to_zipfile(svg_name, content[0], zf)
                                 write_to_zipfile(json_name, content[1], zf)
-                    write_assessment_item(question, zf)
+                    write_assessment_item(question, zf, channel_id)
                 except Exception as e:
-                    logging.error("Publishing error: {}".format(str(e)))
+                    logging.error("Error while publishing channel `{}`: {}".format(channel_id, str(e)))
                     logging.error(traceback.format_exc())
                     # In production, these errors have historically been handled silently.
                     # Retain that behavior for now, but raise an error locally so we can
                     # better understand the cases in which this might happen.
                     report_exception(e)
+
+                    # if we're in a testing or development environment, raise the error
                     if os.environ.get('BRANCH_ENVIRONMENT', '') != "master":
+                        logging.warning("NOTE: the following error would have been swallowed silently in production")
                         raise
         finally:
             zf.close()
@@ -464,7 +472,7 @@ def write_to_zipfile(filename, content, zf):
     zf.writestr(info, content)
 
 
-def write_assessment_item(assessment_item, zf):  # noqa C901
+def write_assessment_item(assessment_item, zf, channel_id):  # noqa C901
     if assessment_item.type == exercises.MULTIPLE_SELECTION:
         template = 'perseus/multiple_selection.json'
     elif assessment_item.type == exercises.SINGLE_SELECTION or assessment_item.type == 'true_false':
@@ -477,7 +485,7 @@ def write_assessment_item(assessment_item, zf):  # noqa C901
         raise TypeError("Unrecognized question type on item {}".format(assessment_item.assessment_id))
 
     question = process_formulas(assessment_item.question)
-    question, question_images = process_image_strings(question, zf)
+    question, question_images = process_image_strings(question, zf, channel_id)
 
     answer_data = json.loads(assessment_item.answers)
     for answer in answer_data:
@@ -487,14 +495,14 @@ def write_assessment_item(assessment_item, zf):  # noqa C901
             answer['answer'] = answer['answer'].replace(exercises.CONTENT_STORAGE_PLACEHOLDER, PERSEUS_IMG_DIR)
             answer['answer'] = process_formulas(answer['answer'])
             # In case perseus doesn't support =wxh syntax, use below code
-            answer['answer'], answer_images = process_image_strings(answer['answer'], zf)
+            answer['answer'], answer_images = process_image_strings(answer['answer'], zf, channel_id)
             answer.update({'images': answer_images})
 
     answer_data = list([a for a in answer_data if a['answer'] or a['answer'] == 0])  # Filter out empty answers, but not 0
     hint_data = json.loads(assessment_item.hints)
     for hint in hint_data:
         hint['hint'] = process_formulas(hint['hint'])
-        hint['hint'], hint_images = process_image_strings(hint['hint'], zf)
+        hint['hint'], hint_images = process_image_strings(hint['hint'], zf, channel_id)
         hint.update({'images': hint_images})
 
     answers_sorted = answer_data
@@ -529,7 +537,7 @@ def process_formulas(content):
     return content
 
 
-def process_image_strings(content, zf):
+def process_image_strings(content, zf, channel_id):
     image_list = []
     content = content.replace(exercises.CONTENT_STORAGE_PLACEHOLDER, PERSEUS_IMG_DIR)
     for match in re.finditer(r'!\[(?:[^\]]*)]\(([^\)]+)\)', content):
@@ -538,6 +546,20 @@ def process_image_strings(content, zf):
             # Add any image files that haven't been written to the zipfile
             filename = img_match.group(1).split('/')[-1]
             checksum, ext = os.path.splitext(filename)
+
+            if not ext:
+                logging.warning("While publishing channel `{}` a filename with no extension was encountered: `{}`".format(channel_id, filename))
+            try:
+                # make sure the checksum is actually a hex string
+                int(checksum, 16)
+            except Exception:
+                logging.warning("while publishing channel `{}` a filename with an improper checksum was encountered: `{}`".format(channel_id, filename))
+
+                # if we're in a testing or development environment, raise the error
+                if os.environ.get('BRANCH_ENVIRONMENT', '') != "master":
+                    logging.warning("NOTE: the following error would have been swallowed silently in production")
+                    raise
+
             image_name = "images/{}.{}".format(checksum, ext[1:])
             if image_name not in zf.namelist():
                 with storage.open(ccmodels.generate_object_storage_name(checksum, filename), 'rb') as imgfile:
@@ -620,20 +642,10 @@ def map_tags_to_node(kolibrinode, ccnode):
         t, _new = kolibrimodels.ContentTag.objects.get_or_create(pk=tag.pk, tag_name=tag.tag_name)
         tags_to_add.append(t)
 
-    kolibrinode.tags = tags_to_add
+    kolibrinode.tags.set(tags_to_add)
     kolibrinode.save()
 
 
-def prepare_export_database(tempdb):
-    call_command("flush", "--noinput", database=get_active_content_database())  # clears the db!
-    call_command("migrate",
-                 "content",
-                 run_syncdb=True,
-                 database=get_active_content_database(),
-                 noinput=True)
-    logging.info("Prepared the export database.")
-
-
 def raise_if_nodes_are_all_unchanged(channel):
 
     logging.debug("Checking if we have any changed nodes.")
diff --git a/contentcuration/contentcuration/views/base.py b/contentcuration/contentcuration/views/base.py
index fbecb6aba4..28b31494c9 100644
--- a/contentcuration/contentcuration/views/base.py
+++ b/contentcuration/contentcuration/views/base.py
@@ -1,13 +1,15 @@
 import json
 from builtins import str
 
+from urllib.parse import urlsplit
+from urllib.parse import urlunsplit
+
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
+from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.cache import cache
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
 from django.db.models import Count
 from django.db.models import IntegerField
 from django.db.models import OuterRef
@@ -19,9 +21,9 @@
 from django.shortcuts import redirect
 from django.shortcuts import render
 from django.urls import is_valid_path
+from django.urls import reverse
+from django.urls import reverse_lazy
 from django.urls import translate_url
-from django.utils.six.moves.urllib.parse import urlsplit
-from django.utils.six.moves.urllib.parse import urlunsplit
 from django.utils.translation import get_language
 from django.utils.translation import LANGUAGE_SESSION_KEY
 from django.views.decorators.http import require_POST
@@ -41,7 +43,6 @@
 from .json_dump import json_for_parse_from_data
 from .json_dump import json_for_parse_from_serializer
 from contentcuration.api import activate_channel
-from contentcuration.db.models.aggregates import ArrayAgg
 from contentcuration.decorators import browser_is_supported
 from contentcuration.models import Channel
 from contentcuration.models import ChannelSet
@@ -79,7 +80,7 @@
 
 
 def current_user_for_context(user):
-    if not user or user.is_anonymous():
+    if not user or user.is_anonymous:
         return json_for_parse_from_data(None)
 
     return json_for_parse_from_data({field: getattr(user, field) for field in user_fields})
@@ -90,7 +91,7 @@ def current_user_for_context(user):
 def base(request):
     if settings.LIBRARY_MODE:
         return channel_list(request)
-    elif request.user.is_authenticated():
+    elif request.user.is_authenticated:
         return redirect(reverse_lazy("channels"))
     else:
         return redirect(reverse_lazy("accounts"))
@@ -142,15 +143,13 @@ def get_or_set_cached_constants(constant, serializer):
 @browser_is_supported
 @permission_classes((AllowAny,))
 def channel_list(request):
-    anon = settings.LIBRARY_MODE or request.user.is_anonymous()
+    anon = settings.LIBRARY_MODE or request.user.is_anonymous
     current_user = current_user_for_context(None if anon else request.user)
     preferences = DEFAULT_USER_PREFERENCES if anon else request.user.content_defaults
 
     public_channel_list = Channel.objects.filter(
-        public=True,
-        main_tree__published=True,
-        deleted=False,
-    ).values_list('main_tree__tree_id', flat=True)
+        public=True, main_tree__published=True, deleted=False,
+    ).values_list("main_tree__tree_id", flat=True)
 
     # Get public channel languages
     public_lang_query = (
@@ -167,22 +166,18 @@ def channel_list(request):
 
     # Get public channel licenses
     public_license_query = (
-        License.objects.filter(
-            contentnode__tree_id__in=public_channel_list
-        )
+        License.objects.filter(contentnode__tree_id__in=public_channel_list)
         .values_list("id", flat=True)
-        .order_by('id')
+        .order_by("id")
         .distinct()
     )
     licenses = list(public_license_query)
 
     # Get public channel kinds
     public_kind_query = (
-        ContentKind.objects.filter(
-            contentnodes__tree_id__in=public_channel_list
-        )
+        ContentKind.objects.filter(contentnodes__tree_id__in=public_channel_list)
         .values_list("kind", flat=True)
-        .order_by('kind')
+        .order_by("kind")
         .distinct()
     )
     kinds = list(public_kind_query)
diff --git a/contentcuration/contentcuration/views/internal.py b/contentcuration/contentcuration/views/internal.py
index e62a55f9d0..8eb625f81a 100644
--- a/contentcuration/contentcuration/views/internal.py
+++ b/contentcuration/contentcuration/views/internal.py
@@ -50,41 +50,51 @@
 from contentcuration.viewsets.sync.utils import generate_update_event
 
 
-VersionStatus = namedtuple('VersionStatus', ['version', 'status', 'message'])
-VERSION_OK = VersionStatus(version=rc.VERSION_OK, status=0, message=rc.VERSION_OK_MESSAGE)
-VERSION_SOFT_WARNING = VersionStatus(version=rc.VERSION_SOFT_WARNING, status=1, message=rc.VERSION_SOFT_WARNING_MESSAGE)
-VERSION_HARD_WARNING = VersionStatus(version=rc.VERSION_HARD_WARNING, status=2, message=rc.VERSION_HARD_WARNING_MESSAGE)
-VERSION_ERROR = VersionStatus(version=rc.VERSION_ERROR, status=3, message=rc.VERSION_ERROR_MESSAGE)
+VersionStatus = namedtuple("VersionStatus", ["version", "status", "message"])
+VERSION_OK = VersionStatus(
+    version=rc.VERSION_OK, status=0, message=rc.VERSION_OK_MESSAGE
+)
+VERSION_SOFT_WARNING = VersionStatus(
+    version=rc.VERSION_SOFT_WARNING, status=1, message=rc.VERSION_SOFT_WARNING_MESSAGE
+)
+VERSION_HARD_WARNING = VersionStatus(
+    version=rc.VERSION_HARD_WARNING, status=2, message=rc.VERSION_HARD_WARNING_MESSAGE
+)
+VERSION_ERROR = VersionStatus(
+    version=rc.VERSION_ERROR, status=3, message=rc.VERSION_ERROR_MESSAGE
+)
 
 
 def handle_server_error(request):
-    client.captureException(stack=True, tags={'url': request.path})
+    client.captureException(stack=True, tags={"url": request.path})
 
 
-@api_view(['POST', 'GET'])
+@api_view(["POST", "GET"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def authenticate_user_internal(request):
     """ Verify user is valid """
     logging.debug("Logging in user")
-    return Response({
-        'success': True,
-        'user_id': request.user.id,
-        'username': str(request.user),
-        'first_name': request.user.first_name,
-        'last_name': request.user.last_name,
-        'is_admin': request.user.is_admin,
-    })
+    return Response(
+        {
+            "success": True,
+            "user_id": request.user.id,
+            "username": str(request.user),
+            "first_name": request.user.first_name,
+            "last_name": request.user.last_name,
+            "is_admin": request.user.is_admin,
+        }
+    )
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def check_version(request):
     """ Get version of Ricecooker with which CC is compatible """
     try:
         logging.debug("Entering the check_version endpoint")
-        version = json.loads(request.body)['version']
+        version = json.loads(request.body)["version"]
         status = None
 
         if LooseVersion(version) >= LooseVersion(VERSION_OK[0]):
@@ -96,16 +106,18 @@ def check_version(request):
         else:
             status = VERSION_ERROR
 
-        return JsonResponse({
-            'success': True,
-            'status': status[1],
-            'message': status[2].format(version, VERSION_OK[0]),
-        })
+        return JsonResponse(
+            {
+                "success": True,
+                "status": status[1],
+                "message": status[2].format(version, VERSION_OK[0]),
+            }
+        )
     except Exception as e:
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def file_diff(request):
@@ -125,7 +137,7 @@ def file_diff(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication,))
 @permission_classes((IsAuthenticated,))
 def api_file_upload(request):
@@ -134,20 +146,20 @@ def api_file_upload(request):
         fobj = request.FILES["file"]
         checksum, ext = fobj._name.split(".")
         try:
-            request.user.check_staged_space(fobj._size, checksum)
+            request.user.check_staged_space(fobj.size, checksum)
         except Exception as e:
             return HttpResponseForbidden(str(e))
 
-        write_file_to_storage(fobj, check_valid=True)
+        try:
+            write_file_to_storage(fobj, check_valid=True)
+        except SuspiciousOperation as e:
+            return HttpResponseBadRequest(str(e))
+
         StagedFile.objects.get_or_create(
-            checksum=checksum,
-            file_size=fobj._size,
-            uploaded_by=request.user
+            checksum=checksum, file_size=fobj.size, uploaded_by=request.user
         )
 
-        return Response({
-            "success": True,
-        })
+        return Response({"success": True})
     except KeyError:
         return HttpResponseBadRequest("Invalid file upload request")
     except Exception as e:
@@ -155,14 +167,14 @@ def api_file_upload(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def api_create_channel_endpoint(request):
     """ Create the channel node """
     data = json.loads(request.body)
     try:
-        channel_data = data['channel_data']
+        channel_data = data["channel_data"]
 
         obj = create_channel(channel_data, request.user)
 
@@ -178,7 +190,7 @@ def api_create_channel_endpoint(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def api_commit_channel(request):
@@ -188,13 +200,14 @@ def api_commit_channel(request):
     """
     data = json.loads(request.body)
     try:
-        channel_id = data['channel_id']
+        channel_id = data["channel_id"]
 
         obj = Channel.get_editable(request.user, channel_id)
 
         # set original_channel_id and source_channel_id to self since chef tree
-        obj.chef_tree.get_descendants(include_self=True).update(original_channel_id=channel_id,
-                                                                source_channel_id=channel_id)
+        obj.chef_tree.get_descendants(include_self=True).update(
+            original_channel_id=channel_id, source_channel_id=channel_id
+        )
 
         # replace staging_tree with chef_tree
         old_staging = obj.staging_tree
@@ -203,10 +216,11 @@ def api_commit_channel(request):
         obj.save()
 
         # Prepare change event indicating a new staging_tree is available
-        event = generate_update_event(channel_id, CHANNEL, {
-            "root_id": obj.main_tree.id,
-            "staging_root_id": obj.staging_tree.id,
-        })
+        event = generate_update_event(
+            channel_id,
+            CHANNEL,
+            {"root_id": obj.main_tree.id, "staging_root_id": obj.staging_tree.id,},
+        )
 
         # Mark old staging tree for garbage collection
         if old_staging and old_staging != obj.main_tree:
@@ -243,7 +257,7 @@ def api_commit_channel(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def api_add_nodes_to_tree(request):
@@ -285,7 +299,7 @@ def api_add_nodes_to_tree(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def api_publish_channel(request):
@@ -325,14 +339,14 @@ def activate_channel_internal(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def check_user_is_editor(request):
     """ Create the channel node """
     data = json.loads(request.body)
     try:
-        channel_id = data['channel_id']
+        channel_id = data["channel_id"]
         try:
             Channel.get_editable(request.user, channel_id)
             return Response({"success": True})
@@ -343,7 +357,7 @@ def check_user_is_editor(request):
         raise HttpResponseBadRequest("Missing attribute from data: {}".format(data))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def get_tree_data(request):
@@ -363,8 +377,8 @@ def get_tree_data(request):
         if tree_root is None:
             raise ValueError("Invalid tree name")
         tree_data = tree_root.get_tree_data()
-        children_data = tree_data.get('children', [])
-        return Response({"success": True, 'tree': children_data})
+        children_data = tree_data.get("children", [])
+        return Response({"success": True, "tree": children_data})
     except (Channel.DoesNotExist, PermissionDenied):
         return HttpResponseNotFound("No channel matching: {}".format(channel_id))
     except ValueError:
@@ -374,7 +388,7 @@ def get_tree_data(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def get_node_tree_data(request):
@@ -391,16 +405,20 @@ def get_node_tree_data(request):
         channel = Channel.get_editable(request.user, channel_id)
         tree_name = "{}_tree".format(serializer.validated_data['tree'])
         tree_root = getattr(channel, tree_name, None)
-        if 'node_id' in serializer.validated_data:
-            node = tree_root.get_descendants().filter(node_id=serializer.validated_data['node_id']).first()
+        if "node_id" in serializer.validated_data:
+            node = (
+                tree_root.get_descendants()
+                .filter(node_id=serializer.validated_data["node_id"])
+                .first()
+            )
         else:
             node = tree_root
         tree_data = node.get_tree_data(levels=1)
-        children_data = tree_data.get('children', [])
+        children_data = tree_data.get("children", [])
         response_data = {
-            'success': True,
-            'tree': children_data,
-            'staged': channel.staging_tree is not None
+            "success": True,
+            "tree": children_data,
+            "staged": channel.staging_tree is not None,
         }
         return Response(response_data)
     except Channel.DoesNotExist:
@@ -410,7 +428,7 @@ def get_node_tree_data(request):
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
-@api_view(['POST'])
+@api_view(["POST"])
 @authentication_classes((TokenAuthentication, SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def get_channel_status_bulk(request):
@@ -423,12 +441,11 @@ def get_channel_status_bulk(request):
             raise PermissionDenied()
         statuses = {cid: get_status(cid) for cid in data['channel_ids']}
 
-        return Response({
-            "success": True,
-            'statuses': statuses,
-        })
+        return Response({"success": True, "statuses": statuses,})
     except (Channel.DoesNotExist, PermissionDenied):
-        return HttpResponseNotFound("No complete set of channels matching: {}".format(",".join(channel_ids)))
+        return HttpResponseNotFound(
+            "No complete set of channels matching: {}".format(",".join(channel_ids))
+        )
     except KeyError:
         raise ObjectDoesNotExist("Missing attribute from data: {}".format(data))
     except Exception as e:
@@ -445,7 +462,7 @@ def get_status(channel_id):
     elif obj.staging_tree:
         return "staged"
     elif obj.main_tree.get_descendants().filter(changed=True).exists():
-        return"unpublished"
+        return "unpublished"
     return "active"
 
 
@@ -453,7 +470,7 @@ def get_status(channel_id):
 def create_channel(channel_data, user):
     """ Set up channel """
     # Set up initial channel
-    channel, isNew = Channel.objects.get_or_create(id=channel_data['id'])
+    channel, isNew = Channel.objects.get_or_create(id=channel_data["id"])
 
     # Add user as editor if channel is new or channel has no editors
     # Otherwise, check if user is an editor
@@ -471,15 +488,17 @@ def create_channel(channel_data, user):
     channel.description = channel_data['description']
     channel.thumbnail = channel_data['thumbnail']
     channel.deleted = False
-    channel.source_id = channel_data.get('source_id')
-    channel.source_domain = channel_data.get('source_domain')
-    channel.source_url = channel_data.get('source_domain') if isNew else channel.source_url
-    channel.ricecooker_version = channel_data.get('ricecooker_version')
-    channel.language_id = channel_data.get('language')
+    channel.source_id = channel_data.get("source_id")
+    channel.source_domain = channel_data.get("source_domain")
+    channel.source_url = (
+        channel_data.get("source_domain") if isNew else channel.source_url
+    )
+    channel.ricecooker_version = channel_data.get("ricecooker_version")
+    channel.language_id = channel_data.get("language")
 
     # older versions of ricecooker won't be sending this field.
-    if 'tagline' in channel_data:
-        channel.tagline = channel_data['tagline']
+    if "tagline" in channel_data:
+        channel.tagline = channel_data["tagline"]
 
     old_chef_tree = channel.chef_tree
     is_published = channel.main_tree is not None and channel.main_tree.published
@@ -520,34 +539,42 @@ def convert_data_to_nodes(user, content_data, parent_node):
         root_mapping = {}
         parent_node = ContentNode.objects.get(pk=parent_node)
         sort_order = parent_node.children.count() + 1
-        existing_node_ids = ContentNode.objects.filter(parent_id=parent_node.pk).values_list('node_id', flat=True)
+        existing_node_ids = ContentNode.objects.filter(
+            parent_id=parent_node.pk
+        ).values_list("node_id", flat=True)
         with transaction.atomic():
             for node_data in content_data:
                 # Check if node id is already in the tree to avoid duplicates
-                if node_data['node_id'] not in existing_node_ids:
+                if node_data["node_id"] not in existing_node_ids:
                     # Create the node
                     new_node = create_node(node_data, parent_node, sort_order)
 
                     # Create files associated with node
-                    map_files_to_node(user, new_node, node_data['files'])
+                    map_files_to_node(user, new_node, node_data["files"])
 
                     # Create questions associated exercise nodes
-                    create_exercises(user, new_node, node_data['questions'])
+                    create_exercises(user, new_node, node_data["questions"])
                     sort_order += 1
 
                     # Create Slideshow slides (if slideshow kind)
-                    if node_data['kind'] == 'slideshow':
-                        extra_fields_unicode = node_data['extra_fields']
+                    if node_data["kind"] == "slideshow":
+                        extra_fields_unicode = node_data["extra_fields"]
 
                         # Extra Fields comes as type<unicode> - convert it to a dict and get slideshow_data
-                        extra_fields_json = extra_fields_unicode.encode("ascii", "ignore")
+                        extra_fields_json = extra_fields_unicode.encode(
+                            "ascii", "ignore"
+                        )
                         extra_fields = json.loads(extra_fields_json)
 
-                        slides = create_slides(user, new_node, extra_fields.get('slideshow_data'))
-                        map_files_to_slideshow_slide_item(user, new_node, slides, node_data["files"])
+                        slides = create_slides(
+                            user, new_node, extra_fields.get("slideshow_data")
+                        )
+                        map_files_to_slideshow_slide_item(
+                            user, new_node, slides, node_data["files"]
+                        )
 
                     # Track mapping between newly created node and node id
-                    root_mapping.update({node_data['node_id']: new_node.pk})
+                    root_mapping.update({node_data["node_id"]: new_node.pk})
             return root_mapping
 
     except KeyError as e:
@@ -558,14 +585,14 @@ def create_node(node_data, parent_node, sort_order):  # noqa: C901
     """ Generate node based on node dict """
     # Make sure license is valid
     license = None
-    license_name = node_data['license']
+    license_name = node_data["license"]
     if license_name is not None:
         try:
             license = License.objects.get(license_name__iexact=license_name)
         except ObjectDoesNotExist:
             raise ObjectDoesNotExist("Invalid license found")
 
-    extra_fields = node_data['extra_fields'] or {}
+    extra_fields = node_data["extra_fields"] or {}
     if isinstance(extra_fields, basestring):
         extra_fields = json.loads(extra_fields)
 
@@ -584,33 +611,35 @@ def create_node(node_data, parent_node, sort_order):  # noqa: C901
     node = ContentNode.objects.create(
         title=title,
         tree_id=parent_node.tree_id,
-        kind_id=node_data['kind'],
-        node_id=node_data['node_id'],
-        content_id=node_data['content_id'],
-        description=node_data['description'],
-        author=node_data['author'],
-        aggregator=node_data.get('aggregator') or "",
-        provider=node_data.get('provider') or "",
+        kind_id=node_data["kind"],
+        node_id=node_data["node_id"],
+        content_id=node_data["content_id"],
+        description=node_data["description"],
+        author=node_data["author"],
+        aggregator=node_data.get("aggregator") or "",
+        provider=node_data.get("provider") or "",
         license=license,
         license_description=license_description,
         copyright_holder=copyright_holder,
         parent=parent_node,
         extra_fields=extra_fields,
         sort_order=sort_order,
-        source_id=node_data.get('source_id'),
-        source_domain=node_data.get('source_domain'),
-        language_id=node_data.get('language'),
+        source_id=node_data.get("source_id"),
+        source_domain=node_data.get("source_domain"),
+        language_id=node_data.get("language"),
         freeze_authoring_data=True,
         role_visibility=node_data.get('role') or roles.LEARNER,
         complete=is_complete,
     )
     tags = []
     channel = node.get_channel()
-    if 'tags' in node_data:
-        tag_data = node_data['tags']
+    if "tags" in node_data:
+        tag_data = node_data["tags"]
         if tag_data is not None:
             for tag in tag_data:
-                tags.append(ContentTag.objects.get_or_create(tag_name=tag, channel=channel)[0])
+                tags.append(
+                    ContentTag.objects.get_or_create(tag_name=tag, channel=channel)[0]
+                )
 
     if len(tags) > 0:
         node.tags = tags
@@ -626,20 +655,20 @@ def create_exercises(user, node, data):
 
         for question in data:
             question_obj = AssessmentItem(
-                type=question.get('type'),
-                question=question.get('question'),
-                hints=question.get('hints'),
-                answers=question.get('answers'),
+                type=question.get("type"),
+                question=question.get("question"),
+                hints=question.get("hints"),
+                answers=question.get("answers"),
                 order=order,
                 contentnode=node,
-                assessment_id=question.get('assessment_id'),
-                raw_data=question.get('raw_data'),
-                source_url=question.get('source_url'),
-                randomize=question.get('randomize') or False,
+                assessment_id=question.get("assessment_id"),
+                raw_data=question.get("raw_data"),
+                source_url=question.get("source_url"),
+                randomize=question.get("randomize") or False,
             )
             order += 1
             question_obj.save()
-            map_files_to_assessment_item(user, question_obj, question['files'])
+            map_files_to_assessment_item(user, question_obj, question["files"])
 
 
 def create_slides(user, node, slideshow_data):
@@ -654,11 +683,11 @@ def create_slides(user, node, slideshow_data):
                 contentnode=node,
                 sort_order=slide.get("sort_order"),
                 metadata={
-                    "caption": slide.get('caption'),
-                    "descriptive_text": slide.get('descriptive_text'),
-                    "checksum": slide.get('checksum'),
-                    "extension": slide.get('extension')
-                }
+                    "caption": slide.get("caption"),
+                    "descriptive_text": slide.get("descriptive_text"),
+                    "checksum": slide.get("checksum"),
+                    "extension": slide.get("extension"),
+                },
             )
             slide_obj.save()
             slides.append(slide_obj)
diff --git a/contentcuration/contentcuration/views/public.py b/contentcuration/contentcuration/views/public.py
index 6ca7eadc4a..0a0bc77c4c 100644
--- a/contentcuration/contentcuration/views/public.py
+++ b/contentcuration/contentcuration/views/public.py
@@ -5,7 +5,7 @@
 from django.db.models import TextField
 from django.db.models import Value
 from django.http import HttpResponseNotFound
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.cache import cache_page
 from rest_framework import viewsets
 from rest_framework.decorators import api_view
diff --git a/contentcuration/contentcuration/views/settings.py b/contentcuration/contentcuration/views/settings.py
index 0aa1b87591..30bc65d28a 100644
--- a/contentcuration/contentcuration/views/settings.py
+++ b/contentcuration/contentcuration/views/settings.py
@@ -11,14 +11,14 @@
 from django.contrib.auth.views import PasswordChangeView
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.mail import send_mail
-from django.core.urlresolvers import reverse_lazy
 from django.db.models import Count
 from django.http import HttpResponse
 from django.http import HttpResponseBadRequest
 from django.shortcuts import render
 from django.template.loader import render_to_string
+from django.urls import reverse_lazy
 from django.utils.translation import get_language
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic.edit import FormView
 from rest_framework.decorators import api_view
 
@@ -51,7 +51,7 @@ def settings(request):
 
     return render(
         request,
-        'settings.html',
+        "settings.html",
         {
             CURRENT_USER: current_user,
             MESSAGES: json_for_parse_from_data(get_messages()),
@@ -63,15 +63,15 @@ def settings(request):
 
 
 @login_required
-@api_view(['GET'])
+@api_view(["GET"])
 def export_user_data(request):
     generateusercsv_task.delay(request.user.pk, language=get_language())
     return HttpResponse({"success": True})
 
 
 class PostFormMixin(LoginRequiredMixin):
-    http_method_names = ['post']
-    success_url = reverse_lazy('settings')
+    http_method_names = ["post"]
+    success_url = reverse_lazy("settings")
 
     def get_form(self, data):
         return self.form_class(data)
@@ -103,8 +103,16 @@ class IssuesSettingsView(PostFormMixin, FormView):
     form_class = IssueReportForm
 
     def form_valid(self, form):
-        message = render_to_string('settings/issue_report_email.txt', {"data": form.cleaned_data, "user": self.request.user})
-        send_mail(_("Kolibri Studio issue report"), message, ccsettings.DEFAULT_FROM_EMAIL, [ccsettings.HELP_EMAIL, self.request.user.email])
+        message = render_to_string(
+            "settings/issue_report_email.txt",
+            {"data": form.cleaned_data, "user": self.request.user},
+        )
+        send_mail(
+            _("Kolibri Studio issue report"),
+            message,
+            ccsettings.DEFAULT_FROM_EMAIL,
+            [ccsettings.HELP_EMAIL, self.request.user.email],
+        )
 
 
 class DeleteAccountView(PostFormMixin, FormView):
@@ -115,25 +123,45 @@ def get_form(self, data):
 
     def form_valid(self, form):
         # Send email to notify team about account being deleted
-        buffer_date = (date.today() + timedelta(days=ccsettings.ACCOUNT_DELETION_BUFFER)).strftime('%A, %B %d %Y')
+        buffer_date = (
+            date.today() + timedelta(days=ccsettings.ACCOUNT_DELETION_BUFFER)
+        ).strftime("%A, %B %d %Y")
         subject = "Kolibri Studio account deleted"
-        message = render_to_string('settings/account_deleted_notification_email.txt', {"user": self.request.user, "buffer_date": buffer_date})
-        send_mail(subject, message, ccsettings.DEFAULT_FROM_EMAIL, [ccsettings.REGISTRATION_INFORMATION_EMAIL])
+        message = render_to_string(
+            "settings/account_deleted_notification_email.txt",
+            {"user": self.request.user, "buffer_date": buffer_date},
+        )
+        send_mail(
+            subject,
+            message,
+            ccsettings.DEFAULT_FROM_EMAIL,
+            [ccsettings.REGISTRATION_INFORMATION_EMAIL],
+        )
 
         # Send email to user regarding account deletion
         site = get_current_site(self.request)
         subject = _("Kolibri Studio account deleted")
-        message = render_to_string('settings/account_deleted_user_email.txt', {
-            "user": self.request.user,
-            "buffer_date": buffer_date,
-            "legal_email": ccsettings.POLICY_EMAIL,
-            "num_days": ccsettings.ACCOUNT_DELETION_BUFFER,
-            "site_name": site and site.name,
-        })
-        send_mail(subject, message, ccsettings.DEFAULT_FROM_EMAIL, [ccsettings.REGISTRATION_INFORMATION_EMAIL, self.request.user.email])
+        message = render_to_string(
+            "settings/account_deleted_user_email.txt",
+            {
+                "user": self.request.user,
+                "buffer_date": buffer_date,
+                "legal_email": ccsettings.POLICY_EMAIL,
+                "num_days": ccsettings.ACCOUNT_DELETION_BUFFER,
+                "site_name": site and site.name,
+            },
+        )
+        send_mail(
+            subject,
+            message,
+            ccsettings.DEFAULT_FROM_EMAIL,
+            [ccsettings.REGISTRATION_INFORMATION_EMAIL, self.request.user.email],
+        )
 
         # Delete user csv files
-        csv_path = generate_user_csv_filename(self.request.user)  # Remove any generated csvs
+        csv_path = generate_user_csv_filename(
+            self.request.user
+        )  # Remove any generated csvs
         if os.path.exists(csv_path):
             os.unlink(csv_path)
 
@@ -174,9 +202,21 @@ def form_valid(self, form):
         # Comment out for now as there is an authentication issue
         # add_row_to_sheet(ccsettings.GOOGLE_STORAGE_REQUEST_SHEET, values)
 
-        channels = [c for c in form.cleaned_data['public'].split(', ') if c]
-        message = render_to_string('settings/storage_request_email.txt', {"data": form.cleaned_data, "user": self.request.user, "channels": channels})
-        send_mail("Kolibri Studio storage request", message, ccsettings.DEFAULT_FROM_EMAIL, [ccsettings.SPACE_REQUEST_EMAIL, self.request.user.email])
+        channels = [c for c in form.cleaned_data["public"].split(", ") if c]
+        message = render_to_string(
+            "settings/storage_request_email.txt",
+            {
+                "data": form.cleaned_data,
+                "user": self.request.user,
+                "channels": channels,
+            },
+        )
+        send_mail(
+            "Kolibri Studio storage request",
+            message,
+            ccsettings.DEFAULT_FROM_EMAIL,
+            [ccsettings.SPACE_REQUEST_EMAIL, self.request.user.email],
+        )
 
 
 class PolicyAcceptView(PostFormMixin, FormView):
diff --git a/contentcuration/contentcuration/views/users.py b/contentcuration/contentcuration/views/users.py
index 1a6fce6d53..ebf85be6e9 100644
--- a/contentcuration/contentcuration/views/users.py
+++ b/contentcuration/contentcuration/views/users.py
@@ -11,17 +11,17 @@
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.exceptions import PermissionDenied
 from django.core.mail import send_mail
-from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponse
 from django.http import HttpResponseBadRequest
 from django.http import HttpResponseForbidden
 from django.shortcuts import redirect
 from django.template.loader import render_to_string
+from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import never_cache
 from django.views.decorators.debug import sensitive_post_parameters
-from registration.backends.hmac.views import ActivationView
-from registration.backends.hmac.views import RegistrationView
+from django_registration.backends.activation.views import ActivationView
+from django_registration.backends.activation.views import RegistrationView
 from rest_framework.authentication import BasicAuthentication
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.authentication import TokenAuthentication
@@ -45,8 +45,10 @@
 logger = logging.getLogger(__name__)
 
 
-@api_view(['POST'])
-@authentication_classes((SessionAuthentication, BasicAuthentication, TokenAuthentication))
+@api_view(["POST"])
+@authentication_classes(
+    (SessionAuthentication, BasicAuthentication, TokenAuthentication)
+)
 @permission_classes((IsAuthenticated,))
 def send_invitation_email(request):
     try:
@@ -64,8 +66,8 @@ def send_invitation_email(request):
             "invited": recipient,
             "email": user_email,
             "channel_id": channel_id,
-            "first_name": recipient.first_name if recipient else '',
-            "last_name": recipient.last_name if recipient else '',
+            "first_name": recipient.first_name if recipient else "",
+            "last_name": recipient.last_name if recipient else "",
         }
 
         # Need to break into two steps to avoid MultipleObjectsReturned error
@@ -95,19 +97,23 @@ def send_invitation_email(request):
         message = render_to_string('permissions/permissions_email.txt', ctx_dict)
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user_email])
     except KeyError:
-        return HttpResponseBadRequest("Missing attribute from data: {}".format(request.data))
+        return HttpResponseBadRequest(
+            "Missing attribute from data: {}".format(request.data)
+        )
 
     return Response(InvitationSerializer(invitation).data)
 
 
-@api_view(['GET'])
+@api_view(["GET"])
 @authentication_classes((SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
 def deferred_user_data(request):
-    return Response({
-        "space_used_by_kind": request.user.get_space_used_by_kind(),
-        "api_token": request.user.get_token(),
-    })
+    return Response(
+        {
+            "space_used_by_kind": request.user.get_space_used_by_kind(),
+            "api_token": request.user.get_token(),
+        }
+    )
 
 
 def login(request):
@@ -141,11 +147,11 @@ def logout(request):
 
 class UserRegistrationView(RegistrationView):
     form_class = RegistrationForm
-    email_body_template = 'registration/activation_email.txt'
-    email_subject_template = 'registration/activation_email_subject.txt'
-    email_html_template = 'registration/activation_email.html'
-    template_name = 'registration/registration_information_form.html'
-    http_method_names = ['post']
+    email_body_template = "registration/activation_email.txt"
+    email_subject_template = "registration/activation_email_subject.txt"
+    email_html_template = "registration/activation_email.html"
+    template_name = "registration/registration_information_form.html"
+    http_method_names = ["post"]
 
     def post(self, request):
         data = json.loads(request.body)
@@ -161,7 +167,7 @@ def post(self, request):
             if inactive_user:
                 form.errors.clear()
                 user = form.save(commit=False)
-                inactive_user.set_password(form.cleaned_data['password1'])
+                inactive_user.set_password(form.cleaned_data["password1"])
                 inactive_user.first_name = user.first_name
                 inactive_user.last_name = user.last_name
                 inactive_user.information = user.information
@@ -170,8 +176,10 @@ def post(self, request):
                 self.send_activation_email(inactive_user)
                 return HttpResponse()
 
-            elif form._errors['email']:
-                return HttpResponseBadRequest(status=405, reason="Account hasn't been activated")
+            elif form._errors["email"]:
+                return HttpResponseBadRequest(
+                    status=405, reason="Account hasn't been activated"
+                )
             return HttpResponseBadRequest()
         except UserWarning:
             return HttpResponseForbidden()
@@ -179,13 +187,17 @@ def post(self, request):
     def send_activation_email(self, user):
         activation_key = self.get_activation_key(user)
         context = self.get_email_context(activation_key)
-        context.update({
-            'user': user,
-            'domain': self.request.META.get('HTTP_ORIGIN') or "https://{}".format(
-                self.request.get_host() or Site.objects.get_current().domain),
-        })
+        context.update(
+            {
+                "user": user,
+                "domain": self.request.META.get("HTTP_ORIGIN")
+                or "https://{}".format(
+                    self.request.get_host() or Site.objects.get_current().domain
+                ),
+            }
+        )
         subject = render_to_string(self.email_subject_template, context)
-        subject = ''.join(subject.splitlines())
+        subject = "".join(subject.splitlines())
         message = render_to_string(self.email_body_template, context)
         user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
 
@@ -193,7 +205,6 @@ def send_activation_email(self, user):
 
 
 class UserActivationView(ActivationView):
-
     def get(self, *args, **kwargs):
         """
         Overrite get method to redirect to failed activation url
@@ -203,10 +214,10 @@ def get(self, *args, **kwargs):
         if response.status_code == 302:
             return response
 
-        return redirect('/accounts/#/activation-expired')
+        return redirect("/accounts/#/activation-expired")
 
     def get_success_url(self, user):
-        return '/accounts/#/account-created'
+        return "/accounts/#/account-created"
 
     def get_user(self, username):
         return User.get_for_email(username, is_active=False)
@@ -229,26 +240,35 @@ def activate(self, *args, **kwargs):
 
         if settings.SEND_USER_ACTIVATION_NOTIFICATION_EMAIL and user:
             # Send email regarding new user information
-            subject = render_to_string('registration/custom_email_subject.txt', {"subject": "New Kolibri Studio Registration"})
-            message = render_to_string('registration/registration_information_email.txt', {
-                "user": user,
-                "information": dict(user.information)
-            })
-            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [settings.REGISTRATION_INFORMATION_EMAIL])
+            subject = render_to_string(
+                "registration/custom_email_subject.txt",
+                {"subject": "New Kolibri Studio Registration"},
+            )
+            message = render_to_string(
+                "registration/registration_information_email.txt",
+                {"user": user, "information": dict(user.information)},
+            )
+            send_mail(
+                subject,
+                message,
+                settings.DEFAULT_FROM_EMAIL,
+                [settings.REGISTRATION_INFORMATION_EMAIL],
+            )
 
         return user
 
 
 class UserPasswordResetView(PasswordResetView):
     form_class = ForgotPasswordForm
-    http_method_names = ['post']
+    http_method_names = ["post"]
 
     def post(self, request):
-        protocol = 'https' if request.is_secure() else 'http'
+        protocol = "https" if request.is_secure() else "http"
         site = request.get_host() or Site.objects.get_current().domain
         email_context = {
-            'site': get_current_site(request),
-            'domain': request.META.get('HTTP_ORIGIN') or "{}://{}".format(protocol, site)
+            "site": get_current_site(request),
+            "domain": request.META.get("HTTP_ORIGIN")
+            or "{}://{}".format(protocol, site),
         }
         form = self.form_class(json.loads(request.body))
         if form.is_valid():
@@ -257,31 +277,37 @@ def post(self, request):
                 request=request,
                 extra_email_context=email_context,
                 from_email=settings.DEFAULT_FROM_EMAIL,
-                email_template_name='registration/password_reset_email.txt',
-                subject_template_name='registration/password_reset_subject.txt',
+                email_template_name="registration/password_reset_email.txt",
+                subject_template_name="registration/password_reset_subject.txt",
             )
         return HttpResponse()
 
 
 class UserPasswordResetConfirmView(PasswordResetConfirmView):
-    http_method_names = ['get', 'post']
+    http_method_names = ["get", "post"]
 
     @method_decorator(sensitive_post_parameters())
     @method_decorator(never_cache)
     def dispatch(self, request, *args, **kwargs):
-        response = super(UserPasswordResetConfirmView, self).dispatch(request, *args, **kwargs)
+        response = super(UserPasswordResetConfirmView, self).dispatch(
+            request, *args, **kwargs
+        )
 
-        if request.method == 'POST':
+        if request.method == "POST":
             return self.post(request, *args, **kwargs)
 
         # Token is valid, redirect to password reset page
         if response.status_code == 302:
-            return redirect('/accounts/#/reset-password?uidb64={}&token={}'.format(kwargs['uidb64'], kwargs['token']))
+            return redirect(
+                "/accounts/#/reset-password?uidb64={}&token={}".format(
+                    kwargs["uidb64"], kwargs["token"]
+                )
+            )
 
-        return redirect('/accounts/#/reset-expired')
+        return redirect("/accounts/#/reset-expired")
 
     def get_success_url(self):
-        return '/accounts/#/password-reset-success'
+        return "/accounts/#/password-reset-success"
 
     def post(self, request, *args, **kwargs):
         form = self.form_class(self.user, json.loads(request.body))
@@ -292,8 +318,10 @@ def post(self, request, *args, **kwargs):
 
 
 def request_activation_link(request):
-    if request.method != 'POST':
-        return HttpResponseBadRequest("Only POST requests are allowed on this endpoint.")
+    if request.method != "POST":
+        return HttpResponseBadRequest(
+            "Only POST requests are allowed on this endpoint."
+        )
     data = json.loads(request.body)
     try:
         user = User.get_for_email(data['email'])
@@ -303,7 +331,9 @@ def request_activation_link(request):
             registration_view.send_activation_email(user)
     except User.DoesNotExist:
         pass
-    return HttpResponse()  # Return success no matter what so people can't try to look up emails
+    return (
+        HttpResponse()
+    )  # Return success no matter what so people can't try to look up emails
 
 
 def new_user_redirect(request, email):
@@ -318,7 +348,7 @@ def new_user_redirect(request, email):
 
     # User has created an account, but hasn't activated it yet
     if user and not user.is_active and user.password:
-        return redirect('/accounts/#/account-not-active')
+        return redirect("/accounts/#/account-not-active")
 
     # User needs to create an account
-    return redirect('/accounts/#/create?email={}'.format(email))
+    return redirect("/accounts/#/create?email={}".format(email))
diff --git a/contentcuration/contentcuration/viewsets/assessmentitem.py b/contentcuration/contentcuration/viewsets/assessmentitem.py
index 75b27a948f..5db084a670 100644
--- a/contentcuration/contentcuration/viewsets/assessmentitem.py
+++ b/contentcuration/contentcuration/viewsets/assessmentitem.py
@@ -2,7 +2,6 @@
 
 from django.db import transaction
 from django_bulk_update.helper import bulk_update
-from django_filters.rest_framework import DjangoFilterBackend
 from le_utils.constants import exercises
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.serializers import ValidationError
@@ -29,7 +28,7 @@
 
 
 class AssessmentItemFilter(RequiredFilterSet):
-    contentnode__in = UUIDInFilter(name="contentnode")
+    contentnode__in = UUIDInFilter(field_name="contentnode")
 
     class Meta:
         model = AssessmentItem
@@ -196,8 +195,7 @@ class AssessmentItemViewSet(BulkCreateMixin, BulkUpdateMixin, ValuesViewset):
     queryset = AssessmentItem.objects.all()
     serializer_class = AssessmentItemSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = AssessmentItemFilter
+    filterset_class = AssessmentItemFilter
     values = (
         "question",
         "type",
diff --git a/contentcuration/contentcuration/viewsets/base.py b/contentcuration/contentcuration/viewsets/base.py
index 9ee95420d3..c044043eb1 100644
--- a/contentcuration/contentcuration/viewsets/base.py
+++ b/contentcuration/contentcuration/viewsets/base.py
@@ -5,7 +5,9 @@
 from django.http import Http404
 from django_bulk_update.helper import bulk_update
 from django_filters.constants import EMPTY_VALUES
+from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import FilterSet
+from rest_framework.filters import OrderingFilter
 from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.serializers import ListSerializer
@@ -345,12 +347,77 @@ def create(self, validated_data):
         return created_objects
 
 
+class ValuesViewsetOrderingFilter(OrderingFilter):
+
+    def get_default_valid_fields(self, queryset, view, context={}):
+        """
+        The original implementation of this makes the assumption that the DRF serializer for the class
+        encodes all the serialization behaviour for the viewset:
+        https://github.com/encode/django-rest-framework/blob/version-3.12.2/rest_framework/filters.py#L208
+
+        With the ValuesViewset, this is no longer the case so here we do an equivalent mapping from the values
+        defined by the values viewset, with consideration for the mapped fields.
+
+        Importantly, we filter out values that have not yet been annotated on the queryset, so if an annotated
+        value is requried for ordering, it should be defined in the get_queryset method of the viewset, and not
+        the annotate_queryset method, which is executed after filtering.
+        """
+        default_fields = set()
+        # All the fields that we have field maps defined for - this only allows for simple mapped fields
+        # where the field is essentially a rename, as we have no good way of doing ordering on a field that
+        # that is doing more complex function based mapping.
+        mapped_fields = {v: k for k, v in view.field_map.items() if isinstance(v, str)}
+        # All the fields of the model
+        model_fields = {f.name for f in queryset.model._meta.get_fields()}
+        # Loop through every value in the view's values tuple
+        for field in view.values:
+            # If the value is for a foreign key lookup, we split it here to make sure that the first relation key
+            # exists on the model - it's unlikely this would ever not be the case, as otherwise the viewset would
+            # be returning 500s.
+            fk_ref = field.split("__")[0]
+            # Check either if the field is a model field, a currently annotated annotation, or
+            # is a foreign key lookup on an FK on this model.
+            if field in model_fields or field in queryset.query.annotations or fk_ref in model_fields:
+                # If the field is a mapped field, we store the field name as returned to the client
+                # not the actual internal field - this will later be mapped when we come to do the ordering.
+                if field in mapped_fields:
+                    default_fields.add((mapped_fields[field], mapped_fields[field]))
+                else:
+                    default_fields.add((field, field))
+
+        return default_fields
+
+    def remove_invalid_fields(self, queryset, fields, view, request):
+        """
+        Modified from https://github.com/encode/django-rest-framework/blob/version-3.12.2/rest_framework/filters.py#L259
+        to do filtering based on valuesviewset setup
+        """
+        # We filter the mapped fields to ones that do simple string mappings here, any functional maps are excluded.
+        mapped_fields = {k: v for k, v in view.field_map.items() if isinstance(v, str)}
+        valid_fields = [item[0] for item in self.get_valid_fields(queryset, view, {'request': request})]
+        ordering = []
+        for term in fields:
+            if term.lstrip("-") in valid_fields:
+                if term.lstrip("-") in mapped_fields:
+                    # In the case that the ordering field is a mapped field on the values viewset
+                    # we substitute the serialized name of the field for the database name.
+                    prefix = "-" if term[0] == "-" else ""
+                    new_term = prefix + mapped_fields[term.lstrip("-")]
+                    ordering.append(new_term)
+                else:
+                    ordering.append(term)
+        if len(ordering) > 1:
+            raise ValidationError("Can only define a single ordering field")
+        return ordering
+
+
 class ReadOnlyValuesViewset(SimpleReprMixin, ReadOnlyModelViewSet):
     """
     A viewset that uses a values call to get all model/queryset data in
     a single database query, rather than delegating serialization to a
     DRF ModelSerializer.
     """
+    filter_backends = (DjangoFilterBackend, ValuesViewsetOrderingFilter)
 
     # A tuple of values to get from the queryset
     values = None
@@ -485,9 +552,6 @@ def get_edit_object(self):
     def annotate_queryset(self, queryset):
         return queryset
 
-    def prefetch_queryset(self, queryset):
-        return queryset
-
     def _map_fields(self, item):
         for key, value in self._field_map.items():
             if callable(value):
@@ -509,18 +573,22 @@ def serialize(self, queryset):
         return self.consolidate(list(map(self._map_fields, queryset or [])), queryset)
 
     def list(self, request, *args, **kwargs):
-        queryset = self.filter_queryset(self.prefetch_queryset(self.get_queryset()))
-        queryset = self._cast_queryset_to_values(queryset)
+        queryset = self.filter_queryset(self.get_queryset())
+
+        page_queryset = self.paginate_queryset(queryset)
 
-        page = self.paginate_queryset(queryset)
+        if page_queryset is not None:
+            queryset = page_queryset
+
+        queryset = self._cast_queryset_to_values(queryset)
 
-        if page is not None:
-            return self.get_paginated_response(self.serialize(page))
+        if page_queryset is not None:
+            return self.get_paginated_response(self.serialize(queryset))
 
         return Response(self.serialize(queryset))
 
     def serialize_object(self, **filter_kwargs):
-        queryset = self.prefetch_queryset(self.get_queryset())
+        queryset = self.get_queryset()
         try:
             filter_kwargs = filter_kwargs or self._get_lookup_filter()
             return self.serialize(
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index 55accb11f2..e4b9e97c62 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -15,11 +15,10 @@
 from django_cte import With
 from django_filters.rest_framework import BooleanFilter
 from django_filters.rest_framework import CharFilter
-from django_filters.rest_framework import DjangoFilterBackend
 from le_utils.constants import content_kinds
 from le_utils.constants import roles
 from rest_framework import serializers
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.permissions import AllowAny
@@ -39,7 +38,7 @@
 from contentcuration.models import User
 from contentcuration.tasks import create_async_task
 from contentcuration.utils.pagination import CachedListPagination
-from contentcuration.utils.pagination import get_order_queryset
+from contentcuration.utils.pagination import ValuesViewsetPageNumberPagination
 from contentcuration.viewsets.base import BulkListSerializer
 from contentcuration.viewsets.base import BulkModelSerializer
 from contentcuration.viewsets.base import ReadOnlyValuesViewset
@@ -55,7 +54,7 @@
 from contentcuration.viewsets.sync.utils import generate_update_event
 
 
-class ChannelListPagination(PageNumberPagination):
+class ChannelListPagination(ValuesViewsetPageNumberPagination):
     page_size = None
     page_size_query_param = "page_size"
     max_page_size = 1000
@@ -93,8 +92,8 @@ class CatalogListPagination(CachedListPagination):
 
 
 class BaseChannelFilter(RequiredFilterSet):
-    published = BooleanFilter(name="main_tree__published")
-    id__in = UUIDInFilter(name="id")
+    published = BooleanFilter(field_name="main_tree__published")
+    id__in = UUIDInFilter(field_name="id")
     keywords = CharFilter(method="filter_keywords")
     languages = CharFilter(method="filter_languages")
     licenses = CharFilter(method="filter_licenses")
@@ -107,7 +106,7 @@ class BaseChannelFilter(RequiredFilterSet):
     staged = BooleanFilter(method="filter_staged")
     public = BooleanFilter(method="filter_public")
     cheffed = BooleanFilter(method="filter_cheffed")
-    exclude = CharFilter(name="id", method="filter_excluded_id")
+    exclude = CharFilter(field_name="id", method="filter_excluded_id")
 
     def __init__(self, *args, **kwargs):
         super(BaseChannelFilter, self).__init__(*args, **kwargs)
@@ -230,11 +229,7 @@ def filter_bookmark(self, queryset, name, value):
 
     class Meta:
         model = Channel
-        fields = base_channel_filter_fields + (
-            "bookmark",
-            "edit",
-            "view",
-        )
+        fields = base_channel_filter_fields + ("bookmark", "edit", "view",)
 
 
 class ThumbnailEncodingFieldsSerializer(JSONFieldDictSerializer):
@@ -394,16 +389,15 @@ class ChannelViewSet(ChangeEventMixin, ValuesViewset):
     queryset = Channel.objects.all()
     permission_classes = [IsAuthenticated]
     serializer_class = ChannelSerializer
-    filter_backends = (DjangoFilterBackend,)
     pagination_class = ChannelListPagination
-    filter_class = ChannelFilter
+    filterset_class = ChannelFilter
 
     field_map = channel_field_map
     values = base_channel_values + ("edit", "view", "bookmark")
 
     def get_queryset(self):
         queryset = super(ChannelViewSet, self).get_queryset()
-        user_id = not self.request.user.is_anonymous() and self.request.user.id
+        user_id = not self.request.user.is_anonymous and self.request.user.id
         user_queryset = User.objects.filter(id=user_id)
 
         return queryset.annotate(
@@ -460,7 +454,7 @@ def update_from_changes(self, changes):
         changes = [change for change in changes if change['mods']]
         return super(ChannelViewSet, self).update_from_changes(changes)
 
-    @detail_route(methods=["post"])
+    @action(detail=True, methods=["post"])
     def publish(self, request, pk=None):
         if not pk:
             raise Http404
@@ -493,7 +487,7 @@ def publish(self, request, pk=None):
             'changes': [self.create_task_event(task_info)]
         })
 
-    @detail_route(methods=["post"])
+    @action(detail=True, methods=["post"])
     def sync(self, request, pk=None):
         if not pk:
             raise Http404
@@ -541,15 +535,15 @@ def sync(self, request, pk=None):
 class CatalogViewSet(ReadOnlyValuesViewset):
     queryset = Channel.objects.all()
     serializer_class = ChannelSerializer
-    filter_backends = (DjangoFilterBackend,)
     pagination_class = CatalogListPagination
-    filter_class = BaseChannelFilter
+    filterset_class = BaseChannelFilter
 
     permission_classes = [AllowAny]
 
     field_map = channel_field_map
-    values = ("id", "name")
-    base_values = (
+    values = (
+        "id",
+        "name",
         "description",
         "thumbnail",
         "thumbnail_encoding",
@@ -565,17 +559,7 @@ def get_queryset(self):
 
         return queryset.order_by("name")
 
-    def paginate_queryset(self, queryset):
-        page_results = self.paginator.paginate_queryset(
-            queryset, self.request, view=self
-        )
-        ids = [result["id"] for result in page_results]
-        queryset = Channel.objects.filter(id__in=ids)
-        queryset = self.complete_annotations(queryset)
-        self.values = self.values + self.base_values
-        return list(queryset.values(*self.values))
-
-    def complete_annotations(self, queryset):
+    def annotate_queryset(self, queryset):
         queryset = queryset.annotate(primary_token=primary_token_subquery)
         channel_main_tree_nodes = ContentNode.objects.filter(
             tree_id=OuterRef("main_tree__tree_id")
@@ -641,10 +625,7 @@ class AdminChannelViewSet(ChannelViewSet):
     pagination_class = CatalogListPagination
     permission_classes = [IsAdminUser]
     serializer_class = AdminChannelSerializer
-    filter_class = AdminChannelFilter
-    filter_backends = (
-        DjangoFilterBackend,
-    )
+    filterset_class = AdminChannelFilter
     field_map = {
         "published": "main_tree__published",
         "created": "main_tree__created",
@@ -652,11 +633,15 @@ class AdminChannelViewSet(ChannelViewSet):
         "demo_server_url": format_demo_server_url,
     }
 
-    base_values = (
+    values = (
         "id",
         "name",
         "description",
         "main_tree__published",
+        "modified",
+        "editors_count",
+        "viewers_count",
+        "size",
         "public",
         "main_tree__created",
         "main_tree__id",
@@ -664,54 +649,23 @@ class AdminChannelViewSet(ChannelViewSet):
         "deleted",
         "source_url",
         "demo_server_url",
+        "primary_token",
     )
-    values = base_values
-
-    def paginate_queryset(self, queryset):
-        order, queryset = get_order_queryset(self.request, queryset, self.field_map)
-        page_results = self.paginator.paginate_queryset(
-            queryset, self.request, view=self
-        )
-        ids = [result["id"] for result in page_results]
-        # tree_ids are needed to optimize files size annotation:
-        self.page_tree_ids = [result["main_tree__tree_id"] for result in page_results]
-
-        self.values = self.base_values
-        queryset = Channel.objects.filter(id__in=ids).values(*(self.values))
-        if order != "undefined":
-            queryset = queryset.order_by(order)
-        return self.complete_annotations(queryset)
 
     def get_queryset(self):
-        self.annotations = self.compose_annotations()
-        order = self.request.GET.get("sortBy", "")
-        if order in self.annotations:
-            self.values = self.values + (order,)
-        return Channel.objects.values("id").order_by("name")
-
-    def annotate_queryset(self, queryset):
-        # will do it after paginate excepting for order by
-        order = self.request.GET.get("sortBy", "")
-        if order in self.annotations:
-            queryset = queryset.annotate(**{order: self.annotations[order]})
-        return queryset
-
-    def compose_annotations(self):
         channel_main_tree_nodes = ContentNode.objects.filter(
             tree_id=OuterRef("main_tree__tree_id")
         )
-
-        annotations = {}
-        annotations["primary_token"] = primary_token_subquery
-        # Add the last modified node modified value as the channel last modified
-        annotations["modified"] = Subquery(
-            channel_main_tree_nodes.values("modified").order_by("-modified")[:1]
+        queryset = Channel.objects.all().annotate(
+            modified=Subquery(
+                channel_main_tree_nodes.values("modified").order_by("-modified")[:1]
+            ),
+            primary_token=primary_token_subquery,
         )
-        return annotations
-
-    def complete_annotations(self, queryset):
+        return queryset
 
-        queryset = queryset.annotate(**self.annotations)
+    def annotate_queryset(self, queryset):
+        page_tree_ids = list(queryset.values_list("main_tree__tree_id", flat=True))
 
         editors_query = (
             User.objects.filter(editable_channels__id=OuterRef("id"))
@@ -726,7 +680,7 @@ def complete_annotations(self, queryset):
 
         nodes = With(
             ContentNode.objects.values("id", "tree_id")
-            .filter(tree_id__in=self.page_tree_ids)
+            .filter(tree_id__in=page_tree_ids)
             .order_by(),
             name="nodes",
         )
diff --git a/contentcuration/contentcuration/viewsets/channelset.py b/contentcuration/contentcuration/viewsets/channelset.py
index 5b91977b5d..a4e665e2a7 100644
--- a/contentcuration/contentcuration/viewsets/channelset.py
+++ b/contentcuration/contentcuration/viewsets/channelset.py
@@ -1,9 +1,7 @@
-from django.db.models import CharField
 from django.db.models import Exists
 from django.db.models import OuterRef
 from django.db.models import Q
 from django_filters.rest_framework import BooleanFilter
-from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import serializers
 from rest_framework.permissions import IsAuthenticated
 
@@ -70,7 +68,6 @@ class Meta:
 class ChannelSetViewSet(ValuesViewset):
     queryset = ChannelSet.objects.all()
     serializer_class = ChannelSetSerializer
-    filter_backends = (DjangoFilterBackend,)
     filter_class = ChannelSetFilter
     permission_classes = [IsAuthenticated]
     values = ("id", "name", "description", "channels", "secret_token__token", "edit")
@@ -79,7 +76,7 @@ class ChannelSetViewSet(ValuesViewset):
 
     def get_queryset(self):
         queryset = super(ChannelSetViewSet, self).get_queryset()
-        user_id = not self.request.user.is_anonymous() and self.request.user.id
+        user_id = not self.request.user.is_anonymous and self.request.user.id
         edit = Exists(User.channel_sets.through.objects.filter(user_id=user_id, channelset_id=OuterRef("id")))
         return queryset.annotate(edit=edit)
 
@@ -87,8 +84,10 @@ def annotate_queryset(self, queryset):
         return queryset.annotate(
             channels=NotNullMapArrayAgg(
                 "secret_token__channels__id",
-                filter=Q(main_tree__published=True, deleted=False),
-                output_field=CharField(),
+                filter=Q(
+                    secret_token__channels__main_tree__published=True,
+                    secret_token__channels__deleted=False,
+                ),
             )
         )
 
diff --git a/contentcuration/contentcuration/viewsets/clipboard.py b/contentcuration/contentcuration/viewsets/clipboard.py
index dba622d2c9..2ae7a5ab5d 100644
--- a/contentcuration/contentcuration/viewsets/clipboard.py
+++ b/contentcuration/contentcuration/viewsets/clipboard.py
@@ -1,7 +1,8 @@
 from django.db.models import F
+from django.db.models import IntegerField
 from django.db.models import OuterRef
 from django.db.models import Subquery
-from django_filters.rest_framework import DjangoFilterBackend
+from django.db.models.functions import Cast
 from le_utils.constants import content_kinds
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.serializers import BooleanField
@@ -103,8 +104,7 @@ def update(self, instance, validated_data):
 
 class ClipboardViewSet(ValuesViewset):
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = ClipboardFilter
+    filterset_class = ClipboardFilter
     serializer_class = ClipboardSerializer
     values = (
         "id",
@@ -118,12 +118,13 @@ class ClipboardViewSet(ValuesViewset):
     )
 
     def get_queryset(self):
-        user_id = not self.request.user.is_anonymous() and self.request.user.id
+        user_id = not self.request.user.is_anonymous and self.request.user.id
         user_queryset = User.objects.filter(id=user_id)
 
-        clipboard_tree_id_query = ContentNode.objects.filter(
-            pk=user_queryset.values_list("clipboard_tree_id", flat=True)[:1]
-        ).values_list("tree_id", flat=True)[:1]
+        clipboard_tree_id_query = Cast(
+            user_queryset.values_list("clipboard_tree__tree_id", flat=True)[:1],
+            output_field=IntegerField(),
+        )
 
         return ContentNode.objects.filter(tree_id=clipboard_tree_id_query)
 
diff --git a/contentcuration/contentcuration/viewsets/common.py b/contentcuration/contentcuration/viewsets/common.py
index 3e76d6f435..c378bb5734 100644
--- a/contentcuration/contentcuration/viewsets/common.py
+++ b/contentcuration/contentcuration/viewsets/common.py
@@ -49,32 +49,27 @@ class NotNullMapArrayAgg(ArrayAgg):
     for patch modifications by adding and deleting by key
     """
 
-    def convert_value(self, value, expression, connection, context):
+    def convert_value(self, value, expression, connection):
         if not value:
             return {}
         return {v: True for v in value if v}
 
 
 class NotNullArrayAgg(ArrayAgg):
-    def convert_value(self, value, expression, connection, context):
+    def convert_value(self, value, expression, connection):
         if not value:
             return []
         return filter(lambda x: x is not None, value)
 
 
-class DistinctNotNullArrayAgg(ArrayAgg):
-    def convert_value(self, value, expression, connection, context):
-        if not value:
-            return []
-        return list(set(filter(lambda x: x is not None, value)))
-
-
 class AggregateSubquery(Subquery):
     def __init__(self, queryset, **extra):
         """
         Set select fields on queryset to avoid outputting more select columns than are needed
         """
-        super(AggregateSubquery, self).__init__(queryset.values(extra.get("field")), **extra)
+        super(AggregateSubquery, self).__init__(
+            queryset.values(extra.get("field")), **extra
+        )
 
 
 class SQCount(AggregateSubquery):
@@ -91,7 +86,9 @@ class SQSum(AggregateSubquery):
 
 class SQArrayAgg(AggregateSubquery):
     # Include ALIAS at the end to support Postgres
-    template = "(SELECT ARRAY_AGG(%(field)s::text) FROM (%(subquery)s) AS %(field)s__sum)"
+    template = (
+        "(SELECT ARRAY_AGG(%(field)s::text) FROM (%(subquery)s) AS %(field)s__sum)"
+    )
     output_field = ArrayField(CharField())
 
 
diff --git a/contentcuration/contentcuration/viewsets/contentnode.py b/contentcuration/contentcuration/viewsets/contentnode.py
index 0ba70444bc..7c96d99caa 100644
--- a/contentcuration/contentcuration/viewsets/contentnode.py
+++ b/contentcuration/contentcuration/viewsets/contentnode.py
@@ -6,15 +6,16 @@
 from django.db import models
 from django.db.models import Exists
 from django.db.models import F
+from django.db.models import IntegerField as DjangoIntegerField
 from django.db.models import OuterRef
 from django.db.models import Q
 from django.db.models import Subquery
+from django.db.models.functions import Cast
 from django.db.models.functions import Coalesce
 from django.http import Http404
 from django.utils.timezone import now
 from django_cte import CTEQuerySet
 from django_filters.rest_framework import CharFilter
-from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import UUIDFilter
 from le_utils.constants import content_kinds
 from le_utils.constants import exercises
@@ -72,10 +73,10 @@
 
 
 class ContentNodeFilter(RequiredFilterSet):
-    id__in = UUIDInFilter(name="id")
+    id__in = UUIDInFilter(field_name="id")
     root_id = UUIDFilter(method="filter_root_id")
     ancestors_of = UUIDFilter(method="filter_ancestors_of")
-    parent__in = UUIDInFilter(name="parent")
+    parent__in = UUIDInFilter(field_name="parent")
     _node_id_channel_id___in = CharFilter(method="filter__node_id_channel_id")
 
     class Meta:
@@ -515,8 +516,7 @@ class ContentNodeViewSet(BulkUpdateMixin, ChangeEventMixin, ValuesViewset):
     queryset = ContentNode.objects.all()
     serializer_class = ContentNodeSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = ContentNodeFilter
+    filterset_class = ContentNodeFilter
     values = (
         "id",
         "content_id",
@@ -597,9 +597,10 @@ def requisites(self, request, pk=None):
         # Do a filter just on the tree_id of the target node, as relationships
         # should not be cross channel, and are not meaningful if they are.
         prereq_table_entries = PrerequisiteContentRelationship.objects.filter(
-            target_node__tree_id=ContentNode.objects.filter(pk=pk).values_list(
-                "tree_id", flat=True
-            )[:1]
+            target_node__tree_id=Cast(
+                ContentNode.objects.filter(pk=pk).values_list("tree_id", flat=True)[:1],
+                output_field=DjangoIntegerField(),
+            )
         ).values("target_node_id", "prerequisite_id")
 
         return Response(
@@ -680,8 +681,16 @@ def annotate_queryset(self, queryset):
             contentnode=OuterRef("id"), preset__thumbnail=True
         )
         original_channel_name = Coalesce(
-            Subquery(Channel.objects.filter(pk=OuterRef("original_channel_id")).values("name")[:1]),
-            Subquery(Channel.objects.filter(main_tree__tree_id=OuterRef("tree_id")).values("name")[:1]),
+            Subquery(
+                Channel.objects.filter(pk=OuterRef("original_channel_id")).values(
+                    "name"
+                )[:1]
+            ),
+            Subquery(
+                Channel.objects.filter(main_tree__tree_id=OuterRef("tree_id")).values(
+                    "name"
+                )[:1]
+            ),
         )
         original_node = ContentNode.objects.filter(
             node_id=OuterRef("original_source_node_id")
@@ -716,7 +725,6 @@ def annotate_queryset(self, queryset):
             ),
             original_channel_name=original_channel_name,
             original_parent_id=Subquery(original_node.values("parent_id")[:1]),
-            original_node_id=Subquery(original_node.values("pk")[:1]),
             has_children=Exists(
                 ContentNode.objects.filter(parent=OuterRef("id")).values("pk")
             ),
diff --git a/contentcuration/contentcuration/viewsets/file.py b/contentcuration/contentcuration/viewsets/file.py
index c9467b9c65..6c65582a56 100644
--- a/contentcuration/contentcuration/viewsets/file.py
+++ b/contentcuration/contentcuration/viewsets/file.py
@@ -2,8 +2,7 @@
 
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseBadRequest
-from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.decorators import list_route
+from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
@@ -27,9 +26,9 @@
 
 
 class FileFilter(RequiredFilterSet):
-    id__in = UUIDInFilter(name="id")
-    contentnode__in = UUIDInFilter(name="contentnode")
-    assessment_item__in = UUIDInFilter(name="assessment_item")
+    id__in = UUIDInFilter(field_name="id")
+    contentnode__in = UUIDInFilter(field_name="contentnode")
+    assessment_item__in = UUIDInFilter(field_name="assessment_item")
 
     class Meta:
         model = File
@@ -85,8 +84,7 @@ class FileViewSet(BulkDeleteMixin, BulkUpdateMixin, ReadOnlyValuesViewset):
     queryset = File.objects.all()
     serializer_class = FileSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = FileFilter
+    filterset_class = FileFilter
     values = (
         "id",
         "checksum",
@@ -129,7 +127,7 @@ def delete_from_changes(self, changes):
 
         return super(FileViewSet, self).delete_from_changes(changes)
 
-    @list_route(methods=["post"])
+    @action(detail=False, methods=["post"])
     def upload_url(self, request):
         try:
             size = request.data["size"]
diff --git a/contentcuration/contentcuration/viewsets/invitation.py b/contentcuration/contentcuration/viewsets/invitation.py
index fe4ae87d4f..c46107f7ac 100644
--- a/contentcuration/contentcuration/viewsets/invitation.py
+++ b/contentcuration/contentcuration/viewsets/invitation.py
@@ -1,5 +1,4 @@
 from django_filters.rest_framework import CharFilter
-from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import FilterSet
 from rest_framework import serializers
 from rest_framework.permissions import IsAuthenticated
@@ -95,8 +94,7 @@ def get_sender_name(item):
 class InvitationViewSet(ValuesViewset):
     queryset = Invitation.objects.all()
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = InvitationFilter
+    filterset_class = InvitationFilter
     serializer_class = InvitationSerializer
     values = (
         "id",
diff --git a/contentcuration/contentcuration/viewsets/task.py b/contentcuration/contentcuration/viewsets/task.py
index c41994baf9..ee89e8ace7 100644
--- a/contentcuration/contentcuration/viewsets/task.py
+++ b/contentcuration/contentcuration/viewsets/task.py
@@ -1,7 +1,6 @@
 import uuid
 
 from celery import states
-from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import UUIDFilter
 from rest_framework.permissions import IsAuthenticated
 
@@ -31,8 +30,7 @@ class TaskViewSet(ReadOnlyValuesViewset, DestroyModelMixin):
     order_by = 'created'
     queryset = Task.objects.order_by(order_by)
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = TaskFilter
+    filterset_class = TaskFilter
     lookup_field = "task_id"
 
     values = (
diff --git a/contentcuration/contentcuration/viewsets/user.py b/contentcuration/contentcuration/viewsets/user.py
index a4d59b38f8..1a9e664d81 100644
--- a/contentcuration/contentcuration/viewsets/user.py
+++ b/contentcuration/contentcuration/viewsets/user.py
@@ -13,12 +13,9 @@
 from django.db.models.functions import Concat
 from django_filters.rest_framework import BooleanFilter
 from django_filters.rest_framework import CharFilter
-from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import FilterSet
 from rest_framework.decorators import action
-from rest_framework.decorators import list_route
 from rest_framework.exceptions import ValidationError
-from rest_framework.pagination import PageNumberPagination
 from rest_framework.permissions import IsAdminUser
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -27,13 +24,12 @@
 from contentcuration.models import boolean_val
 from contentcuration.models import Channel
 from contentcuration.models import User
-from contentcuration.utils.pagination import get_order_queryset
+from contentcuration.utils.pagination import ValuesViewsetPageNumberPagination
 from contentcuration.viewsets.base import BulkListSerializer
 from contentcuration.viewsets.base import BulkModelSerializer
 from contentcuration.viewsets.base import ReadOnlyValuesViewset
 from contentcuration.viewsets.base import RequiredFilterSet
 from contentcuration.viewsets.base import ValuesViewset
-from contentcuration.viewsets.common import CatalogPaginator
 from contentcuration.viewsets.common import NotNullArrayAgg
 from contentcuration.viewsets.common import SQCount
 from contentcuration.viewsets.common import UUIDFilter
@@ -43,23 +39,10 @@
 from contentcuration.viewsets.sync.constants import VIEWER_M2M
 
 
-class UserListPagination(PageNumberPagination):
+class UserListPagination(ValuesViewsetPageNumberPagination):
     page_size = None
     page_size_query_param = "page_size"
     max_page_size = 100
-    django_paginator_class = CatalogPaginator
-
-    def get_paginated_response(self, data):
-        return Response(
-            {
-                "next": self.get_next_link(),
-                "previous": self.get_previous_link(),
-                "page_number": self.page.number,
-                "count": self.page.paginator.count,
-                "total_pages": self.page.paginator.num_pages,
-                "results": data,
-            }
-        )
 
 
 class UserFilter(FilterSet):
@@ -81,8 +64,7 @@ def filter_channel(self, queryset, name, value):
             can_edit=Cast(
                 Cast(
                     SQCount(
-                        channel_queryset.filter(editors=OuterRef("id")),
-                        field="id",
+                        channel_queryset.filter(editors=OuterRef("id")), field="id",
                     ),
                     IntegerField(),
                 ),
@@ -91,8 +73,7 @@ def filter_channel(self, queryset, name, value):
             can_view=Cast(
                 Cast(
                     SQCount(
-                        channel_queryset.filter(viewers=OuterRef("id")),
-                        field="id",
+                        channel_queryset.filter(viewers=OuterRef("id")), field="id",
                     ),
                     IntegerField(),
                 ),
@@ -126,8 +107,7 @@ class UserViewSet(ReadOnlyValuesViewset):
     queryset = User.objects.all()
     serializer_class = UserSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = UserFilter
+    filterset_class = UserFilter
     values = (
         "id",
         "email",
@@ -142,11 +122,11 @@ class UserViewSet(ReadOnlyValuesViewset):
         "view_only_channels": "view_only_channels__ids",
     }
 
-    @list_route(methods=["get"])
+    @action(detail=False, methods=["get"])
     def get_storage_used(self, request):
         return Response(request.user.disk_space_used)
 
-    @list_route(methods=["get"])
+    @action(detail=False, methods=["get"])
     def refresh_storage_used(self, request):
         return Response(request.user.set_space_used())
 
@@ -181,8 +161,7 @@ class ChannelUserViewSet(ReadOnlyValuesViewset):
     queryset = User.objects.all()
     serializer_class = UserSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = ChannelUserFilter
+    filterset_class = ChannelUserFilter
     values = (
         "id",
         "email",
@@ -359,12 +338,9 @@ class AdminUserViewSet(ValuesViewset):
     pagination_class = UserListPagination
     permission_classes = [IsAdminUser]
     serializer_class = AdminUserSerializer
-    filter_class = AdminUserFilter
-    filter_backends = (
-        DjangoFilterBackend,
-    )
+    filterset_class = AdminUserFilter
 
-    base_values = (
+    values = (
         "id",
         "email",
         "first_name",
@@ -375,42 +351,13 @@ class AdminUserViewSet(ValuesViewset):
         "date_joined",
         "is_admin",
         "is_active",
+        "name",
+        "edit_count",
+        "view_count",
     )
-    values = base_values
     queryset = User.objects.all()
 
-    def paginate_queryset(self, queryset):
-        order, queryset = get_order_queryset(self.request, queryset, self.field_map)
-        page_results = self.paginator.paginate_queryset(
-            queryset, self.request, view=self
-        )
-        ids = [result["id"] for result in page_results]
-
-        self.values = self.base_values
-        queryset = User.objects.filter(id__in=ids).values(*(self.values))
-        if order != "undefined":
-            queryset = queryset.order_by(order)
-        return queryset.annotate(**self.annotations)
-
-    def get_queryset(self):
-        self.annotations = self.compose_annotations()
-        order = self.request.GET.get("sortBy", "")
-        if order in self.annotations:
-            self.values = self.values + (order,)
-        return User.objects.values("id").order_by("email")
-
     def annotate_queryset(self, queryset):
-        # will do it after paginate excepting for order by
-        order = self.request.GET.get("sortBy", "")
-        if order in self.annotations:
-            queryset = queryset.annotate(**{order: self.annotations[order]})
-        return queryset
-
-    def compose_annotations(self):
-        annotations = {}
-        annotations["name"] = Concat(
-            F("first_name"), Value(" "), F("last_name"), output_field=CharField()
-        )
         edit_channel_query = (
             Channel.objects.filter(editors__id=OuterRef("id"), deleted=False)
             .values_list("id", flat=True)
@@ -421,9 +368,15 @@ def compose_annotations(self):
             .values_list("id", flat=True)
             .distinct()
         )
-        annotations["edit_count"] = SQCount(edit_channel_query, field="id")
-        annotations["view_count"] = SQCount(viewonly_channel_query, field="id")
-        return annotations
+
+        queryset = queryset.annotate(
+            name=Concat(
+                F("first_name"), Value(" "), F("last_name"), output_field=CharField()
+            ),
+            edit_count=SQCount(edit_channel_query, field="id"),
+            view_count=SQCount(viewonly_channel_query, field="id"),
+        )
+        return queryset
 
     @action(detail=True, methods=("get",))
     def metadata(self, request, pk=None):
diff --git a/contentcuration/contentcuration/wsgi.py b/contentcuration/contentcuration/wsgi.py
index 2a3c212a5a..9fa3a86379 100644
--- a/contentcuration/contentcuration/wsgi.py
+++ b/contentcuration/contentcuration/wsgi.py
@@ -6,10 +6,10 @@
 For more information on this file, see
 https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
 """
-
-import logging
 import os
 
+from django.core.wsgi import get_wsgi_application
+
 # Attach newrelic APM
 try:
     import newrelic.agent
@@ -18,9 +18,5 @@
 except ImportError:
     pass
 
-try:
-    from django.core.wsgi import get_wsgi_application
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "contentcuration.settings")
-    application = get_wsgi_application()
-except ImportError:
-    logging.warn("Django's WSGI wasn't successfully imported!")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "contentcuration.settings")
+application = get_wsgi_application()
diff --git a/contentcuration/kolibri_content/migrations/0013_auto_20210519_1759.py b/contentcuration/kolibri_content/migrations/0013_auto_20210519_1759.py
new file mode 100644
index 0000000000..1617a522bf
--- /dev/null
+++ b/contentcuration/kolibri_content/migrations/0013_auto_20210519_1759.py
@@ -0,0 +1,44 @@
+# Generated by Django 2.2.17 on 2021-05-19 17:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('content', '0012_auto_20210511_1605'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentnode',
+            name='lang',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='content.Language'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='level',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='lft',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='license',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='content.License'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='rght',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='lang',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='content.Language'),
+        ),
+    ]
diff --git a/contentcuration/kolibri_content/models.py b/contentcuration/kolibri_content/models.py
index 2f70c5d4b1..8f89618165 100644
--- a/contentcuration/kolibri_content/models.py
+++ b/contentcuration/kolibri_content/models.py
@@ -3,7 +3,6 @@
 import uuid
 
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from jsonfield import JSONField
 from le_utils.constants import content_kinds
 from le_utils.constants import file_formats
@@ -50,7 +49,7 @@ def get_db_prep_value(self, value, connection, prepared=False):
                 raise TypeError(self.error_messages["invalid"] % {"value": value})
         return value.hex
 
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection):
         return self.to_python(value)
 
     def to_python(self, value):
@@ -59,7 +58,6 @@ def to_python(self, value):
         return value
 
 
-@python_2_unicode_compatible
 class ContentTag(models.Model):
     id = UUIDField(primary_key=True)
     tag_name = models.CharField(max_length=30, blank=True)
@@ -68,7 +66,6 @@ def __str__(self):
         return self.tag_name
 
 
-@python_2_unicode_compatible
 class ContentNode(MPTTModel):
     """
     The top layer of the contentDB schema, defines the most common properties that are shared across all different contents.
@@ -77,7 +74,12 @@ class ContentNode(MPTTModel):
 
     id = UUIDField(primary_key=True)
     parent = TreeForeignKey(
-        "self", null=True, blank=True, related_name="children", db_index=True
+        "self",
+        null=True,
+        blank=True,
+        related_name="children",
+        db_index=True,
+        on_delete=models.CASCADE,
     )
     license_name = models.CharField(max_length=50, null=True, blank=True)
     license_description = models.CharField(max_length=400, null=True, blank=True)
@@ -108,11 +110,15 @@ class ContentNode(MPTTModel):
     stemmed_metaphone = models.CharField(
         max_length=1800, blank=True
     )  # for fuzzy search in title and description
-    lang = models.ForeignKey("Language", blank=True, null=True)
+    lang = models.ForeignKey(
+        "Language", blank=True, null=True, on_delete=models.SET_NULL
+    )
     coach_content = models.BooleanField(default=False, db_index=True)
 
     # Added legacy fields
-    license = models.ForeignKey("License", null=True, blank=True)
+    license = models.ForeignKey(
+        "License", null=True, blank=True, on_delete=models.SET_NULL
+    )
 
     # A JSON Dictionary of properties to configure loading, rendering, etc. the file
     options = JSONField(default={})
@@ -139,7 +145,6 @@ def get_descendant_content_ids(self):
         )
 
 
-@python_2_unicode_compatible
 class Language(models.Model):
     id = models.CharField(max_length=14, primary_key=True)
     lang_code = models.CharField(max_length=3, db_index=True)
@@ -162,13 +167,17 @@ class File(models.Model):
 
     id = UUIDField(primary_key=True)
     # The foreign key mapping happens here as many File objects can map onto a single local file
-    local_file = models.ForeignKey("LocalFile", related_name="files")
+    local_file = models.ForeignKey(
+        "LocalFile", related_name="files", on_delete=models.CASCADE
+    )
     available = models.BooleanField(default=False)
-    contentnode = models.ForeignKey(ContentNode, related_name="files")
+    contentnode = models.ForeignKey(
+        ContentNode, related_name="files", on_delete=models.CASCADE
+    )
     preset = models.CharField(
         max_length=150, choices=format_presets.choices, blank=True
     )
-    lang = models.ForeignKey(Language, blank=True, null=True)
+    lang = models.ForeignKey(Language, blank=True, null=True, on_delete=models.SET_NULL)
     supplementary = models.BooleanField(default=False)
     thumbnail = models.BooleanField(default=False)
     priority = models.IntegerField(blank=True, null=True, db_index=True)
@@ -204,7 +213,6 @@ def delete_orphan_file_objects(self):
         return self.get_orphan_files().delete()
 
 
-@python_2_unicode_compatible
 class LocalFile(models.Model):
     """
     The bottom layer of the contentDB schema, defines the local state of files on the device storage.
@@ -233,7 +241,9 @@ class AssessmentMetaData(models.Model):
     """
 
     id = UUIDField(primary_key=True)
-    contentnode = models.ForeignKey(ContentNode, related_name="assessmentmetadata")
+    contentnode = models.ForeignKey(
+        ContentNode, related_name="assessmentmetadata", on_delete=models.CASCADE
+    )
     # A JSON blob containing a serialized list of ids for questions that the assessment can present.
     assessment_item_ids = JSONField(default=[])
     # Length of the above assessment_item_ids for a convenience lookup.
@@ -247,7 +257,6 @@ class AssessmentMetaData(models.Model):
     is_manipulable = models.BooleanField(default=False)
 
 
-@python_2_unicode_compatible
 class ChannelMetadata(models.Model):
     """
     Holds metadata about all existing content databases that exist locally.
@@ -263,7 +272,7 @@ class ChannelMetadata(models.Model):
     last_updated = models.CharField(null=True, max_length=200)
     # Minimum version of Kolibri that this content database is compatible with
     min_schema_version = models.CharField(max_length=50)
-    root = models.ForeignKey(ContentNode)
+    root = models.ForeignKey(ContentNode, on_delete=models.CASCADE)
 
     # Added legacy fields
     root_pk = UUIDField()
diff --git a/contentcuration/kolibri_content/router.py b/contentcuration/kolibri_content/router.py
index 8e9d2d191f..665ac66a57 100644
--- a/contentcuration/kolibri_content/router.py
+++ b/contentcuration/kolibri_content/router.py
@@ -11,9 +11,9 @@
 """
 import os
 import threading
+from builtins import object
 from functools import wraps
 
-from builtins import object
 from django.apps import apps
 from django.conf import settings
 from django.db import connections
@@ -29,20 +29,20 @@
 
 
 def set_active_content_database(alias):
-    setattr(THREAD_LOCAL, 'ACTIVE_CONTENT_DB_ALIAS', alias)
+    setattr(THREAD_LOCAL, "ACTIVE_CONTENT_DB_ALIAS", alias)
 
 
 def get_active_content_database(return_none_if_not_set=False):
 
     # retrieve the temporary thread-local variable that `using_content_database` sets
-    alias = getattr(THREAD_LOCAL, 'ACTIVE_CONTENT_DB_ALIAS', None)
+    alias = getattr(THREAD_LOCAL, "ACTIVE_CONTENT_DB_ALIAS", None)
 
     # if no content db alias has been activated, that's a problem
     if not alias:
         if return_none_if_not_set:
             return None
         else:
-            raise ContentModelUsedOutsideDBContext()
+            raise TypeError()
 
     # retrieve the database connection to make sure it's been properly initialized
     get_content_database_connection(alias)
@@ -62,12 +62,12 @@ def get_content_database_connection(alias=None):
         if alias.endswith(".sqlite3"):
             filename = alias
         else:
-            filename = os.path.join(settings.CONTENT_DATABASE_DIR, alias + '.sqlite3')
+            filename = os.path.join(settings.CONTENT_DATABASE_DIR, alias + ".sqlite3")
         if not os.path.isfile(filename):
             raise KeyError("Content DB '%s' doesn't exist!!" % alias)
         connections.databases[alias] = {
-            'ENGINE': 'django.db.backends.sqlite3',
-            'NAME': filename,
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": filename,
         }
 
     return connections[alias].connection
@@ -103,7 +103,11 @@ def allow_migrate(self, db, app_label, model_name=None, **hints):
         # So, catch the LookupError, and let the migration proceed.
         try:
 
-            model = apps.get_model(app_label=app_label, model_name=model_name) if model_name else None
+            model = (
+                apps.get_model(app_label=app_label, model_name=model_name)
+                if model_name
+                else None
+            )
 
         except LookupError:
 
@@ -149,7 +153,7 @@ def __init__(self, alias):
         self.alias = alias
 
     def __enter__(self):
-        self.previous_alias = getattr(THREAD_LOCAL, 'ACTIVE_CONTENT_DB_ALIAS', None)
+        self.previous_alias = getattr(THREAD_LOCAL, "ACTIVE_CONTENT_DB_ALIAS", None)
         set_active_content_database(self.alias)
         return self
 
@@ -163,4 +167,5 @@ def inner(*args, **kwargs):
             # Call the function in our context manager
             with self:
                 return querying_func(*args, **kwargs)
+
         return inner
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index 8c0d1a0e2b..ef2fff649d 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -859,6 +859,8 @@
     "PoliciesModal.continueButton": "متابعة",
     "PoliciesModal.checkboxValidationErrorMessage": "هذا الحقل مطلوب",
     "PoliciesModal.checkboxText": "لقد وافقت على الشروط الواردة أعلاه",
+    "TermsOfServiceModal.ToSHeader": "شروط الخدمة",
+    "TermsOfServiceModal.updatedToSHeader": "شروط الخدمة المحدثة",
     "TermsOfServiceModal.prompt": "Please read these terms and conditions carefully",
     "TermsOfServiceModal.disclaimerP1": "Before using this website, you should read the following important information relating to it. These Terms of Service (\"Terms\") govern your use of this website and form a legally binding agreement between you and us regarding your use of our website.",
     "TermsOfServiceModal.disclaimerP2": "If, for any reason, you are unable or unwilling to agree to all of these Terms, please immediately discontinue using or attempting to use the service.",
@@ -949,6 +951,7 @@
     "TermsOfServiceModal.miscellaneousP1": "The Agreement constitutes the entire agreement between Learning Equality and you concerning the subject matter hereof. If any part of the Agreement is held invalid or unenforceable, that part will be construed to reflect the parties' original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of the Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof.",
     "TermsOfServiceModal.miscellaneousP2": "You may assign your rights under the Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; Learning Equality may assign its rights under the Agreement without condition. The Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.",
     "TermsOfServiceModal.miscellaneousP3": "If you have any questions about the Service or these Terms, please contact us at legal@learningequality.org.",
+    "CommunityStandardsModal.communityStandardsHeader": "معايير المجتمع",
     "CommunityStandardsModal.description": "Learning Equality هي منظمة غير ربحية تعمل على تمكين الوصول العادل إلى التجارب التعليمية عالية الجودة. وبالإضافة إلى بيان القيم الأساسية لدينا، تهدف معايير المجتمع هذه إلى تعزيز بيئة داعمة وشاملة لمستخدمينا.",
     "CommunityStandardsModal.coreValuesLink": "تعرف على المزيد حول القيم الأساسية داخل منظمة Learning Equality",
     "CommunityStandardsModal.studioDescription": "يتيح لك استوديو كوليبري الوصول إلى مكتبة كوليبري، وهي مكتبة متنامية من المواد التعليمية والتي نشجعك على استخدامها كمكتبة خاصة بك. قمنا ببناء استوديو كوليبري لمساعدتك في إعداد المواد التعليمية بطرق مختلفة، بما في ذلك على سبيل المثال لا الحصر:",
@@ -962,6 +965,8 @@
     "CommunityStandardsModal.libraryItem2": "حافظ على المواد واضحة ومنظمة وقابلة للاستخدام. نرحب بالمصادر التي تم إنشاؤها على جميع مستويات الإنتاج! للمساعدة في الوصول إلى أكبر عدد ممكن من المتعلمين، ندعوك للاستفادة الكاملة من جميع حقول البيانات الوصفية بهدف الوصول إلى الجودة في الفهم أو الوضوح أو الرقمنة بحيث يكون المحتوى قابلاً للاستخدام ومفهومًا.",
     "CommunityStandardsModal.libraryItem3": "احترم المجتمع. تجنب البذاءة والسوقية الخارجة عن الأغراض التعليمية المحددة التي قد تخدم في بعض السياقات. لن يتم التهاون مع خطاب الكراهية من أي نوع أو الترويج للعنف أو التمييز.",
     "CommunityStandardsModal.libraryItem4": "إن استوديو كوليبري مخصص للأغراض التعليمية فقط ولم يتم تصميمه لأغراض غير تعليمية مثل التوظيف أو نشر المعتقدات أو الإعلان أو مشاركة الملفات أو استضافة الوسائط الشخصية.",
+    "PrivacyPolicyModal.privacyHeader": "سياسة الخصوصية",
+    "PrivacyPolicyModal.updatedPrivacyHeader": "سياسة الخصوصية المحدثة",
     "PrivacyPolicyModal.paragraph1": "توضح سياسة الخصوصية هذه ممارسات الخصوصية لدينا وخياراتك وحقوقك بما يتعلق بالبيانات الشخصية التي نقوم بجمعها. تنطبق سياسة الخصوصية هذه على تطبيق كوليبري (\"التطبيق\") واستوديو كوليبري (\"الاستوديو\") وجميع المواقع الإلكترونية ذات الصلة (يشار إليها مجتمعة باسم \"كوليبري\"). لا ينطبق بيان الخصوصية هذا على تطبيقات الجهات الثالثة أو المنظمات الشريكة التي قد تستخدم برامجنا أو تُستخدم بالتزامن مع برامجنا.",
     "PrivacyPolicyModal.paragraph2": "تعترف منظمة Learning Equality بحقك في الخصوصية، وستتخذ خطوات منطقية لحماية تلك الخصوصية. تتيح لك بعض أقسام كوليبري تزويدنا بمعلومات شخصية، مثل اسمك وعنوان بريدك الإلكتروني. قد نستخدم المعلومات التي تقدمها لتحسين كوليبري. وعندما يكون هناك خيارات حول كيفية استخدامنا للمعلومات التي تقدمها، سنقوم بالإشارة إلى ذلك في نقطة التجميع. نظراً للطريقة التي يعمل بها كوليبري، قد نستخدم أيضاً معلومات متصفحك أو أنشطة التصفح لتخصيصك أو توجيهك إلى المعلومات ذات الصلة. على سبيل المثال، من الممكن أن نستخدم عنوان IP الخاص بك أو معلومات المستعرض أو ملفات تعريف الارتباط أو ملفات الويب بطرق تساعدنا في الحفاظ على بعض تفضيلاتك أو فهم كيفية تصفح زوارنا للموقع كي نتمكن من تحسينه. قد نقوم بتخزين معلوماتك الشخصية خارج نطاق الاتحاد الأوروبي.",
     "PrivacyPolicyModal.paragraph3": "تلتزم منظمة Learning Equality بالتعلّم باستمرار وتحسين جودة كوليبري، ومن الممكن استخدام السجلات المتعلقة بالتفاعلات مع كوليبري في الأبحاث. يتم عادة الإبلاغ عن نتائج الأبحاث على المستوى الإجمالي، ولن يتم الإفصاح علناً عن هويتك الشخصية في أية نتائج بحثية دون موافقة صريحة من قبلك.",
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index 79ebbfd748..2dc8d2e8f2 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -860,6 +860,8 @@
     "PoliciesModal.continueButton": "Continuar",
     "PoliciesModal.checkboxValidationErrorMessage": "Este campo es obligatorio",
     "PoliciesModal.checkboxText": "He leído y estoy de acuerdo con los términos anteriores",
+    "TermsOfServiceModal.ToSHeader": "Términos de Servicio",
+    "TermsOfServiceModal.updatedToSHeader": "Términos de servicio actualizados",
     "TermsOfServiceModal.prompt": "Por favor, lea estos términos y condiciones cuidadosamente",
     "TermsOfServiceModal.disclaimerP1": "Antes de utilizar este sitio web, debe leer la siguiente información importante relacionada con el mismo. Estos Términos de Servicio (\"Términos\") rigen su uso de este sitio web y forman un acuerdo legalmente vinculante entre usted y nosotros con respecto a su uso de nuestro sitio web.",
     "TermsOfServiceModal.disclaimerP2": "Si, por alguna razón, no puede o no desea aceptar todos estos términos, por favor interrumpa inmediatamente el uso del servicio.",
@@ -950,6 +952,7 @@
     "TermsOfServiceModal.miscellaneousP1": "El Acuerdo constituye todo el acuerdo entre Learning Equality y usted con respecto a la materia que aquí se trata. Si alguna parte del Acuerdo es considerada inválida o no aplicable, esa parte será interpretada como reflejo de la intención original de las partes, y las partes restantes permanecerán en pleno vigor y efecto. Una renuncia por cualquiera de las partes de cualquier término o condición del Acuerdo o cualquier incumplimiento del mismo, en cualquier caso, no renunciará a dicho término o condición o a cualquier incumplimiento posterior del mismo.",
     "TermsOfServiceModal.miscellaneousP2": "Usted puede asignar sus derechos bajo el Acuerdo a cualquier parte que acepte estar vinculada por sus términos y condiciones; Learning Equality puede asignar sus derechos en virtud del Acuerdo sin condiciones. El Acuerdo será vinculante y beneficiará a las partes, a sus sucesores y asignaciones autorizadas.",
     "TermsOfServiceModal.miscellaneousP3": "Si tiene alguna pregunta sobre el Servicio o estas Condiciones, póngase en contacto con nosotros en legal@learningequality.org.",
+    "CommunityStandardsModal.communityStandardsHeader": "Normas de la comunidad",
     "CommunityStandardsModal.description": "Learning Equality es una organización sin fines de lucro dedicada a facilitar un acceso equitativo a experiencias educativas de calidad. Junto con nuestra declaración de valores fundamentales, estas Normas Comunitarias pretenden fomentar un entorno de apoyo e inclusivo para nuestros usuarios.",
     "CommunityStandardsModal.coreValuesLink": "Aprenda más sobre los valores fundamentales de Learning Equality",
     "CommunityStandardsModal.studioDescription": "Kolibri Studio le da acceso a la Biblioteca Kolibri, una biblioteca creciente de materiales educativos, que le animamos a utilizar como propio. Construimos Kolibri Studio para ayudarle a preparar materiales educativos de diversas maneras, incluyendo, pero no limitándole a:",
@@ -963,6 +966,8 @@
     "CommunityStandardsModal.libraryItem2": "Mantenga los materiales claros, organizados y utilizables. Acogemos con satisfacción los recursos creados en todos los niveles de producción. Para ayudar a que lleguen al mayor número posible de estudiantes, le invitamos a que utilice todos los campos de metadatos y busque la calidad en sostenibilidad, la legibilidad, o la digitalización para que el contenido sea utilizable y comprensible.",
     "CommunityStandardsModal.libraryItem3": "Respete a la comunidad, evite la oscuridad y la vulgaridad, más allá de los propósitos educativos específicos que podrían servir en algunos contextos. Nunca se tolerará el discurso de odio de ningún tipo, o la promoción de la violencia o la discriminación.",
     "CommunityStandardsModal.libraryItem4": "Kolibri Studio es sólo para propósitos educativos. No está destinado a ser utilizado para fines no educativos como reclutamiento, adoctrinamiento, publicidad, intercambio de archivos o alojamiento personal de medios.",
+    "PrivacyPolicyModal.privacyHeader": "Política de privacidad",
+    "PrivacyPolicyModal.updatedPrivacyHeader": "Política de privacidad actualizada",
     "PrivacyPolicyModal.paragraph1": "Esta Política de privacidad le informa sobre nuestras prácticas de privacidad y sus opciones y derechos en torno a los datos personales que recopilamos. Esta Política de privacidad se aplica a la aplicación Kolibri (\"Aplicación\"), Kolibri Studio (\"Studio\") y todos los sitios web relacionados (en adelante, \"Kolibri\"). Esta Declaración de privacidad no se aplica a las aplicaciones de terceros u organizaciones asociadas que puedan usar nuestro software o que se utilicen junto con nuestro software. ",
     "PrivacyPolicyModal.paragraph2": "Learning Equality reconoce su derecho a la privacidad y tomará medidas razonables para protegerlo. Algunas partes de Kolibri le permiten dejarnos información personal, como su nombre y dirección de correo electrónico. Podemos utilizar la información que proporcione para mejorar Kolibri. Cuando existen opciones sobre cómo usamos la información que nos proporciona, lo indicaremos en el momento de la recopilación. Debido a la forma en que opera Kolibri, también podemos usar información de su navegador o actividades de navegación para personalizar o dirigirse a la información relevante. Por ejemplo, podemos usar su dirección IP, información del navegador, cookies o balizas web de manera que nos ayuden a mantener algunas de sus preferencias, o comprender cómo nuestros visitantes navegan por el sitio para que podamos mejorarlo. Podemos almacenar su información personal fuera de la Unión Europea. ",
     "PrivacyPolicyModal.paragraph3": "Learning Equality se compromete a aprender constantemente y mejorar la calidad de Kolibri, y los registros relacionados a sus interacciones con Kolibri pueden utilizarse para la investigación. Los resultados de la investigación generalmente se recopilan a nivel agregado, y su identidad personal nunca será divulgada públicamente en ningún hallazgo de la investigación sin su consentimiento expreso.",
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index 0a4c3d4016..5f78fc15c6 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -860,6 +860,8 @@
     "PoliciesModal.continueButton": "Continuer",
     "PoliciesModal.checkboxValidationErrorMessage": "Le champ est obligatoire",
     "PoliciesModal.checkboxText": "J'ai accepté les conditions ci-dessus",
+    "TermsOfServiceModal.ToSHeader": "Conditions d'utilisation",
+    "TermsOfServiceModal.updatedToSHeader": "Conditions d'utilisation mises à jour",
     "TermsOfServiceModal.prompt": "Please read these terms and conditions carefully",
     "TermsOfServiceModal.disclaimerP1": "Before using this website, you should read the following important information relating to it. These Terms of Service (\"Terms\") govern your use of this website and form a legally binding agreement between you and us regarding your use of our website.",
     "TermsOfServiceModal.disclaimerP2": "If, for any reason, you are unable or unwilling to agree to all of these Terms, please immediately discontinue using or attempting to use the service.",
@@ -950,6 +952,7 @@
     "TermsOfServiceModal.miscellaneousP1": "The Agreement constitutes the entire agreement between Learning Equality and you concerning the subject matter hereof. If any part of the Agreement is held invalid or unenforceable, that part will be construed to reflect the parties' original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of the Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof.",
     "TermsOfServiceModal.miscellaneousP2": "You may assign your rights under the Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; Learning Equality may assign its rights under the Agreement without condition. The Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.",
     "TermsOfServiceModal.miscellaneousP3": "If you have any questions about the Service or these Terms, please contact us at legal@learningequality.org.",
+    "CommunityStandardsModal.communityStandardsHeader": "Normes communautaires",
     "CommunityStandardsModal.description": "Learning Equality est une organisation à but non lucratif qui se consacre à permettre un accès équitable à des expériences pédagogiques de qualité. Outre la déclaration de nos valeurs fondamentales, ces normes communautaires visent à favoriser un environnement favorable et inclusif pour nos utilisateurs.",
     "CommunityStandardsModal.coreValuesLink": "En savoir plus sur les valeurs fondamentales de Learning Equality",
     "CommunityStandardsModal.studioDescription": "Kolibri Studio vous autorise l'accès à la bibliothèque Kolibri, une bibliothèque en pleine croissance de supports pédagogiques que nous vous encourageons à utiliser comme la vôtre. Kolibri Studio a été créé pour vous aider à préparer des supports pédagogiques de différentes manières y compris, mais non exclusivement :",
@@ -963,6 +966,8 @@
     "CommunityStandardsModal.libraryItem2": "Veillez à ce que les supports soient bien définis, organisés et utilisables. Nous accueillons les ressources créées à tous les niveaux de production ! Pour les aider à atteindre le plus grand nombre d'apprenants possible, nous vous invitons à utiliser pleinement tous les champs de métadonnées et à rechercher la qualité en matière d'intelligibilité, de lisibilité ou de numérisation afin que le contenu soit utilisable et compréhensible.",
     "CommunityStandardsModal.libraryItem3": "Respectez la communauté. Outre les objectifs pédagogiques spécifiques qu'elles peuvent servir dans certains contextes, il convient d'éviter l'obscénité et la vulgarité. Les discours de haine, peu importe leur nature, ou la promotion de la violence ou de la discrimination, ne seront jamais tolérés.",
     "CommunityStandardsModal.libraryItem4": "Kolibri Studio est uniquement destiné à des fins pédagogiques. Il n'est pas destiné à être utilisé à des fins non pédagogiques telles que le recrutement, l'endoctrinement, la publicité, le partage de fichiers ou l'hébergement de médias personnels.",
+    "PrivacyPolicyModal.privacyHeader": "Politique de confidentialité",
+    "PrivacyPolicyModal.updatedPrivacyHeader": "Politique de confidentialité mise à jour",
     "PrivacyPolicyModal.paragraph1": "La présente charte de confidentialité vous informe de nos pratiques en matière de confidentialité et de vos choix et droits concernant les données personnelles que nous recueillons. Elle s'applique à l'application Kolibri (\"Application\"), au Kolibri Studio (\"Studio\") et à tous les sites web qui y sont liés (dénommés collectivement en ceci comme \"Kolibri\"). La présente déclaration de confidentialité ne s'applique pas aux applications tierces ou aux organisations partenaires qui puissent utiliser notre logiciel ou être utilisées en conjonction avec le nôtre.",
     "PrivacyPolicyModal.paragraph2": "Learning Equality reconnaît votre droit à la vie privée, et prendra des mesures raisonnables pour le protéger. Certaines parties de Kolibri vous permettent de nous donner des informations personnelles, telles que votre nom et votre addresse e-mail. Nous pouvons utiliser les informations que vous nous fournissez pour améliorer Kolibri. Là où vous avez le choix sur la manière dont nous utilisons les informations que vous fournissez, nous l'indiquerons au point de collecte. En raison du mode de fonctionnement de Kolibri, nous pouvons également utiliser les informations de votre navigateur ou de vos activités de navigation pour vous personnaliser ou vous orienter vers des informations pertinentes. Par exemple, nous pouvons utiliser votre adresse IP, les informations de votre navigateur, les cookies ou les balises web de manière à nous aider à conserver certaines de vos préférences ou à comprendre comment nos visiteurs naviguent sur le site afin de pouvoir l'améliorer. Il se peut que nous stockions vos informations personnelles en dehors de l'Union européenne.",
     "PrivacyPolicyModal.paragraph3": "Learning Equality s'engage à apprendre constamment et à améliorer la qualité de Kolibri, et les fiches relatives à vos interactions avec Kolibri peuvent être utilisées à des fins de recherche. Les résultats de la recherche seront généralement rapportés au niveau global, et votre identité personnelle ne sera jamais divulguée publiquement dans les résultats de la recherche sans votre consentement explicite.",
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index 5efd8f71d0..0b5da53153 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -860,6 +860,8 @@
     "PoliciesModal.continueButton": "Continue",
     "PoliciesModal.checkboxValidationErrorMessage": "Field is required",
     "PoliciesModal.checkboxText": "I have agreed to the above terms",
+    "TermsOfServiceModal.ToSHeader": "Terms of Service",
+    "TermsOfServiceModal.updatedToSHeader": "Updated terms of service",
     "TermsOfServiceModal.prompt": "Please read these terms and conditions carefully",
     "TermsOfServiceModal.disclaimerP1": "Before using this website, you should read the following important information relating to it. These Terms of Service (\"Terms\") govern your use of this website and form a legally binding agreement between you and us regarding your use of our website.",
     "TermsOfServiceModal.disclaimerP2": "If, for any reason, you are unable or unwilling to agree to all of these Terms, please immediately discontinue using or attempting to use the service.",
@@ -950,6 +952,7 @@
     "TermsOfServiceModal.miscellaneousP1": "The Agreement constitutes the entire agreement between Learning Equality and you concerning the subject matter hereof. If any part of the Agreement is held invalid or unenforceable, that part will be construed to reflect the parties' original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of the Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof.",
     "TermsOfServiceModal.miscellaneousP2": "You may assign your rights under the Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; Learning Equality may assign its rights under the Agreement without condition. The Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.",
     "TermsOfServiceModal.miscellaneousP3": "If you have any questions about the Service or these Terms, please contact us at legal@learningequality.org.",
+    "CommunityStandardsModal.communityStandardsHeader": "Community Standards",
     "CommunityStandardsModal.description": "Learning Equality is a nonprofit organization dedicated to enabling equitable access to quality educational experiences. Along with our statement of Core Values, these Community Standards are intended to foster a supportive and inclusive environment for our users.",
     "CommunityStandardsModal.coreValuesLink": "Learn more about Learning Equality's core values",
     "CommunityStandardsModal.studioDescription": "Kolibri Studio gives you access to the Kolibri Library, a growing library of educational materials, which we encourage you to use as your own. We built Kolibri Studio to help you prepare educational materials in a variety of ways, including but not limited to:",
@@ -963,6 +966,8 @@
     "CommunityStandardsModal.libraryItem2": "Keep materials clear, organized, and usable. We welcome resources created at all levels of production! To help them reach as many learners as possible, we invite you to fully utilize all metadata fields and aim for quality in comprehensibility, legibility, or digitization such that the content is usable and understandable.",
     "CommunityStandardsModal.libraryItem3": "Respect the community. Avoid obscenity and vulgarity, beyond specific educational purposes they might serve in some contexts. Hate speech of any kind, or promotion of violence or discrimination, will never be tolerated.",
     "CommunityStandardsModal.libraryItem4": "Kolibri Studio is for educational purposes only. It is not intended to be used for non-educational purposes such as recruitment, indoctrination, advertisement, file sharing, or personal media hosting.",
+    "PrivacyPolicyModal.privacyHeader": "Privacy policy",
+    "PrivacyPolicyModal.updatedPrivacyHeader": "Updated privacy policy",
     "PrivacyPolicyModal.paragraph1": "This Privacy Policy informs you of our privacy practices and your choices and rights around the personal data that we collect. This Privacy Policy applies to the Kolibri application (\"Application\"), Kolibri Studio (\"Studio\"), and all related websites (herein collectively referred to as \"Kolibri\"). This Privacy Statement does not apply to third party applications or partner organizations that may use our software or be used in conjunction with our software.",
     "PrivacyPolicyModal.paragraph2": "Learning Equality recognizes your right to privacy, and will take reasonable steps to protect this. Some parts of Kolibri allow you to give us personal information, such as your name and email address. We may use the information you provide to improve Kolibri. Where you have choices about how we use the information you provide, we will indicate this at the point of collection. Because of the way Kolibri operates, we may also use information from your browser or browsing activities to personalize or route you to relevant information. For example, we may use your IP address, browser information, cookies or web beacons in ways that help us maintain some of your preferences, or understand how our visitors navigate the site so we can improve it. We may store your personal information outside of the European Union.",
     "PrivacyPolicyModal.paragraph3": "Learning Equality is committed to learning constantly and improving the quality of Kolibri, and records related to your interactions with Kolibri may be used for research. Research findings will typically be reported at the aggregate level, and your personal identity will never be publicly disclosed in any research findings without your express consent.",
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
deleted file mode 100644
index e98733338a..0000000000
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ /dev/null
@@ -1,1217 +0,0 @@
-{
-    "SettingsIndex.settingsTitle": "Settings",
-    "SettingsIndex.accountLabel": "Account",
-    "SettingsIndex.storageLabel": "Storage",
-    "SettingsIndex.usingStudioLabel": "Using Studio",
-    "UsingStudio.policiesLink": "Privacy policy",
-    "UsingStudio.termsOfServiceLink": "Terms of service",
-    "UsingStudio.communityStandardsLink": "Community standards",
-    "UsingStudio.userDocsLink": "User guide",
-    "UsingStudio.resourcesHeader": "Kolibri Studio resources",
-    "UsingStudio.aboutStudio": "About Kolibri Studio Beta",
-    "UsingStudio.aboutStudioText": "Kolibri Studio is undergoing active development, and as such, some changes could cause unexpected behavior or challenges (also known as \"issues\"). If you encounter an issue, please  notify us as soon as they occur to help us resolve them. (See below for instructions on how to report issues.)",
-    "UsingStudio.bestPractices": "Best practices",
-    "UsingStudio.bestPractice1": "When using import and clipboard operations, work with small subsets of topics instead of whole channels at once (especially for large channels).",
-    "UsingStudio.bestPractice2": "It is preferable to create multiple small channels rather than one giant channel with many layers of topics.",
-    "UsingStudio.bestPractice3": "Reload the page often to ensure your work is saved to the server and no network errors have occurred. Use CTRL+R on Linux/Windows or ⌘+R on Mac.",
-    "UsingStudio.bestPractice4": "Avoid simultaneous edits on the same channel. Channels should not be edited by multiple users at the same time or by the same user in multiple browser windows.",
-    "UsingStudio.bestPractice5": "It is possible that you will encounter timeout errors in your browser when performing operations like import and sync, on large channels. Don't be alarmed by this error message and do not repeat the same operation again right away. It doesn't mean the operation has failed- Kolibri Studio is still working in the background. Wait a few minutes and reload the page before continuing your edits.",
-    "UsingStudio.bestPractice6": "Compress videos before uploading them (see these instructions).",
-    "UsingStudio.bestPractice7": "PUBLISH periodically and import your channel into Kolibri to preview the content and obtain a local backup copy of your channel.",
-    "UsingStudio.bestPractice8": "Do not edit the channel after you click PUBLISH. Wait for the notification email before resuming editing operations.",
-    "UsingStudio.bestPractice9": "Report issues as you encounter them.",
-    "UsingStudio.notableIssues": "Notable issues",
-    "UsingStudio.issue1": "Two users have reported isolated incidents where content they imported from another channel disappeared, leaving only empty topics and subtopics. In one report, the content later re-appeared. They did not experience these problems consistently, and the incidents may possibly involve issues with a slow or unstable internet connection. If you run into this issue, please contact us as soon as possible and let us know as much information as you can remember.",
-    "UsingStudio.issueLink1": "Reports of disappearing content",
-    "UsingStudio.issue2": "Some operations in Studio are currently very slow, and so it may appear that the change you attempted to make timed out or did not take effect. In many cases, the change is still being processed and will appear once it is complete. If, after 5-10 minutes, the change still has not taken effect even after a browser refresh, please file an issue. We are working on solutions to these issues.",
-    "UsingStudio.issueLink2": "Slow performance can lead to unexpected errors in the interface",
-    "UsingStudio.reportIssueButton": "Report an issue",
-    "ReportIssueForm.reportIssueHeader": "Report an issue",
-    "ReportIssueForm.fieldRequiredText": "Field is required",
-    "ReportIssueForm.OSLabel": "Operating system (e.g. Windows, MacOS, Linux)",
-    "ReportIssueForm.browserLabel": "Browser (e.g. Chrome, Firefox, Safari)",
-    "ReportIssueForm.channelLabel": "Channel where you encountered the issue (if applicable)",
-    "ReportIssueForm.descriptionLabel": "Describe your issue with as much detail as possible",
-    "ReportIssueForm.submitAction": "Submit",
-    "ReportIssueForm.cancelAction": "Cancel",
-    "ReportIssueForm.issueSubmitted": "Issue submitted",
-    "ReportIssueForm.issueFailed": "Unable to submit issue. Please try again.",
-    "Storage.spaceUsedOfMax": "{qty} of {max}",
-    "Storage.storagePercentageUsed": "{qty}% storage used",
-    "Storage.requestMoreSpaceHeading": "Request more space",
-    "Storage.requestMoreSpaceMessage": "Please use this form to request additional uploading storage for your Kolibri Studio account. The resources you import from our public library to your channels do not count towards your storage limit.",
-    "Storage.learnMoreAboutImportingContentFromChannels": "Learn more about how to import resources from other channels",
-    "Storage.showFormAction": "Open form",
-    "Storage.hideFormAction": "Close form",
-    "RequestForm.natureOfYourContentLabel": "Nature of your content",
-    "RequestForm.storageAmountRequestedPlaceholder": "Amount requested (e.g. 10GB)",
-    "RequestForm.approximatelyHowManyResourcesLabel": "Approximately how many individual resources are you planning to upload?",
-    "RequestForm.numberOfResourcesPlaceholder": "Number of resources",
-    "RequestForm.averageSizeOfResourceLabel": "Average size of each resource",
-    "RequestForm.sizePlaceholder": "Size",
-    "RequestForm.kindOfContentQuestionLabel": "What types of resources do you plan to upload? Please specify",
-    "RequestForm.typeOfContentPlaceholder": "Types of resources",
-    "RequestForm.authorLabel": "Who is the author (creator), curator (organizer), and/or aggregator (maintainer) of your content? Please specify",
-    "RequestForm.responsePlaceholder": "Response",
-    "RequestForm.provideSampleLinkLabel": "Please provide a link to a sample of your content (on Kolibri Studio or from source site)",
-    "RequestForm.pasteLinkPlaceholder": "Paste link here",
-    "RequestForm.whoCanUseContentLabel": "Who can use your content?",
-    "RequestForm.licensingQuestionLabel": "What is the licensing of the content you are uploading? (Check all that apply)",
-    "RequestForm.willYouMakeYourChannelPublicLabel": "If the content is openly licensed, would you be willing to consider making your channels public to other Kolibri users if requested in the future?",
-    "RequestForm.selectAllThatApplyPlaceholder": "Select all that apply",
-    "RequestForm.howAreYouUsingYourContentLabel": "How are you using your content?",
-    "RequestForm.intendedAudienceLabel": "Who is the intended audience for your channel? How big is your audience?",
-    "RequestForm.audiencePlaceholder": "In-school learners, adult learners, teachers, etc",
-    "RequestForm.targetRegionsLabel": "Target region(s) for your content (if applicable)",
-    "RequestForm.howOftenImportedToKolibriLabel": "How many times will this content be imported from Studio into new Kolibri installations per month, on average?",
-    "RequestForm.usageLabel": "Tell us more about your use of Kolibri",
-    "RequestForm.organizationalAffiliationLabel": "Organizational affiliation",
-    "RequestForm.notAffiliatedLabel": "I am not affiliated with an organization for this work",
-    "RequestForm.uploadingOnBehalfLabel": "I am uploading content on behalf of:",
-    "RequestForm.organizationNamePlaceholder": "Organization name",
-    "RequestForm.typeOfOrganizationLabel": "What type of organization or group is coordinating the use of Kolibri (if applicable)?",
-    "RequestForm.grassrootsLabel": "Grassroots and/or volunteer initiative",
-    "RequestForm.smallNgoLabel": "Small NGO with annual budget < $25k",
-    "RequestForm.mediumNgoLabel": "Medium-sized NGO with budget < $500k",
-    "RequestForm.largeIntlNgoLabel": "Larger international NGOs or government agencies",
-    "RequestForm.forProfitLabel": "For-profit or social enterprise company",
-    "RequestForm.otherLabel": "Other",
-    "RequestForm.timelineLabel": "To better understand the time sensitive nature of your request, please indicate an approximate timeline by when you need this additional storage:",
-    "RequestForm.oneWeekLabel": "1 week",
-    "RequestForm.twoToFourWeeksLabel": "2-4 weeks",
-    "RequestForm.coupleMonthsLabel": "1-2 months",
-    "RequestForm.threeToSixMonthsLabel": "3-6 months",
-    "RequestForm.sixPlusMonthsLabel": "6+ months",
-    "RequestForm.unknownLabel": "Unknown",
-    "RequestForm.explainNeedsInDetailLabel": "Please write a paragraph explaining your needs and use case for Kolibri Studio, and how it will integrate into your programs. Include information about who is curating, deploying, and using the content. Is this work being coordinated by an organization, as part of an educational program? Include justification for the additional space being requested and explanation of the time sensitive nature of your request.",
-    "RequestForm.fieldRequiredText": "Field is required",
-    "RequestForm.sendRequestAction": "Send request",
-    "RequestForm.requestSent": "Your storage request has been submitted for processing.",
-    "RequestForm.requestFailed": "Unable to send request. Please try again.",
-    "Account.basicInfoHeader": "Basic Information",
-    "Account.usernameLabel": "Username",
-    "Account.fullNameLabel": "Full name",
-    "Account.passwordLabel": "Password",
-    "Account.changePasswordAction": "Change password",
-    "Account.editFullNameAction": "Edit",
-    "Account.deleteAccountLabel": "Delete account",
-    "Account.completelyDeleteAccountLabel": "Completely remove your account from Kolibri Studio",
-    "Account.unableToDeleteAdminAccount": "Unable to delete an admin account",
-    "Account.handleChannelsBeforeAccount": "You must delete these channels manually or invite others to edit them before you can delete your account.",
-    "Account.apiTokenHeading": "API Token",
-    "Account.apiTokenMessage": "You will need this access token to run content integration scripts for bulk-uploading materials through the Kolibri Studio API.",
-    "Account.apiDocumentation": "API documentation",
-    "Account.exportAccountDataLabel": "You will receive an email with all information linked to your account",
-    "Account.exportStartedHeader": "Data export started",
-    "Account.exportAccountDataHeading": "Export account data",
-    "Account.exportDataButton": "Export data",
-    "Account.exportAccountDataModalMessage": "You'll receive an email with your data when the export is completed",
-    "Account.exportFailed": "Unable to export data. Please try again.",
-    "DeleteAccountForm.deleteAccountLabel": "Delete account",
-    "DeleteAccountForm.deleteAccountConfirmationPrompt": "Are you sure you want to permanently delete your account? This cannot be undone",
-    "DeleteAccountForm.deleteAccountEnterEmail": "Enter your email address to continue",
-    "DeleteAccountForm.cancelButton": "Cancel",
-    "DeleteAccountForm.emailAddressLabel": "Email address",
-    "DeleteAccountForm.emailInvalidText": "Email does not match your account email",
-    "DeleteAccountForm.fieldRequired": "Field is required",
-    "DeleteAccountForm.deletionFailed": "Failed to delete account",
-    "DeleteAccountForm.deletionFailedText": "Failed to delete your account. Please contact us here: https://community.learningequality.org.",
-    "ChangePasswordForm.changePasswordHeader": "Change password",
-    "ChangePasswordForm.newPasswordLabel": "New password",
-    "ChangePasswordForm.confirmNewPasswordLabel": "Confirm new password",
-    "ChangePasswordForm.formInvalidText": "Passwords don't match",
-    "ChangePasswordForm.cancelAction": "Cancel",
-    "ChangePasswordForm.saveChangesAction": "Save changes",
-    "ChangePasswordForm.paswordChangeSuccess": "Password updated",
-    "ChangePasswordForm.passwordChangeFailed": "Failed to save new password",
-    "FullNameForm.editNameHeader": "Edit name",
-    "FullNameForm.firstNameLabel": "First name",
-    "FullNameForm.lastNameLabel": "Last name",
-    "FullNameForm.cancelAction": "Cancel",
-    "FullNameForm.saveChangesAction": "Save changes",
-    "FullNameForm.changesSavedMessage": "Changes saved",
-    "FullNameForm.failedToSaveMessage": "Failed to save changes",
-    "FullNameForm.fieldRequired": "Field is required",
-    "AssessmentItemPreview.answersLabel": "Answers",
-    "AssessmentItemPreview.noAnswersPlaceholder": "Question has no answer options",
-    "AssessmentItemPreview.hintsToggleLabelHide": "Hide hints",
-    "AssessmentItemPreview.hintsToggleLabelShow": "Show {hintsCount} {hintsCount, plural, one {hint} other {hints}}",
-    "MoveModal.moveItems": "Move {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}} into:",
-    "MoveModal.addTopic": "Add new topic",
-    "MoveModal.cancel": "Cancel",
-    "MoveModal.moveHere": "Move here",
-    "MoveModal.resourcesCount": "{count, plural,\n =1 {# resource}\n other {# resources}}",
-    "MoveModal.emptyTopicText": "No resources found",
-    "MoveModal.topicCreatedMessage": "New topic created",
-    "MoveModal.movedMessage": "Moved to {title}",
-    "MoveModal.goToLocationButton": "Go to location",
-    "NewTopicModal.topicTitle": "Topic title",
-    "NewTopicModal.topicTitleRequired": "Title is required",
-    "NewTopicModal.createTopic": "Create new topic",
-    "NewTopicModal.cancel": "Cancel",
-    "NewTopicModal.create": "Create",
-    "AnswersEditor.answersLabel": "Answers",
-    "AnswersEditor.noAnswersPlaceholder": "Question has no answer options",
-    "AnswersEditor.newAnswerBtnLabel": "New answer",
-    "ContentNodeListItem.resources": "{value, number, integer} {value, plural, one {resource} other {resources}}",
-    "ContentNodeListItem.questions": "{value, number, integer} {value, plural, one {question} other {questions}}",
-    "ContentNodeListItem.openTopic": "Open topic",
-    "AssessmentTab.incompleteItemsCountMessage": "{invalidItemsCount} incomplete {invalidItemsCount, plural, one {question} other {questions}}",
-    "AssessmentTab.dialogSubmitBtnLabel": "Submit",
-    "AssessmentTab.dialogCancelBtnLabel": "Cancel",
-    "StudioTree.optionsTooltip": "Options",
-    "AssessmentEditor.incompleteItemIndicatorLabel": "Incomplete",
-    "AssessmentEditor.toolbarItemLabel": "question",
-    "AssessmentEditor.noQuestionsPlaceholder": "Exercise has no questions",
-    "AssessmentEditor.closeBtnLabel": "Close",
-    "AssessmentEditor.newQuestionBtnLabel": "New question",
-    "AssessmentEditor.showAnswers": "Show answers",
-    "AddRelatedResourcesModal.cancelBtnLabel": "Cancel",
-    "AddRelatedResourcesModal.resourcesDisplayedText": "Only showing available resources for",
-    "AddRelatedResourcesModal.addStepBtnLabel": "Add",
-    "AddRelatedResourcesModal.previewStepBtnLabel": "Preview",
-    "AddRelatedResourcesModal.selectedAsCurrentResource": "This is the current resource",
-    "ContentNodeOptions.topicDefaultTitle": "{title} topic",
-    "ContentNodeOptions.newSubtopic": "New topic",
-    "ContentNodeOptions.editTopicDetails": "Edit topic details",
-    "ContentNodeOptions.editDetails": "Edit details",
-    "ContentNodeOptions.viewDetails": "View details",
-    "ContentNodeOptions.move": "Move",
-    "ContentNodeOptions.makeACopy": "Make a copy",
-    "ContentNodeOptions.copyToClipboard": "Copy to clipboard",
-    "ContentNodeOptions.remove": "Delete",
-    "ContentNodeOptions.undo": "Undo",
-    "ContentNodeOptions.cancel": "Cancel",
-    "ContentNodeOptions.creatingCopies": "Copying in clipboard...",
-    "ContentNodeOptions.creatingClipboardCopies": "Copying to clipboard...",
-    "ContentNodeOptions.copiedSnackbar": "Copy operation complete",
-    "ContentNodeOptions.copiedToClipboardSnackbar": "Copied to clipboard",
-    "ContentNodeOptions.removedItems": "Sent to trash",
-    "ContentNodeValidator.incompleteText": "Incomplete",
-    "ContentNodeValidator.missingTitle": "Missing title",
-    "ContentNodeValidator.incompleteDescendantsText": "{count, number, integer} {count, plural, one {resource is incomplete} other {resources are incomplete}}",
-    "ContentNodeValidator.allIncompleteDescendantsText": "{count, plural, one {{count, number, integer} resource is incomplete and cannot be published} other {All {count, number, integer} resources are incomplete and cannot be published}}",
-    "AssessmentItemEditor.questionTypeLabel": "Response type",
-    "AssessmentItemEditor.questionLabel": "Question",
-    "AssessmentItemEditor.dialogTitle": "Changing question type",
-    "AssessmentItemEditor.dialogSubmitBtnLabel": "Change",
-    "AssessmentItemEditor.dialogMessageChangeToSingleSelection": "Switching to 'single choice' will set only one answer as correct. Continue?",
-    "AssessmentItemEditor.dialogMessageChangeToTrueFalse": "Switching to 'true or false' will remove all current answers. Continue?",
-    "AssessmentItemEditor.dialogMessageChangeToInput": "Switching to 'numeric input' will set all answers as correct and remove all non-numeric answers. Continue?",
-    "EditListItem.questionCount": "{count, plural,\n =1 {# question}\n other {# questions}}",
-    "SavingIndicator.savingIndicator": "Saving...",
-    "SavingIndicator.lastSaved": "Saved {saved}",
-    "SavingIndicator.savedNow": "Saved just now",
-    "EditList.selectAllLabel": "Select all",
-    "EditView.undefined": "Related",
-    "EditView.noItemsToEditText": "Please select resources or topics to edit",
-    "EditView.invalidFieldsToolTip": "Some required information is missing",
-    "EditView.errorBannerText": "Please provide the required information",
-    "EditView.editingMultipleCount": "Editing details for {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}",
-    "DetailsTabView.basicInfoHeader": "Basic information",
-    "DetailsTabView.audienceHeader": "Audience",
-    "DetailsTabView.sourceHeader": "Source",
-    "DetailsTabView.assessmentHeader": "Assessment options",
-    "DetailsTabView.thumbnailHeader": "Thumbnail",
-    "DetailsTabView.titleLabel": "Title",
-    "DetailsTabView.titleValidationMessage": "Field is required",
-    "DetailsTabView.languageHelpText": "Leave blank to use the topic language",
-    "DetailsTabView.languageChannelHelpText": "Leave blank to use the channel language",
-    "DetailsTabView.importedFromButtonText": "Imported from {channel}",
-    "DetailsTabView.detectedImportText": "{count, plural,\n =1 {# resource has view-only permission}\n other {# resources have view-only permission}}",
-    "DetailsTabView.authorLabel": "Author",
-    "DetailsTabView.authorToolTip": "Person or organization who created this content",
-    "DetailsTabView.providerLabel": "Provider",
-    "DetailsTabView.providerToolTip": "Organization that commissioned or is distributing the content",
-    "DetailsTabView.aggregatorLabel": "Aggregator",
-    "DetailsTabView.aggregatorToolTip": "Website or org hosting the content collection but not necessarily the creator or copyright holder",
-    "DetailsTabView.copyrightHolderLabel": "Copyright holder",
-    "DetailsTabView.copyrightHolderValidationMessage": "Field is required",
-    "DetailsTabView.descriptionLabel": "Description",
-    "DetailsTabView.tagsLabel": "Tags",
-    "DetailsTabView.noTagsFoundText": "No results found for \"{text}\". Press 'Enter' key to create a new tag",
-    "DetailsTabView.randomizeQuestionLabel": "Randomize question order for learners",
-    "EditModal.editingDetailsHeader": "Edit details",
-    "EditModal.uploadFilesHeader": "Upload files",
-    "EditModal.createExerciseHeader": "New exercise",
-    "EditModal.addTopicsHeader": "New topics",
-    "EditModal.invalidNodesFound": "{count, plural,\n =1 {# incomplete resource found}\n other {# incomplete resources found}}",
-    "EditModal.invalidNodesFoundText": "Incomplete resources will not be published until these errors are resolved",
-    "EditModal.saveAnywaysButton": "Exit anyway",
-    "EditModal.keepEditingButton": "Keep editing",
-    "EditModal.saveFailedHeader": "Save failed",
-    "EditModal.saveFailedText": "There was a problem saving your content",
-    "EditModal.addTopic": "Add another topic",
-    "EditModal.uploadButton": "Upload more files",
-    "EditModal.uploadInProgressHeader": "Upload in progress",
-    "EditModal.uploadInProgressText": "Uploads that are in progress will be lost if you exit",
-    "EditModal.dismissDialogButton": "Cancel",
-    "EditModal.cancelUploadsButton": "Exit",
-    "EditModal.closeWithoutSavingButton": "Close without saving",
-    "EditModal.okButton": "OK",
-    "EditModal.loadErrorText": "Failed to load content",
-    "EditModal.finishButton": "Finish",
-    "ContentNodeEditListItem.optionsTooltip": "Options",
-    "PublishModal.versionText": "Current Version: {version}",
-    "PublishModal.unpublishedText": "Unpublished",
-    "PublishModal.publishingSizeText": "{count, plural, =1 {# resource} other {# resources}}",
-    "PublishModal.incompleteCount": "{count, plural, =1 {# incomplete resource} other {# incomplete resources}}",
-    "PublishModal.incompleteWarning": "Incomplete resources will be not be published and made available for download in Kolibri.",
-    "PublishModal.incompleteInstructions": "Click 'Continue' to confirm that you would like to publish anyway.",
-    "PublishModal.nextButton": "Continue",
-    "PublishModal.publishMessageLabel": "Describe what's new in this channel version",
-    "PublishModal.versionDescriptionLabel": "Version description",
-    "PublishModal.descriptionRequiredMessage": "Please describe what's new in this version before publishing",
-    "PublishModal.descriptionDescriptionTooltip": "This description will be shown to Kolibri admins before they update channel versions",
-    "PublishModal.cancelButton": "Cancel",
-    "PublishModal.publishButton": "Publish",
-    "RelatedResourcesTab.previewHelpText": "Related resources are displayed as recommendations when learners engage with this resource",
-    "RelatedResourcesTab.showPreviewBtnLabel": "Show me",
-    "RelatedResourcesTab.resourcePreviewDialogTitle": "Related resources",
-    "RelatedResourcesTab.resourcePreviewDialogHelpText": "Related resources in Kolibri display as recommendations alongside the resource that a learner is currently engaging with",
-    "RelatedResourcesTab.dialogCloseBtnLabel": "Close",
-    "RelatedResourcesTab.previousStepsTitle": "Previous steps",
-    "RelatedResourcesTab.previousStepsExplanation": "Recommended resources that introduce skills or concepts needed in order to use this resource",
-    "RelatedResourcesTab.addPreviousStepBtnLabel": "Add previous step",
-    "RelatedResourcesTab.nextStepsTitle": "Next steps",
-    "RelatedResourcesTab.nextStepsExplanation": "Recommended resources that build on skills or concepts learned in this resource",
-    "RelatedResourcesTab.addNextStepBtnLabel": "Add next step",
-    "RelatedResourcesTab.removePreviousStepBtnLabel": "Remove previous step",
-    "RelatedResourcesTab.removeNextStepBtnLabel": "Remove next step",
-    "RelatedResourcesTab.tooManyPreviousStepsWarning": "Limit the number of previous steps to create a more guided learning experience",
-    "RelatedResourcesTab.tooManyNextStepsWarning": "Limit the number of next steps to create a more guided learning experience",
-    "RelatedResourcesTab.removedNextStepSnackbar": "Removed next step",
-    "RelatedResourcesTab.removedPreviousStepSnackbar": "Removed previous step",
-    "RelatedResourcesList.removeBtnLabel": "Remove",
-    "AssessmentItemToolbar.toolbarLabelEdit": "Edit",
-    "AssessmentItemToolbar.toolbarLabelMoveUp": "Move up",
-    "AssessmentItemToolbar.toolbarLabelMoveDown": "Move down",
-    "AssessmentItemToolbar.toolbarLabelDelete": "Delete",
-    "AssessmentItemToolbar.toolbarLabelAddAbove": "Add {itemLabel} above",
-    "AssessmentItemToolbar.toolbarLabelAddBelow": "Add {itemLabel} below",
-    "HintsEditor.hintsLabel": "Hints",
-    "HintsEditor.noHintsPlaceholder": "Question has no hints",
-    "HintsEditor.newHintBtnLabel": "New hint",
-    "Clipboard.selectAll": "Select all",
-    "Clipboard.undo": "Undo",
-    "Clipboard.cancel": "Cancel",
-    "Clipboard.close": "Close",
-    "Clipboard.duplicateSelectedButton": "Make a copy",
-    "Clipboard.moveSelectedButton": "Move",
-    "Clipboard.deleteSelectedButton": "Delete",
-    "Clipboard.removingItems": "Deleting from clipboard...",
-    "Clipboard.removedFromClipboard": "Deleted from clipboard",
-    "Clipboard.creatingClipboardCopies": "Copying in clipboard...",
-    "Clipboard.copiedItemsToClipboard": "Copied in clipboard",
-    "ContentNodeOptions.goToOriginalLocation": "Go to original location",
-    "ContentNodeOptions.moveTo": "Move to...",
-    "ContentNodeOptions.copiedItemsToClipboard": "Copied in clipboard",
-    "ContentNodeOptions.removingItems": "Deleting from clipboard...",
-    "ContentNodeOptions.removedFromClipboard": "Deleted from clipboard",
-    "ResourcePanel.questions": "Questions",
-    "ResourcePanel.masteryCriteria": "Mastery criteria",
-    "ResourcePanel.masteryMofN": "{m} out of {n}",
-    "ResourcePanel.details": "Details",
-    "ResourcePanel.showAnswers": "Show answers",
-    "ResourcePanel.questionCount": "{value, number, integer} {value, plural, one {question} other {questions}}",
-    "ResourcePanel.description": "Description",
-    "ResourcePanel.tags": "Tags",
-    "ResourcePanel.audience": "Audience",
-    "ResourcePanel.language": "Language",
-    "ResourcePanel.visibleTo": "Visible to",
-    "ResourcePanel.relatedResources": "Related resources",
-    "ResourcePanel.source": "Source",
-    "ResourcePanel.originalChannel": "Imported from",
-    "ResourcePanel.author": "Author",
-    "ResourcePanel.provider": "Provider",
-    "ResourcePanel.aggregator": "Aggregator",
-    "ResourcePanel.license": "License",
-    "ResourcePanel.copyrightHolder": "Copyright holder",
-    "ResourcePanel.previousSteps": "Previous steps",
-    "ResourcePanel.nextSteps": "Next steps",
-    "ResourcePanel.resources": "Resources",
-    "ResourcePanel.totalResources": "Total resources",
-    "ResourcePanel.coachResources": "Resources for coaches",
-    "ResourcePanel.files": "Files",
-    "ResourcePanel.availableFormats": "Available formats",
-    "ResourcePanel.subtitles": "Captions and subtitles",
-    "ResourcePanel.fileSize": "Size",
-    "ResourcePanel.noLicenseError": "Missing license",
-    "ResourcePanel.noCopyrightHolderError": "Missing copyright holder",
-    "ResourcePanel.noLicenseDescriptionError": "Missing license description",
-    "ResourcePanel.noFilesError": "Missing files",
-    "ResourcePanel.noMasteryModelError": "Missing mastery criteria",
-    "ResourcePanel.noQuestionsError": "Exercise is empty",
-    "ResourcePanel.incompleteQuestionError": "{count, plural, one {# incomplete question} other {# incomplete questions}}",
-    "ProgressBar.progressText": "{percent}%",
-    "ProgressModal.copyHeader": "Importing resources",
-    "ProgressModal.copyDescription": "Import is in progress, please wait...",
-    "ProgressModal.defaultHeader": "Updating channel",
-    "ProgressModal.defaultDescription": "Update is in progress, please wait...",
-    "ProgressModal.defaultErrorText": "An unexpected error has occurred. Please try again, and if you continue to see this message, please contact support via the Help menu.",
-    "ProgressModal.finishedMessage": "Operation complete! Click \"Refresh\" to update the page.",
-    "ProgressModal.moveHeader": "Moving Content",
-    "ProgressModal.moveDescription": "Move operation is in progress, please wait...",
-    "ProgressModal.publishHeader": "Publishing channel",
-    "ProgressModal.publishDescription": "Please wait for publishing to finish to make further edits to your channel. You will receive an email notification once it's complete.",
-    "ProgressModal.syncHeader": "Syncing channel",
-    "ProgressModal.syncDescription": "Channel syncing is in progress, please wait...",
-    "ProgressModal.stopButton": "Stop",
-    "ProgressModal.refreshButton": "Refresh",
-    "ProgressModal.cancel": "No, go back",
-    "ProgressModal.confirmStopButton": "Yes, stop task",
-    "ProgressModal.cancelHeader": "Are you sure?",
-    "ProgressModal.cancelText": "Are you sure you would like to cancel this task?",
-    "TreeView.showSidebar": "Show sidebar",
-    "TreeView.collapseAllButton": "Collapse all",
-    "TreeView.openCurrentLocationButton": "Jump to current topic location",
-    "TreeView.updatedResourcesReadyForReview": "Updated resources are ready for review",
-    "TreeView.closeDrawer": "Close",
-    "TreeViewBase.channelDetails": "View channel details",
-    "TreeViewBase.editChannel": "Edit channel details",
-    "TreeViewBase.openTrash": "Open trash",
-    "TreeViewBase.getToken": "Get token",
-    "TreeViewBase.shareChannel": "Share channel",
-    "TreeViewBase.syncChannel": "Sync resources",
-    "TreeViewBase.publishButton": "Publish",
-    "TreeViewBase.publishButtonTitle": "Make this channel available for import into Kolibri",
-    "TreeViewBase.viewOnly": "View-only",
-    "TreeViewBase.noChangesText": "No changes found in channel",
-    "TreeViewBase.emptyChannelTooltip": "You cannot publish an empty channel",
-    "TreeViewBase.noLanguageSetError": "Missing channel language",
-    "TreeViewBase.incompleteDescendantsText": "{count, number, integer} {count, plural, one {resource is incomplete and cannot be published} other {resources are incomplete and cannot be published}}",
-    "NodePanel.emptyViewOnlyChannelText": "Nothing in this channel yet",
-    "NodePanel.emptyTopicText": "Nothing in this topic yet",
-    "NodePanel.emptyChannelText": "Click \"ADD\" to start building your channel",
-    "NodePanel.emptyChannelSubText": "Create, upload, or import resources from other channels",
-    "CurrentTopicView.addTopic": "New subtopic",
-    "CurrentTopicView.addExercise": "New exercise",
-    "CurrentTopicView.uploadFiles": "Upload files",
-    "CurrentTopicView.importFromChannels": "Import from channels",
-    "CurrentTopicView.addButton": "Add",
-    "CurrentTopicView.editButton": "Edit",
-    "CurrentTopicView.optionsButton": "Options",
-    "CurrentTopicView.copyToClipboardButton": "Copy to clipboard",
-    "CurrentTopicView.undefined": "Compact view",
-    "CurrentTopicView.editSelectedButton": "Edit",
-    "CurrentTopicView.copySelectedButton": "Copy to clipboard",
-    "CurrentTopicView.moveSelectedButton": "Move",
-    "CurrentTopicView.duplicateSelectedButton": "Make a copy",
-    "CurrentTopicView.deleteSelectedButton": "Delete",
-    "CurrentTopicView.selectionCount": "{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}",
-    "CurrentTopicView.undo": "Undo",
-    "CurrentTopicView.cancel": "Cancel",
-    "CurrentTopicView.creatingCopies": "Copying...",
-    "CurrentTopicView.creatingClipboardCopies": "Copying to clipboard...",
-    "CurrentTopicView.copiedItems": "Copy operation complete",
-    "CurrentTopicView.copiedItemsToClipboard": "Copied to clipboard",
-    "CurrentTopicView.removedItems": "Sent to trash",
-    "CurrentTopicView.selectAllLabel": "Select all",
-    "Template.templateString": "You have {count, plural,\n =1 {# node for testing}\n other {# nodes for testing}}",
-    "TrashModal.trashModalTitle": "Trash",
-    "TrashModal.trashEmptyText": "Trash is empty",
-    "TrashModal.trashEmptySubtext": "Resources removed from this channel will appear here",
-    "TrashModal.selectAllHeader": "Select all",
-    "TrashModal.deletedHeader": "Removed",
-    "TrashModal.selectedCountText": "{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}",
-    "TrashModal.deleteButton": "Delete",
-    "TrashModal.restoreButton": "Restore",
-    "TrashModal.deleteConfirmationHeader": "Permanently delete {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}?",
-    "TrashModal.deleteConfirmationText": "You cannot undo this action. Are you sure you want to continue?",
-    "TrashModal.deleteConfirmationDeleteButton": "Delete permanently",
-    "TrashModal.deleteConfirmationCancelButton": "Cancel",
-    "TrashModal.deleteSuccessMessage": "Permanently deleted",
-    "FilePreview.viewFullscreen": "View fullscreen",
-    "FilePreview.exitFullscreen": "Exit fullscreen",
-    "FilePreview.fullscreenModeText": "Fullscreen mode",
-    "FileUploadItem.uploadButton": "Select file",
-    "FileUploadItem.removeFileButton": "Remove",
-    "FileUploadDefault.acceptsHelp": "Supported file types: {extensions}",
-    "FileUploadDefault.uploadToText": "Upload to '{title}'",
-    "FileUploadDefault.dropHereText": "Drag and drop your files here, or select your files manually",
-    "FileUploadDefault.chooseFilesButton": "Select files",
-    "FileUpload.filesHeader": "Preview files",
-    "FileUpload.fileError": "Unsupported file type",
-    "FileUpload.noFileText": "Missing files",
-    "SupplementaryItem.languageText": "{language} ({code})",
-    "SubtitlesList.subtitlesHeader": "Captions and subtitles",
-    "SubtitlesList.acceptedFormatsTooltip": "Supported formats: {extensions}",
-    "SubtitlesList.addSubtitleText": "Add captions",
-    "SupplementaryList.selectFileText": "Select file",
-    "ContentRenderer.noFileText": "Select a file to preview",
-    "ContentRenderer.previewNotSupported": "Preview unavailable",
-    "ThumbnailGenerator.thumbnailGenerationFailedHeader": "Unable to generate thumbnail",
-    "ThumbnailGenerator.thumbnailGenerationFailedText": "There was a problem generating a thumbnail",
-    "ThumbnailGenerator.generatedDefaultFilename": "Generated thumbnail",
-    "ContentNodeThumbnail.noThumbnail": "No thumbnail",
-    "ContentNodeThumbnail.crop": "Crop",
-    "ContentNodeThumbnail.generate": "Generate from file",
-    "ContentNodeThumbnail.upload": "Upload image",
-    "ContentNodeThumbnail.remove": "Remove",
-    "ContentNodeThumbnail.zoomIn": "Zoom in",
-    "ContentNodeThumbnail.zoomOut": "Zoom out",
-    "ContentNodeThumbnail.save": "Save",
-    "ContentNodeThumbnail.cancel": "Cancel",
-    "ContentNodeThumbnail.croppingPrompt": "Drag image to reframe",
-    "ContentNodeThumbnail.uploadingThumbnail": "Uploading",
-    "ContentNodeThumbnail.generatingThumbnail": "Generating from file",
-    "ContentNodeThumbnail.defaultFilename": "File",
-    "SyncResourcesModal.syncModalTitle": "Sync resources",
-    "SyncResourcesModal.syncModalExplainer": "Sync and update your resources with their original source.",
-    "SyncResourcesModal.syncFilesTitle": "Files",
-    "SyncResourcesModal.syncFilesExplainer": "Update all file information",
-    "SyncResourcesModal.syncTagsTitle": "Tags",
-    "SyncResourcesModal.syncTagsExplainer": "Update all tags",
-    "SyncResourcesModal.syncTitlesAndDescriptionsTitle": "Titles and descriptions",
-    "SyncResourcesModal.syncTitlesAndDescriptionsExplainer": "Update resource titles and descriptions",
-    "SyncResourcesModal.syncExercisesTitle": "Assessment details",
-    "SyncResourcesModal.syncExercisesExplainer": "Update questions, answers, and hints",
-    "SyncResourcesModal.cancelButtonLabel": "Cancel",
-    "SyncResourcesModal.continueButtonLabel": "Continue",
-    "SyncResourcesModal.confirmSyncModalTitle": "Confirm sync",
-    "SyncResourcesModal.confirmSyncModalExplainer": "You are about to sync and update the following:",
-    "SyncResourcesModal.backButtonLabel": "Back",
-    "SyncResourcesModal.syncButtonLabel": "Sync",
-    "ReviewSelectionsPage.reviewSelectionHeader": "Review selections",
-    "ReviewSelectionsPage.resourcesInTopic": "{count, number} {count, plural, one {resource} other {resources}}",
-    "ReviewSelectionsPage.removeAction": "Remove",
-    "ReviewSelectionsPage.noResourcesSelected": "No resources selected",
-    "SearchResultsList.searchResultsCount": "{count, number} {count, plural, one {result} other {results}} for '{searchTerm}'",
-    "SearchResultsList.resultsPerPageLabel": "Results per page",
-    "SearchResultsList.saveSearchAction": "Save search",
-    "SearchResultsList.savedSearchesLabel": "View saved searches",
-    "SearchResultsList.searchSavedSnackbar": "Search saved",
-    "ImportFromChannelsModal.resourcesAddedSnackbar": "Selected {count, number} {count, plural, one {resource} other {resources}}",
-    "ImportFromChannelsModal.resourcesRemovedSnackbar": "Removed {count, number} {count, plural, one {resource} other {resources}}",
-    "ImportFromChannelsModal.importTitle": "Import from other channels",
-    "ImportFromChannelsModal.reviewTitle": "Resource selection",
-    "ImportFromChannelsModal.resourcesSelected": "{count, number} {count, plural, one {resource selected} other {resources selected}}",
-    "ImportFromChannelsModal.importAction": "Import",
-    "ImportFromChannelsModal.reviewAction": "Review",
-    "ImportFromChannelsModal.addButton": "Add",
-    "ImportFromChannelsModal.addedText": "Added",
-    "ImportFromChannelsModal.removeButton": "Remove",
-    "InfoModal.close": "Fechar",
-    "EditSearchModal.editSavedSearchTitle": "Edit search title",
-    "EditSearchModal.searchTitleLabel": "Search title",
-    "EditSearchModal.cancelAction": "Cancel",
-    "EditSearchModal.saveChangesAction": "Save",
-    "EditSearchModal.changesSavedSnackbar": "Changes saved",
-    "EditSearchModal.fieldRequired": "Field is required",
-    "BrowsingCard.tagsList": "Tags: {tags}",
-    "BrowsingCard.goToSingleLocationAction": "Go to location",
-    "BrowsingCard.goToPluralLocationsAction": "In {count, number} {count, plural, one {location} other {locations}}",
-    "BrowsingCard.addToClipboardAction": "Copy to clipboard",
-    "BrowsingCard.resourcesCount": "{count, number} {count, plural, one {resource} other {resources}}",
-    "BrowsingCard.coach": "Coach",
-    "ChannelInfoCard.resourceCount": "{count, number} {count, plural, one {resource} other {resources}}",
-    "SavedSearchesModal.editAction": "Edit",
-    "SavedSearchesModal.deleteAction": "Delete",
-    "SavedSearchesModal.closeAction": "Close",
-    "SavedSearchesModal.closeButtonLabel": "Fechar",
-    "SavedSearchesModal.savedSearchesTitle": "Saved searches",
-    "SavedSearchesModal.noSavedSearches": "You do not have any saved searches",
-    "SavedSearchesModal.searchDeletedSnackbar": "Saved search deleted",
-    "SavedSearchesModal.filterCount": "{count, number} {count, plural, one {filter} other {filters}}",
-    "SavedSearchesModal.deleteSearchTitle": "Delete saved search",
-    "SavedSearchesModal.deleteConfirmation": "Are you sure you want to delete this saved search?",
-    "SavedSearchesModal.cancelAction": "Cancel",
-    "SearchFilters.channelsHeader": "Channels",
-    "SearchFilters.channelTypeLabel": "Channel type",
-    "SearchFilters.channelSourceLabel": "Channel/source",
-    "SearchFilters.filtersHeader": "Filter options",
-    "SearchFilters.kindLabel": "Format",
-    "SearchFilters.hideTopicsLabel": "Hide topics",
-    "SearchFilters.assessmentsLabel": "Show assessments only",
-    "SearchFilters.licensesLabel": "License",
-    "SearchFilters.coachContentLabel": "Show resources for coaches",
-    "SearchFilters.addedAfterDateLabel": "Added after",
-    "ContentTreeList.allChannelsLabel": "Channels",
-    "ContentTreeList.noResourcesOrTopics": "There are no resources or topics here",
-    "ContentTreeList.selectAllAction": "Select all",
-    "SearchFilterBar.coachContent": "Resources for coaches",
-    "SearchFilterBar.assessments": "Assessments",
-    "SearchFilterBar.topicsHidden": "No topics",
-    "SearchFilterBar.createdAfter": "Added after '{date}'",
-    "SearchFilterBar.clearAll": "Clear all",
-    "ChannelList.channelFilterLabel": "Channels",
-    "ChannelList.noMatchingChannels": "There are no matching channels",
-    "SearchOrBrowseWindow.backToBrowseAction": "Back to browse",
-    "SearchOrBrowseWindow.searchLabel": "Search for resources…",
-    "SearchOrBrowseWindow.searchAction": "Search",
-    "SearchOrBrowseWindow.undo": "Undo",
-    "SearchOrBrowseWindow.cancel": "Cancel",
-    "SearchOrBrowseWindow.copyingToClipboard": "Copying to clipboard...",
-    "SearchOrBrowseWindow.copiedToClipboard": "Copied to clipboard",
-    "SearchOrBrowseWindow.copyFailed": "Failed to copy to clipboard",
-    "StagingTreePage.deploy": "Deploy",
-    "StagingTreePage.backToViewing": "Back to viewing",
-    "StagingTreePage.reviewMode": "Review mode",
-    "StagingTreePage.emptyChannelText": "No resources found",
-    "StagingTreePage.emptyChannelSubText": "No changes to review! The channel contains all the latest topics and resources.",
-    "StagingTreePage.collapseAllButton": "Collapse all",
-    "StagingTreePage.openCurrentLocationButton": "Jump to current topic location",
-    "StagingTreePage.totalResources": "Total resources",
-    "StagingTreePage.totalSize": "Total size",
-    "StagingTreePage.openSummaryDetailsDialogBtn": "View summary",
-    "StagingTreePage.closeSummaryDetailsDialogBtn": "Close",
-    "StagingTreePage.summaryDetailsDialogTitle": "Summary details",
-    "StagingTreePage.deployChannel": "Deploy channel",
-    "StagingTreePage.deployDialogDescription": "You are about to replace all live resources with staged resources.",
-    "StagingTreePage.liveResources": "Live resources",
-    "StagingTreePage.stagedResources": "Staged resources",
-    "StagingTreePage.topicsCount": "{count, number} {count, plural, one { topic } other { topics }}",
-    "StagingTreePage.resourcesCount": "{count, number} {count, plural, one { resource } other { resources }}",
-    "StagingTreePage.cancelDeployBtn": "Cancel",
-    "StagingTreePage.confirmDeployBtn": "Deploy channel",
-    "StagingTreePage.channelDeployed": "Channel has been deployed",
-    "StagingTreePage.emptyTopicText": "This topic is empty",
-    "StagingTreePage.viewDetails": "View details",
-    "Diff.positiveSign": "+",
-    "Diff.negativeSign": "-",
-    "DiffTable.headerType": "Type",
-    "DiffTable.headerLive": "Live",
-    "DiffTable.headerStaged": "Staged",
-    "DiffTable.headerDiff": "Net changes",
-    "DiffTable.typeVersion": "API version",
-    "DiffTable.typeFileSize": "File size",
-    "DiffTable.typeTopics": "Topics",
-    "DiffTable.typeVideos": "Videos",
-    "DiffTable.typeAudios": "Audios",
-    "DiffTable.typeExercises": "Exercises",
-    "DiffTable.typeDocuments": "Documents",
-    "DiffTable.typeHtml5Apps": "HTML5 apps",
-    "DiffTable.typeSlideshows": "Slideshows",
-    "AddPreviousStepsPage.toolbarTitle": "Add previous step",
-    "AddPreviousStepsPage.selectedAsPreviousStep": "Already selected as a previous step",
-    "AddPreviousStepsPage.selectedAsNextStep": "This resource is already selected for 'next steps'",
-    "AddPreviousStepsPage.addedPreviousStepSnackbar": "Added previous step",
-    "AddNextStepsPage.toolbarTitle": "Add next step",
-    "AddNextStepsPage.selectedAsPreviousStep": "This resource is already selected for 'previous steps'",
-    "AddNextStepsPage.selectedAsNextStep": "Already selected as a next step",
-    "AddNextStepsPage.addedNextStepSnackbar": "Added next step",
-    "ChannelListIndex.channelSets": "Collections",
-    "ChannelListIndex.catalog": "Content Library",
-    "ChannelListIndex.invitations": "You have {count, plural,\n =1 {# invitation}\n other {# invitations}}",
-    "ChannelListIndex.libraryTitle": "Kolibri Content Library Catalog",
-    "ChannelListIndex.frequentlyAskedQuestions": "Frequently asked questions",
-    "ChannelItem.resourceCount": "{count, plural,\n =1 {# resource}\n other {# resources}}",
-    "ChannelItem.unpublishedText": "Unpublished",
-    "ChannelItem.lastPublished": "Published {last_published}",
-    "ChannelItem.details": "Details",
-    "ChannelItem.viewContent": "View channel on Kolibri",
-    "ChannelItem.goToWebsite": "Go to source website",
-    "ChannelItem.editChannel": "Edit channel details",
-    "ChannelItem.copyToken": "Copy channel token",
-    "ChannelItem.deleteChannel": "Delete channel",
-    "ChannelItem.deleteTitle": "Delete this channel",
-    "ChannelItem.deletePrompt": "This channel will be permanently deleted. This cannot be undone.",
-    "ChannelItem.channelLanguageNotSetIndicator": "No language set",
-    "ChannelItem.cancel": "Cancel",
-    "CatalogFilterBar.keywords": "\"{text}\"",
-    "CatalogFilterBar.coachContent": "Coach content",
-    "CatalogFilterBar.assessments": "Assessments",
-    "CatalogFilterBar.subtitles": "Subtitles",
-    "CatalogFilterBar.starred": "Starred",
-    "CatalogFilterBar.clearAll": "Clear all",
-    "CatalogFilterBar.channelCount": "{count, plural,\n =1 {# channel}\n other {# channels}}",
-    "CatalogFilters.searchLabel": "Keywords",
-    "CatalogFilters.coachLabel": "Resources for coaches",
-    "CatalogFilters.assessmentsLabel": "Assessments",
-    "CatalogFilters.subtitlesLabel": "Captions or subtitles",
-    "CatalogFilters.starredLabel": "Starred",
-    "CatalogFilters.licenseLabel": "Licenses",
-    "CatalogFilters.formatLabel": "Formats",
-    "CatalogFilters.includesLabel": "Display only channels with",
-    "CatalogFilters.searchText": "Search",
-    "CatalogFilters.coachDescription": "Resources for coaches are only visible to coaches in Kolibri",
-    "CatalogFilters.frequentlyAskedQuestionsLink": "Frequently asked questions",
-    "CatalogFilters.copyright": "© {year} Learning Equality",
-    "ChannelStar.unstar": "Remove from starred channels",
-    "ChannelStar.star": "Add to starred channels",
-    "ChannelInvitation.editText": "{sender} has invited you to edit {channel}",
-    "ChannelInvitation.viewText": "{sender} has invited you to view {channel}",
-    "ChannelInvitation.goToChannelSnackbarAction": "Go to channel",
-    "ChannelInvitation.acceptedSnackbar": "Accepted invitation",
-    "ChannelInvitation.declinedSnackbar": "Declined invitation",
-    "ChannelInvitation.accept": "Accept",
-    "ChannelInvitation.decline": "Decline",
-    "ChannelInvitation.cancel": "Cancel",
-    "ChannelInvitation.decliningInvitation": "Declining Invitation",
-    "ChannelInvitation.decliningInvitationMessage": "Are you sure you want to decline this invitation?",
-    "LanguageFilter.languageLabel": "Languages",
-    "LanguageFilter.languageText": "{language} ({count})",
-    "LanguageFilter.noMatchingLanguageText": "No language matches the search",
-    "CatalogList.resultsText": "{count, plural,\n =1 {# result found}\n other {# results found}}",
-    "CatalogList.selectChannels": "Download a summary of selected channels",
-    "CatalogList.cancelButton": "Cancel",
-    "CatalogList.downloadButton": "Download",
-    "CatalogList.downloadCSV": "Download spreadsheet",
-    "CatalogList.downloadPDF": "Download PDF",
-    "CatalogList.downloadingMessage": "Download started",
-    "CatalogList.channelSelectionCount": "{count, plural,\n =1 {# channel selected}\n other {# channels selected}}",
-    "CatalogList.selectAll": "Select all",
-    "ChannelList.loading": "Loading channels...",
-    "ChannelList.noChannelsFound": "No channels found",
-    "ChannelList.channel": "New channel",
-    "CatalogFAQ.faqHeader": "Frequently asked questions",
-    "CatalogFAQ.aboutHeader": "Welcome to the Kolibri Content Library Catalog! ",
-    "CatalogFAQ.descriptionP1": "Here you can learn more about the educational resources publicly available for use in Kolibri, which are organized into \"channels\". Use the filters to browse channels by keyword, language, or formats of the materials inside.",
-    "CatalogFAQ.channelLink": "What is a channel?",
-    "CatalogFAQ.descriptionP2": "Click on a channel to get a preview of what subjects and topics it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.",
-    "CatalogFAQ.descriptionP3": "Sharing the work of these resource creators is what inspires Learning Equality's efforts. We hope you find something that excites you about the potential of digital learning, online or off!",
-    "CatalogFAQ.aboutLibraryHeader": "About the Kolibri Content Library",
-    "CatalogFAQ.selectionQuestion": "How does Learning Equality determine what goes into this library?",
-    "CatalogFAQ.selectionAnswerP1": "Our approach is unique in that we aim to assemble a library of resources which supports the diversity of needs Kolibri is designed to meet, rather than collecting all possible open educational resources.",
-    "CatalogFAQ.selectionAnswerP2": "To inform what we select, the Learning Equality team is continually maintaining our awareness of openly licensed digital resources available in the educational landscape. Most of our resources come from an organization, institution, or creator with learning design experience and an educational mandate. We prioritize providing a diversity of grade levels, subject areas and languages. Where possible, we also evaluate and seek input on the degree to which the materials may be suitable for the unique blended learning settings in which we work.",
-    "CatalogFAQ.maintenanceQuestion": "How is this library created and maintained?",
-    "CatalogFAQ.maintenanceAnswerP1": "Because Kolibri is designed for learners and educators who are disconnected from the internet, content must first be packaged so that it can be used without internet connection. For most sources, our content team uses custom-written, automated scripts to bring content into Kolibri from a website, an app, or a private source such as a hard drive (with the appropriate permissions).",
-    "CatalogFAQ.maintenanceAnswerP2": "To learn more about how content is packaged for use on Kolibri and what types of formats are supported, please refer to our content integration guide.",
-    "CatalogFAQ.viewIntegrationGuide": "View content integration guide",
-    "CatalogFAQ.endoresementQuestion": "Have these sources been vetted or endorsed as classroom-safe and ready?",
-    "CatalogFAQ.endorsementAnswer": "We select sources with an educational affiliation or mandate, so you can trust that most resources in the Kolibri Content Library were designed for learning purposes. However,  we are not able to guarantee the appropriateness of each individual item within any particular source. We recommend that educators and administrators conduct a thorough review of any digital content using their own criteria - including reorganization and re-curation, if necessary - before using it with learners. Since we recognize that there may be many different standards across situations for criteria like preferred levels of interactivity, subject/age appropriateness, cultural sensitivity and tone, among others, we have intentionally offered a wide range of materials to help meet the needs of all learners whatever they may be.",
-    "CatalogFAQ.ownershipQuestion": "Does Learning Equality own these resources?",
-    "CatalogFAQ.ownershipAnswer": "No. Just like an online learning repository with links to external websites, we gather useful digital learning resources to help our community discover a rich variety of learning materials they may not have known about otherwise. All the materials in this educational library are fully credited to the creating organization, reformatted for best display on digital devices, and include any additional information the creator has shared with us. We only include content which is either openly licensed, available to distribute for special nonprofit or noncommercial purposes, or shared with us for distribution through agreement with the creator. Since materials in the library are intended for use in an open source platform, we do not profit financially from their use.",
-    "CatalogFAQ.newContentQuestion": "Does Learning Equality add new materials?",
-    "CatalogFAQ.newContentAnswer": "Our content team routinely adds new sources and channels to the library and updates existing channels as content creators make new materials available.",
-    "CatalogFAQ.customContentQuestion": "How can I add my own materials or recommend materials from other creators for this library?",
-    "CatalogFAQ.customContentAnswer": "We would love to get in touch with you regarding your own materials or your recommendations. Please contact us at content@learningequality.org!",
-    "CatalogFAQ.usingResourcesHeader": "About using these resources",
-    "CatalogFAQ.usingContentQuestion": "I found something I'm interested in and would like to start using it. What should I do?",
-    "CatalogFAQ.usingContentAnswer": "Great! All of these resources have been specially packaged for use on Kolibri, our open source platform for offline learning, so please review how to get started with Kolibri first, then follow the instructions to import materials.",
-    "CatalogFAQ.viewGettingStartedLink": "Documentation resources to get started with Kolibri",
-    "CatalogFAQ.channelQuestion": "What is a channel?",
-    "CatalogFAQ.channelAnswer": "A channel is Kolibri’s unit of organization for digital content. It's a collection of resources organized by single institutions or creators, each of which may contain a set of books, games, textbooks, articles, simulations, exercises, and many more types of educational materials, all made available for use in Kolibri without the need for internet access. A channel isn't necessarily a course or a sequence, it's simply a collection of materials published or gathered together by one organization, as close to the provider's original layout as possible, while still organized for the best possible navigation in Kolibri.",
-    "CatalogFAQ.sampleContentQuestion": "How do I review the contents of the channels themselves?",
-    "CatalogFAQ.sampleContentAnswer": "You can do this in three ways:",
-    "CatalogFAQ.sampleContentAnswerItem1": "To see the original content source, click the ⋮  button and select 'Go to source website'",
-    "CatalogFAQ.sampleContentAnswerItem2": "To preview the content on one of our online demo servers (available in English, Spanish, Arabic, French, and Hindi), click the ⋮ button and select 'View channel on Kolibri'",
-    "CatalogFAQ.sampleContentAnswerItem3": "Download Kolibri and import the channel on your device for full access offline.",
-    "CatalogFAQ.downloadKolibriLink": "Download Kolibri",
-    "CatalogFAQ.partialChannelQuestion": "I want to use some of the resources in this channel, but not all of it. What should I do?",
-    "CatalogFAQ.partialChannelAnswer": "When importing content into Kolibri, you can select the specific subsections of a channel you're interested in. If you’d like to make changes such as editing the title or folder descriptions, or changing the order in which materials appear, please contact us at content@learningequality.org for early access to our Kolibri Studio tool, which can be used to make these changes.",
-    "CatalogFAQ.coachContentQuestion": "What are 'resources for coaches'?",
-    "CatalogFAQ.coachContentAnswer": "Most resources are directed at learners, but some, such as lesson plans, subject refreshers, professional learning guides, and similar, are directed at teachers and facilitators. In Kolibri, we mark this content as \"for coaches\" and limit its visibility to those with coach accounts. If you see coach materials here, they may require less planning for any facilitators using the resource!",
-    "CatalogFAQ.issueQuestion": "I found a bug, broken link, or some mislabeled information within a resource. What should I do?",
-    "CatalogFAQ.issueAnswer": "Please email us at content@learningequality.org and include the channel name, along with a description of the issue. If you notice an issue on a specific resource, please be sure to link that as well. We'd be happy to investigate and grateful for your feedback!",
-    "CatalogFAQ.aboutKolibriHeader": "About Kolibri",
-    "CatalogFAQ.KolibriQuestion": "What is Kolibri?",
-    "CatalogFAQ.KolibriAnswer": "Kolibri is an open source ed-tech platform designed for low-resource communities, focused on:",
-    "CatalogFAQ.KolibriAnswerItem1": "Overcoming infrastructural barriers that prevent equitable access to quality education for learners in low-resource and low-connectivity contexts",
-    "CatalogFAQ.KolibriAnswerItem2": "Increasing the availability of open learning materials suitable for many curricula, learning goals, and situations",
-    "CatalogFAQ.KolibriAnswerItem3": "Fostering innovative pedagogy and effective learning outcomes",
-    "CatalogFAQ.usingKolibriQuestion": "How can I use Kolibri?",
-    "CatalogFAQ.usingKolibriAnswerP1": "You can learn more about using Kolibri by doing any of the following:",
-    "CatalogFAQ.usingKolibriItem1": "Visit the Learning Equality website",
-    "CatalogFAQ.visitWebsiteLink": "Visit website",
-    "CatalogFAQ.usingKolibriItem2": "View a demo of the platform",
-    "CatalogFAQ.viewDemoLink": "View demo",
-    "CatalogFAQ.usingKolibriItem3": "Download the software",
-    "CatalogFAQ.downloadLink": "Download",
-    "CatalogFAQ.usingKolibriAnswerP2": "We invite you to use the Kolibri user documentation for further guidance.",
-    "CatalogFAQ.viewDocsLink": "View docs",
-    "CatalogFAQ.makerQuestion": "Who are the makers of Kolibri?",
-    "CatalogFAQ.makerAnswerP1": "Learning Equality, a 501(c)(3) nonprofit based in San Diego, California, is committed to enabling every person in the world to realize their right to a quality education, by supporting the creation, adaptation, and distribution of open educational resources, and creating supportive tools for innovative pedagogy.",
-    "CatalogFAQ.makerAnswerP2": "In recognition of the digital divide, Learning Equality started by bringing the Khan Academy experience offline to more than 6 million learners around the globe. Its second-generation product, Kolibri, is part of a broader ecosystem of products and tools that support curriculum alignment, blended learning pedagogies, and broader use of Open Educational Resources to improve learning.",
-    "ChannelListAppError.channelPermissionsErrorDetails": "Sign in or ask the owner of this channel to give you permission to edit or view",
-    "ChannelItem.versionText": "Version {version}",
-    "ChannelSetModal.creatingChannelSet": "New collection",
-    "ChannelSetModal.loading": "Loading...",
-    "ChannelSetModal.titleLabel": "Collection name",
-    "ChannelSetModal.channelCountText": "{channelCount, plural, =0 {No published channels in your collection} =1 {# channel} other {# channels}}",
-    "ChannelSetModal.channelSelectedCountText": "{channelCount, plural, =1 {# channel selected} other {# channels selected}}",
-    "ChannelSetModal.titleRequiredText": "Field is required",
-    "ChannelSetModal.publishedChannelsOnlyText": "Only published channels are available for selection",
-    "ChannelSetModal.tokenPrompt": "Copy this token into Kolibri to import this collection onto your device.",
-    "ChannelSetModal.token": "Collection token",
-    "ChannelSetModal.channels": "Collection channels",
-    "ChannelSetModal.selectChannelsHeader": "Select channels",
-    "ChannelSetModal.saveButton": "Save and close",
-    "ChannelSetModal.createButton": "Create",
-    "ChannelSetModal.finish": "Finish",
-    "ChannelSetModal.undefined": "Starred",
-    "ChannelSetModal.unsavedChangesHeader": "Unsaved changes",
-    "ChannelSetModal.unsavedChangesText": "You will lose any unsaved changes. Are you sure you want to exit?",
-    "ChannelSetModal.closeButton": "Exit without saving",
-    "ChannelSetModal.removeText": "Remove",
-    "ChannelSelectionList.searchText": "Search for a channel",
-    "ChannelSelectionList.loading": "Loading channels...",
-    "ChannelSelectionList.noChannelsFound": "No channels found",
-    "ChannelSetList.loading": "Loading collections...",
-    "ChannelSetList.cancelButtonLabel": "Close",
-    "ChannelSetList.noChannelSetsFound": "You can package together multiple channels to create a collection. The entire collection can then be imported to Kolibri at once by using a collection token.",
-    "ChannelSetList.addChannelSetTitle": "New collection",
-    "ChannelSetList.aboutChannelSets": "About Collections",
-    "ChannelSetList.channelSetsDescriptionText": "A collection contains multiple Kolibri Studio channels that can be imported at one time to Kolibri with a single collection token.",
-    "ChannelSetList.channelSetsInstructionsText": "You can make a collection by selecting the channels you want to be imported together.",
-    "ChannelSetList.channelSetsDisclaimer": "You will need Kolibri version 0.12.0 or higher to import channel collections",
-    "ChannelSetList.title": "Collection title",
-    "ChannelSetList.token": "Token ID",
-    "ChannelSetList.channelNumber": "Number of channels",
-    "ChannelSetList.options": "Options",
-    "ChannelSetItem.deleteChannelSetTitle": "Delete collection",
-    "ChannelSetItem.deleteChannelSetText": "Are you sure you want to delete this collection?",
-    "ChannelSetItem.cancel": "Cancel",
-    "ChannelSetItem.edit": "Edit collection",
-    "ChannelSetItem.delete": "Delete collection",
-    "ChannelSetItem.options": "Options",
-    "ContentDefaults.defaultsTitle": "Default copyright values for new resources (optional)",
-    "ContentDefaults.defaultsSubTitle": "New resources will be automatically given these values",
-    "ContentDefaults.author": "Author",
-    "ContentDefaults.aggregator": "Aggregator",
-    "ContentDefaults.provider": "Provider",
-    "ContentDefaults.license": "License",
-    "ContentDefaults.licenseDescription": "License description",
-    "ContentDefaults.noLicense": "No license selected",
-    "ContentDefaults.copyrightHolder": "Copyright holder",
-    "ContentDefaults.thumbnailsTitle": "Automatically generate thumbnails for the following resource types",
-    "ContentDefaults.videos": "Videos",
-    "ContentDefaults.html5": "HTML5 apps",
-    "ContentDefaults.documents": "Documents",
-    "PasswordField.passwordLabel": "Password",
-    "PasswordField.fieldRequiredMessage": "Field is required",
-    "CountryField.locationLabel": "Select all that apply",
-    "CountryField.locationRequiredMessage": "Field is required",
-    "CountryField.noCountriesFound": "No countries found",
-    "EmailField.emailLabel": "Email",
-    "EmailField.validEmailMessage": "Please enter a valid email",
-    "EmailField.emailRequiredMessage": "Field is required",
-    "TextField.fieldRequiredMessage": "Field is required",
-    "MultiSelect.noItemsFound": "No items found",
-    "TextArea.fieldRequiredMessage": "Field is required",
-    "ImagesMenu.imageHeader": "Upload image",
-    "ImagesMenu.btnLabelInsert": "Insert",
-    "ImagesMenu.btnLabelCancel": "Cancel",
-    "ImagesMenu.altTextLabel": "Image description",
-    "ImagesMenu.altTextHint": "The image description is necessary to enable visually impaired learners to answer questions, and it also displays when the image fails to load",
-    "ImagesMenu.defaultDropText": "Drag and drop an image here, or upload manually",
-    "ImagesMenu.selectFileButton": "Select file",
-    "ImagesMenu.acceptsText": "Supported file types: {acceptedFormats}",
-    "ImagesMenu.currentImageDefaultText": "Current image",
-    "ImagesMenu.selectFile": "Select file",
-    "MarkdownEditor.bold": "Bold (Ctrl+B)",
-    "MarkdownEditor.italic": "Italic (Ctrl+I)",
-    "MarkdownEditor.image": "Insert image (Ctrl+P)",
-    "MarkdownEditor.formulas": "Insert formula (Ctrl+F)",
-    "MarkdownEditor.minimize": "Minimize (Ctrl+M)",
-    "ImageField.editImageOption": "Edit",
-    "ImageField.resizeImageOption": "Resize",
-    "ImageField.removeImageOption": "Remove",
-    "FormulasMenu.formulasMenuTitle": "Special characters",
-    "FormulasMenu.btnLabelInsert": "Insert",
-    "LanguageDropdown.labelText": "Language",
-    "LanguageDropdown.languageItemText": "{language} ({code})",
-    "LanguageDropdown.languageRequired": "Field is required",
-    "LanguageDropdown.noDataText": "Language not found",
-    "ResponsiveDialog.closeButtonLabel": "Close",
-    "ToggleText.more": "Show more",
-    "ToggleText.less": "Show less",
-    "AppBar.title": "Kolibri Studio Beta",
-    "AppBar.administration": "Administration",
-    "AppBar.settings": "Settings",
-    "AppBar.help": "Help and support",
-    "AppBar.logIn": "Sign in",
-    "AppBar.logOut": "Sign out",
-    "Details.sizeHeading": "Channel size",
-    "Details.sizeText": "{text} ({size})",
-    "Details.resourceHeading": "Total resources",
-    "Details.coachHeading": "Resources for coaches",
-    "Details.coachDescription": "Resources for coaches are only visible to coaches in Kolibri",
-    "Details.tagsHeading": "Common tags",
-    "Details.creationHeading": "Created on",
-    "Details.containsHeading": "Contains",
-    "Details.languagesHeading": "Languages",
-    "Details.subtitlesHeading": "Captions and subtitles",
-    "Details.authorsLabel": "Authors",
-    "Details.authorToolTip": "Person or organization who created this content",
-    "Details.providersLabel": "Providers",
-    "Details.providerToolTip": "Organization that commissioned or is distributing the content",
-    "Details.aggregatorsLabel": "Aggregators",
-    "Details.aggregatorToolTip": "Website or organization hosting the content collection but not necessarily the creator or copyright holder",
-    "Details.licensesLabel": "Licenses",
-    "Details.copyrightHoldersLabel": "Copyright holders",
-    "Details.assessmentsIncludedText": "Assessments",
-    "Details.undefined": "Very large",
-    "Details.containsContentHeading": "Contains content from",
-    "Details.sampleFromChannelHeading": "Sample content from this channel",
-    "Details.sampleFromTopicHeading": "Sample content from this topic",
-    "Details.tokenHeading": "Channel token",
-    "Details.publishedHeading": "Published on",
-    "Details.currentVersionHeading": "Published version",
-    "Details.primaryLanguageHeading": "Primary language",
-    "Details.unpublishedText": "Unpublished",
-    "Alert.closeButtonLabel": "OK",
-    "Alert.dontShowAgain": "Don't show this message again",
-    "ExpandableList.more": "Show more ({more})",
-    "ExpandableList.less": "Show less",
-    "VisibilityDropdown.labelText": "Visible to",
-    "VisibilityDropdown.visibilityHeader": "About resource visibility",
-    "VisibilityDropdown.visibilityDescription": "Visibility determines what type of Kolibri users can see resources.",
-    "VisibilityDropdown.coach": "Resources are visible only to coaches (teachers, facilitators, administrators)",
-    "VisibilityDropdown.learner": "Resources are visible to anyone",
-    "VisibilityDropdown.visibilityRequired": "Field is required",
-    "PoliciesModal.ToSHeader": "Terms of Service",
-    "PoliciesModal.updatedToSHeader": "Updated terms of service",
-    "PoliciesModal.privacyHeader": "Privacy policy",
-    "PoliciesModal.updatedPrivacyHeader": "Updated privacy policy",
-    "PoliciesModal.communityStandardsHeader": "Community Standards",
-    "PoliciesModal.lastUpdated": "Last updated {date}",
-    "PoliciesModal.closeButton": "Close",
-    "PoliciesModal.continueButton": "Continue",
-    "PoliciesModal.checkboxValidationErrorMessage": "Field is required",
-    "PoliciesModal.checkboxText": "I have agreed to the above terms",
-    "TermsOfServiceModal.prompt": "Please read these terms and conditions carefully",
-    "TermsOfServiceModal.disclaimerP1": "Before using this website, you should read the following important information relating to it. These Terms of Service (\"Terms\") govern your use of this website and form a legally binding agreement between you and us regarding your use of our website.",
-    "TermsOfServiceModal.disclaimerP2": "If, for any reason, you are unable or unwilling to agree to all of these Terms, please immediately discontinue using or attempting to use the service.",
-    "TermsOfServiceModal.disclaimerP3": "By continuing to use the Service you agree to these terms which will bind you.",
-    "TermsOfServiceModal.definitionsHeader": "Definitions",
-    "TermsOfServiceModal.definitionsP1": "These are the Terms for the web application hosted at https://studio.learningequality.org/, along with any API's or other interfaces it provides (the \"Service\"), controlled and operated by Learning Equality (\"Learning Equality\", \"we\", \"us\" and \"our\"). We are registered as a nonprofit organization in California, USA under EIN 46-2676188, and have our registered office at 9700 Gilman Dr, PMB 323, La Jolla, CA 92093.",
-    "TermsOfServiceModal.definitionsP2": "These Terms describe our commitments to you, and your rights and responsibilities when using the Service. If you breach any of these Terms, your right to access and use of the Service and Service will be terminated. Please read them carefully and reach out to us if you have any questions.",
-    "TermsOfServiceModal.definitionsP3": "\"Content refers to media files (such as videos, audio files, HTML5 content, or other materials) that are hosted on the Service, along with their associated descriptive metadata.",
-    "TermsOfServiceModal.definitionsP4": "Throughout these Terms, \"you\" applies to both individuals and entities that access or use the Service. If you are an individual using the Service on behalf of an entity, you represent and warrant that you have the authority to bind that entity to the Agreement and that by using our Service, you are accepting the Agreement on behalf of that entity.",
-    "TermsOfServiceModal.accountTermsHeader": "Account Terms",
-    "TermsOfServiceModal.accountTermsP1": "When you register for an account on the Service, you agree to provide us with complete and accurate information. You will be solely responsible and liable for any activity that occurs under your username. You are responsible for keeping your account information up-to-date and for keeping your access credentials (password and API token) private and secure.",
-    "TermsOfServiceModal.accountTermsP2": "You are responsible for maintaining the security of your account and any Service-related content, and you are fully responsible for all activities that occur under your account and any other actions taken in connection with the Service. You shall not share or misuse your access credentials. You must immediately notify us of any unauthorized uses of your account, or of any other breach of security. We will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.",
-    "TermsOfServiceModal.accountTermsP3": "Access to and use of the Service is only for those over the age of 13 (or 16 in the European Union). If you are younger than this, you may not register for or use the Service. Any person who registers as a user or provides their personal information to the Service represents that they are 13 years of age or older (or 16 years or older in the European Union).",
-    "TermsOfServiceModal.acceptableUseHeader": "Acceptable Use Restrictions",
-    "TermsOfServiceModal.acceptableUseP1": "You represent and warrant that your use of the Service:",
-    "TermsOfServiceModal.acceptableUseItem1": "Will be in strict accordance with these Terms;",
-    "TermsOfServiceModal.acceptableUseItem2": "Will comply with all applicable laws and regulations (including, without limitation, all applicable laws regarding online conduct and acceptable content, privacy, data protection, and the transmission of technical data exported from the United States or the country in which you reside);",
-    "TermsOfServiceModal.acceptableUseItem3": "Will not use the Services for any unlawful purposes, to publish illegal content, or in furtherance of illegal activities;",
-    "TermsOfServiceModal.acceptableUseItem4": "Will not transmit any material that is defamatory, offensive or otherwise objectionable in relation to your use of the Service;",
-    "TermsOfServiceModal.acceptableUseItem5": "Will not infringe or misappropriate the intellectual property rights of any third party;",
-    "TermsOfServiceModal.acceptableUseItem6": "Will not overburden Learning Equality's systems, as determined by us in our sole discretion, including but not limited to excessive bandwidth utilization or number of requests;",
-    "TermsOfServiceModal.acceptableUseItem7": "Will not attempt to circumvent your assigned storage quota or other account restrictions through technical or other means;",
-    "TermsOfServiceModal.acceptableUseItem8": "Will not disclose sensitive personal information of others;",
-    "TermsOfServiceModal.acceptableUseItem9": "Will not be used to send spam or bulk unsolicited messages;",
-    "TermsOfServiceModal.acceptableUseItem10": "Will not interfere with, disrupt, or attack any service or network; and",
-    "TermsOfServiceModal.acceptableUseItem11": "Will not be used to create, distribute, or enable material that is - or that facilitates or operates in conjunction with - malware, spyware, adware, or other malicious programs or code.",
-    "TermsOfServiceModal.userContentHeader": "User-Generated Content",
-    "TermsOfServiceModal.userContentP1": "We have not reviewed, and cannot review, all of the Content (such as, but not limited to, text, photo, video, audio, code, computer software, or other materials) uploaded to or authored using the Service by users or anyone else and are not responsible for any use or effects of such Content. So, for example:",
-    "TermsOfServiceModal.userContentList1Item1": "We do not endorse any uploaded Content or represent that Content is accurate, useful, or non-harmful. Content could be offensive, indecent, or objectionable; include technical inaccuracies, typographical mistakes, or other errors; or violate or infringe the privacy, publicity rights, intellectual property rights (see our Copyright Infringement and DMCA Policy section to submit copyright complaints), or other proprietary rights of third parties.",
-    "TermsOfServiceModal.userContentList1Item2": "If you upload or author Content, or otherwise make (or allow any third party to make) Content available on the Service, you are entirely responsible for the Content, and any harm resulting from, that Content or your conduct.",
-    "TermsOfServiceModal.userContentList1Item3": "You are responsible for ensuring that you have proper permissions to upload and distribute any and all uploaded Content and for ensuring that the copyright holder and licensing are properly evidenced on the uploaded Content.",
-    "TermsOfServiceModal.userContentList1Item4": "We disclaim any responsibility for any harm resulting from anyone's use or downloading of Content. If you access or use any Content, you are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content.",
-    "TermsOfServiceModal.userContentList1Item5": "We are not a party to, and will have no responsibility or liability for, any communications, transactions, interactions, or disputes between you and the provider of any Content.",
-    "TermsOfServiceModal.userContentList1Item6": "Please note that additional third party terms and conditions may apply to the downloading, copying, or use of Content.",
-    "TermsOfServiceModal.userContentP2": "We also have not reviewed, and cannot review, all of the material made available through the websites and web pages that link to, or are linked from the Service. For example:",
-    "TermsOfServiceModal.userContentList2Item1": "We do not have any control over those websites and are not responsible for their contents or their use.",
-    "TermsOfServiceModal.userContentList2Item2": "The existence of a link to or from the Service does not represent or imply that we endorse such website.",
-    "TermsOfServiceModal.userContentList2Item3": "You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content.",
-    "TermsOfServiceModal.userContentP3": "We reserve the right to remove any Content that violates our Terms or for any other reason.",
-    "TermsOfServiceModal.userContentP4": "Please note we cannot:",
-    "TermsOfServiceModal.userContentList3Item1": "remove or force upgrades of copies of Content that have already been downloaded from the Service, except in cases in which the Kolibri Learning Application is running on a server that is under our control. This may mean that when we delete uploaded content not all copies will be removed.",
-    "TermsOfServiceModal.userContentList3Item2": "remove or change the licensing on old versions of Content that others have made copies of, should you change the licensing on your content and/or request a removal of the Content from us. When a Creative Commons license is applied to a specific version of a piece of Content, the rights conferred to others for distribution and use of that Content cannot be revoked. Whilst we cannot remove or force updates on copies of the Content, we would let you update the license on your own copy of the Content moving forward, and for future versions.",
-    "TermsOfServiceModal.licensingHeader": "Licensing and Copyright",
-    "TermsOfServiceModal.licensingP1": "The Service allows you to upload and distribute Content. When you do, the following terms apply:",
-    "TermsOfServiceModal.licensingList1Item1": "Copyright ownership of the Content is retained by the original copyright holder and must be indicated, and license information must be marked so as to accurately reflect the copyright holder's intentions around the distribution and use of that Content.",
-    "TermsOfServiceModal.licensingList1Item2": "If you are not yourself the copyright holder, you must have the rights to distribute the uploaded Content, either through explicit written permission from the copyright holder, or as allowed by the terms of the license under which the Content has been released.",
-    "TermsOfServiceModal.licensingList1Item3": "If you are the copyright holder of the uploaded content, then by marking the Content you upload with a particular license, you are agreeing for the Content to be distributed and used under the terms of that license in perpetuity.",
-    "TermsOfServiceModal.licensingP2": "We follow a policy of making content, including its associated metadata, as open as possible while following the appropriate copyright laws. With this in mind, we distinguish between:",
-    "TermsOfServiceModal.licensingList2Item1": "Descriptive metadata: This includes primary metadata associated with a single piece of Content, for example, titles, descriptions, and other elements which constitute a definitive part of the Content regardless of which system it appears on. These metadata elements will fall under the same copyright and licensing as the Content itself.",
-    "TermsOfServiceModal.licensingList2Item2": "Organizational metadata: This defines how a piece of content may be used, aids with discovery, and places it within some broader structure of relations on the Service, for example, tags, curation into topics (including the titles of those topics), and other elements pertaining to the display and ordering of Content on the system itself. By using the Service, you agree that work you do to generate organizational metadata elements are released into the Public Domain, and may be made available for others to use, without any claim to copyright or restricted licensing. We may also share, leverage and distribute this organizational metadata. This is so that we can benefit others and improve the impact of our platforms.",
-    "TermsOfServiceModal.dmcaHeader": "DMCA Policy",
-    "TermsOfServiceModal.dmcaP1": "As we ask others to respect our intellectual property rights, we respect the intellectual property rights of others. If you believe that material located on or associated with the Service violates your copyright, please notify us in accordance with our Digital Millennium Copyright Act (\"DMCA\") Policy. We will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. We will terminate a visitor's access to and use of the website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of copyrights or other intellectual property rights. In the case of such termination, we will have no obligation to provide a refund of any payments or other forms of restitution.",
-    "TermsOfServiceModal.dmcaLink": "Report a violation",
-    "TermsOfServiceModal.intellectualPropertyHeader": "Intellectual Property Notice",
-    "TermsOfServiceModal.intellectualPropertyP1": "The Agreement does not transfer from Learning Equality to you any Learning Equality or third party intellectual property, and all right, title, and interest in and to such property will remain (as between the parties) solely with Learning Equality. \"Kolibri\", \"Kolibri Studio\", \"Learning Equality\", the Kolibri logo, and all other trademarks, service marks, graphics, and logos used in connection with learningequality.org or the Service, are trademarks or registered trademarks of Learning Equality or Learning Equality's licensors. Other trademarks, service marks, graphics, and logos used in connection with the Service may be the trademarks of other third parties. Your use of the Service grants you no right or license to reproduce or otherwise use any Learning Equality or third party trademarks and any such use may constitute an infringement of the holder's rights",
-    "TermsOfServiceModal.communityStandardsHeader": "Community Standards",
-    "TermsOfServiceModal.communityStandardsP1": "For more information about the intended use of the Service, and standards around Content, please see our Community Standards page.",
-    "TermsOfServiceModal.communityStandardsLink": "Learn more about Studio's community standards",
-    "TermsOfServiceModal.yourPrivacyHeader": "Your Privacy",
-    "TermsOfServiceModal.yourPrivacyP1": "We take your privacy seriously. Please read our Privacy Policy to see how we collect, use and protect your personal data.",
-    "TermsOfServiceModal.yourPrivacyLink": "Learn more about Studio's privacy policy",
-    "TermsOfServiceModal.cancellationHeader": "Cancellation or Termination",
-    "TermsOfServiceModal.cancellationP1": "We may terminate or restrict your access to all or any part of the Service at any time, with or without cause, with or without notice, effective immediately. We have the right (though not the obligation) to, in our sole discretion, (i) close down an account or remove content due to prolonged inactivity, (ii) refuse or remove any content that, in our reasonable opinion, violates any Learning Equality policy (including our Community Standards) or is in any way harmful or objectionable, or (iii) terminate or deny access to and use of the Service to any individual or entity for any reason. We will have no obligation to provide a refund of any amounts previously paid.",
-    "TermsOfServiceModal.cancellationP2": "If we end your rights to use the Service:",
-    "TermsOfServiceModal.cancellationItem1": "You must stop all activities authorized by these Terms, including your use of the Service.",
-    "TermsOfServiceModal.cancellationItem2": "You must not register and create a new account under your name, a fake or borrowed name, or the name of any third party, even if you may be acting on behalf of the third party.",
-    "TermsOfServiceModal.cancellationP3": "In addition to terminating or suspending your account, we reserve the right to take appropriate legal action, including without limitation pursuing civil, criminal, and injunctive action for violating these Terms.",
-    "TermsOfServiceModal.cancellationP4": "All provisions of the Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity, and limitations of liability.",
-    "TermsOfServiceModal.communicationsHeader": "Communications with Learning Equality",
-    "TermsOfServiceModal.communicationsP1": "For contractual purposes, you (1) consent to receive communications from us in an electronic form via the email address you have submitted or via the Service; and (2) agree that all Terms of Service, agreements, notices, disclosures, and other communications that we provide to you electronically satisfy any legal requirement that those communications would satisfy if they were on paper. This section does not affect your non-waivable rights.",
-    "TermsOfServiceModal.warrantyHeader": "Disclaimer of Warranties",
-    "TermsOfServiceModal.warrantyHeaderP1": "You acknowledge that the website and the Service is provided \"as is\" and \"as available\", with all faults and without warranty of any kind, and we hereby disclaim all warranties and conditions with respect to the website and Service, either express, implied or statutory, including, but not limited to, any implied warranties and/or conditions of merchantability, of satisfactory quality, of fitness for a particular purpose, of accuracy, and non-infringement of third party rights. Any use of the Service and website is at your own risk. Some jurisdictions do not allow the exclusion of implied warranties, so the above limitations may not apply to you.",
-    "TermsOfServiceModal.changesToToSHeader": "Changes to these Terms of Service",
-    "TermsOfServiceModal.changesToToSP1": "We are constantly updating our Service and that means sometimes we have to change the legal terms under which our Service is offered. These Terms may only be modified by a written amendment signed by an authorized executive of Learning Equality, or by the posting by Learning Equality of a revised version. If we make changes that are material, we will let you know by posting on one of our blogs, or by sending you an email or other communication before the changes take effect. The notice will designate a reasonable period of time after which the new terms will take effect. If you disagree with our changes, then you should stop using the Service within the designated notice period, or once the changes become effective. Your continued use of the Service will be subject to the new terms. However, any dispute that arose before the changes shall be governed by the Terms (including the binding individual arbitration clause) that were in place when the dispute arose.",
-    "TermsOfServiceModal.jurisdictionHeader": "Jurisdiction and Applicable Law",
-    "TermsOfServiceModal.jurisdictionP1": "Except to the extent any applicable law provides otherwise, the Agreement and any access to or use of the Service will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. The proper venue for any disputes arising out of or relating to the Agreement and any access to or use of the Service will be the state and federal courts located in San Diego County, California.",
-    "TermsOfServiceModal.arbitrationHeader": "Arbitration Agreement",
-    "TermsOfServiceModal.arbitrationP1": "Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under the Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (\"JAMS\") by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Diego, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce the Agreement shall be entitled to costs and attorneys' fees.",
-    "TermsOfServiceModal.liabilityHeader": "Limitation of Liability",
-    "TermsOfServiceModal.liabilityP1": "To the extent legally permitted under the applicable law, Learning Equality shall not be responsible for any loss or damage to you, your customers or third parties caused by failure of the website to function. In no event will Learning Equality be liable for any special, consequential, incidental, or indirect damages (including, without limitation, those resulting from lost profits, cost of substitute goods or services, lost data or business interruption) in connection with the use of the website or Service of in connection with any other claim arising from these Terms of Service. The aggregate liability of Learning Equality arisint from or relating to these Tmers and the Service, regardless of the form of action or claim (contract, tort or otherwise) and even if you have been advised of the possibility of such damages shall not exceed the amount paid by you during the twelve (12) month period prior to the cause of action. Nothing in these Terms shall limit or exclude Learning Equality liability for gross negligence or for death or personal injury. Applicable law may not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not apply to you.",
-    "TermsOfServiceModal.thirdPartyHeader": "Third Party Content and Third Party Applications",
-    "TermsOfServiceModal.thirdPartyP1": "The links to third party websites, any third party content, and any third party applications may be provided for your convenience and information only. The content on any linked website or in any third party application is not under our control and we are not responsible for the content of linked websites and/or third party applications, including any further links contained in a third party website. We make no representations or warranties in connection with any third party content or third party applications, which at all times and in each instance is provided \"as is.\" Third party applications may be subject to additional policies and conditions or agreements between you and the provider of such third party applications. You agree to fully comply with all such additional policies, conditions and agreements. If you decide to access any third party content, and/or any third party application, you do so entirely at your own risk.",
-    "TermsOfServiceModal.thirdPartyRightsHeader": "Third Party Rights",
-    "TermsOfServiceModal.thirdPartyRightsP1": "Nothing in our Terms is intended to confer on any third party any benefit or any right (under the Contracts (Rights of Third Parties) Act 1999 UK or otherwise) to enforce any provision of our Terms or any agreement entered into in connection with it.",
-    "TermsOfServiceModal.indemnificationHeader": "Indemnification",
-    "TermsOfServiceModal.indemnificationP1": "You agree to indemnify and hold harmless Learning Equality, its contractors, and its licensors, and their respective directors, officers, employees, and agents from and against any and all losses, liabilities, demands, damages, costs, claims, and expenses, including attorneys' fees, arising out of or related to your use of the Service, including but not limited to your violation of the Agreement, Content that you upload or author, and any other activities conducted using the Service.",
-    "TermsOfServiceModal.miscellaneousHeader": "Miscellaneous",
-    "TermsOfServiceModal.miscellaneousP1": "The Agreement constitutes the entire agreement between Learning Equality and you concerning the subject matter hereof. If any part of the Agreement is held invalid or unenforceable, that part will be construed to reflect the parties' original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of the Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof.",
-    "TermsOfServiceModal.miscellaneousP2": "You may assign your rights under the Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; Learning Equality may assign its rights under the Agreement without condition. The Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.",
-    "TermsOfServiceModal.miscellaneousP3": "If you have any questions about the Service or these Terms, please contact us at legal@learningequality.org.",
-    "CommunityStandardsModal.description": "Learning Equality is a nonprofit organization dedicated to enabling equitable access to quality educational experiences. Along with our statement of Core Values, these Community Standards are intended to foster a supportive and inclusive environment for our users.",
-    "CommunityStandardsModal.coreValuesLink": "Learn more about Learning Equality's core values",
-    "CommunityStandardsModal.studioDescription": "Kolibri Studio gives you access to the Kolibri Library, a growing library of educational materials, which we encourage you to use as your own. We built Kolibri Studio to help you prepare educational materials in a variety of ways, including but not limited to:",
-    "CommunityStandardsModal.studioItem1": "Browsing. Selecting appropriate educational materials for your situation from the Kolibri Library, the listing of sources available on the public channels page in Kolibri Studio",
-    "CommunityStandardsModal.studioItem2": "Curating. Reorganizing the materials in these channels by selecting, deleting, and reordering appropriate items",
-    "CommunityStandardsModal.studioItem3": "Sharing. Creating and publishing new channels with what you find, either to share with your own implementations privately or to share with others on Kolibri Studio.",
-    "CommunityStandardsModal.studioItem4": "Modifying & Creating. Adding your own assessment exercises to any existing materials",
-    "CommunityStandardsModal.studioItem5": "Hosting. Uploading your own materials (limited to materials you know are appropriately licensed to do so) from a local hard drive or other locations on the internet",
-    "CommunityStandardsModal.libraryDescription": "The Kolibri Library is both a grassroots and curated effort to provide a wide variety of materials for all learners and learning purposes. To help us achieve these goals, we invite you to use Kolibri Studio in ways that:",
-    "CommunityStandardsModal.libraryItem1": "Model good practices in open sharing and respect copyright. Create an ethical sharing community by labeling licenses, making sure you know the appropriate licenses for what you upload, and ensuring that appropriate written permissions are documented if needed. Studio is primarily designed to host materials which are openly licensed or come with special permissions for re-distribution and reproduction.",
-    "CommunityStandardsModal.libraryItem2": "Keep materials clear, organized, and usable. We welcome resources created at all levels of production! To help them reach as many learners as possible, we invite you to fully utilize all metadata fields and aim for quality in comprehensibility, legibility, or digitization such that the content is usable and understandable.",
-    "CommunityStandardsModal.libraryItem3": "Respect the community. Avoid obscenity and vulgarity, beyond specific educational purposes they might serve in some contexts. Hate speech of any kind, or promotion of violence or discrimination, will never be tolerated.",
-    "CommunityStandardsModal.libraryItem4": "Kolibri Studio is for educational purposes only. It is not intended to be used for non-educational purposes such as recruitment, indoctrination, advertisement, file sharing, or personal media hosting.",
-    "PrivacyPolicyModal.paragraph1": "This Privacy Policy informs you of our privacy practices and your choices and rights around the personal data that we collect. This Privacy Policy applies to the Kolibri application (\"Application\"), Kolibri Studio (\"Studio\"), and all related websites (herein collectively referred to as \"Kolibri\"). This Privacy Statement does not apply to third party applications or partner organizations that may use our software or be used in conjunction with our software.",
-    "PrivacyPolicyModal.paragraph2": "Learning Equality recognizes your right to privacy, and will take reasonable steps to protect this. Some parts of Kolibri allow you to give us personal information, such as your name and email address. We may use the information you provide to improve Kolibri. Where you have choices about how we use the information you provide, we will indicate this at the point of collection. Because of the way Kolibri operates, we may also use information from your browser or browsing activities to personalize or route you to relevant information. For example, we may use your IP address, browser information, cookies or web beacons in ways that help us maintain some of your preferences, or understand how our visitors navigate the site so we can improve it. We may store your personal information outside of the European Union.",
-    "PrivacyPolicyModal.paragraph3": "Learning Equality is committed to learning constantly and improving the quality of Kolibri, and records related to your interactions with Kolibri may be used for research. Research findings will typically be reported at the aggregate level, and your personal identity will never be publicly disclosed in any research findings without your express consent.",
-    "PrivacyPolicyModal.linkText": "Learn more about Learning Equality's core values.",
-    "PrivacyPolicyModal.paragraph4": "If you have any questions about these practices or use of your personal information, please email legal@learningequality.org.",
-    "LicenseDropdown.licenseLabel": "License",
-    "LicenseDropdown.licenseValidationMessage": "Field is required",
-    "LicenseDropdown.licenseDescriptionLabel": "License description",
-    "LicenseDropdown.descriptionValidationMessage": "Field is required",
-    "LicenseDropdown.learnMoreButton": "Learn More",
-    "LicenseDropdown.licenseInfoHeader": "About licenses",
-    "ChannelThumbnail.crop": "Crop",
-    "ChannelThumbnail.upload": "Upload image",
-    "ChannelThumbnail.remove": "Remove",
-    "ChannelThumbnail.zoomIn": "Zoom in",
-    "ChannelThumbnail.zoomOut": "Zoom out",
-    "ChannelThumbnail.save": "Save",
-    "ChannelThumbnail.cancel": "Cancel",
-    "ChannelCatalogFrontPage.catalogHeader": "Kolibri Content Library channels",
-    "ChannelCatalogFrontPage.exported": "Exported",
-    "ChannelCatalogFrontPage.formatsHeading": "Formats",
-    "ChannelCatalogFrontPage.coachHeading": "Resources for coaches",
-    "ChannelCatalogFrontPage.containsHeading": "Contains",
-    "ChannelCatalogFrontPage.languagesHeading": "Languages",
-    "ChannelCatalogFrontPage.subtitlesIncludedText": "Captions or subtitles",
-    "ChannelCatalogFrontPage.assessmentsIncludedText": "Assessments",
-    "ChannelCatalogFrontPage.defaultNoItemsText": "---",
-    "ChannelCatalogFrontPage.numberOfChannels": "{ num } channels",
-    "ChannelDetailsModal.downloadButton": "Download channel summary",
-    "ChannelDetailsModal.downloadPDF": "Download PDF",
-    "ChannelDetailsModal.downloadCSV": "Download CSV",
-    "ChannelSharingTable.editorsSubheading": "{count, plural,\n =1 {# user who can edit}\n other {# users who can edit}}",
-    "ChannelSharingTable.viewersSubheading": "{count, plural,\n =1 {# user who can view}\n other {# users who can view}}",
-    "ChannelSharingTable.currentUserText": "{first_name} {last_name} (you)",
-    "ChannelSharingTable.guestText": "Guest",
-    "ChannelSharingTable.noUsersText": "No users found",
-    "ChannelSharingTable.invitePendingText": "Invite pending",
-    "ChannelSharingTable.optionsDropdown": "Options",
-    "ChannelSharingTable.resendInvitation": "Resend invitation",
-    "ChannelSharingTable.deleteInvitation": "Delete invitation",
-    "ChannelSharingTable.makeEditor": "Grant edit permissions",
-    "ChannelSharingTable.removeViewer": "Revoke view permissions",
-    "ChannelSharingTable.invitationDeletedMessage": "Invitation deleted",
-    "ChannelSharingTable.invitationSentMessage": "Invitation sent",
-    "ChannelSharingTable.userRemovedMessage": "User removed",
-    "ChannelSharingTable.editPermissionsGrantedMessage": "Edit permissions granted",
-    "ChannelSharingTable.invitationFailedError": "Invitation failed to resend. Please try again",
-    "ChannelSharingTable.cancelButton": "Cancel",
-    "ChannelSharingTable.removeViewerHeader": "Revoke view permissions",
-    "ChannelSharingTable.removeViewerText": "Are you sure you would like to revoke view permissions for {first_name} {last_name}?",
-    "ChannelSharingTable.removeViewerConfirm": "Yes, revoke",
-    "ChannelSharingTable.deleteInvitationHeader": "Delete invitation",
-    "ChannelSharingTable.deleteInvitationText": "Are you sure you would like to delete the invitation for {email}?",
-    "ChannelSharingTable.deleteInvitationConfirm": "Delete invitation",
-    "ChannelSharingTable.makeEditorHeader": "Grant edit permissions",
-    "ChannelSharingTable.makeEditorText": "Are you sure you would like to grant edit permissions to {first_name} {last_name}?",
-    "ChannelSharingTable.makeEditorConfirm": "Yes, grant permissions",
-    "ChannelModal.creatingHeader": "New channel",
-    "ChannelModal.details": "Channel details",
-    "ChannelModal.channelName": "Channel name",
-    "ChannelModal.channelError": "Channel name cannot be blank",
-    "ChannelModal.channelDescription": "Channel description",
-    "ChannelModal.editTab": "Details",
-    "ChannelModal.shareTab": "Sharing",
-    "ChannelModal.APIText": "Channels generated automatically are not editable.",
-    "ChannelModal.saveChangesButton": "Save changes",
-    "ChannelModal.createButton": "Create",
-    "ChannelModal.changesSaved": "Changes saved",
-    "ChannelModal.unsavedChangesHeader": "Unsaved changes",
-    "ChannelModal.unsavedChangesText": "You will lose any unsaved changes. Are you sure you want to exit?",
-    "ChannelModal.keepEditingButton": "Keep editing",
-    "ChannelModal.closeButton": "Exit without saving",
-    "ChannelTokenModal.copyTitle": "Copy channel token",
-    "ChannelTokenModal.copyTokenInstructions": "Paste this token into Kolibri to import this channel",
-    "ChannelTokenModal.close": "Close",
-    "ChannelSharing.inviteSubheading": "Invite collaborators",
-    "ChannelSharing.emailLabel": "Email",
-    "ChannelSharing.canEdit": "Can edit",
-    "ChannelSharing.canView": "Can view",
-    "ChannelSharing.inviteButton": "Send invitation",
-    "ChannelSharing.validEmailMessage": "Please enter a valid email",
-    "ChannelSharing.emailRequiredMessage": "Email is required",
-    "ChannelSharing.alreadyInvitedError": "User already invited",
-    "ChannelSharing.alreadyHasAccessError": "User already has access to this channel",
-    "ChannelSharing.invitationFailedError": "Invitation failed to send. Please try again",
-    "ChannelSharing.invitationSentMessage": "Invitation sent",
-    "OfflineText.offlineIndicatorText": "Offline",
-    "OfflineText.offlineText": "You seem to be offline. Your changes will be saved once your connection is back.",
-    "CopyToken.copyPrompt": "Copy token to import channel into Kolibri",
-    "CopyToken.copiedTokenId": "Token copied",
-    "CopyToken.copyFailed": "Copy failed",
-    "MainNavigationDrawer.channelsLink": "Channels",
-    "MainNavigationDrawer.administrationLink": "Administration",
-    "MainNavigationDrawer.settingsLink": "Settings",
-    "MainNavigationDrawer.helpLink": "Help and support",
-    "MainNavigationDrawer.logoutLink": "Sign out",
-    "MainNavigationDrawer.copyright": "© {year} Learning Equality",
-    "ContentNodeIcon.topic": "Topic",
-    "ContentNodeIcon.video": "Video",
-    "ContentNodeIcon.audio": "Audio",
-    "ContentNodeIcon.exercise": "Exercise",
-    "ContentNodeIcon.document": "Document",
-    "ContentNodeIcon.slideshow": "Slideshow",
-    "ContentNodeIcon.html5": "HTML5 App",
-    "ContentNodeIcon.unsupported": "Unsupported",
-    "FileStatusText.selectFile": "Select file",
-    "Uploader.unsupportedFilesHeader": "Unsupported files",
-    "Uploader.unsupportedFilesText": "{count, plural,\n =1 {# file will not be uploaded.}\n other {# files will not be uploaded.}} \n {extensionCount, plural,\n =1 {Supported file type is}\n other {Supported file types are}} {extensions}",
-    "Uploader.listDelimiter": ", ",
-    "Uploader.noStorageHeader": "Not enough space",
-    "Uploader.uploadSize": "Upload is too large: {size}",
-    "Uploader.remainingStorage": "Remaining storage: {size}",
-    "Uploader.tooLargeFilesHeader": "Max file size exceeded",
-    "Uploader.maxFileSizeText": "{count, plural,\n =1 {# file will not be uploaded.}\n other {# files will not be uploaded.}} File size must be under {size}",
-    "FileStorage.storageUsed": "Total storage used: {used} of {total}",
-    "FileStorage.requestStorage": "Request storage",
-    "FileStorage.storageFull": "Storage limit reached",
-    "FileStorage.storageFullWithSize": "Total storage limit reached: {used} of {total}",
-    "FileStorage.storageLow": "Storage is running low",
-    "FileStorage.storageLowWithSize": "Total storage is running low: {used} of {total}",
-    "Thumbnail.thumbnail": "{title} thumbnail",
-    "MasteryDropdown.labelText": "Mastery criteria",
-    "MasteryDropdown.exerciseHeader": "About exercises",
-    "MasteryDropdown.exerciseDescripiton": "Exercises contain a set of interactive questions that a learner can engage with in Kolibri. Learners receive instant feedback for each answer (correct or incorrect). Kolibri will display available questions in an exercise until the learner achieves mastery.",
-    "MasteryDropdown.masteryDescripiton": "Kolibri marks an exercise as \"completed\" when the mastery criteria is met. Here are the different types of mastery criteria for an exercise:",
-    "MasteryDropdown.masteryValidationMessage": "Field is required",
-    "MasteryDropdown.mnValueValidationMessage": "Must be at least 1",
-    "MasteryDropdown.mnIntegerValidationMessage": "Must be a whole number",
-    "MasteryDropdown.mValueValidationMessage": "Must be less than or equal to N",
-    "MasteryDropdown.requiredValidationMessage": "Field is required",
-    "MasteryDropdown.mHint": "Correct answers needed",
-    "MasteryDropdown.nHint": "Recent answers",
-    "TechnicalTextBlock.copyToClipboardButtonPrompt": "Copy to clipboard",
-    "TechnicalTextBlock.copiedToClipboardConfirmation": "Copied to clipboard",
-    "TechnicalTextBlock.copiedToClipboardFailure": "Copy to clipboard failed",
-    "ReportErrorModal.reportErrorHeader": "Report Error",
-    "ReportErrorModal.forumPrompt": "Visit the community forums",
-    "ReportErrorModal.forumUseTips": "Search the community forum to see if others encountered similar issues. If unable to find anything, paste the error details below into a new forum post so we can rectify the error in a future version of Kolibri Studio.",
-    "ReportErrorModal.forumPostingTips": "Include a description of what you were trying to do and what you clicked on when the error appeared.",
-    "ReportErrorModal.emailPrompt": "Send an email to the developers",
-    "ReportErrorModal.emailDescription": "Contact the support team with your error details and we’ll do our best to help.",
-    "ReportErrorModal.errorDetailsHeader": "Error details",
-    "ReportErrorModal.closeAction": "Close",
-    "PageNotFoundError.pageNotFoundHeader": "Page not found",
-    "PageNotFoundError.pageNotFoundDetails": "Sorry, that page does not exist",
-    "PageNotFoundError.backToHomeAction": "Back to home",
-    "GenericError.genericErrorHeader": "Sorry, something went wrong",
-    "GenericError.genericErrorDetails": "Try refreshing this page or going back to the home page",
-    "GenericError.refreshAction": "Refresh",
-    "GenericError.backToHomeAction": "Back to home",
-    "GenericError.helpByReportingAction": "Help us by reporting this error",
-    "ChannelNotFoundError.channelNotFoundHeader": "Channel not found",
-    "ChannelNotFoundError.channelNotFoundDetails": "This channel does not exist or may have been removed. Contact content@learningequality.org if you think this is a mistake.",
-    "ChannelNotFoundError.backToHomeAction": "Back to home",
-    "PermissionsError.permissionDeniedHeader": "Did you forget to sign in?",
-    "PermissionsError.goToHomePageAction": "Go to home page",
-    "MessageLayout.backToLogin": "Continue to sign-in page",
-    "Main.kolibriStudio": "Kolibri Studio",
-    "Main.passwordLabel": "Password",
-    "Main.forgotPasswordLink": "Forgot your password?",
-    "Main.signInButton": "Sign in",
-    "Main.createAccountButton": "Create an account",
-    "Main.guestModeLink": "Explore without an account",
-    "Main.loginFailed": "Email or password is incorrect",
-    "AccountDeleted.accountDeletedTitle": "Account successfully deleted",
-    "AccountDeleted.continueToSignIn": "Continue to sign-in page",
-    "Create.backToLoginButton": "Sign in",
-    "Create.createAnAccountTitle": "Create an account",
-    "Create.fieldRequiredMessage": "Field is required",
-    "Create.errorsMessage": "Please fix the errors below",
-    "Create.registrationFailed": "There was an error registering your account. Please try again",
-    "Create.basicInformationHeader": "Basic information",
-    "Create.firstNameLabel": "First name",
-    "Create.lastNameLabel": "Last name",
-    "Create.emailExistsMessage": "An account with this email already exists",
-    "Create.passwordLabel": "Password",
-    "Create.confirmPasswordLabel": "Confirm password",
-    "Create.passwordMatchMessage": "Passwords don't match",
-    "Create.usageLabel": "How do you plan on using Kolibri Studio (check all that apply)",
-    "Create.organizingUsageOption": "Organizing or aligning existing materials",
-    "Create.findingUsageOption": "Finding and adding additional content sources",
-    "Create.sequencingUsageOption": "Using prerequisites to put materials in a sequence",
-    "Create.creatingExercisesUsageOption": "Creating exercises",
-    "Create.sharingUsageOption": "Sharing materials publicly",
-    "Create.storingUsageOption": "Storing materials for private or local use",
-    "Create.storingUsagePlaceholder": "How much storage do you need?",
-    "Create.storingUsageExample": "e.g. 500MB",
-    "Create.taggingUsageOption": "Tagging content sources for discovery",
-    "Create.otherUsageOption": "Other",
-    "Create.otherUsagePlaceholder": "Please describe",
-    "Create.locationLabel": "Where do you plan to use Kolibri Studio? (check all that apply)",
-    "Create.sourceLabel": "How did you hear about us?",
-    "Create.sourcePlaceholder": "Select one",
-    "Create.organizationSourceOption": "Organization",
-    "Create.organizationSourcePlaceholder": "Name of organization",
-    "Create.websiteSourceOption": "Learning Equality website",
-    "Create.newsletterSourceOption": "Learning Equality newsletter",
-    "Create.forumSourceOption": "Learning Equality community forum",
-    "Create.githubSourceOption": "Learning Equality GitHub",
-    "Create.socialMediaSourceOption": "Social media",
-    "Create.conferenceSourceOption": "Conference",
-    "Create.conferenceSourcePlaceholder": "Name of conference",
-    "Create.conversationSourceOption": "Conversation with Learning Equality",
-    "Create.personalDemoSourceOption": "Personal demo",
-    "Create.otherSourceOption": "Other",
-    "Create.otherSourcePlaceholder": "Please describe",
-    "Create.viewToSLink": "View terms of service",
-    "Create.ToSCheck": "I have read and agree to the terms of service",
-    "Create.ToSRequiredMessage": "Please accept our terms of service",
-    "Create.viewPrivacyPolicyLink": "View privacy policy",
-    "Create.privacyPolicyCheck": "I have read and agree to the privacy policy",
-    "Create.privacyPolicyRequiredMessage": "Please accept our privacy policy",
-    "Create.contactMessage": "Questions or concerns? Please email us at content@learningequality.org",
-    "Create.finishButton": "Finish",
-    "ActivationSent.header": "Activation link sent",
-    "ActivationSent.text": "Thank you for creating an account! To complete the process, please check your email for the activation link we sent you.",
-    "ActivationExpired.activationExpiredTitle": "Activation failed",
-    "ActivationExpired.activationExpiredText": "This activation link has been used already or has expired.",
-    "ActivationExpired.requestNewLink": "Request a new activation link",
-    "AccountCreated.accountCreatedTitle": "Account successfully created",
-    "AccountCreated.continueToSignIn": "Continue to sign-in",
-    "ActivationLinkReSent.activationReSentTitle": "Instructions sent. Thank you!",
-    "ActivationLinkReSent.activationReSentText": "If there is already an account with the email address provided, you should receive instructions shortly. If you don't see an email from us, please check your spam folder.",
-    "AccountNotActivated.title": "Account has not been activated",
-    "AccountNotActivated.text": "Please check your email for an activation link or request a new link.",
-    "AccountNotActivated.requestNewLink": "Request a new activation link",
-    "RequestNewActivationLink.activationExpiredTitle": "Activation failed",
-    "RequestNewActivationLink.activationExpiredText": "This activation link has been used already or is invalid.",
-    "RequestNewActivationLink.submitButton": "Submit",
-    "RequestNewActivationLink.activationRequestFailed": "Failed to send a new activation link. Please try again.",
-    "ResetPassword.resetPasswordTitle": "Reset your password",
-    "ResetPassword.resetPasswordPrompt": "Enter and confirm your new password",
-    "ResetPassword.passwordLabel": "New password",
-    "ResetPassword.passwordConfirmLabel": "Confirm password",
-    "ResetPassword.passwordMatchMessage": "Passwords don't match",
-    "ResetPassword.submitButton": "Submit",
-    "ResetPassword.resetPasswordFailed": "Failed to reset password. Please try again.",
-    "PasswordInstructionsSent.passwordInstructionsHeader": "Instructions sent. Thank you!",
-    "PasswordInstructionsSent.passwordInstructionsText": "If there is already an account with the email address provided, you should receive the instructions shortly. If you don't see an email from us, please check your spam folder.",
-    "ResetLinkExpired.resetExpiredTitle": "Reset link expired",
-    "ResetLinkExpired.resetExpiredText": "This password reset link has been used already or has expired.",
-    "ResetLinkExpired.requestNewLink": "Request a new password reset link",
-    "ResetPasswordSuccess.header": "Password reset successfully",
-    "ResetPasswordSuccess.text": "Your password has been reset. You may sign in now.",
-    "ForgotPassword.forgotPasswordTitle": "Reset your password",
-    "ForgotPassword.forgotPasswordPrompt": "Please enter your email address to receive instructions for resetting your password",
-    "ForgotPassword.submitButton": "Submit",
-    "ForgotPassword.forgotPasswordFailed": "Failed to send a password reset link. Please try again.",
-    "AdministrationAppError.unauthorizedDetails": "You need to be an administrator of Studio to view this page",
-    "AdministrationIndex.channelsLabel": "Channels",
-    "AdministrationIndex.usersLabel": "Users"
-}
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_MESSAGES/django.po b/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_MESSAGES/django.po
index b4df12f8e0..db7db83afa 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_MESSAGES/django.po
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: kolibri-studio\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-10-13 23:53+0000\n"
-"PO-Revision-Date: 2020-10-29 20:21\n"
+"PO-Revision-Date: 2021-05-24 19:02\n"
 "Last-Translator: \n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
@@ -14,223 +14,223 @@ msgstr ""
 "X-Crowdin-Project: kolibri-studio\n"
 "X-Crowdin-Project-ID: 286000\n"
 "X-Crowdin-Language: pt-BR\n"
-"X-Crowdin-File: /develop/django.po\n"
+"X-Crowdin-File: /master/django.po\n"
 "X-Crowdin-File-ID: 1672\n"
 
 #: contentcuration/contentcuration/api.py:140
 msgid "Date/Time Created"
-msgstr ""
+msgstr "Data/Horário de criação"
 
 #: contentcuration/contentcuration/api.py:141
 #: contentcuration/contentcuration/api.py:142
 msgid "Not Available"
-msgstr ""
+msgstr "Indisponível"
 
 #: contentcuration/contentcuration/api.py:145
 msgid "Ricecooker Version"
-msgstr ""
+msgstr "Versão do Ricecooker"
 
 #: contentcuration/contentcuration/api.py:150
 #: contentcuration/contentcuration/utils/csv_writer.py:169
 msgid "File Size"
-msgstr ""
+msgstr "Tamanho do arquivo"
 
 #: contentcuration/contentcuration/api.py:161
 msgid "# of {}s"
-msgstr ""
+msgstr "# de {}s"
 
 #: contentcuration/contentcuration/api.py:165
 msgid "# of Questions"
-msgstr ""
+msgstr "# de perguntas"
 
 #: contentcuration/contentcuration/api.py:175
 msgid "# of Subtitles"
-msgstr ""
+msgstr "# de legendas"
 
 #: contentcuration/contentcuration/catalog_settings.py:4
 #: contentcuration/contentcuration/sandbox_settings.py:8
 #: contentcuration/contentcuration/settings.py:287
 msgid "Arabic"
-msgstr ""
+msgstr "Árabe"
 
 #: contentcuration/contentcuration/middleware/db_readonly.py:24
 msgid "The site is currently in read-only mode. Please try again later."
-msgstr ""
+msgstr "No momento, o site está em modo somente leitura. Por favor, tente novamente mais tarde."
 
 #: contentcuration/contentcuration/models.py:274
 msgid "Not enough space. Check your storage under Settings page."
-msgstr ""
+msgstr "Espaço insuficiente. Verifique seu armazenamento na página Configurações."
 
 #: contentcuration/contentcuration/models.py:289
 #: contentcuration/contentcuration/models.py:296
 msgid "Out of storage! Request more space under Settings > Storage."
-msgstr ""
+msgstr "Sem armazenamento! Solicite mais espaço em Configurações > Armazenamento."
 
 #: contentcuration/contentcuration/models.py:1365
 msgid " (Original)"
-msgstr ""
+msgstr " (Original)"
 
 #: contentcuration/contentcuration/settings.py:285
 msgid "English"
-msgstr ""
+msgstr "Inglês"
 
 #: contentcuration/contentcuration/settings.py:286
 msgid "Spanish"
-msgstr ""
+msgstr "Espanhol"
 
 #: contentcuration/contentcuration/tasks.py:253
 msgid "Unknown error starting task. Please contact support."
-msgstr ""
+msgstr "Erro desconhecido ao iniciar tarefa. Por favor, entre em contato com o suporte."
 
 #: contentcuration/contentcuration/templates/base.html:78
 #: contentcuration/contentcuration/templates/channel_list.html:14
 msgid "Kolibri Studio"
-msgstr ""
+msgstr "Kolibri Studio"
 
 #: contentcuration/contentcuration/templates/base.html:167
 msgid "Contentworkshop.learningequality.org has been deprecated. Please go to <a href=\"https://studio.learningequality.org\">studio.learningequality.org</a> for the latest version of Studio"
-msgstr ""
+msgstr "Contentworkshop.learningequality.org foi descontinuado. Por favor, acesse <a href=\"https://studio.learningequality.org\">studio.learningequality.org</a> para ver a última versão do Kolibri Studio"
 
 #: contentcuration/contentcuration/templates/channel_list.html:13
 msgid "Kolibri Content Library Catalog"
-msgstr ""
+msgstr "Catálogo da Biblioteca de Conteúdos Kolibri"
 
 #: contentcuration/contentcuration/templates/channel_not_found.html:23
 msgid "We're sorry, this channel was not found."
-msgstr ""
+msgstr "Infelizmente este canal não foi encontrado."
 
 #: contentcuration/contentcuration/templates/channel_not_found.html:24
 #: contentcuration/contentcuration/templates/permissions/open_channel_fail.html:14
 #: contentcuration/contentcuration/templates/staging_not_found.html:23
 #: contentcuration/contentcuration/templates/unauthorized.html:23
 msgid "Go Home"
-msgstr ""
+msgstr "Ir para a página inicial"
 
 #: contentcuration/contentcuration/templates/exercise_list.html:67
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #: contentcuration/contentcuration/templates/exercise_list.html:73
 msgid "current"
-msgstr ""
+msgstr "atual"
 
 #: contentcuration/contentcuration/templates/exercise_list.html:77
 msgid "Next"
-msgstr ""
+msgstr "Próximo"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:206
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:165
 msgid "Language not set"
-msgstr ""
+msgstr "Idioma não definido"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:212
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:171
 #, python-format
 msgid "This file was generated on %(date)s"
-msgstr ""
+msgstr "Este arquivo foi gerado em %(date)s"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:231
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:189
 msgid "Created"
-msgstr ""
+msgstr "Criado"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:232
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:190
 msgid "Last Published"
-msgstr ""
+msgstr "Última publicação"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:233
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:191
 msgid "Unpublished"
-msgstr ""
+msgstr "Não publicado"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:245
 msgid "USING THIS CHANNEL"
-msgstr ""
+msgstr "USANDO ESTE CANAL"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:247
 msgid "Copy one of the following into Kolibri to import this channel:"
-msgstr ""
+msgstr "Para importar este canal, copie um dos seguintes itens para a Plataforma de Aprendizagem Kolibri:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:252
 msgid "Tokens (Recommended):"
-msgstr ""
+msgstr "Tokens (recomendados):"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:260
 msgid "Channel ID:"
-msgstr ""
+msgstr "ID do canal:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:267
 msgid "Channel must be published to import into Kolibri"
-msgstr ""
+msgstr "O canal deve estar publicado para ser importado para a Plataforma de Aprendizagem Kolibri"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:273
 msgid "WHAT'S INSIDE"
-msgstr ""
+msgstr "O QUE ESTÁ INCLUSO"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:283
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:213
 #, python-format
 msgid "%(count)s Resource"
 msgid_plural "%(count)s Resources"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)s Conteúdo"
+msgstr[1] "%(count)s Conteúdos"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:304
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:234
 msgid "Includes"
-msgstr ""
+msgstr "Inclui"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:310
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:236
 #: contentcuration/contentcuration/utils/export_writer.py:603
 msgid "Languages"
-msgstr ""
+msgstr "Idiomas"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:316
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:245
 #: contentcuration/contentcuration/utils/export_writer.py:603
 msgid "Subtitles"
-msgstr ""
+msgstr "Legendas"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:324
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:254
 msgid "For Educators"
-msgstr ""
+msgstr "Para Educadores"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:325
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:256
 msgid "Coach Content"
-msgstr ""
+msgstr "Conteúdo para educadores"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:325
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:257
 msgid "Assessments"
-msgstr ""
+msgstr "Avaliações"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:334
 msgid "Content Tags"
-msgstr ""
+msgstr "Marcadores de conteúdo"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:338
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:270
 msgid "No tags found"
-msgstr ""
+msgstr "Nenhum marcador encontrado"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:343
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:448
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:274
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:337
 msgid "This channel is empty"
-msgstr ""
+msgstr "Este canal está vazio"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:348
 msgid "SOURCE"
-msgstr ""
+msgstr "FONTE"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:360
 msgid "This channel features resources created by:"
-msgstr ""
+msgstr "Este canal contém conteúdos criados por:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:361
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:379
@@ -243,32 +243,32 @@ msgstr ""
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:322
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:333
 msgid "Information not available"
-msgstr ""
+msgstr "Informação indisponível"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:378
 msgid "The material in this channel was provided by:"
-msgstr ""
+msgstr "O material neste canal foi fornecido por:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:397
 msgid "Material in this channel was originally hosted by:"
-msgstr ""
+msgstr "O material neste canal foi hospedado originalmente por:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:416
 msgid "This channel includes the following licenses:"
-msgstr ""
+msgstr "Este canal inclui as seguintes licenças:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf.html:439
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:326
 msgid "Copyright Holders:"
-msgstr ""
+msgstr "Detentores dos direitos autorais:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:192
 msgid "Token:"
-msgstr ""
+msgstr "Token:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:203
 msgid "What's Inside"
-msgstr ""
+msgstr "Conteúdo"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:239
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:248
@@ -276,31 +276,35 @@ msgstr ""
 msgid "\n"
 "                                            <span class=\"no-break\">(+ %(count)s more)</span>\n"
 "                                        "
-msgstr ""
+msgstr "\n"
+"                                            <span class=\"no-break\">(+ %(count)s mais)</span>\n"
+"                                        "
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:267
 #: contentcuration/contentcuration/utils/export_writer.py:559
 msgid "Most Common Tags"
-msgstr ""
+msgstr "Marcadores mais comuns"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:280
 msgid "Source Information"
-msgstr ""
+msgstr "Informações da fonte"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:284
 msgid "Authors:"
-msgstr ""
+msgstr "Autores:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:288
 #, python-format
 msgid "\n"
 "                                    <b>(+ %(count)s more)</b>\n"
 "                                "
-msgstr ""
+msgstr "\n"
+"                                    <b>(+ %(count)s mais)</b>\n"
+"                                "
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:298
 msgid "Providers:"
-msgstr ""
+msgstr "Provedores:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:301
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:313
@@ -309,15 +313,17 @@ msgstr ""
 msgid "\n"
 "                                <b>(+ %(count)s more)</b>\n"
 "                            "
-msgstr ""
+msgstr "\n"
+"                                <b>(+ %(count)s mais)</b>\n"
+"                            "
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:310
 msgid "Aggregators:"
-msgstr ""
+msgstr "Agregadores:"
 
 #: contentcuration/contentcuration/templates/export/channel_detail_pdf_condensed.html:322
 msgid "Licenses:"
-msgstr ""
+msgstr "Licenças:"
 
 #: contentcuration/contentcuration/templates/export/csv_email.txt:4
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:4
@@ -332,12 +338,12 @@ msgstr ""
 #: contentcuration/contentcuration/templates/settings/storage_request_email.txt:6
 #, python-format
 msgid "Hello %(name)s,"
-msgstr ""
+msgstr "Olá %(name)s,"
 
 #: contentcuration/contentcuration/templates/export/csv_email.txt:6
 #, python-format
 msgid "Your csv for %(channel_name)s has finished generating (attached)."
-msgstr ""
+msgstr "Seu arquivo csv para %(channel_name)s foi gerado (em anexo)."
 
 #: contentcuration/contentcuration/templates/export/csv_email.txt:8
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:29
@@ -350,7 +356,7 @@ msgstr ""
 #: contentcuration/contentcuration/templates/settings/account_deleted_user_email.txt:10
 #: contentcuration/contentcuration/templates/settings/storage_request_email.txt:46
 msgid "Thanks for using Kolibri Studio!"
-msgstr ""
+msgstr "Obrigado por usar o Kolibri Studio!"
 
 #: contentcuration/contentcuration/templates/export/csv_email.txt:10
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:31
@@ -364,575 +370,575 @@ msgstr ""
 #: contentcuration/contentcuration/templates/settings/issue_report_email.txt:26
 #: contentcuration/contentcuration/templates/settings/storage_request_email.txt:48
 msgid "The Learning Equality Team"
-msgstr ""
+msgstr "A equipe Learning Equality"
 
 #: contentcuration/contentcuration/templates/export/csv_email_subject.txt:1
 #, python-format
 msgid "CSV for %(channel_name)s"
-msgstr ""
+msgstr "Arquivo csv para %(channel_name)s"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:6
 msgid "Here is the information for your Kolibri Studio account"
-msgstr ""
+msgstr "Aqui estão as informações sobre a sua conta no Kolibri Studio"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:8
 msgid "Name:"
-msgstr ""
+msgstr "Nome:"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:9
 #: contentcuration/contentcuration/templates/registration/password_reset_form.html:23
 msgid "Email:"
-msgstr ""
+msgstr "E-mail:"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:10
 msgid "Date joined:"
-msgstr ""
+msgstr "Data de adesão:"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:11
 msgid "Countries:"
-msgstr ""
+msgstr "Países:"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:12
 msgid "Intended use for Studio:"
-msgstr ""
+msgstr "Intenção de uso do Kolibri Studio:"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:13
 msgid "You heard about Kolibri Studio from:"
-msgstr ""
+msgstr "Como você ouviu sobre o Kolibri Studio:"
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:15
 msgid "Channels you have edit access to: "
-msgstr ""
+msgstr "Canais que você tem acesso para editar: "
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:19
 msgid "Channels you have view access to: "
-msgstr ""
+msgstr "Canais que você tem acesso para visualizar: "
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:23
 msgid "Information about the resources you have uploaded has been attached as a CSV file."
-msgstr ""
+msgstr "As informações sobre os conteúdos que você enviou foram anexadas como um arquivo CSV."
 
 #: contentcuration/contentcuration/templates/export/user_csv_email.txt:26
 #, python-format
 msgid "If you have any questions or concerns, please email us at %(legal_email)s."
-msgstr ""
+msgstr "Se você tiver perguntas ou dúvidas, por favor envie um e-mail para %(legal_email)s."
 
 #: contentcuration/contentcuration/templates/export/user_csv_email_subject.txt:1
 msgid "Your Kolibri Studio account information"
-msgstr ""
+msgstr "Informações sobre a sua conta no Kolibri Studio"
 
 #: contentcuration/contentcuration/templates/permissions/open_channel_fail.html:12
 msgid "There was an error opening this channel."
-msgstr ""
+msgstr "Ocorreu um erro ao abrir este canal."
 
 #: contentcuration/contentcuration/templates/permissions/open_channel_fail.html:13
 msgid "Try running ricecooker again."
-msgstr ""
+msgstr "Tente rodar o ricecooker novamente."
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:93
 #: contentcuration/contentcuration/templates/registration/activation_email.html:91
 #: contentcuration/contentcuration/templates/registration/password_reset_email.html:91
 msgid "Hello"
-msgstr ""
+msgstr "Olá"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:94
 msgid "has invited you to edit a channel at"
-msgstr ""
+msgstr "te convidou para editar um canal em"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:100
 #, python-format
 msgid "Invititation to %(share_mode)s channel"
-msgstr ""
+msgstr "Convite para o canal %(share_mode)s"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:104
 msgid "Click one of the following links to either accept or decline your invitation:"
-msgstr ""
+msgstr "Clique num dos links a seguir para aceitar ou recusar o convite:"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:107
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:109
 msgid "ACCEPT"
-msgstr ""
+msgstr "ACEITAR"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:112
 msgid "DECLINE"
-msgstr ""
+msgstr "RECUSAR"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.html:117
 #: contentcuration/contentcuration/templates/registration/activation_email.html:110
 #: contentcuration/contentcuration/templates/registration/password_reset_email.html:110
 msgid "Thanks for using our site!"
-msgstr ""
+msgstr "Obrigado por usar o nosso site!"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.txt:7
 #, python-format
 msgid "%(first)s %(last)s has invited you to edit a channel at %(site)s."
-msgstr ""
+msgstr "%(first)s %(last)s te convidou para editar um canal em %(site)s."
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.txt:9
 #, python-format
 msgid "%(first)s %(last)s has invited you to view a channel at %(site)s."
-msgstr ""
+msgstr "%(first)s %(last)s te convidou para visualizar um canal em %(site)s."
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.txt:13
 msgid "Please sign in to Kolibri Studio to accept or decline your invitation:"
-msgstr ""
+msgstr "Por favor, faça o login no Kolibri Studio para aceitar ou recusar o seu convite:"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email.txt:16
 msgid "Please follow this link to create an account (you must be signed in to accept or decline invitations):"
-msgstr ""
+msgstr "Por favor, use este link para criar uma conta (você deve estar logado para aceitar ou recusar convites):"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email_subject.txt:1
 #, python-format
 msgid "You've been invited to edit %(channel)s"
-msgstr ""
+msgstr "Você foi convidado para editar %(channel)s"
 
 #: contentcuration/contentcuration/templates/permissions/permissions_email_subject.txt:1
 #, python-format
 msgid "You've been invited to view %(channel)s"
-msgstr ""
+msgstr "Você foi convidado para visualizar %(channel)s"
 
 #: contentcuration/contentcuration/templates/registration/activation_email.html:92
 msgid "Welcome to Kolibri! Here is the link to activate your account:"
-msgstr ""
+msgstr "Bem-vindo ao Kolibri Studio! Aqui está o link para ativar a sua conta:"
 
 #: contentcuration/contentcuration/templates/registration/activation_email.html:101
 msgid "Click here to activate your account."
-msgstr ""
+msgstr "Clique aqui para ativar a sua conta."
 
 #: contentcuration/contentcuration/templates/registration/activation_email.html:102
 msgid "This link is valid for"
-msgstr ""
+msgstr "Este link é válido por"
 
 #: contentcuration/contentcuration/templates/registration/activation_email.html:102
 #, python-format
 msgid "%(expiration_days)s days."
-msgstr ""
+msgstr "%(expiration_days)s dias."
 
 #: contentcuration/contentcuration/templates/registration/activation_email.html:104
 msgid "ACTIVATE"
-msgstr ""
+msgstr "ATIVAR"
 
 #: contentcuration/contentcuration/templates/registration/activation_email.txt:6
 #, python-format
 msgid "Here is your activation link for %(site_name)s:"
-msgstr ""
+msgstr "Aqui está o seu link de ativação para %(site_name)s:"
 
 #: contentcuration/contentcuration/templates/registration/activation_email.txt:10
 #: contentcuration/contentcuration/templates/registration/activation_needed_email.txt:12
 #, python-format
 msgid "This link is valid for %(expiration_days)s days."
-msgstr ""
+msgstr "Este link é válido por %(expiration_days)s dias."
 
 #: contentcuration/contentcuration/templates/registration/activation_email_subject.txt:1
 msgid "Account activation link for"
-msgstr ""
+msgstr "Link de ativação da conta para"
 
 #: contentcuration/contentcuration/templates/registration/activation_needed_email.txt:6
 #, python-format
 msgid "You have requested a password reset link on %(site_name)s without first activating your account."
-msgstr ""
+msgstr "Você solicitou um link para redefinição de senha em %(site_name)s sem antes ativar a sua conta."
 
 #: contentcuration/contentcuration/templates/registration/activation_needed_email.txt:8
 msgid "Please activate your account by following the link below:"
-msgstr ""
+msgstr "Por favor, ative a sua conta usando o link abaixo:"
 
 #: contentcuration/contentcuration/templates/registration/channel_published_email.txt:6
 #, python-format
 msgid "%(channel_name)s has finished publishing! Here is the channel token (for importing it into Kolibri):"
-msgstr ""
+msgstr "%(channel_name)s acabout de ser publicado! Aqui está o token do canal (para importar para a Plataforma de Aprendizagem Kolibri):"
 
 #: contentcuration/contentcuration/templates/registration/channel_published_email.txt:8
 #, python-format
 msgid "Token: %(channel_token)s"
-msgstr ""
+msgstr "Token: %(channel_token)s"
 
 #: contentcuration/contentcuration/templates/registration/channel_published_email.txt:10
 #, python-format
 msgid "ID (for Kolibri version 0.6.0 and below): %(channel_id)s"
-msgstr ""
+msgstr "ID (para uso no Kolibri versão 0.6.0 e inferior): %(channel_id)s"
 
 #: contentcuration/contentcuration/templates/registration/channel_published_email.txt:12
 #, python-format
 msgid "Version notes: %(notes)s"
-msgstr ""
+msgstr "Notas da versão: %(notes)s"
 
 #: contentcuration/contentcuration/templates/registration/channel_published_email.txt:21
 msgid "You are receiving this email because you are subscribed to this channel."
-msgstr ""
+msgstr "Você está recebendo este e-mail porque está inscrito neste canal."
 
 #: contentcuration/contentcuration/templates/registration/getting_started.html:16
 msgid "Content Curation Tools for Kolibri"
-msgstr ""
+msgstr "Ferramentas de curadoria de conteúdo para o Kolibri"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_confirm.html:14
 #: contentcuration/contentcuration/templates/registration/password_reset_form.html:15
 msgid "Password Reset"
-msgstr ""
+msgstr "Redefinir a senha"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_confirm.html:17
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_confirm.html:20
 msgid "Password reset unsuccessful."
-msgstr ""
+msgstr "A redefinição de senha falhou."
 
 #: contentcuration/contentcuration/templates/registration/password_reset_confirm.html:21
 msgid "The password reset link was invalid, possibly because it has already been used. "
-msgstr ""
+msgstr "O link para redefinição de senha estava inválido, pois provavelmente já foi usado. "
 
 #: contentcuration/contentcuration/templates/registration/password_reset_confirm.html:22
 msgid "Request a new password reset."
-msgstr ""
+msgstr "Solicitar uma nova redefinição de senha."
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.html:92
 msgid "You are receiving this e-mail because you requested a password reset for your user account at"
-msgstr ""
+msgstr "Você está recebendo este e-mail porque pediu uma redefinição de senha para a sua conta de usuário em"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.html:98
 msgid "Reset my Password"
-msgstr ""
+msgstr "Redefinir minha senha"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.html:101
 msgid "Please click the button below and choose a new password."
-msgstr ""
+msgstr "Por favor, clique no botão abaixo e escolha uma nova senha."
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.html:102
 msgid "Your username is"
-msgstr ""
+msgstr "Seu nome de usuário é"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.html:104
 msgid "RESET"
-msgstr ""
+msgstr "REDEFINIR"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.txt:5
 #, python-format
 msgid "You have requested a password reset for your account at %(site_name)s."
-msgstr ""
+msgstr "Você pediu uma redefinição de senha para sua conta em %(site_name)s."
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.txt:7
 msgid "Please reset your password by following the link below:"
-msgstr ""
+msgstr "Por favor, redefina sua senha usando o link abaixo:"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_email.txt:12
 msgid "In case you've forgotten, your username is:"
-msgstr ""
+msgstr "Caso tenha se esquecido, seu nome de usuário é:"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_form.html:16
 msgid "Enter your email, and we'll send instructions for setting a new password."
-msgstr ""
+msgstr "Digite o seu e-mail e te enviaremos instruções para configurar uma nova senha."
 
 #: contentcuration/contentcuration/templates/registration/password_reset_form.html:19
 #, python-format
 msgid "%(form.email.errors)s"
-msgstr ""
+msgstr "%(form.email.errors)s"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_form.html:24
 msgid "Reset Password"
-msgstr ""
+msgstr "Redefinir a senha"
 
 #: contentcuration/contentcuration/templates/registration/password_reset_subject.txt:1
 msgid "Password reset on"
-msgstr ""
+msgstr "Redefinição de senha em"
 
 #: contentcuration/contentcuration/templates/registration/registration_needed_email.txt:6
 #, python-format
 msgid "You have requested a password reset on %(site_name)s without first creating an account."
-msgstr ""
+msgstr "Você solicitou um link para redefinição de senha em %(site_name)s sem criar a sua conta primeiro."
 
 #: contentcuration/contentcuration/templates/registration/registration_needed_email.txt:8
 msgid "Please create an account by following the link below:"
-msgstr ""
+msgstr "Por favor, crie uma conta usando o link abaixo:"
 
 #: contentcuration/contentcuration/templates/settings/account_deleted_user_email.txt:5
 #, python-format
 msgid "Your %(email)s account on %(site_name)s has been deleted."
-msgstr ""
+msgstr "Sua conta %(email)s em %(site_name)s foi excluída."
 
 #: contentcuration/contentcuration/templates/settings/account_deleted_user_email.txt:7
 #, python-format
 msgid "If this was a mistake, please email us at %(legal_email)s by %(buffer_date)s (%(num_days)s days from now)."
-msgstr ""
+msgstr "Se isto foi um erro, por favor envie um e-mail para %(legal_email)s até %(buffer_date)s Daqui a (%(num_days)s dias."
 
 #: contentcuration/contentcuration/templates/settings/issue_report_email.txt:8
 msgid "Thank you for reporting your issue. Here is a copy of your report:"
-msgstr ""
+msgstr "Obrigado por nos informar do problema. Aqui está uma cópia do seu relatório:"
 
 #: contentcuration/contentcuration/templates/settings/issue_report_email.txt:20
 msgid "We are currently reviewing the information that you have provided, and will file your issue accordingly."
-msgstr ""
+msgstr "No momento, estamos revisando as informações que você forneceu e registraremos o seu problema de acordo."
 
 #: contentcuration/contentcuration/templates/settings/issue_report_email.txt:21
 msgid "We appreciate your patience and assistance as we work to improve Kolibri Studio!"
-msgstr ""
+msgstr "Agradecemos a sua paciência e a sua ajuda enquanto trabalhamos para melhorar o Kolibri Studio!"
 
 #: contentcuration/contentcuration/templates/settings/issue_report_email.txt:24
 msgid "Thank you,"
-msgstr ""
+msgstr "Obrigado,"
 
 #: contentcuration/contentcuration/templates/settings/storage_request_email.txt:8
 msgid "Thank you for your request for additional storage."
-msgstr ""
+msgstr "Obrigado pela sua solicitação de armazenamento adicional."
 
 #: contentcuration/contentcuration/templates/settings/storage_request_email.txt:10
 msgid "Here is a copy of your request:"
-msgstr ""
+msgstr "Aqui está uma cópia da sua solicitação:"
 
 #: contentcuration/contentcuration/templates/settings/storage_request_email.txt:43
 msgid "We are currently reviewing the information that you have provided, and will work to be in touch in a timely manner depending on the scope of your request. While Kolibri Studio is under active development, we need to be especially mindful of how much additional storage can be provided to ensure that we can successfully continue to build the Studio tool. Many thanks in advance for your understanding."
-msgstr ""
+msgstr "Estamos revisando as informações que você forneceu e faremos o possível para entrar em contato em tempo hábil, de acordo com o âmbito do seu pedido. "
 
 #: contentcuration/contentcuration/templates/staging_not_found.html:22
 msgid "No updates to review."
-msgstr ""
+msgstr "Não há atualizações a serem revisadas."
 
 #: contentcuration/contentcuration/templates/unauthorized.html:22
 msgid "You do not have access to this page."
-msgstr ""
+msgstr "Você não tem acesso a esta página."
 
 #: contentcuration/contentcuration/templates/unsupported_browser.html:47
 msgid "Unsupported Browser."
-msgstr ""
+msgstr "Navegador não suportado."
 
 #: contentcuration/contentcuration/templates/unsupported_browser.html:49
 msgid "Sorry, your browser version is not supported."
-msgstr ""
+msgstr "Infelizmente a versão do seu navegador não é suportada."
 
 #: contentcuration/contentcuration/templates/unsupported_browser.html:51
 msgid "To use Kolibri Studio, we recommend using Firefox or Chrome."
-msgstr ""
+msgstr "Para usar o Kolibri Studio, recomendamos os navegadores Firefox ou Chrome."
 
 #: contentcuration/contentcuration/templates/unsupported_browser.html:53
 msgid "You can also try updating your current browser."
-msgstr ""
+msgstr "Você também pode tentar atualizar o seu navegador."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:10
 msgid "The Attribution License lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials."
-msgstr ""
+msgstr "A licença de Atribuição permite que outros distribuam, remixem, ajustem e se baseiem no seu trabalho, até comercialmente, desde que te deem crédito pela criação original. É o tipo de licença mais flexível oferecido. Recomendado para o máximo de divulgação e uso dos materiais licenciados."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:15
 msgid "The Attribution-ShareAlike License lets others remix, tweak, and build upon your work even for commercial purposes, as long as they credit you and license their new creations under the identical terms. This license is often compared to \"copyleft\" free and open source software licenses. All new works based on yours will carry the same license, so any derivatives will also allow commercial use. This is the license used by Wikipedia, and is recommended for materials that would benefit from incorporating content from Wikipedia and similarly licensed projects."
-msgstr ""
+msgstr "A licença de Atribuição-CompartilhaIgual permite que outros remixem, ajustem e se baseiem no seu trabalho, mesmo que por motivos comerciais, desde que te deem crédito e licenciem suas novas criações sob os mesmos termos. Essa licença é frequentemente comparada às de software livre, como as de \"copyleft\" e de código aberto. Todos os novos trabalhos baseados no seu terão a mesma licença, então quaisquer derivativos também permitirão o uso comercial. Essa é a licença usada pelo Wikipedia e é recomendada para materiais que se beneficiariam de incorporarem conteúdo do Wikipedia e de outros projetos similarmente licenciados."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:25
 msgid "The Attribution-NoDerivs License allows for redistribution, commercial and non-commercial, as long as it is passed along unchanged and in whole, with credit to you."
-msgstr ""
+msgstr "A licença de Atribuição-SemDerivações permite redistribuição, comercial ou não comercial, desde que seja feita sem modificações e por inteiro, com os créditos a você."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:28
 msgid "The Attribution-NonCommercial License lets others remix, tweak, and build upon your work non-commercially, and although their new works must also acknowledge you and be non-commercial, they don't have to license their derivative works on the same terms."
-msgstr ""
+msgstr "A licença de Atribuição-NãoComercial permite que outros remixem, ajustem e se baseiem no seu trabalho não comercialmente, e embora os seus novos trabalhos devam também te reconhecer e serem não comerciais, não precisam licenciar os seus trabalhos derivados sob os mesmos termos."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:32
 msgid "The Attribution-NonCommercial-ShareAlike License lets others remix, tweak, and build upon your work non-commercially, as long as they credit you and license their new creations under the identical terms."
-msgstr ""
+msgstr "A licença de Atribuição-NãoComercial-CompartilhaIgual permite que outros remixem, ajustem e se baseiem no seu trabalho não comercialmente, desde que te deem crédito e licenciem suas novas criações sob os mesmos termos."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:36
 msgid "The Attribution-NonCommercial-NoDerivs License is the most restrictive of our six main licenses, only allowing others to download your works and share them with others as long as they credit you, but they can't change them in any way or use them commercially."
-msgstr ""
+msgstr "A licença de Atribuição-NãoComercial-SemDerivações é a mais restritiva das nossas seis principais licenças, permitindo apenas que outros baixem seus trabalhos e os compartilhem com outros desde que te deem crédito, mas não podem alterá-los ou usá-los comercialmente."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:40
 msgid "The All Rights Reserved License indicates that the copyright holder reserves, or holds for their own use, all the rights provided by copyright law under one specific copyright treaty."
-msgstr ""
+msgstr "A licença de Todos os Direitos Reservados indica que o detentor dos direitos autorais reserva-se, ou mantém para si o uso, de todos os direitos providos pela lei de direitos autorais sob um único acordo de direitos autorais."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:43
 msgid "Public Domain work has been identified as being free of known restrictions under copyright law, including all related and neighboring rights."
-msgstr ""
+msgstr "Um trabalho de domínio público é identificado como livre das restrições correntes sob a lei de direitos autorais, incluindo todos os direitos relacionados e afins."
 
 #: contentcuration/contentcuration/templatetags/license_tags.py:46
 msgid "Special Permissions is a custom license to use when the current licenses do not apply to the content. The owner of this license is responsible for creating a description of what this license entails."
-msgstr ""
+msgstr "A licença personalizada de Permissões Especiais é usada quando as licenças atuais não se aplicarem ao conteúdo. O detentor dessa licença é responsável por criar a descrição do que ela pressupõe."
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:26
 msgid "100% Correct"
-msgstr ""
+msgstr "100% de acerto"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:27
 msgid "10 in a row"
-msgstr ""
+msgstr "10 seguidas"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:28
 msgid "2 in a row"
-msgstr ""
+msgstr "2 seguidas"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:29
 msgid "3 in a row"
-msgstr ""
+msgstr "3 seguidas"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:30
 msgid "5 in a row"
-msgstr ""
+msgstr "5 seguidas"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:31
 msgid "M of N..."
-msgstr ""
+msgstr "M de N..."
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:32
 msgid "CC BY"
-msgstr ""
+msgstr "CC BY"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:33
 msgid "CC BY-SA"
-msgstr ""
+msgstr "CC BY-SA"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:34
 msgid "CC BY-ND"
-msgstr ""
+msgstr "CC BY-ND"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:35
 msgid "CC BY-NC"
-msgstr ""
+msgstr "CC BY-NC"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:36
 msgid "CC BY-NC-SA"
-msgstr ""
+msgstr "CC BY-NC-SA"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:37
 msgid "CC BY-NC-ND"
-msgstr ""
+msgstr "CC BY-NC-ND"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:38
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "Todos os direitos reservados"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:39
 msgid "Public Domain"
-msgstr ""
+msgstr "Domínio público"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:40
 msgid "Special Permissions"
-msgstr ""
+msgstr "Permissões especiais"
 
 #: contentcuration/contentcuration/templatetags/translation_tags.py:49
 #, python-format
 msgid "%(filesize)s %(unit)s"
-msgstr ""
+msgstr "%(filesize)s %(unit)s"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:135
 #: contentcuration/contentcuration/utils/csv_writer.py:147
 #: contentcuration/contentcuration/utils/csv_writer.py:180
 msgid "No Channel"
-msgstr ""
+msgstr "Nenhum canal"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:146
 msgid "No resource"
-msgstr ""
+msgstr "Nenhum conteúdo"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:169
 msgid "Channel"
-msgstr ""
+msgstr "Canal"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:169
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:169
 msgid "Kind"
-msgstr ""
+msgstr "Tipo"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:169
 msgid "Filename"
-msgstr ""
+msgstr "Nome do arquivo"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:169
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:169
 #: contentcuration/contentcuration/utils/export_writer.py:602
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:170
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:170
 #: contentcuration/contentcuration/utils/export_writer.py:602
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:170
 msgid "License"
-msgstr ""
+msgstr "Licença"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:170
 msgid "License Description"
-msgstr ""
+msgstr "Descrição da licença"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:170
 msgid "Copyright Holder"
-msgstr ""
+msgstr "Detentor dos direitos autorais"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:180
 msgid "No Resource"
-msgstr ""
+msgstr "Nenhum conteúdo"
 
 #: contentcuration/contentcuration/utils/csv_writer.py:180
 msgid "Staged File"
-msgstr ""
+msgstr "Arquivo preparado"
 
 #: contentcuration/contentcuration/utils/export_writer.py:200
 #, python-format
 msgid "%(count)d Topic"
 msgid_plural "%(count)d Topics"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d tema"
+msgstr[1] "%(count)d temas"
 
 #: contentcuration/contentcuration/utils/export_writer.py:202
 #, python-format
 msgid "%(count)d Video"
 msgid_plural "%(count)d Videos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d vídeo"
+msgstr[1] "%(count)d vídeos"
 
 #: contentcuration/contentcuration/utils/export_writer.py:204
 #, python-format
 msgid "%(count)d Audio"
 msgid_plural "%(count)d Audios"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d áudio"
+msgstr[1] "%(count)d áudios"
 
 #: contentcuration/contentcuration/utils/export_writer.py:206
 #, python-format
 msgid "%(count)d Exercise"
 msgid_plural "%(count)d Exercises"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d exercício"
+msgstr[1] "%(count)d exercícios"
 
 #: contentcuration/contentcuration/utils/export_writer.py:208
 #, python-format
 msgid "%(count)d Document"
 msgid_plural "%(count)d Documents"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d documento"
+msgstr[1] "%(count)d documentos"
 
 #: contentcuration/contentcuration/utils/export_writer.py:210
 #, python-format
 msgid "%(count)d Html App"
 msgid_plural "%(count)d Html Apps"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d aplicativo HTML"
+msgstr[1] "%(count)d aplicativos HTML"
 
 #: contentcuration/contentcuration/utils/export_writer.py:212
 #, python-format
 msgid "%(count)d H5P App"
 msgid_plural "%(count)d H5P Apps"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d aplicativo H5P"
+msgstr[1] "%(count)d aplicativos H5P"
 
 #: contentcuration/contentcuration/utils/export_writer.py:214
 #, python-format
 msgid "%(count)d Slideshow"
 msgid_plural "%(count)d Slideshows"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d apresentação"
+msgstr[1] "%(count)d apresentações"
 
 #: contentcuration/contentcuration/utils/export_writer.py:216
 #, python-format
 msgid "%(count)d Total Resource"
 msgid_plural "%(count)d Total Resources"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d conteúdo total"
+msgstr[1] "%(count)d conteúdos totais"
 
 #: contentcuration/contentcuration/utils/export_writer.py:218
 #, python-format
@@ -940,214 +946,215 @@ msgid "%(count)d\n"
 "Total Resource"
 msgid_plural "%(count)d\n"
 "Total Resources"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)d\n"
+"Conteúdo total"
+msgstr[1] "%(count)d\n"
+"Conteúdos totais"
 
 #: contentcuration/contentcuration/utils/export_writer.py:243
 msgid "Very Small"
-msgstr ""
+msgstr "Extra pequeno"
 
 #: contentcuration/contentcuration/utils/export_writer.py:243
 msgid "Small"
-msgstr ""
+msgstr "Pequeno"
 
 #: contentcuration/contentcuration/utils/export_writer.py:243
 msgid "Average"
-msgstr ""
+msgstr "Médio"
 
 #: contentcuration/contentcuration/utils/export_writer.py:243
 msgid "Large"
-msgstr ""
+msgstr "Grande"
 
 #: contentcuration/contentcuration/utils/export_writer.py:243
 msgid "Very Large"
-msgstr ""
+msgstr "Extra grande"
 
 #: contentcuration/contentcuration/utils/export_writer.py:435
 #, python-format
 msgid "Page %(page)s of %(pagecount)s - %(channel)s can be found on Kolibri Studio, a product of Learning Equality"
-msgstr ""
+msgstr "A página %(page)s de %(pagecount)s - no canal %(channel)s pode ser encontrada no Kolibri Studio, uma ferramenta da Learning Equality"
 
 #: contentcuration/contentcuration/utils/export_writer.py:438
 #, python-format
 msgid "Page %(page)s of %(pagecount)s - These channels can be found on Kolibri Studio, a product of Learning Equality"
-msgstr ""
+msgstr "Página %(page)s de %(pagecount)s - Estes canais se encontram no Kolibri Studio, uma ferramenta da Learning Equality"
 
 #: contentcuration/contentcuration/utils/export_writer.py:521
 #: contentcuration/contentcuration/utils/export_writer.py:609
 msgid "No language set"
-msgstr ""
+msgstr "Nenhum idioma definido"
 
 #: contentcuration/contentcuration/utils/export_writer.py:524
 msgid "    * Subtitles included"
-msgstr ""
+msgstr "    * Legendas inclusas"
 
 #: contentcuration/contentcuration/utils/export_writer.py:529
 msgid " Coach Content"
-msgstr ""
+msgstr " Conteúdo de professores"
 
 #: contentcuration/contentcuration/utils/export_writer.py:534
 msgid " Assessments"
-msgstr ""
+msgstr " Avaliações"
 
 #: contentcuration/contentcuration/utils/export_writer.py:541
 #, python-format
 msgid "Channel size: %(size)s"
-msgstr ""
+msgstr "Tamanho do canal: %(size)s"
 
 #: contentcuration/contentcuration/utils/export_writer.py:554
 msgid "Resource Breakdown"
-msgstr ""
+msgstr "Detalhamento dos conteúdos"
 
 #: contentcuration/contentcuration/utils/export_writer.py:568
 msgid "No Resources Found"
-msgstr ""
+msgstr "Nenhum conteúdo encontrado"
 
 #: contentcuration/contentcuration/utils/export_writer.py:576
 msgid "No Tags Found"
-msgstr ""
+msgstr "Nenhum marcador encontrado"
 
 #: contentcuration/contentcuration/utils/export_writer.py:593
 msgid "This slide was automatically generated by Kolibri Studio, a product of Learning Equality"
-msgstr ""
+msgstr "Este slide foi gerado automaticamente pelo Kolibri Studio, um produto da Learning Equality"
 
 #: contentcuration/contentcuration/utils/export_writer.py:602
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: contentcuration/contentcuration/utils/export_writer.py:602
 msgid "Token"
-msgstr ""
+msgstr "Token"
 
 #: contentcuration/contentcuration/utils/export_writer.py:602
 msgid "Size"
-msgstr ""
+msgstr "Tamanho"
 
 #: contentcuration/contentcuration/utils/export_writer.py:602
 msgid "Storage"
-msgstr ""
+msgstr "Armazenamento"
 
 #: contentcuration/contentcuration/utils/export_writer.py:602
 msgid "Resources"
-msgstr ""
+msgstr "Conteúdos"
 
 #: contentcuration/contentcuration/utils/export_writer.py:603
 msgid "Coach Content?"
-msgstr ""
+msgstr "Conteúdo de professores?"
 
 #: contentcuration/contentcuration/utils/export_writer.py:603
 msgid "Assessments?"
-msgstr ""
+msgstr "Avaliações?"
 
 #: contentcuration/contentcuration/utils/export_writer.py:603
 msgid "Tags"
-msgstr ""
+msgstr "Marcadores"
 
 #: contentcuration/contentcuration/utils/export_writer.py:603
 msgid "Authors"
-msgstr ""
+msgstr "Autores"
 
 #: contentcuration/contentcuration/utils/export_writer.py:604
 msgid "Providers"
-msgstr ""
+msgstr "Provedores"
 
 #: contentcuration/contentcuration/utils/export_writer.py:604
 msgid "Aggregators"
-msgstr ""
+msgstr "Agregadores"
 
 #: contentcuration/contentcuration/utils/export_writer.py:604
 msgid "Licenses"
-msgstr ""
+msgstr "Licenças"
 
 #: contentcuration/contentcuration/utils/export_writer.py:604
 msgid "Copyright Holders"
-msgstr ""
+msgstr "Detentores dos direitos autorais"
 
 #: contentcuration/contentcuration/utils/export_writer.py:610
 msgid "Publish channel to get token"
-msgstr ""
+msgstr "Publicar o canal para obter o token"
 
 #: contentcuration/contentcuration/utils/export_writer.py:616
 #: contentcuration/contentcuration/utils/export_writer.py:617
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: contentcuration/contentcuration/utils/export_writer.py:616
 #: contentcuration/contentcuration/utils/export_writer.py:617
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: contentcuration/contentcuration/utils/format.py:15
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: contentcuration/contentcuration/utils/format.py:17
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
 #: contentcuration/contentcuration/utils/format.py:19
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: contentcuration/contentcuration/utils/format.py:21
 msgid "GB"
-msgstr ""
+msgstr "GB"
 
 #: contentcuration/contentcuration/utils/format.py:23
 msgid "TB"
-msgstr ""
+msgstr "TB"
 
 #: contentcuration/contentcuration/utils/incidents.py:7
 msgid "There was a problem with a third-party service. This means certain operations might be blocked. We appreciate your patience while these issues are being resolved."
-msgstr ""
+msgstr "Ocorreu um problema com um serviço de terceiros. Isso significa que algumas operações podem estar bloqueadas. Agradecemos pela paciência enquanto esses problemas são resolvidos."
 
 #: contentcuration/contentcuration/utils/incidents.py:16
 msgid "<b>EMERGENCY MAINTENANCE</b> Kolibri Studio is operating on read-only mode for the time being in order for us to resolve some maintenance issues. This means all editing capabilities are disabled at the moment. We're currently working very hard to fix the issue as soon as possible. If you have any questions please contact us at content@learningequality.org. We apologize for any inconvenience caused and appreciate your patience while we resolve these issues."
-msgstr ""
+msgstr "<b>MANUTENÇÃO DE EMERGÊNCIA</b> O Kolibri Studio está operando em modo somente leitura por enquanto para resolvermos problemas de manutenção. Isso significa que todas as funções de edição estão desativadas no momento. Estamos trabalhando arduamente para resolver o problema o quanto antes. Se tiver perguntas, por favor envie um e-mail para content@learningequality.org. Sentimos muito por qualquer inconveniente e agradecemos pela paciência enquanto resolvemos esses problemas."
 
 #: contentcuration/contentcuration/utils/incidents.py:31
 msgid "<b>EMERGENCY MAINTENANCE</b> Kolibri Studio is operating on read-only mode for the time being in order for us to resolve some database issues. This means all editing capabilities are disabled at the moment. We're currently working very hard to fix the issue as soon as possible. If you have any questions please contact us at content@learningequality.org. We apologize for any inconvenience caused and appreciate your patience while we resolve these issues."
-msgstr ""
+msgstr "<b>MANUTENÇÃO DE EMERGÊNCIA</b> O Kolibri Studio está operando em modo somente leitura por enquanto para resolvermos problemas de base de dados. Isso significa que todas as funções de edição estão desativadas no momento. Estamos trabalhando arduamente para resolver o problema o quanto antes. Se tiver perguntas, por favor envie um e-mail para content@learningequality.org. Sentimos muito por qualquer inconveniente e agradecemos pela paciência enquanto resolvemos esses problemas."
 
 #: contentcuration/contentcuration/utils/incidents.py:46
 msgid "We are encountering issues with Google Cloud Storage. This means any file uploading and publishing operations are currently unavailable. We appreciate your patience while these issues are being resolved. To check the status of this service, please visit <a target='_blank' href='https://status.cloud.google.com/'>here</a>"
-msgstr ""
+msgstr "Estamos com problemas com o Google Cloud Storage. Isso significa que operações de envio ou publicação de arquivos estão indisponíveis. Agradecemos pela paciência enquanto esses problemas são resolvidos. Para verificar o status desse serviço, por favor visite <a target='_blank' href='https://status.cloud.google.com/'>aqui</a>"
 
 #: contentcuration/contentcuration/utils/incidents.py:57
 msgid "We are encountering issues with a third-party service. This means publishing is currently unavailable. We appreciate your patience while these issues are being resolved."
-msgstr ""
+msgstr "Estamos com problemas com um serviço de terceiros. Isso significa que operações de publicação estão indisponíveis. Agradecemos pela paciência enquanto esses problemas são resolvidos."
 
 #: contentcuration/contentcuration/utils/incidents.py:65
 msgid "We are encountering issues with our data center. This means you may encounter networking problems while using Studio. We appreciate your patience while these issues are being resolved. To check the status of this service, please visit <a target='_blank' href='https://status.cloud.google.com/'>here</a>"
-msgstr ""
+msgstr "Estamos com problemas com o nosso centro de dados. Isso significa que você pode ter problemas de conexão enquanto usa o Studio. Agradecemos pela paciência enquanto esses problemas são resolvidos. Para saber o status do serviço, por favor visite <a target='_blank' href='https://status.cloud.google.com/'>aqui</a>"
 
 #: contentcuration/contentcuration/utils/nodes.py:254
 #: contentcuration/contentcuration/utils/nodes.py:255
 msgid " (Copy)"
-msgstr ""
+msgstr " (Copiar)"
 
 #: contentcuration/contentcuration/utils/publish.py:71
 msgid "Kolibri Studio Channel Published"
-msgstr ""
+msgstr "Canal do Kolibri Studio publicado"
 
 #: contentcuration/contentcuration/views/public.py:63
 #: contentcuration/contentcuration/views/public.py:74
 msgid "Api endpoint {} is not available"
-msgstr ""
+msgstr "Ponto de extremidade da API {} está indisponível"
 
 #: contentcuration/contentcuration/views/public.py:76
 msgid "No channel matching {} found"
-msgstr ""
+msgstr "Nenhum canal correspondente a {} encontrado"
 
 #: contentcuration/contentcuration/views/settings.py:100
 msgid "Kolibri Studio issue report"
-msgstr ""
+msgstr "Relatório de problemas do Kolibri Studio"
 
 #: contentcuration/contentcuration/views/settings.py:134
 msgid "Kolibri Studio account deleted"
-msgstr ""
+msgstr "Conta do Kolibri Studio excluída"
 
 #: contentcuration/kolibri_content/models.py:188
 msgid "Unknown format"
-msgstr ""
-
+msgstr "Formato desconhecido"
diff --git a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
index 6bb4c086bd..7eec3f900f 100644
--- a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
@@ -406,6 +406,7 @@
   "Clipboard.removingItems": "جاري الحذف من الحافظة...",
   "Clipboard.selectAll": "تحديد الكل",
   "Clipboard.undo": "تراجع",
+  "CommunityStandardsModal.communityStandardsHeader": "معايير المجتمع",
   "CommunityStandardsModal.coreValuesLink": "تعرف على المزيد حول القيم الأساسية داخل منظمة Learning Equality",
   "CommunityStandardsModal.description": "Learning Equality هي منظمة غير ربحية تعمل على تمكين الوصول العادل إلى التجارب التعليمية عالية الجودة. وبالإضافة إلى بيان القيم الأساسية لدينا، تهدف معايير المجتمع هذه إلى تعزيز بيئة داعمة وشاملة لمستخدمينا.",
   "CommunityStandardsModal.libraryDescription": "تعد مكتبة كوليبري ثمرة جهد شعبي منظم لتوفير مجموعة متنوعة من المواد لجميع المتعلمين ولكافة أغراض التعلم. لمساعدتنا في تحقيق هذه الأهداف، ندعوك لاستخدام استوديو كوليبري بطرق من شأنها أن:",
@@ -939,6 +940,8 @@
   "PoliciesModal.privacyHeader": "سياسة الخصوصية",
   "PoliciesModal.updatedPrivacyHeader": "سياسة الخصوصية المحدثة",
   "PoliciesModal.updatedToSHeader": "شروط الخدمة المحدثة",
+  "PrivacyPolicyModal.privacyHeader": "سياسة الخصوصية",
+  "PrivacyPolicyModal.updatedPrivacyHeader": "سياسة الخصوصية المحدثة",
   "PrivacyPolicyModal.linkText": "تعرف على المزيد حول القيم الأساسية لمنظمة Learning Equality.",
   "PrivacyPolicyModal.paragraph1": "توضح سياسة الخصوصية هذه ممارسات الخصوصية لدينا وخياراتك وحقوقك بما يتعلق بالبيانات الشخصية التي نقوم بجمعها. تنطبق سياسة الخصوصية هذه على تطبيق كوليبري (\"التطبيق\") واستوديو كوليبري (\"الاستوديو\") وجميع المواقع الإلكترونية ذات الصلة (يشار إليها مجتمعة باسم \"كوليبري\"). لا ينطبق بيان الخصوصية هذا على تطبيقات الجهات الثالثة أو المنظمات الشريكة التي قد تستخدم برامجنا أو تُستخدم بالتزامن مع برامجنا.",
   "PrivacyPolicyModal.paragraph2": "تعترف منظمة Learning Equality بحقك في الخصوصية، وستتخذ خطوات منطقية لحماية تلك الخصوصية. تتيح لك بعض أقسام كوليبري تزويدنا بمعلومات شخصية، مثل اسمك وعنوان بريدك الإلكتروني. قد نستخدم المعلومات التي تقدمها لتحسين كوليبري. وعندما يكون هناك خيارات حول كيفية استخدامنا للمعلومات التي تقدمها، سنقوم بالإشارة إلى ذلك في نقطة التجميع. نظراً للطريقة التي يعمل بها كوليبري، قد نستخدم أيضاً معلومات متصفحك أو أنشطة التصفح لتخصيصك أو توجيهك إلى المعلومات ذات الصلة. على سبيل المثال، من الممكن أن نستخدم عنوان IP الخاص بك أو معلومات المستعرض أو ملفات تعريف الارتباط أو ملفات الويب بطرق تساعدنا في الحفاظ على بعض تفضيلاتك أو فهم كيفية تصفح زوارنا للموقع كي نتمكن من تحسينه. قد نقوم بتخزين معلوماتك الشخصية خارج نطاق الاتحاد الأوروبي.",
@@ -1213,6 +1216,8 @@
   "TechnicalTextBlock.copiedToClipboardFailure": "فشلت عملية النسخ إلى الحافظة",
   "TechnicalTextBlock.copyToClipboardButtonPrompt": "نسخ إلى الحافظة",
   "Template.templateString": "لديك {count, plural, zero {} one {# nodes for testing} two {# nodes for testing} few {# nodes for testing} many {# nodes for testing}\n =1 {# node for testing}\n other {# nodes for testing}}",
+  "TermsOfServiceModal.ToSHeader": "شروط الخدمة",
+  "TermsOfServiceModal.updatedToSHeader": "شروط الخدمة المحدثة",
   "TermsOfServiceModal.acceptableUseHeader": "Acceptable Use Restrictions",
   "TermsOfServiceModal.acceptableUseItem1": "Will be in strict accordance with these Terms;",
   "TermsOfServiceModal.acceptableUseItem10": "Will not interfere with, disrupt, or attack any service or network; and",
diff --git a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
index 8c524383f0..70ccedc1a9 100644
--- a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
@@ -406,6 +406,7 @@
   "Clipboard.removingItems": "Eliminando del portapapeles...",
   "Clipboard.selectAll": "Seleccionar todo",
   "Clipboard.undo": "Deshacer",
+  "CommunityStandardsModal.communityStandardsHeader": "Normas de la comunidad",
   "CommunityStandardsModal.coreValuesLink": "Aprenda más sobre los valores fundamentales de Learning Equality",
   "CommunityStandardsModal.description": "Learning Equality es una organización sin fines de lucro dedicada a facilitar un acceso equitativo a experiencias educativas de calidad. Junto con nuestra declaración de valores fundamentales, estas Normas Comunitarias pretenden fomentar un entorno de apoyo e inclusivo para nuestros usuarios.",
   "CommunityStandardsModal.libraryDescription": "La Biblioteca Kolibri es igualmente un esfuerzo popular como curado para proporcionar una amplia variedad de materiales para todos los estudiantes y todos los propósitos de aprendizaje. Para ayudarnos a lograr estos objetivos, le invitamos a utilizar Kolibri Studio de maneras que:",
@@ -939,6 +940,8 @@
   "PoliciesModal.privacyHeader": "Política de privacidad",
   "PoliciesModal.updatedPrivacyHeader": "Política de privacidad actualizada",
   "PoliciesModal.updatedToSHeader": "Términos de servicio actualizados",
+  "PrivacyPolicyModal.privacyHeader": "Política de privacidad",
+  "PrivacyPolicyModal.updatedPrivacyHeader": "Política de privacidad actualizada",
   "PrivacyPolicyModal.linkText": "Aprenda más sobre los valores fundamentales de Learning Equality.",
   "PrivacyPolicyModal.paragraph1": "Esta Política de privacidad le informa sobre nuestras prácticas de privacidad y sus opciones y derechos en torno a los datos personales que recopilamos. Esta Política de privacidad se aplica a la aplicación Kolibri (\"Aplicación\"), Kolibri Studio (\"Studio\") y todos los sitios web relacionados (en adelante, \"Kolibri\"). Esta Declaración de privacidad no se aplica a las aplicaciones de terceros u organizaciones asociadas que puedan usar nuestro software o que se utilicen junto con nuestro software. ",
   "PrivacyPolicyModal.paragraph2": "Learning Equality reconoce su derecho a la privacidad y tomará medidas razonables para protegerlo. Algunas partes de Kolibri le permiten dejarnos información personal, como su nombre y dirección de correo electrónico. Podemos utilizar la información que proporcione para mejorar Kolibri. Cuando existen opciones sobre cómo usamos la información que nos proporciona, lo indicaremos en el momento de la recopilación. Debido a la forma en que opera Kolibri, también podemos usar información de su navegador o actividades de navegación para personalizar o dirigirse a la información relevante. Por ejemplo, podemos usar su dirección IP, información del navegador, cookies o balizas web de manera que nos ayuden a mantener algunas de sus preferencias, o comprender cómo nuestros visitantes navegan por el sitio para que podamos mejorarlo. Podemos almacenar su información personal fuera de la Unión Europea. ",
@@ -1213,6 +1216,8 @@
   "TechnicalTextBlock.copiedToClipboardFailure": "Error al copiar al portapapeles",
   "TechnicalTextBlock.copyToClipboardButtonPrompt": "Copiar al portapapeles",
   "Template.templateString": "Tiene {count, plural, one {}\n =1 {# nodo para revisar}\n other {# nodos para revisar}}",
+  "TermsOfServiceModal.ToSHeader": "Términos de Servicio",
+  "TermsOfServiceModal.updatedToSHeader": "Términos de servicio actualizados",
   "TermsOfServiceModal.acceptableUseHeader": "Restricciones de uso aceptables",
   "TermsOfServiceModal.acceptableUseItem1": "Estará estrictamente de acuerdo con estos términos;",
   "TermsOfServiceModal.acceptableUseItem10": "No interferirá, interrumpirá o atacará ningún servicio o red; y",
diff --git a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
index 2f8ea5f66f..bbae91f83b 100644
--- a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
@@ -406,6 +406,7 @@
   "Clipboard.removingItems": "Suppression du presse-papier en cours...",
   "Clipboard.selectAll": "Tout sélectionner",
   "Clipboard.undo": "Annuler",
+  "CommunityStandardsModal.communityStandardsHeader": "Normes communautaires",
   "CommunityStandardsModal.coreValuesLink": "En savoir plus sur les valeurs fondamentales de Learning Equality",
   "CommunityStandardsModal.description": "Learning Equality est une organisation à but non lucratif qui se consacre à fournir un accès équitable à des expériences éducatives de qualité. En plus des Valeurs fondamentales que nous revendiquons, ces Normes communautaires visent à favoriser un environnement valorisant et inclusif pour nos utilisateurs.",
   "CommunityStandardsModal.libraryDescription": "La bibliothèque Kolibri est une initiative tant populaire que raisonnée visant à fournir une grande variété de supports à tous les apprenants quels que soient leurs objectifs d'apprentissage. Pour nous aider à atteindre ces objectifs, nous vous invitons à utiliser Kolibri Studio dans le respect des principes suivants :",
@@ -939,6 +940,8 @@
   "PoliciesModal.privacyHeader": "Politique de confidentialité",
   "PoliciesModal.updatedPrivacyHeader": "Politique de confidentialité mise à jour",
   "PoliciesModal.updatedToSHeader": "Conditions d'utilisation mises à jour",
+  "PrivacyPolicyModal.privacyHeader": "Politique de confidentialité",
+  "PrivacyPolicyModal.updatedPrivacyHeader": "Politique de confidentialité mise à jour",
   "PrivacyPolicyModal.linkText": "En savoir plus sur les valeurs fondamentales de Learning Equality.",
   "PrivacyPolicyModal.paragraph1": "La présente Politique de confidentialité a pour objet de vous informer de nos pratiques en matière de confidentialité et de vos choix et droits concernant les données personnelles que nous recueillons. Elle s'applique à l'application Kolibri (« l'Application »), à Kolibri Studio (« Studio ») et à tous les sites Web qui y sont liés (ci-après collectivement désignés « Kolibri »). La présente déclaration de confidentialité ne s'applique pas aux applications tierces ou aux organisations partenaires susceptibles d'utiliser notre logiciel ou d'être utilisées en conjonction avec celui-ci.",
   "PrivacyPolicyModal.paragraph2": "Learning Equality reconnaît votre droit à la vie privée, et prendra des mesures raisonnables pour le protéger. Certaines parties de Kolibri vous permettent de nous communiquer des informations personnelles, telles que votre nom et votre adresse e-mail. Les informations que vous nous fournissez sont susceptibles d'être utilisées pour améliorer Kolibri. Lorsqu'il vous appartient de choisir comment les informations fournies seront utilisées, nous vous l'indiquerons au moment de leur collecte. En raison du mode de fonctionnement de Kolibri, nous pourrions également utiliser les données de votre navigateur ou de vos activités de navigation pour personnaliser votre expérience ou vous orienter vers des informations pertinentes. Nous pourrions par exemple utiliser votre adresse IP, les données de votre navigateur, des cookies ou des balises Web pour nous aider à conserver certaines de vos préférences ou à comprendre comment nos visiteurs naviguent sur le site aux fins de l'améliorer. Il se peut que nous stockions vos informations personnelles en dehors de l'Union européenne.",
@@ -1213,6 +1216,8 @@
   "TechnicalTextBlock.copiedToClipboardFailure": "Échec de la copie dans le presse-papier",
   "TechnicalTextBlock.copyToClipboardButtonPrompt": "Copier dans le presse-papier",
   "Template.templateString": "Vous avez {count, plural, one {}\n =1 {# nœud aux fins de tests}\n other {# nœuds aux fins de tests}}",
+  "TermsOfServiceModal.ToSHeader": "Conditions d'utilisation",
+  "TermsOfServiceModal.updatedToSHeader": "Conditions d'utilisation mises à jour",
   "TermsOfServiceModal.acceptableUseHeader": "Acceptable Use Restrictions",
   "TermsOfServiceModal.acceptableUseItem1": "Will be in strict accordance with these Terms;",
   "TermsOfServiceModal.acceptableUseItem10": "Will not interfere with, disrupt, or attack any service or network; and",
diff --git a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
index 2d5c747d5f..5d9af0a070 100644
--- a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
@@ -406,6 +406,7 @@
   "Clipboard.removingItems": "Deleting from clipboard...",
   "Clipboard.selectAll": "सभी का चयन करें",
   "Clipboard.undo": "अकृत करें",
+  "CommunityStandardsModal.communityStandardsHeader": "Community Standards",
   "CommunityStandardsModal.coreValuesLink": "Learn more about Learning Equality's core values",
   "CommunityStandardsModal.description": "Learning Equality is a nonprofit organization dedicated to enabling equitable access to quality educational experiences. Along with our statement of Core Values, these Community Standards are intended to foster a supportive and inclusive environment for our users.",
   "CommunityStandardsModal.libraryDescription": "The Kolibri Library is both a grassroots and curated effort to provide a wide variety of materials for all learners and learning purposes. To help us achieve these goals, we invite you to use Kolibri Studio in ways that:",
@@ -939,6 +940,8 @@
   "PoliciesModal.privacyHeader": "Privacy policy",
   "PoliciesModal.updatedPrivacyHeader": "Updated privacy policy",
   "PoliciesModal.updatedToSHeader": "Updated terms of service",
+  "PrivacyPolicyModal.privacyHeader": "Privacy policy",
+  "PrivacyPolicyModal.updatedPrivacyHeader": "Updated privacy policy",
   "PrivacyPolicyModal.linkText": "Learn more about Learning Equality's core values.",
   "PrivacyPolicyModal.paragraph1": "This Privacy Policy informs you of our privacy practices and your choices and rights around the personal data that we collect. This Privacy Policy applies to the Kolibri application (\"Application\"), Kolibri Studio (\"Studio\"), and all related websites (herein collectively referred to as \"Kolibri\"). This Privacy Statement does not apply to third party applications or partner organizations that may use our software or be used in conjunction with our software.",
   "PrivacyPolicyModal.paragraph2": "Learning Equality recognizes your right to privacy, and will take reasonable steps to protect this. Some parts of Kolibri allow you to give us personal information, such as your name and email address. We may use the information you provide to improve Kolibri. Where you have choices about how we use the information you provide, we will indicate this at the point of collection. Because of the way Kolibri operates, we may also use information from your browser or browsing activities to personalize or route you to relevant information. For example, we may use your IP address, browser information, cookies or web beacons in ways that help us maintain some of your preferences, or understand how our visitors navigate the site so we can improve it. We may store your personal information outside of the European Union.",
@@ -1213,6 +1216,8 @@
   "TechnicalTextBlock.copiedToClipboardFailure": "Copy to clipboard failed",
   "TechnicalTextBlock.copyToClipboardButtonPrompt": "क्लिपबोर्ड पर कॉपी करें",
   "Template.templateString": "You have {count, plural,\n =1 {# node for testing}\n other {# nodes for testing}}",
+  "TermsOfServiceModal.ToSHeader": "Terms of Service",
+  "TermsOfServiceModal.updatedToSHeader": "Updated terms of service",
   "TermsOfServiceModal.acceptableUseHeader": "Acceptable Use Restrictions",
   "TermsOfServiceModal.acceptableUseItem1": "Will be in strict accordance with these Terms;",
   "TermsOfServiceModal.acceptableUseItem10": "Will not interfere with, disrupt, or attack any service or network; and",
diff --git a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
index 82763ffbee..197f48b12e 100644
--- a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
@@ -1,1218 +1,1220 @@
 {
   "Account.apiDocumentation": "Documentação da API",
   "Account.apiTokenHeading": "Token da API",
-  "Account.apiTokenMessage": "You will need this access token to run content integration scripts for bulk-uploading materials through the Kolibri Studio API.",
-  "Account.basicInfoHeader": "Basic Information",
-  "Account.changePasswordAction": "Mudar de senha",
-  "Account.completelyDeleteAccountLabel": "Completely remove your account from Kolibri Studio",
-  "Account.deleteAccountLabel": "Delete account",
-  "Account.editFullNameAction": "Edit full name",
-  "Account.exportAccountDataHeading": "Export account data",
-  "Account.exportAccountDataLabel": "You will receive an email with all information linked to your account",
-  "Account.exportAccountDataModalMessage": "You'll receive an email with your data when the export is completed",
-  "Account.exportDataButton": "Export data",
-  "Account.exportFailed": "Unable to export data. Please try again.",
-  "Account.exportStartedHeader": "Data export started",
+  "Account.apiTokenMessage": "Você precisará deste token de acesso para executar scripts de integração para materiais de envio em massa por meio da API do Kolibri Studio.",
+  "Account.basicInfoHeader": "Informações básicas",
+  "Account.changePasswordAction": "Alterar senha",
+  "Account.completelyDeleteAccountLabel": "Remover completamente sua conta do Kolibri Studio",
+  "Account.deleteAccountLabel": "Excluir conta",
+  "Account.editFullNameAction": "Editar o nome completo",
+  "Account.exportAccountDataHeading": "Exportar os dados da conta",
+  "Account.exportAccountDataLabel": "Você receberá um e-mail com todas as informações vinculadas à sua conta",
+  "Account.exportAccountDataModalMessage": "Você receberá um e-mail com seus dados quando a exportação for concluída",
+  "Account.exportDataButton": "Exportar dados",
+  "Account.exportFailed": "Não foi possível exportar os dados. Por favor, tente novamente.",
+  "Account.exportStartedHeader": "Exportação de dados iniciada",
   "Account.fullNameLabel": "Nome completo",
-  "Account.handleChannelsBeforeAccount": "You must delete these channels manually or invite others to edit them before you can delete your account.",
+  "Account.handleChannelsBeforeAccount": "Você precisa excluir estes canais manualmente ou convidar outros para editá-los antes de poder excluir sua conta.",
   "Account.passwordLabel": "Senha",
-  "Account.unableToDeleteAdminAccount": "Unable to delete an admin account",
-  "Account.usernameLabel": "Nome de utilizador",
-  "AccountCreated.accountCreatedTitle": "Account successfully created",
-  "AccountCreated.continueToSignIn": "Continue to sign-in",
-  "AccountDeleted.accountDeletedTitle": "Account successfully deleted",
-  "AccountDeleted.continueToSignIn": "Continue to sign-in page",
-  "AccountNotActivated.requestNewLink": "Request a new activation link",
-  "AccountNotActivated.text": "Please check your email for an activation link or request a new link.",
-  "AccountNotActivated.title": "Account has not been activated",
-  "ActivationExpired.activationExpiredText": "This activation link has been used already or has expired.",
-  "ActivationExpired.activationExpiredTitle": "Activation failed",
-  "ActivationExpired.requestNewLink": "Request a new activation link",
-  "ActivationLinkReSent.activationReSentText": "If there is already an account with the email address provided, you should receive instructions shortly. If you don't see an email from us, please check your spam folder.",
-  "ActivationLinkReSent.activationReSentTitle": "Instructions sent. Thank you!",
-  "ActivationSent.header": "Activation link sent",
-  "ActivationSent.text": "Thank you for creating an account! To complete the process, please check your email for the activation link we sent you.",
-  "AddNextStepsPage.addedNextStepSnackbar": "Added next step",
-  "AddNextStepsPage.toolbarTitle": "Add next step",
-  "AddPreviousStepsPage.addedPreviousStepSnackbar": "Added previous step",
-  "AddPreviousStepsPage.toolbarTitle": "Add previous step",
+  "Account.unableToDeleteAdminAccount": "Não foi possível excluir uma conta de administrador",
+  "Account.usernameLabel": "Nome de usuário",
+  "AccountCreated.accountCreatedTitle": "Conta criada com sucesso",
+  "AccountCreated.continueToSignIn": "Continuar para iniciar sessão",
+  "AccountDeleted.accountDeletedTitle": "Conta excluída com sucesso",
+  "AccountDeleted.continueToSignIn": "Continuar para a página de login",
+  "AccountNotActivated.requestNewLink": "Solicitar um novo link de ativação",
+  "AccountNotActivated.text": "Por favor, verifique o seu e-mail para um link de ativação ou solicite um novo link.",
+  "AccountNotActivated.title": "A conta não foi ativada",
+  "ActivationExpired.activationExpiredText": "Este link de ativação já foi usado ou expirou.",
+  "ActivationExpired.activationExpiredTitle": "Falha na ativação",
+  "ActivationExpired.requestNewLink": "Solicitar um novo link de ativação",
+  "ActivationLinkReSent.activationReSentText": "Se uma conta com o e-mail fornecido já existe, você receberá as instruções em breve. Se não encontrar um e-mail nosso, por favor verifique a sua pasta de spam.",
+  "ActivationLinkReSent.activationReSentTitle": "Instruções enviadas. Obrigado!",
+  "ActivationSent.header": "Link de ativação enviado",
+  "ActivationSent.text": "Obrigado por criar uma conta! Para completar o processo, por favor verifique o seu e-mail para o link de ativação que te enviamos.",
+  "AddNextStepsPage.addedNextStepSnackbar": "Próximo passo adicionado",
+  "AddNextStepsPage.toolbarTitle": "Adicionar próximo passo",
+  "AddPreviousStepsPage.addedPreviousStepSnackbar": "Passo anterior adicionado",
+  "AddPreviousStepsPage.toolbarTitle": "Adicionar passo anterior",
   "AddRelatedResourcesModal.addStepBtnLabel": "Adicionar",
   "AddRelatedResourcesModal.cancelBtnLabel": "Cancelar",
   "AddRelatedResourcesModal.previewStepBtnLabel": "Pré-visualizar",
-  "AddRelatedResourcesModal.resourcesDisplayedText": "Only showing available resources for",
-  "AddRelatedResourcesModal.selectedAsCurrentResource": "This is the current resource",
-  "AddRelatedResourcesModal.selectedAsNextStep": "Already selected as a next step",
-  "AddRelatedResourcesModal.selectedAsPreviousStep": "Already selected as a previous step",
-  "AdministrationAppError.unauthorizedDetails": "You need to be an administrator of Studio to view this page",
+  "AddRelatedResourcesModal.resourcesDisplayedText": "Mostrando apenas conteúdos disponíveis para",
+  "AddRelatedResourcesModal.selectedAsCurrentResource": "Este é o conteúdo atual",
+  "AddRelatedResourcesModal.selectedAsNextStep": "Já selecionado como um próximo passo",
+  "AddRelatedResourcesModal.selectedAsPreviousStep": "Já selecionado como um passo anterior",
+  "AdministrationAppError.unauthorizedDetails": "Você precisa ser um administrador do Studio para visualizar esta página",
   "AdministrationIndex.channelsLabel": "Canais",
   "AdministrationIndex.usersLabel": "Usuários",
   "Alert.closeButtonLabel": "OK",
   "Alert.dontShowAgain": "Não mostrar esta mensagem novamente",
   "AnswersEditor.answersLabel": "Respostas",
-  "AnswersEditor.newAnswerBtnLabel": "New answer",
-  "AnswersEditor.noAnswersPlaceholder": "Question has no answer options",
-  "AnswersEditor.numberFieldErrorLabel": "Answer must be a number",
-  "AppBar.administration": "Administration",
-  "AppBar.changeLanguage": "Change language",
-  "AppBar.help": "Help and support",
+  "AnswersEditor.newAnswerBtnLabel": "Nova resposta",
+  "AnswersEditor.noAnswersPlaceholder": "A pergunta não tem opções de resposta",
+  "AnswersEditor.numberFieldErrorLabel": "A resposta deve ser um número",
+  "AppBar.administration": "Administração",
+  "AppBar.changeLanguage": "Alterar idioma",
+  "AppBar.help": "Ajuda e suporte",
   "AppBar.logIn": "Iniciar sessão",
   "AppBar.logOut": "Terminar sessão",
   "AppBar.settings": "Configurações",
   "AppBar.title": "Kolibri Studio",
   "AssessmentEditor.closeBtnLabel": "Fechar",
-  "AssessmentEditor.incompleteItemIndicatorLabel": "Incomplete",
-  "AssessmentEditor.newQuestionBtnLabel": "New question",
-  "AssessmentEditor.noQuestionsPlaceholder": "Exercise has no questions",
-  "AssessmentEditor.showAnswers": "Show answers",
+  "AssessmentEditor.incompleteItemIndicatorLabel": "Incompleto",
+  "AssessmentEditor.newQuestionBtnLabel": "Nova pergunta",
+  "AssessmentEditor.noQuestionsPlaceholder": "O exercício não tem perguntas",
+  "AssessmentEditor.showAnswers": "Mostrar respostas",
   "AssessmentEditor.toolbarItemLabel": "pergunta",
-  "AssessmentItemEditor.dialogMessageChangeToInput": "Switching to 'numeric input' will set all answers as correct and remove all non-numeric answers. Continue?",
-  "AssessmentItemEditor.dialogMessageChangeToSingleSelection": "Switching to 'single choice' will set only one answer as correct. Continue?",
-  "AssessmentItemEditor.dialogMessageChangeToTrueFalse": "Switching to 'true or false' will remove all current answers. Continue?",
+  "AssessmentItemEditor.dialogMessageChangeToInput": "Mudar para 'entrada numérica' definirá todas as perguntas como corretas e removerá as respostas não numéricas. Continuar?",
+  "AssessmentItemEditor.dialogMessageChangeToSingleSelection": "Mudar para 'única escolha' definirá apenas uma resposta como correta. Continuar?",
+  "AssessmentItemEditor.dialogMessageChangeToTrueFalse": "Mudar para 'verdadeiro ou falso' removerá todas as respostas atuais. Continuar?",
   "AssessmentItemEditor.dialogSubmitBtnLabel": "Alterar",
-  "AssessmentItemEditor.dialogTitle": "Changing question type",
+  "AssessmentItemEditor.dialogTitle": "Mudando o tipo de pergunta",
   "AssessmentItemEditor.questionLabel": "Pergunta",
-  "AssessmentItemEditor.questionTypeLabel": "Response type",
+  "AssessmentItemEditor.questionTypeLabel": "Tipo de resposta",
   "AssessmentItemPreview.answersLabel": "Respostas",
-  "AssessmentItemPreview.hintsToggleLabelHide": "Hide hints",
-  "AssessmentItemPreview.hintsToggleLabelShow": "Show {hintsCount} {hintsCount, plural, one {hint} other {hints}}",
-  "AssessmentItemPreview.noAnswersPlaceholder": "Question has no answer options",
-  "AssessmentItemToolbar.toolbarLabelAddAbove": "Add {itemLabel} above",
-  "AssessmentItemToolbar.toolbarLabelAddBelow": "Add {itemLabel} below",
+  "AssessmentItemPreview.hintsToggleLabelHide": "Ocultar dicas",
+  "AssessmentItemPreview.hintsToggleLabelShow": "Mostrar {hintsCount} {hintsCount, plural, one {dica} other {dicas}}",
+  "AssessmentItemPreview.noAnswersPlaceholder": "A pergunta não tem opções de resposta",
+  "AssessmentItemToolbar.toolbarLabelAddAbove": "Adicionar {itemLabel} acima",
+  "AssessmentItemToolbar.toolbarLabelAddBelow": "Adicionar {itemLabel} abaixo",
   "AssessmentItemToolbar.toolbarLabelDelete": "Excluir",
   "AssessmentItemToolbar.toolbarLabelEdit": "Editar",
-  "AssessmentItemToolbar.toolbarLabelMoveDown": "Move down",
-  "AssessmentItemToolbar.toolbarLabelMoveUp": "Move up",
+  "AssessmentItemToolbar.toolbarLabelMoveDown": "Mover para baixo",
+  "AssessmentItemToolbar.toolbarLabelMoveUp": "Mover para cima",
   "AssessmentTab.dialogCancelBtnLabel": "Cancelar",
-  "AssessmentTab.dialogSubmitBtnLabel": "Submit",
-  "AssessmentTab.incompleteItemsCountMessage": "{invalidItemsCount} incomplete {invalidItemsCount, plural, one {question} other {questions}}",
+  "AssessmentTab.dialogSubmitBtnLabel": "Enviar",
+  "AssessmentTab.incompleteItemsCountMessage": "{invalidItemsCount} {invalidItemsCount, plural, one {pergunta incompleta} other {perguntas incompletas}}",
   "BrowsingCard.addToClipboardAction": "Copiar para área de transferência",
-  "BrowsingCard.coach": "Resource for coaches",
-  "BrowsingCard.goToPluralLocationsAction": "In {count, number} {count, plural, one {location} other {locations}}",
-  "BrowsingCard.goToSingleLocationAction": "Go to location",
-  "BrowsingCard.hasCoachTooltip": "{value, number, integer} {value, plural, one {resource for coaches} other {resources for coaches}}",
-  "BrowsingCard.previewAction": "View details",
-  "BrowsingCard.resourcesCount": "{count, number} {count, plural, one {recurso} other {recursos}}",
-  "BrowsingCard.tagsList": "Tags: {tags}",
+  "BrowsingCard.coach": "Material para professores",
+  "BrowsingCard.goToPluralLocationsAction": "Em {count, number} {count, plural, one {local} other {locais}}",
+  "BrowsingCard.goToSingleLocationAction": "Ir para o local",
+  "BrowsingCard.hasCoachTooltip": "{value, number, integer} {value, plural, one {material para professores} other {materiais para professores}}",
+  "BrowsingCard.previewAction": "Ver detalhes",
+  "BrowsingCard.resourcesCount": "{count, number} {count, plural, one {conteúdo} other {conteúdos}}",
+  "BrowsingCard.tagsList": "Marcadores: {tags}",
   "BytesForHumansStrings.fileSizeInBytes": "{n, number, integer} B",
   "BytesForHumansStrings.fileSizeInGigabytes": "{n, number, integer} GB",
   "BytesForHumansStrings.fileSizeInKilobytes": "{n, number, integer} KB",
   "BytesForHumansStrings.fileSizeInMegabytes": "{n, number, integer} MB",
   "BytesForHumansStrings.fileSizeInTerabytes": "{n, number, integer} TB",
-  "CatalogFAQ.KolibriAnswer": "Kolibri is an open source ed-tech platform designed for low-resource communities, focused on:",
-  "CatalogFAQ.KolibriAnswerItem1": "Overcoming infrastructural barriers that prevent equitable access to quality education for learners in low-resource and low-connectivity contexts",
-  "CatalogFAQ.KolibriAnswerItem2": "Increasing the availability of open learning materials suitable for many curricula, learning goals, and situations",
-  "CatalogFAQ.KolibriAnswerItem3": "Fostering innovative pedagogy and effective learning outcomes",
-  "CatalogFAQ.KolibriQuestion": "What is Kolibri?",
-  "CatalogFAQ.aboutHeader": "Welcome to the Kolibri Content Library Catalog! ",
-  "CatalogFAQ.aboutKolibriHeader": "Sobre Kolibri",
-  "CatalogFAQ.aboutLibraryHeader": "About the Kolibri Content Library",
-  "CatalogFAQ.channelAnswer": "A channel is Kolibri’s unit of organization for digital content. It's a collection of resources organized by single institutions or creators, each of which may contain a set of books, games, textbooks, articles, simulations, exercises, and many more types of educational materials, all made available for use in Kolibri without the need for internet access. A channel isn't necessarily a course or a sequence, it's simply a collection of materials published or gathered together by one organization, as close to the provider's original layout as possible, while still organized for the best possible navigation in Kolibri.",
-  "CatalogFAQ.channelLink": "What is a channel?",
-  "CatalogFAQ.channelQuestion": "What is a channel?",
-  "CatalogFAQ.coachContentAnswer": "Most resources are directed at learners, but some, such as lesson plans, subject refreshers, professional learning guides, and similar, are directed at teachers and facilitators. In Kolibri, we mark this content as \"for coaches\" and limit its visibility to those with coach accounts. If you see coach materials here, they may require less planning for any facilitators using the resource!",
-  "CatalogFAQ.coachContentQuestion": "What are 'resources for coaches'?",
-  "CatalogFAQ.customContentAnswer": "We would love to get in touch with you regarding your own materials or your recommendations. Please contact us at content@learningequality.org!",
-  "CatalogFAQ.customContentQuestion": "How can I add my own materials or recommend materials from other creators for this library?",
-  "CatalogFAQ.descriptionP1": "Here you can learn more about the educational resources publicly available for use in Kolibri, which are organized into \"channels\". Use the filters to browse channels by keyword, language, or formats of the materials inside.",
-  "CatalogFAQ.descriptionP2": "Click on a channel to get a preview of what subjects and topics it covers, learn more about its creator, see how many resources the channel contains, and learn how to import it into Kolibri. You can also find coach-specific content (lesson plans, teacher professional guides, and other supplementary facilitation material), assessments and exercises, and captions for accessibility.",
-  "CatalogFAQ.descriptionP3": "Sharing the work of these resource creators is what inspires Learning Equality's efforts. We hope you find something that excites you about the potential of digital learning, online or off!",
-  "CatalogFAQ.downloadKolibriLink": "Download Kolibri",
+  "CatalogFAQ.KolibriAnswer": "O Kolibri é uma plataforma de tecnologia educacional de código aberto feita para comunidades com recursos limitados, focado em:",
+  "CatalogFAQ.KolibriAnswerItem1": "Superar as barreiras de infraestrutura que impedem o acesso igualitário à educação de qualidade para estudantes em contextos de recursos e conectividade limitados",
+  "CatalogFAQ.KolibriAnswerItem2": "Aumentar a disponibilidade de materiais de aprendizagem aberta adequados a diversos currículos, objetivos de aprendizagem e situações",
+  "CatalogFAQ.KolibriAnswerItem3": "Promover inovações pedagógicas e resultados de aprendizagem efetivos",
+  "CatalogFAQ.KolibriQuestion": "O que é o Kolibri?",
+  "CatalogFAQ.aboutHeader": "Bem-vindo ao catálogo da biblioteca de conteúdo do Kolibri! ",
+  "CatalogFAQ.aboutKolibriHeader": "Sobre o Kolibri",
+  "CatalogFAQ.aboutLibraryHeader": "Sobre a biblioteca de conteúdo do Kolibri",
+  "CatalogFAQ.channelAnswer": "Um canal é a unidade de organização de conteúdo digital do Kolibri. É um conjunto de conteúdos organizado por instituições ou criadores únicos, cada qual podendo conter um apanhado de livros, jogos, livros didáticos, artigos, simulações, exercícios e muitos outros tipos de materiais educacionais, todos disponibilizados para uso no Kolibri sem precisar de conexão à internet. Um canal não é necessariamente um curso ou sequência, mas simplesmente um conjunto de materiais publicados ou reunidos por uma organização, o mais fiel possível ao formato do provedor original, porém sendo organizado para a melhor navegação possível no Kolibri.",
+  "CatalogFAQ.channelLink": "O que é um canal?",
+  "CatalogFAQ.channelQuestion": "O que é um canal?",
+  "CatalogFAQ.coachContentAnswer": "Boa parte dos conteúdos é direcionado para estudantes, mas alguns como os planos de lição, revisões de assuntos, guias de aprendizagem professional, e similares, são direcionados a professores e facilitadores. No Kolibri, marcamos esses conteúdos como \"para professores\" e limitamos sua visibilidade para quem possuir contas de professores. Se você vir materiais de professores aqui, isso indica que requerem menos planejamento por parte de facilitadores utilizando o conteúdo!",
+  "CatalogFAQ.coachContentQuestion": "O que são 'materiais para professores'?",
+  "CatalogFAQ.customContentAnswer": "Adoraríamos entrar em contato com você sobre os seus próprios materiais ou recomendações. Por favor, envie um e-mail para content@learningequality.org!",
+  "CatalogFAQ.customContentQuestion": "Como posso adicionar os meus próprios materiais ou recomendar materiais de outros criadores para esta biblioteca?",
+  "CatalogFAQ.descriptionP1": "Aqui você pode aprender mais sobre os conteúdos educacionais disponíveis publicamente para uso no Kolibri, que são organizados em \"canais\". Use os filtros para navegar pelos canais por meio de palavras-chave, idioma, ou formatos de materiais contidos neles.",
+  "CatalogFAQ.descriptionP2": "Clique em um canal para pré-visualizar quais assuntos e temas ele cobre, saiba mais sobre o seu criador, quantos conteúdos o canal contém e aprenda como importá-lo para o Kolibri. Você pode também encontrar conteúdo específico para professores (planos de lições, guias profissionais para professores, e outros materiais suplementares de facilitação), avaliações, exercícios, e legendas para acessibilidade.",
+  "CatalogFAQ.descriptionP3": "Compartilhar o trabalho desses criadores de conteúdo é o que inspira os esforços da Learning Equality. Esperamos que você encontre algo que te entusiasme sobre o potencial da aprendizagem digital, online ou offline!",
+  "CatalogFAQ.downloadKolibriLink": "Baixar o Kolibri",
   "CatalogFAQ.downloadLink": "Baixar",
-  "CatalogFAQ.endoresementQuestion": "Have these sources been vetted or endorsed as classroom-safe and ready?",
-  "CatalogFAQ.endorsementAnswer": "We select sources with an educational affiliation or mandate, so you can trust that most resources in the Kolibri Content Library were designed for learning purposes. However,  we are not able to guarantee the appropriateness of each individual item within any particular source. We recommend that educators and administrators conduct a thorough review of any digital content using their own criteria - including reorganization and re-curation, if necessary - before using it with learners. Since we recognize that there may be many different standards across situations for criteria like preferred levels of interactivity, subject/age appropriateness, cultural sensitivity and tone, among others, we have intentionally offered a wide range of materials to help meet the needs of all learners whatever they may be.",
-  "CatalogFAQ.faqHeader": "Frequently asked questions",
-  "CatalogFAQ.issueAnswer": "Please email us at content@learningequality.org and include the channel name, along with a description of the issue. If you notice an issue on a specific resource, please be sure to link that as well. We'd be happy to investigate and grateful for your feedback!",
-  "CatalogFAQ.issueQuestion": "I found a bug, broken link, or some mislabeled information within a resource. What should I do?",
-  "CatalogFAQ.maintenanceAnswerP1": "Because Kolibri is designed for learners and educators who are disconnected from the internet, content must first be packaged so that it can be used without internet connection. For most sources, our content team uses custom-written, automated scripts to bring content into Kolibri from a website, an app, or a private source such as a hard drive (with the appropriate permissions).",
-  "CatalogFAQ.maintenanceAnswerP2": "To learn more about how content is packaged for use on Kolibri and what types of formats are supported, please refer to our content integration guide.",
-  "CatalogFAQ.maintenanceQuestion": "How is this library created and maintained?",
-  "CatalogFAQ.makerAnswerP1": "Learning Equality, a 501(c)(3) nonprofit based in San Diego, California, is committed to enabling every person in the world to realize their right to a quality education, by supporting the creation, adaptation, and distribution of open educational resources, and creating supportive tools for innovative pedagogy.",
-  "CatalogFAQ.makerAnswerP2": "In recognition of the digital divide, Learning Equality started by bringing the Khan Academy experience offline to more than 6 million learners around the globe. Its second-generation product, Kolibri, is part of a broader ecosystem of products and tools that support curriculum alignment, blended learning pedagogies, and broader use of Open Educational Resources to improve learning.",
-  "CatalogFAQ.makerQuestion": "Who are the makers of Kolibri?",
-  "CatalogFAQ.newContentAnswer": "Our content team routinely adds new sources and channels to the library and updates existing channels as content creators make new materials available.",
-  "CatalogFAQ.newContentQuestion": "Does Learning Equality add new materials?",
-  "CatalogFAQ.ownershipAnswer": "No. Just like an online learning repository with links to external websites, we gather useful digital learning resources to help our community discover a rich variety of learning materials they may not have known about otherwise. All the materials in this educational library are fully credited to the creating organization, reformatted for best display on digital devices, and include any additional information the creator has shared with us. We only include content which is either openly licensed, available to distribute for special nonprofit or noncommercial purposes, or shared with us for distribution through agreement with the creator. Since materials in the library are intended for use in an open source platform, we do not profit financially from their use.",
-  "CatalogFAQ.ownershipQuestion": "Does Learning Equality own these resources?",
-  "CatalogFAQ.partialChannelAnswer": "When importing content into Kolibri, you can select the specific subsections of a channel you're interested in. If you’d like to make changes such as editing the title or folder descriptions, or changing the order in which materials appear, please contact us at content@learningequality.org for early access to our Kolibri Studio tool, which can be used to make these changes.",
-  "CatalogFAQ.partialChannelQuestion": "I want to use some of the resources in this channel, but not all of it. What should I do?",
-  "CatalogFAQ.sampleContentAnswer": "You can do this in three ways:",
-  "CatalogFAQ.sampleContentAnswerItem1": "To see the original content source, click the ⋮  button and select 'Go to source website'",
-  "CatalogFAQ.sampleContentAnswerItem2": "To preview the content on one of our online demo servers (available in English, Spanish, Arabic, French, and Hindi), click the ⋮ button and select 'View channel on Kolibri'",
-  "CatalogFAQ.sampleContentAnswerItem3": "Download Kolibri and import the channel on your device for full access offline.",
-  "CatalogFAQ.sampleContentQuestion": "How do I review the contents of the channels themselves?",
-  "CatalogFAQ.selectionAnswerP1": "Our approach is unique in that we aim to assemble a library of resources which supports the diversity of needs Kolibri is designed to meet, rather than collecting all possible open educational resources.",
-  "CatalogFAQ.selectionAnswerP2": "To inform what we select, the Learning Equality team is continually maintaining our awareness of openly licensed digital resources available in the educational landscape. Most of our resources come from an organization, institution, or creator with learning design experience and an educational mandate. We prioritize providing a diversity of grade levels, subject areas and languages. Where possible, we also evaluate and seek input on the degree to which the materials may be suitable for the unique blended learning settings in which we work.",
-  "CatalogFAQ.selectionQuestion": "How does Learning Equality determine what goes into this library?",
-  "CatalogFAQ.usingContentAnswer": "Great! All of these resources have been specially packaged for use on Kolibri, our open source platform for offline learning, so please review how to get started with Kolibri first, then follow the instructions to import materials.",
-  "CatalogFAQ.usingContentQuestion": "I found something I'm interested in and would like to start using it. What should I do?",
-  "CatalogFAQ.usingKolibriAnswerP1": "You can learn more about using Kolibri by doing any of the following:",
-  "CatalogFAQ.usingKolibriAnswerP2": "We invite you to use the Kolibri user documentation for further guidance.",
-  "CatalogFAQ.usingKolibriItem1": "Visit the Learning Equality website",
-  "CatalogFAQ.usingKolibriItem2": "View a demo of the platform",
-  "CatalogFAQ.usingKolibriItem3": "Download the software",
-  "CatalogFAQ.usingKolibriQuestion": "How can I use Kolibri?",
-  "CatalogFAQ.usingResourcesHeader": "About using these resources",
-  "CatalogFAQ.viewDemoLink": "View demo",
-  "CatalogFAQ.viewDocsLink": "View docs",
-  "CatalogFAQ.viewGettingStartedLink": "Documentation resources to get started with Kolibri",
-  "CatalogFAQ.viewIntegrationGuide": "View content integration guide",
-  "CatalogFAQ.visitWebsiteLink": "Visit website",
-  "CatalogFilterBar.assessments": "Assessments",
-  "CatalogFilterBar.channelCount": "{count, plural,\n =1 {# channel}\n other {# channels}}",
-  "CatalogFilterBar.clearAll": "Clear all",
+  "CatalogFAQ.endoresementQuestion": "Estas fontes foram examinadas ou aprovadas como seguras e prontas para serem usadas na sala de aula?",
+  "CatalogFAQ.endorsementAnswer": "Selecionamos fontes com uma afiliação ou finalidade educacional, para que você possa confiar que a maioria dos conteúdos na biblioteca de conteúdo do Kolibri foram feitos para fins educacionais. Entretanto, não estamos aptos a garantir a pertinência de cada item em cada uma das fontes. Recomendamos que educadores e administradores conduzam uma revisão atenciosa de quaisquer conteúdos digitais mediante seus próprios critérios - incluindo reorganização e re-curadoria, se necessário - antes de os usarem com estudantes. Reconhecemos que podem existir normas diferentes para critérios dependendo do contexto, como níveis preferidos de interatividade, adequação ao assunto/idade, sensitividade e tom cultural, entre outros. Oferecemos intencionalmente uma grande variedade de materiais para ajudar a alcançar a todas as necessidades de todos estudantes.",
+  "CatalogFAQ.faqHeader": "Perguntas frequentes",
+  "CatalogFAQ.issueAnswer": "Por favor, envie um e-mail para content@learningequality.org e inclua o nome do canal junto a uma descrição do problema. Se notar um problema em um conteúdo específico, assegure-se de também colocar um link para isso. Teremos o maior prazer em investigar e agradecemos os seus comentários!",
+  "CatalogFAQ.issueQuestion": "Encontrei um problema, um link quebrado, ou alguma informação mal etiquetada em um conteúdo. O que devo fazer?",
+  "CatalogFAQ.maintenanceAnswerP1": "Porque o Kolibri é feito para estudantes e educadores que estão desconectados da internet, o conteúdo precisa primeiro ser integrado para ser usado sem conexão à internet. Para a maioria das fontes, nossa equipe de conteúdo usa scripts personalizados e automatizados para trazer conteúdo para o Kolibri de um website, um aplicativo, ou uma fonte privada como um disco rígido (com as devidas permissões).",
+  "CatalogFAQ.maintenanceAnswerP2": "Para saber mais sobre como o conteúdo é integrado para uso no Kolibri e que tipos de formato são suportados, por favor, refira-se ao nosso guia de integração de conteúdo.",
+  "CatalogFAQ.maintenanceQuestion": "Como se cria e mantém esta biblioteca?",
+  "CatalogFAQ.makerAnswerP1": "A Learning Equality, uma organização sem fins lucrativos 501(c)(3) baseada em San Diego, Califórnia, compromete-se com possibilitar que todos no mundo realizem o seu direito à educação de qualidade ao apoiar a criação, adaptação e distribuição de conteúdos educacionais abertos e ao criar ferramentas de apoio para pedagogia inovadora.",
+  "CatalogFAQ.makerAnswerP2": "Reconhecendo a desigualdade digital, a Learning Equality começou por trazer a experiência offline da Khan Academy para mais de 6 milhões de estudantes no mundo todo. Seu produto de segunda geração, o Kolibri, é parte de um ecossistema amplo de produtos e ferramentas que apoiam o alinhamento curricular, pedagogias de aprendizagem híbridas, e uso mais abrangente de conteúdos educacionais abertos para otimizar a aprendizagem.",
+  "CatalogFAQ.makerQuestion": "Quem são os criadores do Kolibri?",
+  "CatalogFAQ.newContentAnswer": "Nossa equipe de conteúdos adiciona regularmente novas fontes e canais à biblioteca e atualiza canais existentes à medida que criadores de conteúdo disponibilizam novos materiais.",
+  "CatalogFAQ.newContentQuestion": "A Learning Equality adiciona novos materiais?",
+  "CatalogFAQ.ownershipAnswer": "Não. Assim como um repositório online com links para websites externos, reunimos conteúdos digitais úteis para ajudar a nossa comunidade a descobrir a rica variedade de materiais de aprendizagem, que talvez não conheceriam de outra forma. Todos os materiais nessa biblioteca educacional são totalmente creditados à organização criadora, reformatados para uma melhor visualização em dispositivos digitais, e incluem quaisquer informações adicionais que o criador tenha compartilhado conosco. Incluímos apenas conteúdos com licença aberta, disponíveis para distribuição para objetivos especiais sem fins lucrativos ou não comerciais, ou compartilhados conosco para distribuição mediante acordo com o criador. Já que materiais na biblioteca possuem o intuito de serem usados em uma plataforma de código aberto, não lucramos financeiramente com seu uso.",
+  "CatalogFAQ.ownershipQuestion": "Esses conteúdos pertencem à Learning Equality?",
+  "CatalogFAQ.partialChannelAnswer": "Quando estiver importando conteúdo para o Kolibri, você pode selecionar as subseções específicas de um canal que estiver interessado. Se quiser fazer alterações como editar o título ou descrição de pastas, ou mudar a ordem na qual os materiais aparecem, por favor, envie um e-mail para content@learningequality.org para o acesso antecipado da nossa ferramenta Kolibri Studio, que pode ser usada para fazer essas alterações.",
+  "CatalogFAQ.partialChannelQuestion": "Quero usar alguns conteúdos deste canal, mas não todos. O que devo fazer?",
+  "CatalogFAQ.sampleContentAnswer": "Pode fazê-lo de três formas:",
+  "CatalogFAQ.sampleContentAnswerItem1": "Para ver a fonte do conteúdo original, clique no botão ⋮ e selecione 'Ir para o website de origem'",
+  "CatalogFAQ.sampleContentAnswerItem2": "Para pré-visualizar o conteúdo em um dos nossos servidores de demonstração online (disponíveis em inglês, espanhol, árabe, francês e hindi), clique no botão ⋮ e selecione 'Visualizar o canal no Kolibri'",
+  "CatalogFAQ.sampleContentAnswerItem3": "Baixe o Kolibri e importe o canal no seu dispositivo para ter um acesso completo offline.",
+  "CatalogFAQ.sampleContentQuestion": "Como reviso os conteúdos dos próprios canais?",
+  "CatalogFAQ.selectionAnswerP1": "Nossa abordagem é única, pois almejamos reunir uma biblioteca de conteúdos que suporte a diversidade de necessidades que o Kolibri é feito para atender, ao invés de coletar todos os conteúdos educacionais abertos possíveis.",
+  "CatalogFAQ.selectionAnswerP2": "Para informar o que selecionamos, a equipe da Learning Equality mantém uma atenção contínua nos conteúdos digitais licenciados disponíveis no ambiente pedagógico. A maioria dos nossos conteúdos vem de uma organização, instituição, ou criador com experiência em projetos de aprendizagem e com finalidades educacionais. Priorizamos fornecer uma diversidade de níveis, assuntos e idiomas. Sempre que possível, também avaliamos e buscamos informações sobre os níveis em que os materiais podem ser adequados aos ambientes únicos de aprendizagem híbrida em que trabalhamos.",
+  "CatalogFAQ.selectionQuestion": "Como a Learning Equality determina o que é incluído nessa biblioteca?",
+  "CatalogFAQ.usingContentAnswer": "Ótimo! Todos esses conteúdos foram especialmente integrados para uso no Kolibri, nossa plataforma de código aberto para aprendizagem offline. Por favor, reveja primeiramente como iniciar o Kolibri e depois siga as instruções para importar materiais.",
+  "CatalogFAQ.usingContentQuestion": "Encontrei algo que me interessa e gostaria de começar a usá-lo. O que devo fazer?",
+  "CatalogFAQ.usingKolibriAnswerP1": "Você pode aprender mais sobre usar o Kolibri com os seguintes passos:",
+  "CatalogFAQ.usingKolibriAnswerP2": "Te convidamos a usar a documentação de usuário do Kolibri para mais informações.",
+  "CatalogFAQ.usingKolibriItem1": "Visite o website da Learning Equality",
+  "CatalogFAQ.usingKolibriItem2": "Visualizar uma demonstração da plataforma",
+  "CatalogFAQ.usingKolibriItem3": "Baixar o software",
+  "CatalogFAQ.usingKolibriQuestion": "Como posso usar o Kolibri?",
+  "CatalogFAQ.usingResourcesHeader": "Sobre usar estes conteúdos",
+  "CatalogFAQ.viewDemoLink": "Ver demonstração",
+  "CatalogFAQ.viewDocsLink": "Ver documentos",
+  "CatalogFAQ.viewGettingStartedLink": "Conteúdos de documentação para iniciar o Kolibri",
+  "CatalogFAQ.viewIntegrationGuide": "Ver o guia de integração de conteúdo",
+  "CatalogFAQ.visitWebsiteLink": "Visitar website",
+  "CatalogFilterBar.assessments": "Avaliações",
+  "CatalogFilterBar.channelCount": "{count, plural, one {}\n =1 {# canal}\n other {# canais}}",
+  "CatalogFilterBar.clearAll": "Limpar tudo",
   "CatalogFilterBar.close": "Fechar",
-  "CatalogFilterBar.coachContent": "Coach content",
-  "CatalogFilterBar.copyTitle": "Copy collection token",
-  "CatalogFilterBar.copyToken": "Copy collection token",
-  "CatalogFilterBar.copyTokenInstructions": "Paste this token into Kolibri to import the channels contained in this collection",
+  "CatalogFilterBar.coachContent": "Conteúdo de professores",
+  "CatalogFilterBar.copyTitle": "Copiar token do conjunto",
+  "CatalogFilterBar.copyToken": "Copiar token do conjunto",
+  "CatalogFilterBar.copyTokenInstructions": "Cole este token no Kolibri para importar os canais contidos neste conjunto",
   "CatalogFilterBar.keywords": "\"{text}\"",
-  "CatalogFilterBar.starred": "Starred",
+  "CatalogFilterBar.starred": "Favoritos",
   "CatalogFilterBar.subtitles": "Legendas",
-  "CatalogFilters.coachDescription": "Resources for coaches are only visible to coaches in Kolibri",
-  "CatalogFilters.coachLabel": "Resources for coaches",
+  "CatalogFilters.coachDescription": "Os materiais para professores são visíveis apenas para eles no Kolibri",
+  "CatalogFilters.coachLabel": "Materiais para professores",
   "CatalogFilters.copyright": "© {year} Learning Equality",
-  "CatalogFilters.formatLabel": "Formats",
-  "CatalogFilters.frequentlyAskedQuestionsLink": "Frequently asked questions",
-  "CatalogFilters.includesLabel": "Display only channels with",
-  "CatalogFilters.licenseLabel": "Licenses",
-  "CatalogFilters.searchLabel": "Keywords",
+  "CatalogFilters.formatLabel": "Formatos",
+  "CatalogFilters.frequentlyAskedQuestionsLink": "Perguntas frequentes",
+  "CatalogFilters.includesLabel": "Mostrar apenas canais com",
+  "CatalogFilters.licenseLabel": "Licenças",
+  "CatalogFilters.searchLabel": "Palavras-chave",
   "CatalogFilters.searchText": "Buscar",
-  "CatalogFilters.starredLabel": "Starred",
-  "CatalogFilters.subtitlesLabel": "Captions or subtitles",
+  "CatalogFilters.starredLabel": "Favoritos",
+  "CatalogFilters.subtitlesLabel": "Legendas",
   "CatalogList.cancelButton": "Cancelar",
-  "CatalogList.channelSelectionCount": "{count, plural,\n =1 {# channel selected}\n other {# channels selected}}",
+  "CatalogList.channelSelectionCount": "{count, plural, one {}\n =1 {# canal selecionado}\n other {# canais selecionados}}",
   "CatalogList.downloadButton": "Baixar",
-  "CatalogList.downloadCSV": "Download CSV",
-  "CatalogList.downloadPDF": "Download PDF",
-  "CatalogList.downloadingMessage": "Download started",
-  "CatalogList.resultsText": "{count, plural,\n =1 {# result found}\n other {# results found}}",
+  "CatalogList.downloadCSV": "Baixar CSV",
+  "CatalogList.downloadPDF": "Baixar PDF",
+  "CatalogList.downloadingMessage": "Download iniciado",
+  "CatalogList.resultsText": "{count, plural, one {}\n =1 {# resultado encontrado}\n other {# resultados encontrados}}",
   "CatalogList.selectAll": "Selecionar todos",
-  "CatalogList.selectChannels": "Download a summary of selected channels",
+  "CatalogList.selectChannels": "Baixar um resumo dos canais selecionados",
   "ChangePasswordForm.cancelAction": "Cancelar",
-  "ChangePasswordForm.changePasswordHeader": "Mudar de senha",
-  "ChangePasswordForm.confirmNewPasswordLabel": "Confirme nova senha",
-  "ChangePasswordForm.formInvalidText": "Passwords don't match",
+  "ChangePasswordForm.changePasswordHeader": "Alterar senha",
+  "ChangePasswordForm.confirmNewPasswordLabel": "Confirmar nova senha",
+  "ChangePasswordForm.formInvalidText": "As senhas não coincidem",
   "ChangePasswordForm.newPasswordLabel": "Nova senha",
-  "ChangePasswordForm.passwordChangeFailed": "Failed to save new password",
-  "ChangePasswordForm.paswordChangeSuccess": "Password updated",
+  "ChangePasswordForm.passwordChangeFailed": "Erro ao salvar a nova senha",
+  "ChangePasswordForm.paswordChangeSuccess": "Senha atualizada",
   "ChangePasswordForm.saveChangesAction": "Salvar alterações",
-  "ChannelCatalogFrontPage.assessmentsIncludedText": "Assessments",
-  "ChannelCatalogFrontPage.catalogHeader": "Kolibri Content Library channels",
-  "ChannelCatalogFrontPage.coachHeading": "Resources for coaches",
-  "ChannelCatalogFrontPage.containsHeading": "Contains",
+  "ChannelCatalogFrontPage.assessmentsIncludedText": "Avaliações",
+  "ChannelCatalogFrontPage.catalogHeader": "Canais da biblioteca de conteúdo do Kolibri",
+  "ChannelCatalogFrontPage.coachHeading": "Materiais para professores",
+  "ChannelCatalogFrontPage.containsHeading": "Contém",
   "ChannelCatalogFrontPage.defaultNoItemsText": "---",
-  "ChannelCatalogFrontPage.exported": "Exported",
-  "ChannelCatalogFrontPage.formatsHeading": "Formats",
+  "ChannelCatalogFrontPage.exported": "Exportado",
+  "ChannelCatalogFrontPage.formatsHeading": "Formatos",
   "ChannelCatalogFrontPage.languagesHeading": "Idiomas",
-  "ChannelCatalogFrontPage.numberOfChannels": "{ num } channels",
-  "ChannelCatalogFrontPage.subtitlesIncludedText": "Captions or subtitles",
+  "ChannelCatalogFrontPage.numberOfChannels": "{ num } canais",
+  "ChannelCatalogFrontPage.subtitlesIncludedText": "Legendas",
   "ChannelDeletedError.backToHomeAction": "Voltar à página inicial",
-  "ChannelDeletedError.channelDeletedDetails": "This channel does not exist or may have been removed. Please contact us at content@learningequality.org if you think this is a mistake.",
+  "ChannelDeletedError.channelDeletedDetails": "Este canal não existe ou pode ter sido removido. Por favor, envie um e-mail para content@learningequality.org se achar que isto é um erro.",
   "ChannelDeletedError.channelDeletedHeader": "Canal não encontrado",
-  "ChannelDetailsModal.downloadButton": "Download channel summary",
-  "ChannelDetailsModal.downloadCSV": "Download CSV",
-  "ChannelDetailsModal.downloadPDF": "Download PDF",
-  "ChannelExportStrings.aggregators": "Aggregators",
-  "ChannelExportStrings.assessments": "Assessments",
-  "ChannelExportStrings.authors": "Authors",
-  "ChannelExportStrings.coachContent": "Resources for coaches",
-  "ChannelExportStrings.copyrightHolders": "Copyright holders",
+  "ChannelDetailsModal.downloadButton": "Baixar resumo do canal",
+  "ChannelDetailsModal.downloadCSV": "Baixar CSV",
+  "ChannelDetailsModal.downloadPDF": "Baixar PDF",
+  "ChannelExportStrings.aggregators": "Agregadores",
+  "ChannelExportStrings.assessments": "Avaliações",
+  "ChannelExportStrings.authors": "Autores",
+  "ChannelExportStrings.coachContent": "Materiais para professores",
+  "ChannelExportStrings.copyrightHolders": "Detentores dos direitos autorais",
   "ChannelExportStrings.description": "Descrição",
-  "ChannelExportStrings.downloadFilename": "{year}_{month}_Kolibri_Content_Library",
-  "ChannelExportStrings.id": "Channel ID",
+  "ChannelExportStrings.downloadFilename": "{year}_{month}_Biblioteca_Conteúdo_Kolibri",
+  "ChannelExportStrings.id": "ID do canal",
   "ChannelExportStrings.language": "Idioma",
-  "ChannelExportStrings.languages": "Included languages",
-  "ChannelExportStrings.licenses": "Licenses",
+  "ChannelExportStrings.languages": "Idiomas inclusos",
+  "ChannelExportStrings.licenses": "Licenças",
   "ChannelExportStrings.name": "Nome",
   "ChannelExportStrings.no": "Não",
-  "ChannelExportStrings.providers": "Providers",
+  "ChannelExportStrings.providers": "Provedores",
   "ChannelExportStrings.resources": "Conteúdos",
-  "ChannelExportStrings.size": "Total resources",
-  "ChannelExportStrings.storage": "Storage",
-  "ChannelExportStrings.subtitles": "Captions or subtitles",
+  "ChannelExportStrings.size": "Conteúdos totais",
+  "ChannelExportStrings.storage": "Armazenamento",
+  "ChannelExportStrings.subtitles": "Legendas",
   "ChannelExportStrings.tags": "Marcadores",
   "ChannelExportStrings.token": "Token",
   "ChannelExportStrings.yes": "Sim",
   "ChannelInfoCard.resourceCount": "{count, number} {count, plural, one {recurso} other {recursos}}",
-  "ChannelInvitation.accept": "Accept",
-  "ChannelInvitation.acceptedSnackbar": "Accepted invitation",
+  "ChannelInvitation.accept": "Aceitar",
+  "ChannelInvitation.acceptedSnackbar": "Convite aceito",
   "ChannelInvitation.cancel": "Cancelar",
-  "ChannelInvitation.decline": "Decline",
-  "ChannelInvitation.declinedSnackbar": "Declined invitation",
-  "ChannelInvitation.decliningInvitation": "Declining Invitation",
-  "ChannelInvitation.decliningInvitationMessage": "Are you sure you want to decline this invitation?",
-  "ChannelInvitation.editText": "{sender} has invited you to edit {channel}",
-  "ChannelInvitation.goToChannelSnackbarAction": "Go to channel",
-  "ChannelInvitation.viewText": "{sender} has invited you to view {channel}",
+  "ChannelInvitation.decline": "Recusar",
+  "ChannelInvitation.declinedSnackbar": "Convite recusado",
+  "ChannelInvitation.decliningInvitation": "Recusando convite",
+  "ChannelInvitation.decliningInvitationMessage": "Tem certeza que deseja recusar este convite?",
+  "ChannelInvitation.editText": "{sender} te convidou para editar {channel}",
+  "ChannelInvitation.goToChannelSnackbarAction": "Ir para o canal",
+  "ChannelInvitation.viewText": "{sender} te convidou para visualizar {channel}",
   "ChannelItem.cancel": "Cancelar",
-  "ChannelItem.channelDeletedSnackbar": "Channel deleted",
-  "ChannelItem.channelLanguageNotSetIndicator": "No language set",
-  "ChannelItem.copyToken": "Copy channel token",
+  "ChannelItem.channelDeletedSnackbar": "Canal excluído",
+  "ChannelItem.channelLanguageNotSetIndicator": "Nenhum idioma",
+  "ChannelItem.copyToken": "Copiar token do canal",
   "ChannelItem.deleteChannel": "Excluir canal",
-  "ChannelItem.deletePrompt": "This channel will be permanently deleted. This cannot be undone.",
-  "ChannelItem.deleteTitle": "Delete this channel",
+  "ChannelItem.deletePrompt": "Este canal será excluído permanentemente. Esta ação não pode ser desfeita.",
+  "ChannelItem.deleteTitle": "Excluir este canal",
   "ChannelItem.details": "Detalhes",
-  "ChannelItem.editChannel": "Edit channel details",
-  "ChannelItem.goToWebsite": "Go to source website",
-  "ChannelItem.lastPublished": "Published {last_published}",
-  "ChannelItem.lastUpdated": "Updated {updated}",
-  "ChannelItem.resourceCount": "{count, plural,\n =1 {# resource}\n other {# resources}}",
-  "ChannelItem.unpublishedText": "Unpublished",
-  "ChannelItem.versionText": "Version {version}",
-  "ChannelItem.viewContent": "View channel on Kolibri",
-  "ChannelList.channel": "New channel",
+  "ChannelItem.editChannel": "Editar detalhes do canal",
+  "ChannelItem.goToWebsite": "Ir para o website de origem",
+  "ChannelItem.lastPublished": "Publicado em {last_published}",
+  "ChannelItem.lastUpdated": "Atualizado {updated}",
+  "ChannelItem.resourceCount": "{count, plural, one {}\n =1 {# recurso}\n other {# recursos}}",
+  "ChannelItem.unpublishedText": "Não publicado",
+  "ChannelItem.versionText": "Versão {version}",
+  "ChannelItem.viewContent": "Visualizar canal no Kolibri",
+  "ChannelList.channel": "Novo canal",
   "ChannelList.channelFilterLabel": "Canais",
-  "ChannelList.noChannelsFound": "No channels found",
-  "ChannelList.noMatchingChannels": "There are no matching channels",
-  "ChannelListAppError.channelPermissionsErrorDetails": "Sign in or ask the owner of this channel to give you permission to edit or view",
-  "ChannelListIndex.catalog": "Content Library",
-  "ChannelListIndex.channelSets": "Collections",
-  "ChannelListIndex.frequentlyAskedQuestions": "Frequently asked questions",
-  "ChannelListIndex.invitations": "You have {count, plural,\n =1 {# invitation}\n other {# invitations}}",
-  "ChannelListIndex.libraryTitle": "Kolibri Content Library Catalog",
-  "ChannelModal.APIText": "Channels generated automatically are not editable.",
+  "ChannelList.noChannelsFound": "Nenhum canal encontrado",
+  "ChannelList.noMatchingChannels": "Não há canais correspondentes",
+  "ChannelListAppError.channelPermissionsErrorDetails": "Faça o login ou peça ao proprietário deste canal que te dê permissão para editar ou visualizar",
+  "ChannelListIndex.catalog": "Biblioteca de conteúdo",
+  "ChannelListIndex.channelSets": "Conjuntos",
+  "ChannelListIndex.frequentlyAskedQuestions": "Perguntas frequentes",
+  "ChannelListIndex.invitations": "Você tem {count, plural, one {}\n =1 {# convite}\n other {# convites}}",
+  "ChannelListIndex.libraryTitle": "Catálogo da biblioteca de conteúdo do Kolibri",
+  "ChannelModal.APIText": "Os canais gerados automaticamente não são editáveis.",
   "ChannelModal.changesSaved": "Alterações salvas",
-  "ChannelModal.channelDescription": "Channel description",
-  "ChannelModal.channelError": "Field is required",
-  "ChannelModal.channelName": "Channel name",
-  "ChannelModal.closeButton": "Exit without saving",
+  "ChannelModal.channelDescription": "Descrição do canal",
+  "ChannelModal.channelError": "Campo obrigatório",
+  "ChannelModal.channelName": "Nome do canal",
+  "ChannelModal.closeButton": "Sair sem salvar",
   "ChannelModal.createButton": "Criar",
-  "ChannelModal.creatingHeader": "New channel",
-  "ChannelModal.details": "Channel details",
+  "ChannelModal.creatingHeader": "Novo canal",
+  "ChannelModal.details": "Detalhes do canal",
   "ChannelModal.editTab": "Detalhes",
-  "ChannelModal.keepEditingButton": "Keep editing",
-  "ChannelModal.notFoundError": "Channel does not exist",
+  "ChannelModal.keepEditingButton": "Continuar editando",
+  "ChannelModal.notFoundError": "O canal não existe",
   "ChannelModal.saveChangesButton": "Salvar alterações",
-  "ChannelModal.shareTab": "Sharing",
-  "ChannelModal.unauthorizedError": "You cannot edit this channel",
-  "ChannelModal.unsavedChangesHeader": "Unsaved changes",
-  "ChannelModal.unsavedChangesText": "You will lose any unsaved changes. Are you sure you want to exit?",
+  "ChannelModal.shareTab": "Compartilhando",
+  "ChannelModal.unauthorizedError": "Você não pode editar este canal",
+  "ChannelModal.unsavedChangesHeader": "Alterações não salvas",
+  "ChannelModal.unsavedChangesText": "Você perderá todas as alterações não salvas. Tem certeza que deseja sair?",
   "ChannelNotFoundError.backToHomeAction": "Voltar à página inicial",
-  "ChannelNotFoundError.channelNotFoundDetails": "This channel does not exist or may have been removed. Please contact us at content@learningequality.org if you think this is a mistake.",
+  "ChannelNotFoundError.channelNotFoundDetails": "Este canal não existe ou pode ter sido removido. Por favor, envie um e-mail para content@learningequality.org se achar que isto é um erro.",
   "ChannelNotFoundError.channelNotFoundHeader": "Canal não encontrado",
-  "ChannelSelectionList.noChannelsFound": "No channels found",
+  "ChannelSelectionList.noChannelsFound": "Nenhum canal encontrado",
   "ChannelSelectionList.searchText": "Buscar canal",
   "ChannelSetItem.cancel": "Cancelar",
-  "ChannelSetItem.delete": "Delete collection",
-  "ChannelSetItem.deleteChannelSetText": "Are you sure you want to delete this collection?",
-  "ChannelSetItem.deleteChannelSetTitle": "Delete collection",
-  "ChannelSetItem.edit": "Edit collection",
+  "ChannelSetItem.delete": "Excluir conjunto",
+  "ChannelSetItem.deleteChannelSetText": "Tem certeza que deseja excluir esta coleção?",
+  "ChannelSetItem.deleteChannelSetTitle": "Excluir conjunto",
+  "ChannelSetItem.edit": "Editar conjunto",
   "ChannelSetItem.options": "Opções",
-  "ChannelSetItem.saving": "Saving",
-  "ChannelSetList.aboutChannelSets": "About collections",
-  "ChannelSetList.aboutChannelSetsLink": "Learn about collections",
-  "ChannelSetList.addChannelSetTitle": "New collection",
+  "ChannelSetItem.saving": "Salvando",
+  "ChannelSetList.aboutChannelSets": "Sobre os conjuntos",
+  "ChannelSetList.aboutChannelSetsLink": "Saiba mais sobre os conjuntos",
+  "ChannelSetList.addChannelSetTitle": "Novo conjunto",
   "ChannelSetList.cancelButtonLabel": "Fechar",
-  "ChannelSetList.channelNumber": "Number of channels",
-  "ChannelSetList.channelSetsDescriptionText": "A collection contains multiple Kolibri Studio channels that can be imported at one time to Kolibri with a single collection token.",
-  "ChannelSetList.channelSetsDisclaimer": "You will need Kolibri version 0.12.0 or higher to import channel collections",
-  "ChannelSetList.channelSetsInstructionsText": "You can make a collection by selecting the channels you want to be imported together.",
-  "ChannelSetList.noChannelSetsFound": "You can package together multiple channels to create a collection. The entire collection can then be imported to Kolibri at once by using a collection token.",
+  "ChannelSetList.channelNumber": "Número de canais",
+  "ChannelSetList.channelSetsDescriptionText": "Um conjunto contém vários canais do Kolibri Studio que podem ser importados de uma vez ao Kolibri com um único token de conjunto.",
+  "ChannelSetList.channelSetsDisclaimer": "Você precisará da versão 0.12.0 ou superior do Kolibri para importar conjuntos de canais",
+  "ChannelSetList.channelSetsInstructionsText": "Você pode fazer um conjunto selecionando os canais que quer importar juntos.",
+  "ChannelSetList.noChannelSetsFound": "Você pode integrar vários canais para criar um conjunto. O conjunto inteiro pode então ser importado ao Kolibri de uma vez por meio de um token de conjunto.",
   "ChannelSetList.options": "Opções",
-  "ChannelSetList.title": "Collection name",
-  "ChannelSetList.token": "Token ID",
-  "ChannelSetModal.bookmark": "Starred",
-  "ChannelSetModal.channelAdded": "Channel added",
-  "ChannelSetModal.channelCountText": "{channelCount, plural, =0 {No published channels in your collection} =1 {# channel} other {# channels}}",
-  "ChannelSetModal.channelRemoved": "Channel removed",
-  "ChannelSetModal.channelSelectedCountText": "{channelCount, plural, =1 {# channel selected} other {# channels selected}}",
-  "ChannelSetModal.channels": "Collection channels",
-  "ChannelSetModal.closeButton": "Exit without saving",
-  "ChannelSetModal.collectionErrorText": "This collection does not exist",
-  "ChannelSetModal.createButton": "Create",
-  "ChannelSetModal.creatingChannelSet": "New collection",
-  "ChannelSetModal.edit": "My Channels",
-  "ChannelSetModal.finish": "Finish",
-  "ChannelSetModal.public": "Public",
-  "ChannelSetModal.publishedChannelsOnlyText": "Only published channels are available for selection",
-  "ChannelSetModal.removeText": "Remove",
-  "ChannelSetModal.saveButton": "Save and close",
-  "ChannelSetModal.selectChannelsHeader": "Select channels",
-  "ChannelSetModal.titleLabel": "Collection name",
-  "ChannelSetModal.titleRequiredText": "Field is required",
-  "ChannelSetModal.token": "Collection token",
-  "ChannelSetModal.tokenPrompt": "Copy this token into Kolibri to import this collection onto your device.",
-  "ChannelSetModal.unsavedChangesHeader": "Unsaved changes",
-  "ChannelSetModal.unsavedChangesText": "You will lose any unsaved changes. Are you sure you want to exit?",
-  "ChannelSetModal.view": "View-Only",
-  "ChannelSharing.alreadyHasAccessError": "User already has access to this channel",
-  "ChannelSharing.alreadyInvitedError": "User already invited",
-  "ChannelSharing.canEdit": "Can edit",
-  "ChannelSharing.canView": "Can view",
-  "ChannelSharing.emailLabel": "Email",
-  "ChannelSharing.emailRequiredMessage": "Email is required",
-  "ChannelSharing.invitationFailedError": "Invitation failed to send. Please try again",
-  "ChannelSharing.invitationSentMessage": "Invitation sent",
-  "ChannelSharing.inviteButton": "Send invitation",
-  "ChannelSharing.inviteSubheading": "Invite collaborators",
-  "ChannelSharing.validEmailMessage": "Please enter a valid email",
+  "ChannelSetList.title": "Nome do conjunto",
+  "ChannelSetList.token": "ID do token",
+  "ChannelSetModal.bookmark": "Favoritos",
+  "ChannelSetModal.channelAdded": "Canal adicionado",
+  "ChannelSetModal.channelCountText": "{channelCount, plural, one {} =0 {Não há canais publicados no seu conjunto} =1 {# canal} other {# canais}}",
+  "ChannelSetModal.channelRemoved": "Canal removido",
+  "ChannelSetModal.channelSelectedCountText": "{channelCount, plural, one {} =1 {# canal selecionado} other {# canais selecionados}}",
+  "ChannelSetModal.channels": "Canais do conjunto",
+  "ChannelSetModal.closeButton": "Sair sem salvar",
+  "ChannelSetModal.collectionErrorText": "Este conjunto não existe",
+  "ChannelSetModal.createButton": "Criar",
+  "ChannelSetModal.creatingChannelSet": "Novo conjunto",
+  "ChannelSetModal.edit": "Meus canais",
+  "ChannelSetModal.finish": "Finalizar",
+  "ChannelSetModal.public": "Publicar",
+  "ChannelSetModal.publishedChannelsOnlyText": "Apenas canais publicados estão disponíveis para seleção",
+  "ChannelSetModal.removeText": "Remover",
+  "ChannelSetModal.saveButton": "Salvar e fechar",
+  "ChannelSetModal.selectChannelsHeader": "Selecionar canais",
+  "ChannelSetModal.titleLabel": "Nome do conjunto",
+  "ChannelSetModal.titleRequiredText": "Campo obrigatório",
+  "ChannelSetModal.token": "Token do conjunto",
+  "ChannelSetModal.tokenPrompt": "Copie este token no Kolibri para importar este conjunto ao seu dispositivo.",
+  "ChannelSetModal.unsavedChangesHeader": "Alterações não salvas",
+  "ChannelSetModal.unsavedChangesText": "Você perderá todas as alterações não salvas. Tem certeza que deseja sair?",
+  "ChannelSetModal.view": "Apenas modo de leitura",
+  "ChannelSharing.alreadyHasAccessError": "O usuário já tem acesso a este canal",
+  "ChannelSharing.alreadyInvitedError": "Usuário já convidado",
+  "ChannelSharing.canEdit": "Pode editar",
+  "ChannelSharing.canView": "Pode visualizar",
+  "ChannelSharing.emailLabel": "E-mail",
+  "ChannelSharing.emailRequiredMessage": "O e-mail é obrigatório",
+  "ChannelSharing.invitationFailedError": "Falha ao enviar convite. Por favor, tente novamente",
+  "ChannelSharing.invitationSentMessage": "Convite enviado",
+  "ChannelSharing.inviteButton": "Enviar convite",
+  "ChannelSharing.inviteSubheading": "Convidar colaboradores",
+  "ChannelSharing.validEmailMessage": "Por favor, digite um e-mail válido",
   "ChannelSharingTable.cancelButton": "Cancelar",
-  "ChannelSharingTable.currentUserText": "{first_name} {last_name} (you)",
-  "ChannelSharingTable.deleteInvitation": "Delete invitation",
-  "ChannelSharingTable.deleteInvitationConfirm": "Delete invitation",
-  "ChannelSharingTable.deleteInvitationHeader": "Delete invitation",
-  "ChannelSharingTable.deleteInvitationText": "Are you sure you would like to delete the invitation for {email}?",
-  "ChannelSharingTable.editPermissionsGrantedMessage": "Edit permissions granted",
-  "ChannelSharingTable.editorsSubheading": "{count, plural,\n =1 {# user who can edit}\n other {# users who can edit}}",
-  "ChannelSharingTable.guestText": "Guest",
-  "ChannelSharingTable.invitationDeletedMessage": "Invitation deleted",
-  "ChannelSharingTable.invitationFailedError": "Invitation failed to resend. Please try again",
-  "ChannelSharingTable.invitationSentMessage": "Invitation sent",
-  "ChannelSharingTable.invitePendingText": "Invite pending",
-  "ChannelSharingTable.makeEditor": "Grant edit permissions",
-  "ChannelSharingTable.makeEditorConfirm": "Yes, grant permissions",
-  "ChannelSharingTable.makeEditorHeader": "Grant edit permissions",
-  "ChannelSharingTable.makeEditorText": "Are you sure you would like to grant edit permissions to {first_name} {last_name}?",
-  "ChannelSharingTable.noUsersText": "No users found",
+  "ChannelSharingTable.currentUserText": "{first_name} {last_name} (você)",
+  "ChannelSharingTable.deleteInvitation": "Excluir convite",
+  "ChannelSharingTable.deleteInvitationConfirm": "Excluir convite",
+  "ChannelSharingTable.deleteInvitationHeader": "Excluir convite",
+  "ChannelSharingTable.deleteInvitationText": "Tem certeza que deseja excluir o convite para {email}?",
+  "ChannelSharingTable.editPermissionsGrantedMessage": "Permissões de edição concedidos",
+  "ChannelSharingTable.editorsSubheading": "{count, plural, one {}\n =1 {# usuário que pode editar}\n other {# usuários que podem editar}}",
+  "ChannelSharingTable.guestText": "Convidado",
+  "ChannelSharingTable.invitationDeletedMessage": "Convite excluído",
+  "ChannelSharingTable.invitationFailedError": "Falha ao reenviar convite. Por favor, tente novamente",
+  "ChannelSharingTable.invitationSentMessage": "Convite enviado",
+  "ChannelSharingTable.invitePendingText": "Convite pendente",
+  "ChannelSharingTable.makeEditor": "Conceder permissões de edição",
+  "ChannelSharingTable.makeEditorConfirm": "Sim, conceder permissões",
+  "ChannelSharingTable.makeEditorHeader": "Conceder permissões de edição",
+  "ChannelSharingTable.makeEditorText": "Tem certeza que deseja conceder permissões de edição a {first_name} {last_name}?",
+  "ChannelSharingTable.noUsersText": "Nenhum usuário encontrado",
   "ChannelSharingTable.optionsDropdown": "Opções",
-  "ChannelSharingTable.removeViewer": "Revoke view permissions",
-  "ChannelSharingTable.removeViewerConfirm": "Yes, revoke",
-  "ChannelSharingTable.removeViewerHeader": "Revoke view permissions",
-  "ChannelSharingTable.removeViewerText": "Are you sure you would like to revoke view permissions for {first_name} {last_name}?",
-  "ChannelSharingTable.resendInvitation": "Resend invitation",
-  "ChannelSharingTable.userRemovedMessage": "User removed",
-  "ChannelSharingTable.viewersSubheading": "{count, plural,\n =1 {# user who can view}\n other {# users who can view}}",
-  "ChannelStar.star": "Add to starred channels",
-  "ChannelStar.starred": "Added to starred channels",
-  "ChannelStar.unstar": "Remove from starred channels",
-  "ChannelStar.unstarred": "Removed from starred channels",
+  "ChannelSharingTable.removeViewer": "Revogar permissões de visualização",
+  "ChannelSharingTable.removeViewerConfirm": "Sim, revogar",
+  "ChannelSharingTable.removeViewerHeader": "Revogar permissões de visualização",
+  "ChannelSharingTable.removeViewerText": "Tem certeza que deseja revogar as permissões de visualização de {first_name} {last_name}?",
+  "ChannelSharingTable.resendInvitation": "Reenviar convite",
+  "ChannelSharingTable.userRemovedMessage": "Usuário removido",
+  "ChannelSharingTable.viewersSubheading": "{count, plural, one {}\n =1 {# usuário que pode visualizar}\n other {# usuários que podem visualizar}}",
+  "ChannelStar.star": "Adicionar aos canais favoritos",
+  "ChannelStar.starred": "Adicionado aos canais favoritos",
+  "ChannelStar.unstar": "Remover dos canais favoritos",
+  "ChannelStar.unstarred": "Removido dos canais favoritos",
   "ChannelThumbnail.cancel": "Cancelar",
-  "ChannelThumbnail.crop": "Crop",
-  "ChannelThumbnail.croppingPrompt": "Drag image to reframe",
-  "ChannelThumbnail.defaultFilename": "File",
-  "ChannelThumbnail.noThumbnail": "No thumbnail",
+  "ChannelThumbnail.crop": "Recortar",
+  "ChannelThumbnail.croppingPrompt": "Arraste a imagem para reenquadrar",
+  "ChannelThumbnail.defaultFilename": "Arquivo",
+  "ChannelThumbnail.noThumbnail": "Sem miniatura",
   "ChannelThumbnail.remove": "Remover",
-  "ChannelThumbnail.retryUpload": "Retry upload",
+  "ChannelThumbnail.retryUpload": "Tentar o envio novamente",
   "ChannelThumbnail.save": "Salvar",
-  "ChannelThumbnail.upload": "Upload image",
-  "ChannelThumbnail.uploadFailed": "Upload failed",
-  "ChannelThumbnail.uploadingThumbnail": "Uploading",
-  "ChannelThumbnail.zoomIn": "Zoom in",
-  "ChannelThumbnail.zoomOut": "Zoom out",
+  "ChannelThumbnail.upload": "Enviar imagem",
+  "ChannelThumbnail.uploadFailed": "Falha ao enviar",
+  "ChannelThumbnail.uploadingThumbnail": "Enviando",
+  "ChannelThumbnail.zoomIn": "Aumentar zoom",
+  "ChannelThumbnail.zoomOut": "Diminuir zoom",
   "ChannelTokenModal.close": "Fechar",
-  "ChannelTokenModal.copyTitle": "Copy channel token",
-  "ChannelTokenModal.copyTokenInstructions": "Paste this token into Kolibri to import this channel",
-  "Clipboard.backToClipboard": "Clipboard",
+  "ChannelTokenModal.copyTitle": "Copiar token do canal",
+  "ChannelTokenModal.copyTokenInstructions": "Cole este token no Kolibri para importar este canal",
+  "Clipboard.backToClipboard": "Área de transferência",
   "Clipboard.cancel": "Cancelar",
   "Clipboard.close": "Fechar",
-  "Clipboard.copiedItemsToClipboard": "Copied in clipboard",
-  "Clipboard.creatingClipboardCopies": "Copying in clipboard...",
+  "Clipboard.copiedItemsToClipboard": "Copiado para a área de transferência",
+  "Clipboard.creatingClipboardCopies": "Copiando para a área de transferência...",
   "Clipboard.deleteSelectedButton": "Excluir",
-  "Clipboard.duplicateSelectedButton": "Make a copy",
-  "Clipboard.emptyDefaultText": "Use the clipboard to copy resources and move them to other topics and channels",
-  "Clipboard.emptyDefaultTitle": "No resources in your clipboard",
+  "Clipboard.duplicateSelectedButton": "Fazer uma cópia",
+  "Clipboard.emptyDefaultText": "Use a área de transferência para copiar conteúdos e movê-los a outros temas e canais",
+  "Clipboard.emptyDefaultTitle": "Não há conteúdos na sua área de transferência",
   "Clipboard.moveSelectedButton": "Mover",
-  "Clipboard.removedFromClipboard": "Deleted from clipboard",
-  "Clipboard.removingItems": "Deleting from clipboard...",
+  "Clipboard.removedFromClipboard": "Apagado da área de transferência",
+  "Clipboard.removingItems": "Excluindo da área de transferência...",
   "Clipboard.selectAll": "Selecionar todos",
   "Clipboard.undo": "Desfazer",
-  "CommunityStandardsModal.coreValuesLink": "Learn more about Learning Equality's core values",
-  "CommunityStandardsModal.description": "Learning Equality is a nonprofit organization dedicated to enabling equitable access to quality educational experiences. Along with our statement of Core Values, these Community Standards are intended to foster a supportive and inclusive environment for our users.",
-  "CommunityStandardsModal.libraryDescription": "The Kolibri Library is both a grassroots and curated effort to provide a wide variety of materials for all learners and learning purposes. To help us achieve these goals, we invite you to use Kolibri Studio in ways that:",
-  "CommunityStandardsModal.libraryItem1": "Model good practices in open sharing and respect copyright. Create an ethical sharing community by labeling licenses, making sure you know the appropriate licenses for what you upload, and ensuring that appropriate written permissions are documented if needed. Studio is primarily designed to host materials which are openly licensed or come with special permissions for re-distribution and reproduction.",
-  "CommunityStandardsModal.libraryItem2": "Keep materials clear, organized, and usable. We welcome resources created at all levels of production! To help them reach as many learners as possible, we invite you to fully utilize all metadata fields and aim for quality in comprehensibility, legibility, or digitization such that the content is usable and understandable.",
-  "CommunityStandardsModal.libraryItem3": "Respect the community. Avoid obscenity and vulgarity, beyond specific educational purposes they might serve in some contexts. Hate speech of any kind, or promotion of violence or discrimination, will never be tolerated.",
-  "CommunityStandardsModal.libraryItem4": "Kolibri Studio is for educational purposes only. It is not intended to be used for non-educational purposes such as recruitment, indoctrination, advertisement, file sharing, or personal media hosting.",
-  "CommunityStandardsModal.studioDescription": "Kolibri Studio gives you access to the Kolibri Library, a growing library of educational materials, which we encourage you to use as your own. We built Kolibri Studio to help you prepare educational materials in a variety of ways, including but not limited to:",
-  "CommunityStandardsModal.studioItem1": "Browsing. Selecting appropriate educational materials for your situation from the Kolibri Library, the listing of sources available on the public channels page in Kolibri Studio",
-  "CommunityStandardsModal.studioItem2": "Curating. Reorganizing the materials in these channels by selecting, deleting, and reordering appropriate items",
-  "CommunityStandardsModal.studioItem3": "Sharing. Creating and publishing new channels with what you find, either to share with your own implementations privately or to share with others on Kolibri Studio.",
-  "CommunityStandardsModal.studioItem4": "Modifying & Creating. Adding your own assessment exercises to any existing materials",
-  "CommunityStandardsModal.studioItem5": "Hosting. Uploading your own materials (limited to materials you know are appropriately licensed to do so) from a local hard drive or other locations on the internet",
-  "ConstantStrings.All Rights Reserved": "All Rights Reserved",
-  "ConstantStrings.All Rights Reserved_description": "The All Rights Reserved License indicates that the copyright holder reserves, or holds for their own use, all the rights provided by copyright law under one specific copyright treaty.",
+  "CommunityStandardsModal.communityStandardsHeader": "Normas comunitárias",
+  "CommunityStandardsModal.coreValuesLink": "Saiba mais sobre os valores fundamentais da Learning Equality",
+  "CommunityStandardsModal.description": "A Learning Equality é uma organização sem fins lucrativos dedicada a possibilitar o acesso igualitário a experiências de educação de qualidade. Junto à nossa declaração de valores fundamentais, estas normas comunitárias pretendem promover um ambiente solidário e inclusivo para nossos usuários.",
+  "CommunityStandardsModal.libraryDescription": "A biblioteca do Kolibri é tanto um esforço curado como popular para fornecer uma ampla variedade de materiais para todos os estudantes e propósitos de aprendizagem. Para nos ajudar a atingir estes objetivos, te convidamos a usar o Kolibri Studio de forma que:",
+  "CommunityStandardsModal.libraryItem1": "Modele práticas recomendadas em compartilhamento aberto e respeite direitos autorais. Crie uma comunidade artificial de compartilhamento ao rotular licenças, certificando-se de que conheça as licenças apropriadas para o que envia, e garantindo que permissões escritas apropriadas sejam documentadas se necessário. O Studio é feito principalmente para hospedar materiais que possuem licença aberta ou vêm com permissões especiais para redistribuição e reprodução.",
+  "CommunityStandardsModal.libraryItem2": "Mantenha os materiais claros, organizados e utilizáveis. Acolhemos conteúdos criados em todos os níveis de produção! Para ajudá-los a alcançar o máximo de estudantes possível, te convidamos a usar por completo todos os campos de metadados e visar a qualidade na inteligibilidade, legibilidade, ou digitalização, de forma que o conteúdo seja utilizável e compreensível.",
+  "CommunityStandardsModal.libraryItem3": "Respeite a comunidade. Evite obscenidades e vulgaridades, com exceção de alguns contextos e por propósitos educacionais específicos em que podem ser úteis. Jamais serão tolerados discursos de ódio de qualquer tipo, bem como incitação à violência ou discriminação.",
+  "CommunityStandardsModal.libraryItem4": "O Kolibri Studio é apenas para propósitos educacionais. Não foi feito para ser usado para propósitos não educacionais como recrutamento, doutrinamento, propaganda, compartilhamento de arquivos, ou hospedagem de mídias pessoais.",
+  "CommunityStandardsModal.studioDescription": "O Kolibri Studio te dá acesso à biblioteca do Kolibri, uma biblioteca crescente de materiais educacionais, a qual encorajamos que você use como se fosse sua. Construímos o Kolibri Studio para te ajudar a preparar materiais educacionais de diversas maneiras, incluindo, mas não se limitando a:",
+  "CommunityStandardsModal.studioItem1": "Navegação. Selecionar materiais educacionais da biblioteca do Kolibri que sejam adequados à sua situação, a listagem disponível na página dos canais públicos no Kolibri Studio",
+  "CommunityStandardsModal.studioItem2": "Curadoria. Reorganizar os materiais nestes canais ao selecionar, excluir, e reordenar itens apropriados",
+  "CommunityStandardsModal.studioItem3": "Compartilhamento. Criar e publicar novos canais com o que você encontrar, seja para compartilhar com as suas próprias implementações de forma privada ou compartilhar com outros no Kolibri Studio.",
+  "CommunityStandardsModal.studioItem4": "Modificação e criação. Adicionar seus próprios exercícios avaliativos a qualquer material existente",
+  "CommunityStandardsModal.studioItem5": "Hospedagem. Enviar seus próprios materiais (limitado a materiais que você sabe serem licenciados de forma apropriada) para um disco rígido local ou outras localidades na internet",
+  "ConstantStrings.All Rights Reserved": "Todos os direitos reservados",
+  "ConstantStrings.All Rights Reserved_description": "A licença de todos os direitos reservados indica que o detentor dos direitos autorais reserva-se, ou mantém para si o uso, de todos os direitos providos pela lei de direitos autorais sob um único acordo de direitos autorais.",
   "ConstantStrings.CC BY": "CC BY",
   "ConstantStrings.CC BY-NC": "CC BY-NC",
   "ConstantStrings.CC BY-NC-ND": "CC BY-NC-ND",
-  "ConstantStrings.CC BY-NC-ND_description": "The Attribution-NonCommercial-NoDerivs License is the most restrictive of our six main licenses, only allowing others to download your works and share them with others as long as they credit you, but they can't change them in any way or use them commercially.",
+  "ConstantStrings.CC BY-NC-ND_description": "A licença de Atribuição-NãoComercial-SemDerivações é a mais restritiva das nossas seis principais licenças, permitindo apenas que outros baixem seus trabalhos e os compartilhem com outros desde que te deem crédito, mas não podem alterá-los ou usá-los comercialmente.",
   "ConstantStrings.CC BY-NC-SA": "CC BY-NC-SA",
-  "ConstantStrings.CC BY-NC-SA_description": "The Attribution-NonCommercial-ShareAlike License lets others remix, tweak, and build upon your work non-commercially, as long as they credit you and license their new creations under the identical terms.",
-  "ConstantStrings.CC BY-NC_description": "The Attribution-NonCommercial License lets others remix, tweak, and build upon your work non-commercially, and although their new works must also acknowledge you and be non-commercial, they don't have to license their derivative works on the same terms.",
+  "ConstantStrings.CC BY-NC-SA_description": "A licença de Atribuição-NãoComercial-CompartilhaIgual permite que outros remixem, ajustem e se baseiem no seu trabalho não comercialmente, desde que te deem crédito e licenciem suas novas criações sob os mesmos termos.",
+  "ConstantStrings.CC BY-NC_description": "A licença de Atribuição-NãoComercial permite que outros remixem, ajustem e se baseiem no seu trabalho não comercialmente, e embora os seus novos trabalhos devam também te reconhecer e serem não comerciais, não precisam licenciar os seus trabalhos derivados sob os mesmos termos.",
   "ConstantStrings.CC BY-ND": "CC BY-ND",
-  "ConstantStrings.CC BY-ND_description": "The Attribution-NoDerivs License allows for redistribution, commercial and non-commercial, as long as it is passed along unchanged and in whole, with credit to you.",
+  "ConstantStrings.CC BY-ND_description": "A licença de Atribuição-SemDerivações permite redistribuição, comercial ou não comercial, desde que seja feita sem modificações e por inteiro, com os créditos a você.",
   "ConstantStrings.CC BY-SA": "CC BY-SA",
-  "ConstantStrings.CC BY-SA_description": "The Attribution-ShareAlike License lets others remix, tweak, and build upon your work even for commercial purposes, as long as they credit you and license their new creations under the identical terms. This license is often compared to \"copyleft\" free and open source software licenses. All new works based on yours will carry the same license, so any derivatives will also allow commercial use. This is the license used by Wikipedia, and is recommended for materials that would benefit from incorporating content from Wikipedia and similarly licensed projects.",
-  "ConstantStrings.CC BY_description": "The Attribution License lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials.",
-  "ConstantStrings.Public Domain": "Public Domain",
-  "ConstantStrings.Public Domain_description": "Public Domain work has been identified as being free of known restrictions under copyright law, including all related and neighboring rights.",
-  "ConstantStrings.Special Permissions": "Special Permissions",
-  "ConstantStrings.Special Permissions_description": "Special Permissions is a custom license to use when the current licenses do not apply to the content. The owner of this license is responsible for creating a description of what this license entails.",
-  "ConstantStrings.audio": "Audio",
-  "ConstantStrings.audio_thumbnail": "Thumbnail",
-  "ConstantStrings.bookmark": "Starred",
-  "ConstantStrings.coach": "Coaches",
-  "ConstantStrings.do_all": "100% correct",
-  "ConstantStrings.do_all_description": "Learner must answer all questions in the exercise correctly (not recommended for long exercises)",
-  "ConstantStrings.document": "Document",
-  "ConstantStrings.document_thumbnail": "Thumbnail",
-  "ConstantStrings.edit": "My channels",
-  "ConstantStrings.epub": "EPub document",
-  "ConstantStrings.exercise": "Exercise",
-  "ConstantStrings.exercise_thumbnail": "Thumbnail",
-  "ConstantStrings.firstCopy": "Copy of {title}",
-  "ConstantStrings.gif": "GIF image",
-  "ConstantStrings.h5p": "H5P App",
-  "ConstantStrings.high_res_video": "High resolution",
-  "ConstantStrings.html5": "HTML5 App",
-  "ConstantStrings.html5_thumbnail": "Thumbnail",
-  "ConstantStrings.html5_zip": "HTML5 zip",
-  "ConstantStrings.input_question": "Numeric input",
-  "ConstantStrings.jpeg": "JPEG image",
-  "ConstantStrings.jpg": "JPG image",
+  "ConstantStrings.CC BY-SA_description": "A licença de Atribuição-CompartilhaIgual permite que outros remixem, ajustem e se baseiem no seu trabalho, mesmo que por motivos comerciais, desde que te deem crédito e licenciem suas novas criações sob os mesmos termos. Essa licença é frequentemente comparada às de software livre, como as de \"copyleft\" e de código aberto. Todos os novos trabalhos baseados no seu terão a mesma licença, então quaisquer derivativos também permitirão o uso comercial. Essa é a licença usada pelo Wikipedia e é recomendada para materiais que se beneficiariam de incorporarem conteúdo do Wikipedia e de outros projetos similarmente licenciados.",
+  "ConstantStrings.CC BY_description": "A licença de Atribuição permite que outros distribuam, remixem, ajustem e se baseiem no seu trabalho, até comercialmente, desde que te deem crédito pela criação original. É o tipo de licença mais flexível oferecido. Recomendado para o máximo de divulgação e uso dos materiais licenciados.",
+  "ConstantStrings.Public Domain": "Domínio público",
+  "ConstantStrings.Public Domain_description": "Um trabalho de domínio público é identificado como livre das restrições correntes sob a lei de direitos autorais, incluindo todos os direitos relacionados e afins.",
+  "ConstantStrings.Special Permissions": "Permissões especiais",
+  "ConstantStrings.Special Permissions_description": "A licença personalizada de Permissões Especiais é usada quando as licenças atuais não se aplicarem ao conteúdo. O detentor dessa licença é responsável por criar a descrição do que ela pressupõe.",
+  "ConstantStrings.audio": "Áudio",
+  "ConstantStrings.audio_thumbnail": "Miniatura",
+  "ConstantStrings.bookmark": "Favoritos",
+  "ConstantStrings.coach": "Professores",
+  "ConstantStrings.do_all": "100% correto",
+  "ConstantStrings.do_all_description": "Estudantes devem responder corretamente a todas as perguntas no exercício (não recomendado para exercícios longos)",
+  "ConstantStrings.document": "Documento",
+  "ConstantStrings.document_thumbnail": "Miniatura",
+  "ConstantStrings.edit": "Meus canais",
+  "ConstantStrings.epub": "Documento EPUB",
+  "ConstantStrings.exercise": "Exercício",
+  "ConstantStrings.exercise_thumbnail": "Miniatura",
+  "ConstantStrings.firstCopy": "Cópia de {title}",
+  "ConstantStrings.gif": "Imagem GIF",
+  "ConstantStrings.h5p": "Aplicativo H5P",
+  "ConstantStrings.high_res_video": "Alta resolução",
+  "ConstantStrings.html5": "Aplicativo HTML5",
+  "ConstantStrings.html5_thumbnail": "Miniatura",
+  "ConstantStrings.html5_zip": "Zip HTML5",
+  "ConstantStrings.input_question": "Entrada numérica",
+  "ConstantStrings.jpeg": "Imagem JPEG",
+  "ConstantStrings.jpg": "Imagem JPG",
   "ConstantStrings.json": "JSON",
-  "ConstantStrings.learner": "Anyone",
-  "ConstantStrings.low_res_video": "Low resolution",
-  "ConstantStrings.m_of_n": "M of N...",
-  "ConstantStrings.m_of_n_description": "Learner must answer M questions correctly from the last N answered questions. For example, ‘3 of 5’ means learners must answer 3 questions correctly out of the 5 most recently answered.",
-  "ConstantStrings.mp3": "MP3 audio",
-  "ConstantStrings.mp4": "MP4 video",
-  "ConstantStrings.webm": "WEBM video",
-  "ConstantStrings.multiple_selection": "Multiple choice",
-  "ConstantStrings.nthCopy": "Copy {n, number, integer} of {title}",
-  "ConstantStrings.num_correct_in_a_row_10": "10 in a row",
-  "ConstantStrings.num_correct_in_a_row_10_description": "Learner must answer 10 questions in a row correctly",
-  "ConstantStrings.num_correct_in_a_row_2": "2 in a row",
-  "ConstantStrings.num_correct_in_a_row_2_description": "Learner must answer 2 questions in a row correctly",
-  "ConstantStrings.num_correct_in_a_row_3": "3 in a row",
-  "ConstantStrings.num_correct_in_a_row_3_description": "Learner must answer 3 questions in a row correctly",
-  "ConstantStrings.num_correct_in_a_row_5": "5 in a row",
-  "ConstantStrings.num_correct_in_a_row_5_description": "Learner must answer 5 questions in a row correctly",
-  "ConstantStrings.pdf": "PDF document",
-  "ConstantStrings.perseus": "Perseus Exercise",
-  "ConstantStrings.perseus_question": "Khan Academy question",
-  "ConstantStrings.png": "PNG image",
-  "ConstantStrings.public": "Content library",
-  "ConstantStrings.single_selection": "Single choice",
-  "ConstantStrings.slideshow": "Slideshow",
-  "ConstantStrings.svg": "SVG image",
-  "ConstantStrings.topic": "Topic",
-  "ConstantStrings.topic_thumbnail": "Thumbnail",
-  "ConstantStrings.true_false": "True/False",
-  "ConstantStrings.unknown_question": "Unknown question type",
-  "ConstantStrings.video": "Video",
-  "ConstantStrings.video_subtitle": "Captions",
-  "ConstantStrings.video_thumbnail": "Thumbnail",
-  "ConstantStrings.view": "View-only",
-  "ConstantStrings.vtt": "VTT caption",
-  "ConstantStrings.zip": "HTML5 zip",
+  "ConstantStrings.learner": "Qualquer um",
+  "ConstantStrings.low_res_video": "Baixa resolução",
+  "ConstantStrings.m_of_n": "M de N...",
+  "ConstantStrings.m_of_n_description": "Estudantes precisam responder corretamente M perguntas das últimas N respondidas. Por exemplo, '3 de 5' significa que estudantes precisam responder corretamente 3 perguntas das 5 mais recentes.",
+  "ConstantStrings.mp3": "Áudio MP3",
+  "ConstantStrings.mp4": "Vídeo MP4",
+  "ConstantStrings.multiple_selection": "Múltipla escolha",
+  "ConstantStrings.nthCopy": "Copiar {n, number, integer} de {title}",
+  "ConstantStrings.num_correct_in_a_row_10": "10 seguidas",
+  "ConstantStrings.num_correct_in_a_row_10_description": "Estudantes devem responder corretamente a 10 perguntas seguidas",
+  "ConstantStrings.num_correct_in_a_row_2": "2 seguidas",
+  "ConstantStrings.num_correct_in_a_row_2_description": "Estudantes devem responder corretamente a 2 perguntas seguidas",
+  "ConstantStrings.num_correct_in_a_row_3": "3 seguidas",
+  "ConstantStrings.num_correct_in_a_row_3_description": "Estudantes devem responder corretamente a 3 perguntas seguidas",
+  "ConstantStrings.num_correct_in_a_row_5": "5 seguidas",
+  "ConstantStrings.num_correct_in_a_row_5_description": "Estudantes devem responder corretamente a 5 perguntas seguidas",
+  "ConstantStrings.pdf": "Documento PDF",
+  "ConstantStrings.perseus": "Exercício Perseus",
+  "ConstantStrings.perseus_question": "Pergunta da Khan Academy",
+  "ConstantStrings.png": "Imagem PNG",
+  "ConstantStrings.public": "Biblioteca de conteúdo",
+  "ConstantStrings.single_selection": "Única escolha",
+  "ConstantStrings.slideshow": "Apresentação",
+  "ConstantStrings.svg": "Imagem SVG",
+  "ConstantStrings.topic": "Tema",
+  "ConstantStrings.topic_thumbnail": "Miniatura",
+  "ConstantStrings.true_false": "Verdadeiro/Falso",
+  "ConstantStrings.unknown_question": "Tipo de pergunta desconhecido",
+  "ConstantStrings.video": "Vídeo",
+  "ConstantStrings.video_subtitle": "Legendas",
+  "ConstantStrings.video_thumbnail": "Miniatura",
+  "ConstantStrings.view": "Apenas modo de leitura",
+  "ConstantStrings.vtt": "Legenda VTT",
+  "ConstantStrings.zip": "Zip HTML5",
   "ContentDefaults.aggregator": "Agregador",
   "ContentDefaults.author": "Autor",
   "ContentDefaults.copyrightHolder": "Detentor dos direitos autorais",
-  "ContentDefaults.defaultsSubTitle": "New resources will be automatically given these values",
-  "ContentDefaults.defaultsTitle": "Default copyright settings for new resources (optional)",
+  "ContentDefaults.defaultsSubTitle": "Estes valores serão automaticamente atribuídos aos novos conteúdos",
+  "ContentDefaults.defaultsTitle": "Configuração padrão dos direitos autorais para novos conteúdos (opcional)",
   "ContentDefaults.documents": "Documentos",
-  "ContentDefaults.html5": "HTML5 apps",
+  "ContentDefaults.html5": "Aplicativos HTML5",
   "ContentDefaults.license": "Licença",
-  "ContentDefaults.licenseDescription": "License description",
-  "ContentDefaults.noLicense": "No license selected",
+  "ContentDefaults.licenseDescription": "Descrição da licença",
+  "ContentDefaults.noLicense": "Nenhuma licença selecionada",
   "ContentDefaults.provider": "Provedor",
-  "ContentDefaults.thumbnailsTitle": "Automatically generate thumbnails for the following resource types",
+  "ContentDefaults.thumbnailsTitle": "Gerar automaticamente miniaturas para os seguintes tipos de conteúdo",
   "ContentDefaults.videos": "Vídeos",
-  "ContentNodeChangedIcon.containsNew": "Contains unpublished resources",
-  "ContentNodeChangedIcon.containsNewAndUpdated": "Contains unpublished resources and changes",
-  "ContentNodeChangedIcon.containsUpdated": "Contains unpublished changes",
-  "ContentNodeChangedIcon.isNewResource": "Unpublished",
-  "ContentNodeChangedIcon.isNewTopic": "Unpublished topic",
-  "ContentNodeChangedIcon.isUpdatedResource": "Updated since last publish",
-  "ContentNodeChangedIcon.isUpdatedTopic": "Topic has been updated since last publish",
+  "ContentNodeChangedIcon.containsNew": "Contém conteúdos não publicados",
+  "ContentNodeChangedIcon.containsNewAndUpdated": "Contém alterações e conteúdos não publicados",
+  "ContentNodeChangedIcon.containsUpdated": "Contém alterações não publicadas",
+  "ContentNodeChangedIcon.isNewResource": "Não publicado",
+  "ContentNodeChangedIcon.isNewTopic": "Tema não publicado",
+  "ContentNodeChangedIcon.isUpdatedResource": "Atualizado desde a última publicação",
+  "ContentNodeChangedIcon.isUpdatedTopic": "O tema foi atualizado desde a última publicação",
   "ContentNodeEditListItem.optionsTooltip": "Opções",
   "ContentNodeIcon.audio": "Áudio",
   "ContentNodeIcon.document": "Documento",
   "ContentNodeIcon.exercise": "Exercício",
-  "ContentNodeIcon.html5": "HTML5 App",
+  "ContentNodeIcon.html5": "Aplicativo HTML5",
   "ContentNodeIcon.slideshow": "Apresentação",
   "ContentNodeIcon.topic": "Tema",
-  "ContentNodeIcon.unsupported": "Unsupported",
+  "ContentNodeIcon.unsupported": "Não suportado",
   "ContentNodeIcon.video": "Vídeo",
-  "ContentNodeListItem.coachTooltip": "Resource for coaches",
-  "ContentNodeListItem.copyingTask": "Copying",
-  "ContentNodeListItem.hasCoachTooltip": "{value, number, integer} {value, plural, one {resource for coaches} other {resources for coaches}}",
-  "ContentNodeListItem.openTopic": "Open topic",
+  "ContentNodeListItem.coachTooltip": "Material para professores",
+  "ContentNodeListItem.copyingTask": "Copiando",
+  "ContentNodeListItem.hasCoachTooltip": "{value, number, integer} {value, plural, one {material para professores} other {materiais para professores}}",
+  "ContentNodeListItem.openTopic": "Abrir tema",
   "ContentNodeListItem.questions": "{value, number, integer} {value, plural, one {pergunta} other {perguntas}}",
   "ContentNodeListItem.resources": "{value, number, integer} {value, plural, one {recurso} other {recursos}}",
   "ContentNodeOptions.cancel": "Cancelar",
-  "ContentNodeOptions.copiedItemsToClipboard": "Copied in clipboard",
+  "ContentNodeOptions.copiedItemsToClipboard": "Copiado para a área de transferência",
   "ContentNodeOptions.copiedToClipboardSnackbar": "Copiado para a área de transferência",
   "ContentNodeOptions.copyToClipboard": "Copiar para área de transferência",
-  "ContentNodeOptions.creatingClipboardCopies": "Copying to clipboard...",
-  "ContentNodeOptions.creatingCopies": "Copying...",
+  "ContentNodeOptions.creatingClipboardCopies": "Copiando para área de transferência...",
+  "ContentNodeOptions.creatingCopies": "Copiando...",
   "ContentNodeOptions.editDetails": "Editar detalhes",
-  "ContentNodeOptions.editTopicDetails": "Edit topic details",
-  "ContentNodeOptions.goToOriginalLocation": "Go to original location",
-  "ContentNodeOptions.makeACopy": "Make a copy",
+  "ContentNodeOptions.editTopicDetails": "Editar detalhes do tema",
+  "ContentNodeOptions.goToOriginalLocation": "Ir para a localização de origem",
+  "ContentNodeOptions.makeACopy": "Fazer uma cópia",
   "ContentNodeOptions.move": "Mover",
-  "ContentNodeOptions.moveTo": "Move to...",
-  "ContentNodeOptions.newSubtopic": "New topic",
+  "ContentNodeOptions.moveTo": "Mover para...",
+  "ContentNodeOptions.newSubtopic": "Novo tema",
   "ContentNodeOptions.remove": "Remover",
-  "ContentNodeOptions.removedFromClipboard": "Deleted from clipboard",
-  "ContentNodeOptions.removedItems": "Sent to trash",
-  "ContentNodeOptions.removingItems": "Deleting from clipboard...",
-  "ContentNodeOptions.topicDefaultTitle": "{title} topic",
+  "ContentNodeOptions.removedFromClipboard": "Excluído da área de transferência",
+  "ContentNodeOptions.removedItems": "Enviado para a lixeira",
+  "ContentNodeOptions.removingItems": "Excluindo da área de transferência...",
+  "ContentNodeOptions.topicDefaultTitle": "{title} tema",
   "ContentNodeOptions.undo": "Desfazer",
-  "ContentNodeOptions.viewDetails": "View details",
-  "ContentNodeStrings.untitled": "Untitled",
+  "ContentNodeOptions.viewDetails": "Ver detalhes",
+  "ContentNodeStrings.untitled": "Sem título",
   "ContentNodeThumbnail.cancel": "Cancelar",
-  "ContentNodeThumbnail.crop": "Crop",
-  "ContentNodeThumbnail.croppingPrompt": "Drag image to reframe",
+  "ContentNodeThumbnail.crop": "Recortar",
+  "ContentNodeThumbnail.croppingPrompt": "Arraste a imagem para reenquadrar",
   "ContentNodeThumbnail.defaultFilename": "Arquivo",
-  "ContentNodeThumbnail.generate": "Generate from file",
-  "ContentNodeThumbnail.generatingThumbnail": "Generating from file",
-  "ContentNodeThumbnail.noThumbnail": "No thumbnail",
+  "ContentNodeThumbnail.generate": "Gerar do arquivo",
+  "ContentNodeThumbnail.generatingThumbnail": "Gerando do arquivo",
+  "ContentNodeThumbnail.noThumbnail": "Sem miniatura",
   "ContentNodeThumbnail.remove": "Remover",
-  "ContentNodeThumbnail.retryUpload": "Retry upload",
+  "ContentNodeThumbnail.retryUpload": "Tentar o envio novamente",
   "ContentNodeThumbnail.save": "Salvar",
-  "ContentNodeThumbnail.upload": "Upload image",
-  "ContentNodeThumbnail.uploadFailed": "Upload failed",
-  "ContentNodeThumbnail.uploadingThumbnail": "Uploading",
-  "ContentNodeThumbnail.zoomIn": "Zoom in",
-  "ContentNodeThumbnail.zoomOut": "Zoom out",
-  "ContentNodeValidator.allIncompleteDescendantsText": "{count, plural, one {{count, number, integer} resource is incomplete and cannot be published} other {All {count, number, integer} resources are incomplete and cannot be published}}",
-  "ContentNodeValidator.incompleteDescendantsText": "{count, number, integer} {count, plural, one {resource is incomplete} other {resources are incomplete}}",
-  "ContentNodeValidator.incompleteText": "Incomplete",
-  "ContentNodeValidator.missingTitle": "Missing title",
-  "ContentRenderer.noFileText": "Select a file to preview",
-  "ContentRenderer.previewNotSupported": "Preview unavailable",
+  "ContentNodeThumbnail.upload": "Enviar imagem",
+  "ContentNodeThumbnail.uploadFailed": "Falha ao enviar",
+  "ContentNodeThumbnail.uploadingThumbnail": "Enviando",
+  "ContentNodeThumbnail.zoomIn": "Aumentar zoom",
+  "ContentNodeThumbnail.zoomOut": "Diminuir zoom",
+  "ContentNodeValidator.allIncompleteDescendantsText": "{count, plural, one {{count, number, integer} conteúdo está incompleto e não pode ser publicado} other {Os {count, number, integer} conteúdos estão incompletos e não podem ser publicados}}",
+  "ContentNodeValidator.incompleteDescendantsText": "{count, number, integer} {count, plural, one {conteúdo está incompleto} other {conteúdos estão incompletos}}",
+  "ContentNodeValidator.incompleteText": "Incompleto",
+  "ContentNodeValidator.missingTitle": "Falta o título",
+  "ContentRenderer.noFileText": "Selecione um arquivo para pré-visualizar",
+  "ContentRenderer.previewNotSupported": "Pré-visualização indisponível",
   "ContentTreeList.allChannelsLabel": "Canais",
-  "ContentTreeList.noResourcesOrTopics": "There are no resources or topics here",
+  "ContentTreeList.noResourcesOrTopics": "Não há conteudos ou temas aqui",
   "ContentTreeList.selectAllAction": "Selecionar todos",
-  "CopyToken.copiedTokenId": "Token copied",
-  "CopyToken.copyFailed": "Copy failed",
-  "CopyToken.copyPrompt": "Copy token to import channel into Kolibri",
-  "CountryField.locationLabel": "Select all that apply",
-  "CountryField.locationRequiredMessage": "Field is required",
-  "CountryField.noCountriesFound": "No countries found",
-  "Create.ToSCheck": "I have read and agree to the terms of service",
-  "Create.ToSRequiredMessage": "Please accept our terms of service",
+  "CopyToken.copiedTokenId": "Token copiado",
+  "CopyToken.copyFailed": "Falha ao copiar",
+  "CopyToken.copyPrompt": "Copiar token para importar o canal no Kolibri",
+  "CountryField.locationLabel": "Selecione tudo que se aplica",
+  "CountryField.locationRequiredMessage": "Campo obrigatório",
+  "CountryField.noCountriesFound": "Nenhum país encontrado",
+  "Create.ToSCheck": "Eu li e concordo com os termos de serviço",
+  "Create.ToSRequiredMessage": "Por favor, aceite os nossos termos de serviço",
   "Create.backToLoginButton": "Iniciar sessão",
-  "Create.basicInformationHeader": "Basic information",
-  "Create.conferenceSourceOption": "Conference",
-  "Create.conferenceSourcePlaceholder": "Name of conference",
-  "Create.confirmPasswordLabel": "Confirm password",
-  "Create.contactMessage": "Questions or concerns? Please email us at content@learningequality.org",
-  "Create.conversationSourceOption": "Conversation with Learning Equality",
+  "Create.basicInformationHeader": "Informações básicas",
+  "Create.conferenceSourceOption": "Conferência",
+  "Create.conferenceSourcePlaceholder": "Nome da conferência",
+  "Create.confirmPasswordLabel": "Confirmar senha",
+  "Create.contactMessage": "Perguntas ou sugestões? Por favor, envie um e-mail para content@learningequality.org",
+  "Create.conversationSourceOption": "Conversa com a Learning Equality",
   "Create.createAnAccountTitle": "Criar uma conta",
-  "Create.creatingExercisesUsageOption": "Creating exercises",
-  "Create.emailExistsMessage": "An account with this email already exists",
-  "Create.errorsMessage": "Please fix the errors below",
-  "Create.fieldRequiredMessage": "Field is required",
-  "Create.findingUsageOption": "Finding and adding additional content sources",
+  "Create.creatingExercisesUsageOption": "Criando exercícios",
+  "Create.emailExistsMessage": "Já existe uma conta com este e-mail",
+  "Create.errorsMessage": "Por favor, corrija os erros abaixo",
+  "Create.fieldRequiredMessage": "Campo obrigatório",
+  "Create.findingUsageOption": "Encontrando e acrescentando fontes de conteúdo adicionais",
   "Create.finishButton": "Finalizar",
-  "Create.firstNameLabel": "First name",
-  "Create.forumSourceOption": "Learning Equality community forum",
-  "Create.githubSourceOption": "Learning Equality GitHub",
-  "Create.lastNameLabel": "Last name",
-  "Create.locationLabel": "Where do you plan to use Kolibri Studio? (check all that apply)",
-  "Create.newsletterSourceOption": "Learning Equality newsletter",
-  "Create.organizationSourceOption": "Organization",
-  "Create.organizationSourcePlaceholder": "Name of organization",
-  "Create.organizingUsageOption": "Organizing or aligning existing materials",
+  "Create.firstNameLabel": "Nome",
+  "Create.forumSourceOption": "Fórum da comunidade da Learning Equality",
+  "Create.githubSourceOption": "GitHug da Learning Equality",
+  "Create.lastNameLabel": "Sobrenome",
+  "Create.locationLabel": "Onde você pretende usar o Kolibri Studio? (selecione tudo que se aplica)",
+  "Create.newsletterSourceOption": "Boletim informativo da Learning Equality",
+  "Create.organizationSourceOption": "Organização",
+  "Create.organizationSourcePlaceholder": "Nome da organização",
+  "Create.organizingUsageOption": "Organizando e alinhando materiais existentes",
   "Create.otherSourceOption": "Outro",
-  "Create.otherSourcePlaceholder": "Please describe",
+  "Create.otherSourcePlaceholder": "Por favor, descreva",
   "Create.otherUsageOption": "Outro",
-  "Create.otherUsagePlaceholder": "Please describe",
+  "Create.otherUsagePlaceholder": "Por favor, descreva",
   "Create.passwordLabel": "Senha",
-  "Create.passwordMatchMessage": "Passwords don't match",
-  "Create.personalDemoSourceOption": "Personal demo",
-  "Create.privacyPolicyCheck": "I have read and agree to the privacy policy",
-  "Create.privacyPolicyRequiredMessage": "Please accept our privacy policy",
-  "Create.registrationFailed": "There was an error registering your account. Please try again",
-  "Create.sequencingUsageOption": "Using prerequisites to put materials in a sequence",
-  "Create.sharingUsageOption": "Sharing materials publicly",
-  "Create.socialMediaSourceOption": "Social media",
-  "Create.sourceLabel": "How did you hear about us?",
-  "Create.sourcePlaceholder": "Select one",
-  "Create.storingUsageExample": "e.g. 500MB",
-  "Create.storingUsageOption": "Storing materials for private or local use",
-  "Create.storingUsagePlaceholder": "How much storage do you need?",
-  "Create.taggingUsageOption": "Tagging content sources for discovery",
-  "Create.usageLabel": "How do you plan on using Kolibri Studio (check all that apply)",
-  "Create.viewPrivacyPolicyLink": "View privacy policy",
-  "Create.viewToSLink": "View terms of service",
-  "Create.websiteSourceOption": "Learning Equality website",
-  "CurrentTopicView.COMFORTABLE_VIEW": "Comfortable view",
-  "CurrentTopicView.COMPACT_VIEW": "Compact view",
-  "CurrentTopicView.DEFAULT_VIEW": "Default view",
-  "CurrentTopicView.addButton": "Add",
-  "CurrentTopicView.addExercise": "New exercise",
-  "CurrentTopicView.addTopic": "New topic",
-  "CurrentTopicView.cancel": "Cancel",
-  "CurrentTopicView.copiedItemsToClipboard": "Copied to clipboard",
-  "CurrentTopicView.copySelectedButton": "Copy to clipboard",
-  "CurrentTopicView.copyToClipboardButton": "Copy to clipboard",
-  "CurrentTopicView.creatingClipboardCopies": "Copying to clipboard...",
-  "CurrentTopicView.creatingCopies": "Copying...",
-  "CurrentTopicView.deleteSelectedButton": "Delete",
-  "CurrentTopicView.duplicateSelectedButton": "Make a copy",
-  "CurrentTopicView.editButton": "Edit",
-  "CurrentTopicView.editSelectedButton": "Edit",
-  "CurrentTopicView.importFromChannels": "Import from channels",
-  "CurrentTopicView.moveSelectedButton": "Move",
-  "CurrentTopicView.optionsButton": "Options",
-  "CurrentTopicView.removedItems": "Sent to trash",
-  "CurrentTopicView.selectAllLabel": "Select all",
-  "CurrentTopicView.selectionCount": "{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}",
-  "CurrentTopicView.undo": "Undo",
-  "CurrentTopicView.uploadFiles": "Upload files",
-  "CurrentTopicView.viewModeTooltip": "View",
+  "Create.passwordMatchMessage": "As senhas não coincidem",
+  "Create.personalDemoSourceOption": "Demonstração pessoal",
+  "Create.privacyPolicyCheck": "Eu li e concordo com a política de privacidade",
+  "Create.privacyPolicyRequiredMessage": "Por favor, aceite a nossa política de privacidade",
+  "Create.registrationFailed": "Ocorreu um erro ao registrar a sua conta. Por favor, tente novamente",
+  "Create.sequencingUsageOption": "Usando pré-requisitos para colocar materiais em sequência",
+  "Create.sharingUsageOption": "Compartilhando materiais publicamente",
+  "Create.socialMediaSourceOption": "Redes sociais",
+  "Create.sourceLabel": "Como você ficou sabendo de nós?",
+  "Create.sourcePlaceholder": "Selecione um",
+  "Create.storingUsageExample": "ex.: 500 MB",
+  "Create.storingUsageOption": "Armazenando materiais para uso privado ou local",
+  "Create.storingUsagePlaceholder": "Quanto armazenamento você precisa?",
+  "Create.taggingUsageOption": "Marcando fontes de conteúdo para encontrá-las",
+  "Create.usageLabel": "Como você pretende usar o Kolibri Studio (selecione tudo que se aplica)",
+  "Create.viewPrivacyPolicyLink": "Ver política de privacidade",
+  "Create.viewToSLink": "Ver termos de serviço",
+  "Create.websiteSourceOption": "Website da Learning Equality",
+  "CurrentTopicView.COMFORTABLE_VIEW": "Vista confortável",
+  "CurrentTopicView.COMPACT_VIEW": "Vista compacta",
+  "CurrentTopicView.DEFAULT_VIEW": "Vista padrão",
+  "CurrentTopicView.addButton": "Adicionar",
+  "CurrentTopicView.addExercise": "Novo exercício",
+  "CurrentTopicView.addTopic": "Novo tema",
+  "CurrentTopicView.cancel": "Cancelar",
+  "CurrentTopicView.copiedItemsToClipboard": "Copiado para a área de transferência",
+  "CurrentTopicView.copySelectedButton": "Copiar para área de transferência",
+  "CurrentTopicView.copyToClipboardButton": "Copiar para área de transferência",
+  "CurrentTopicView.creatingClipboardCopies": "Copiando para área de transferência...",
+  "CurrentTopicView.creatingCopies": "Copiando...",
+  "CurrentTopicView.deleteSelectedButton": "Excluir",
+  "CurrentTopicView.duplicateSelectedButton": "Fazer uma cópia",
+  "CurrentTopicView.editButton": "Editar",
+  "CurrentTopicView.editSelectedButton": "Editar",
+  "CurrentTopicView.importFromChannels": "Importar dos canais",
+  "CurrentTopicView.moveSelectedButton": "Mover",
+  "CurrentTopicView.optionsButton": "Opções",
+  "CurrentTopicView.removedItems": "Enviado para a lixeira",
+  "CurrentTopicView.selectAllLabel": "Selecionar tudo",
+  "CurrentTopicView.selectionCount": "{topicCount, plural, one {}\n =1 {# tema}\n other {# temas}}, {resourceCount, plural,\n =1 {# conteúdo}\n other {# conteúdos}}",
+  "CurrentTopicView.undo": "Desfazer",
+  "CurrentTopicView.uploadFiles": "Enviar arquivos",
+  "CurrentTopicView.viewModeTooltip": "Visualizar",
   "DeleteAccountForm.cancelButton": "Cancelar",
-  "DeleteAccountForm.deleteAccountConfirmationPrompt": "Are you sure you want to permanently delete your account? This cannot be undone",
-  "DeleteAccountForm.deleteAccountEnterEmail": "Enter your email address to continue",
-  "DeleteAccountForm.deleteAccountLabel": "Delete account",
-  "DeleteAccountForm.deletionFailed": "Failed to delete account",
-  "DeleteAccountForm.deletionFailedText": "Failed to delete your account. Please contact us here: https://community.learningequality.org.",
-  "DeleteAccountForm.emailAddressLabel": "Email address",
-  "DeleteAccountForm.emailInvalidText": "Email does not match your account email",
-  "DeleteAccountForm.fieldRequired": "Field is required",
-  "Details.AVERAGE": "Average",
-  "Details.LARGE": "Large",
-  "Details.SMALL": "Small",
-  "Details.VERY_LARGE": "Very large",
-  "Details.VERY_SMALL": "Very small",
-  "Details.aggregatorToolTip": "Website or organization hosting the content collection but not necessarily the creator or copyright holder",
-  "Details.aggregatorsLabel": "Aggregators",
-  "Details.assessmentsIncludedText": "Assessments",
-  "Details.authorToolTip": "Person or organization who created this content",
-  "Details.authorsLabel": "Authors",
-  "Details.coachDescription": "Resources for coaches are only visible to coaches in Kolibri",
-  "Details.coachHeading": "Resources for coaches",
-  "Details.containsContentHeading": "Contains content from",
-  "Details.containsHeading": "Contains",
-  "Details.copyrightHoldersLabel": "Copyright holders",
-  "Details.creationHeading": "Created on",
-  "Details.currentVersionHeading": "Published version",
-  "Details.languagesHeading": "Languages",
-  "Details.licensesLabel": "Licenses",
-  "Details.primaryLanguageHeading": "Primary language",
-  "Details.providerToolTip": "Organization that commissioned or is distributing the content",
-  "Details.providersLabel": "Providers",
-  "Details.publishedHeading": "Published on",
-  "Details.resourceHeading": "Total resources",
-  "Details.sampleFromChannelHeading": "Sample content from this channel",
-  "Details.sampleFromTopicHeading": "Sample content from this topic",
-  "Details.sizeHeading": "Channel size",
+  "DeleteAccountForm.deleteAccountConfirmationPrompt": "Tem certeza de que deseja excluir sua conta permanentemente? Esta ação não pode ser desfeita",
+  "DeleteAccountForm.deleteAccountEnterEmail": "Insira seu endereço de e-mail para continuar",
+  "DeleteAccountForm.deleteAccountLabel": "Excluir conta",
+  "DeleteAccountForm.deletionFailed": "Falha ao excluir a conta",
+  "DeleteAccountForm.deletionFailedText": "Falha ao excluir sua conta. Por favor, contate-nos no endereço: https://community.learningequality.org.",
+  "DeleteAccountForm.emailAddressLabel": "Endereço de e-mail",
+  "DeleteAccountForm.emailInvalidText": "O e-mail não corresponde ao e-mail da sua conta",
+  "DeleteAccountForm.fieldRequired": "Campo obrigatório",
+  "Details.AVERAGE": "Médio",
+  "Details.LARGE": "Grande",
+  "Details.SMALL": "Pequeno",
+  "Details.VERY_LARGE": "Muito grande",
+  "Details.VERY_SMALL": "Muito pequeno",
+  "Details.aggregatorToolTip": "Website ou organização hospedando este conjunto de conteúdos, mas não necessariamente o criador ou detentor dos direitos autorais",
+  "Details.aggregatorsLabel": "Agregadores",
+  "Details.assessmentsIncludedText": "Avaliações",
+  "Details.authorToolTip": "Pessoa ou organização que criou este conteúdo",
+  "Details.authorsLabel": "Autores",
+  "Details.coachDescription": "Os materiais para professores são visíveis apenas para eles no Kolibri",
+  "Details.coachHeading": "Materiais para professores",
+  "Details.containsContentHeading": "Contém conteúdo de",
+  "Details.containsHeading": "Contém",
+  "Details.copyrightHoldersLabel": "Detentores dos direitos autorais",
+  "Details.creationHeading": "Criado em",
+  "Details.currentVersionHeading": "Versão publicada",
+  "Details.languagesHeading": "Idiomas",
+  "Details.licensesLabel": "Licenças",
+  "Details.primaryLanguageHeading": "Idioma principal",
+  "Details.providerToolTip": "Organização que encomendou ou distribui o conteúdo",
+  "Details.providersLabel": "Provedores",
+  "Details.publishedHeading": "Publicado em",
+  "Details.resourceHeading": "Conteúdos totais",
+  "Details.sampleFromChannelHeading": "Amostra de conteúdo deste canal",
+  "Details.sampleFromTopicHeading": "Amostra de conteúdo deste tema",
+  "Details.sizeHeading": "Tamanho do canal",
   "Details.sizeText": "{text} ({size})",
-  "Details.subtitlesHeading": "Captions and subtitles",
-  "Details.tagsHeading": "Common tags",
-  "Details.tokenHeading": "Channel token",
-  "Details.unpublishedText": "Unpublished",
+  "Details.subtitlesHeading": "Legendas",
+  "Details.tagsHeading": "Marcadores comuns",
+  "Details.tokenHeading": "Token do canal",
+  "Details.unpublishedText": "Não publicado",
   "DetailsTabView.aggregatorLabel": "Agregador",
-  "DetailsTabView.aggregatorToolTip": "Website or org hosting the content collection but not necessarily the creator or copyright holder",
-  "DetailsTabView.assessmentHeader": "Assessment options",
-  "DetailsTabView.audienceHeader": "Audience",
+  "DetailsTabView.aggregatorToolTip": "Website ou organização hospedando este conjunto de conteúdos, mas não necessariamente o criador ou detentor dos direitos autorais",
+  "DetailsTabView.assessmentHeader": "Opções de avaliação",
+  "DetailsTabView.audienceHeader": "Público",
   "DetailsTabView.authorLabel": "Autor",
-  "DetailsTabView.authorToolTip": "Person or organization who created this content",
-  "DetailsTabView.basicInfoHeader": "Basic information",
+  "DetailsTabView.authorToolTip": "Pessoa ou organização que criou este conteúdo",
+  "DetailsTabView.basicInfoHeader": "Informações básicas",
   "DetailsTabView.copyrightHolderLabel": "Detentor dos direitos autorais",
   "DetailsTabView.descriptionLabel": "Descrição",
-  "DetailsTabView.detectedImportText": "{count, plural,\n =1 {# resource has view-only permission}\n other {# resources have view-only permission}}",
-  "DetailsTabView.importedFromButtonText": "Imported from {channel}",
-  "DetailsTabView.languageChannelHelpText": "Leave blank to use the channel language",
-  "DetailsTabView.languageHelpText": "Leave blank to use the topic language",
-  "DetailsTabView.noTagsFoundText": "No results found for \"{text}\". Press 'Enter' key to create a new tag",
+  "DetailsTabView.detectedImportText": "{count, plural, one {}\n =1 {# conteúdo tem permissão apenas para visualização}\n other {# conteúdos têm permissão apenas para visualização}}",
+  "DetailsTabView.importedFromButtonText": "Importado do {channel}",
+  "DetailsTabView.languageChannelHelpText": "Deixar em branco para usar o idioma do canal",
+  "DetailsTabView.languageHelpText": "Deixar em branco para usar o idioma do tema",
+  "DetailsTabView.noTagsFoundText": "Nenhum resultado encontrado para \"{text}\". Pressione 'Enter' para criar um novo marcador",
   "DetailsTabView.providerLabel": "Provedor",
-  "DetailsTabView.providerToolTip": "Organization that commissioned or is distributing the content",
-  "DetailsTabView.randomizeQuestionLabel": "Randomize question order for learners",
-  "DetailsTabView.sourceHeader": "Source",
+  "DetailsTabView.providerToolTip": "Organização que encomendou ou distribui o conteúdo",
+  "DetailsTabView.randomizeQuestionLabel": "Aleatorizar a ordem das perguntas para os estudantes",
+  "DetailsTabView.sourceHeader": "Fonte",
   "DetailsTabView.tagsLabel": "Marcadores",
-  "DetailsTabView.thumbnailHeader": "Thumbnail",
+  "DetailsTabView.thumbnailHeader": "Miniatura",
   "DetailsTabView.titleLabel": "Título",
   "Diff.negativeSign": "-",
   "Diff.positiveSign": "+",
-  "DiffTable.headerDiff": "Net changes",
-  "DiffTable.headerLive": "Live",
-  "DiffTable.headerStaged": "Staged",
+  "DiffTable.headerDiff": "Variações líquidas",
+  "DiffTable.headerLive": "Ao vivo",
+  "DiffTable.headerStaged": "Preparado",
   "DiffTable.headerType": "Tipo",
-  "DiffTable.typeAudios": "Audios",
+  "DiffTable.typeAudios": "Áudios",
   "DiffTable.typeDocuments": "Documentos",
   "DiffTable.typeExercises": "Exercícios",
-  "DiffTable.typeFileSize": "File size",
-  "DiffTable.typeHtml5Apps": "HTML5 apps",
-  "DiffTable.typeSlideshows": "Slideshows",
+  "DiffTable.typeFileSize": "Tamanho do arquivo",
+  "DiffTable.typeHtml5Apps": "Aplicativos HTML5",
+  "DiffTable.typeSlideshows": "Apresentações",
   "DiffTable.typeTopics": "Tópicos",
-  "DiffTable.typeVersion": "API version",
+  "DiffTable.typeVersion": "Versão da API",
   "DiffTable.typeVideos": "Vídeos",
   "EditList.selectAllLabel": "Selecionar todos",
-  "EditListItem.questionCount": "{count, plural,\n =1 {# question}\n other {# questions}}",
-  "EditModal.addTopic": "Add new topic",
-  "EditModal.addTopicsHeader": "New topic",
+  "EditListItem.questionCount": "{count, plural, one {}\n =1 {# pergunta}\n other {# perguntas}}",
+  "EditModal.addTopic": "Adicionar um novo tema",
+  "EditModal.addTopicsHeader": "Novo tema",
   "EditModal.cancelUploadsButton": "Sair",
-  "EditModal.closeWithoutSavingButton": "Close without saving",
-  "EditModal.createExerciseHeader": "New exercise",
+  "EditModal.closeWithoutSavingButton": "Fechar sem salvar",
+  "EditModal.createExerciseHeader": "Novo exercício",
   "EditModal.dismissDialogButton": "Cancelar",
-  "EditModal.editFilesHeader": "Edit files",
+  "EditModal.editFilesHeader": "Editar arquivos",
   "EditModal.editingDetailsHeader": "Editar detalhes",
   "EditModal.finishButton": "Finalizar",
-  "EditModal.invalidNodesFound": "{count, plural,\n =1 {# incomplete resource found}\n other {# incomplete resources found}}",
-  "EditModal.invalidNodesFoundText": "Incomplete resources will not be published until these errors are resolved",
-  "EditModal.keepEditingButton": "Keep editing",
-  "EditModal.loadErrorText": "Failed to load content",
+  "EditModal.invalidNodesFound": "{count, plural, one {}\n =1 {# conteúdo incompleto encontrado}\n other {# conteúdos incompletos encontrados}}",
+  "EditModal.invalidNodesFoundText": "Conteúdos incompletos não serão publicados até estes erros serem resolvidos",
+  "EditModal.keepEditingButton": "Continuar editando",
+  "EditModal.loadErrorText": "Falha ao carregar conteúdo",
   "EditModal.okButton": "OK",
-  "EditModal.saveAnywaysButton": "Exit anyway",
-  "EditModal.saveFailedHeader": "Save failed",
-  "EditModal.saveFailedText": "There was a problem saving your content",
-  "EditModal.uploadButton": "Upload more",
-  "EditModal.uploadFilesHeader": "Upload files",
-  "EditModal.uploadInProgressHeader": "Upload in progress",
-  "EditModal.uploadInProgressText": "Uploads that are in progress will be lost if you exit",
+  "EditModal.saveAnywaysButton": "Sair mesmo assim",
+  "EditModal.saveFailedHeader": "Falha ao salvar",
+  "EditModal.saveFailedText": "Ocorreu um erro ao salvar o seu conteúdo",
+  "EditModal.uploadButton": "Enviar mais",
+  "EditModal.uploadFilesHeader": "Enviar arquivos",
+  "EditModal.uploadInProgressHeader": "Envio em andamento",
+  "EditModal.uploadInProgressText": "Envios em andamento serão perdidos se você sair",
   "EditSearchModal.cancelAction": "Cancelar",
   "EditSearchModal.changesSavedSnackbar": "Alterações salvas",
-  "EditSearchModal.editSavedSearchTitle": "Edit search title",
-  "EditSearchModal.fieldRequired": "Field is required",
+  "EditSearchModal.editSavedSearchTitle": "Editar título de busca",
+  "EditSearchModal.fieldRequired": "Campo obrigatório",
   "EditSearchModal.saveChangesAction": "Salvar",
-  "EditSearchModal.searchTitleLabel": "Search title",
-  "EditView.details": "Details",
-  "EditView.editingMultipleCount": "Editing details for {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}",
-  "EditView.errorBannerText": "Please provide the required information",
-  "EditView.invalidFieldsToolTip": "Some required information is missing",
-  "EditView.noItemsToEditText": "Please select resources or topics to edit",
-  "EditView.preview": "Preview",
-  "EditView.questions": "Questions",
-  "EditView.related": "Related",
-  "EmailField.emailLabel": "Email",
-  "EmailField.emailRequiredMessage": "Field is required",
-  "EmailField.validEmailMessage": "Please enter a valid email",
-  "ExpandableList.less": "Show less",
-  "ExpandableList.more": "Show more ({more})",
+  "EditSearchModal.searchTitleLabel": "Título da busca",
+  "EditView.details": "Detalhes",
+  "EditView.editingMultipleCount": "Editando detalhes para {topicCount, plural, one {}\n =1 {# tema}\n other {# temas}}, {resourceCount, plural,\n =1 {# conteúdo}\n other {# conteúdos}}",
+  "EditView.errorBannerText": "Por favor, forneça as informações necessárias",
+  "EditView.invalidFieldsToolTip": "Está faltando alguma informação necessária",
+  "EditView.noItemsToEditText": "Por favor, selecione conteúdos ou temas para editar",
+  "EditView.preview": "Pré-visualização",
+  "EditView.questions": "Perguntas",
+  "EditView.related": "Relacionados",
+  "EmailField.emailLabel": "E-mail",
+  "EmailField.emailRequiredMessage": "Campo obrigatório",
+  "EmailField.validEmailMessage": "Por favor, digite um e-mail válido",
+  "ExpandableList.less": "Mostrar menos",
+  "ExpandableList.more": "Mostrar mais ({more})",
   "FeedbackForm.cancelAction": "Cancelar",
   "FeedbackForm.closeAction": "Fechar",
-  "FeedbackForm.communityForumLink": "Open community forum",
-  "FeedbackForm.feedbackFailed": "Unable to submit feedback. Please try again.",
-  "FeedbackForm.feedbackLabel": "Describe your feedback",
-  "FeedbackForm.fieldRequiredText": "Field is required",
-  "FeedbackForm.header": "Give feedback",
-  "FeedbackForm.promptP1": "Please share your experience with Kolibri Studio and any comments on how we can improve. If you are reporting an error, please describe your issue in as much detail as possible.",
-  "FeedbackForm.promptP2": "You can also search and post to the community forum to see if others encountered similar issues.",
-  "FeedbackForm.submitAction": "Submit",
-  "FeedbackForm.submittedHeader": "Thank you",
-  "FeedbackForm.submittedP1": "Your feedback is essential for future iterations of Kolibri Studio.",
-  "FeedbackForm.submittedP2": "While we cannot respond to each individual comment, we consider all feedback as we strive to improve the user experience.",
-  "FeedbackForm.submittedP3": "You are welcome to send us feedback anytime.",
+  "FeedbackForm.communityForumLink": "Abrir fórum da comunidade",
+  "FeedbackForm.feedbackFailed": "Não foi possível enviar comentário. Por favor, tente novamente.",
+  "FeedbackForm.feedbackLabel": "Descreva o seu comentário",
+  "FeedbackForm.fieldRequiredText": "Campo obrigatório",
+  "FeedbackForm.header": "Deixar um comentário",
+  "FeedbackForm.promptP1": "Por favor, compartilhe a sua experiência com o Kolibri Studio ou qualquer comentário sobre como podemos melhorar. Se você estiver relatando um erro, por favor, descreva o seu problema da forma mais detalhada possível.",
+  "FeedbackForm.promptP2": "Você também pode buscar e postar no fórum da comunidade para ver se outros encontraram problemas similares.",
+  "FeedbackForm.submitAction": "Enviar",
+  "FeedbackForm.submittedHeader": "Obrigado",
+  "FeedbackForm.submittedP1": "O seu comentário é essencial para futuras iterações do Kolibri Studio.",
+  "FeedbackForm.submittedP2": "Embora não possamos responder a cada um dos comentários, levamos todos eles em consideração para melhorarmos a experiência do usuário.",
+  "FeedbackForm.submittedP3": "Você pode nos enviar comentários a qualquer momento.",
   "FilePreview.exitFullscreen": "Sair do modo tela cheia",
-  "FilePreview.fullscreenModeText": "Fullscreen mode",
-  "FilePreview.viewFullscreen": "View fullscreen",
-  "FileStatusText.selectFile": "Select file",
-  "FileStorage.requestStorage": "Request storage",
-  "FileStorage.storageFull": "Storage limit reached",
-  "FileStorage.storageFullWithSize": "Total storage limit reached: {used} of {total}",
-  "FileStorage.storageLow": "Storage is running low",
-  "FileStorage.storageLowWithSize": "Total storage is running low: {used} of {total}",
-  "FileStorage.storageUsed": "Total storage used: {used} of {total}",
-  "FileUpload.fileError": "Unsupported file type",
-  "FileUpload.filesHeader": "Preview files",
-  "FileUpload.noFileText": "Missing files",
-  "FileUploadDefault.acceptsHelp": "Supported file types: {extensions}",
-  "FileUploadDefault.chooseFilesButton": "Select files",
-  "FileUploadDefault.dropHereText": "Drag and drop your files here, or select your files manually",
-  "FileUploadDefault.uploadToText": "Upload to '{title}'",
+  "FilePreview.fullscreenModeText": "Modo tela cheia",
+  "FilePreview.viewFullscreen": "Visualizar em tela cheia",
+  "FileStatusText.selectFile": "Selecionar arquivo",
+  "FileStorage.requestStorage": "Solicitar armazenamento",
+  "FileStorage.storageFull": "Limite de armazenamento atingido",
+  "FileStorage.storageFullWithSize": "Limite de armazenamento total atingido: {used} de {total}",
+  "FileStorage.storageLow": "O armazenamento está acabando",
+  "FileStorage.storageLowWithSize": "O armazenamento total está acabando: {used} de {total}",
+  "FileStorage.storageUsed": "Total de armazenamento usado: {used} de {total}",
+  "FileUpload.fileError": "Tipo de arquivo não suportado",
+  "FileUpload.filesHeader": "Pré-visualizar arquivos",
+  "FileUpload.noFileText": "Faltam arquivos",
+  "FileUploadDefault.acceptsHelp": "Tipos de arquivo suportados: {extensions}",
+  "FileUploadDefault.chooseFilesButton": "Selecionar arquivos",
+  "FileUploadDefault.dropHereText": "Arraste e solte seus arquivos aqui ou selecione-os manualmente",
+  "FileUploadDefault.uploadToText": "Enviar para '{title}'",
   "FileUploadItem.removeFileButton": "Remover",
-  "FileUploadItem.retryUpload": "Retry upload",
-  "FileUploadItem.uploadButton": "Select file",
-  "FileUploadItem.uploadFailed": "Upload failed",
-  "ForgotPassword.forgotPasswordFailed": "Failed to send a password reset link. Please try again.",
-  "ForgotPassword.forgotPasswordPrompt": "Please enter your email address to receive instructions for resetting your password",
-  "ForgotPassword.forgotPasswordTitle": "Reset your password",
-  "ForgotPassword.submitButton": "Submit",
-  "FormulasMenu.btnLabelInsert": "Insert",
-  "FormulasMenu.formulasMenuTitle": "Special characters",
+  "FileUploadItem.retryUpload": "Tentar o envio novamente",
+  "FileUploadItem.uploadButton": "Selecionar arquivo",
+  "FileUploadItem.uploadFailed": "Falha ao enviar",
+  "ForgotPassword.forgotPasswordFailed": "Falha ao enviar link de redefinição de senha. Por favor, tente novamente.",
+  "ForgotPassword.forgotPasswordPrompt": "Por favor, digite seu endereço de e-mail para receber as instruções de redefinição de senha",
+  "ForgotPassword.forgotPasswordTitle": "Redefinir sua senha",
+  "ForgotPassword.submitButton": "Enviar",
+  "FormulasMenu.btnLabelInsert": "Inserir",
+  "FormulasMenu.formulasMenuTitle": "Caracteres especiais",
   "FullNameForm.cancelAction": "Cancelar",
   "FullNameForm.changesSavedMessage": "Alterações salvas",
-  "FullNameForm.editNameHeader": "Edit full name",
-  "FullNameForm.failedToSaveMessage": "Failed to save changes",
-  "FullNameForm.fieldRequired": "Field is required",
-  "FullNameForm.firstNameLabel": "First name",
-  "FullNameForm.lastNameLabel": "Last name",
+  "FullNameForm.editNameHeader": "Editar o nome completo",
+  "FullNameForm.failedToSaveMessage": "Falha ao salvar as alterações",
+  "FullNameForm.fieldRequired": "Campo obrigatório",
+  "FullNameForm.firstNameLabel": "Nome",
+  "FullNameForm.lastNameLabel": "Sobrenome",
   "FullNameForm.saveChangesAction": "Salvar alterações",
   "GenericError.backToHomeAction": "Voltar à página inicial",
   "GenericError.genericErrorDetails": "Tente atualizar a página ou voltar para a página inicial",
-  "GenericError.genericErrorHeader": "Sorry, something went wrong",
+  "GenericError.genericErrorHeader": "Infelizmente algo deu errado",
   "GenericError.helpByReportingAction": "Ajude-nos reportando esse erro",
   "GenericError.refreshAction": "Atualizar",
   "HintsEditor.hintsLabel": "Dicas",
-  "HintsEditor.newHintBtnLabel": "New hint",
-  "HintsEditor.noHintsPlaceholder": "Question has no hints",
-  "ImagesMenu.acceptsText": "Supported file types: {acceptedFormats}",
-  "ImagesMenu.altTextHint": "The image description is necessary to enable visually impaired learners to answer questions, and it also displays when the image fails to load",
-  "ImagesMenu.altTextLabel": "Image description",
+  "HintsEditor.newHintBtnLabel": "Nova dica",
+  "HintsEditor.noHintsPlaceholder": "A pergunta não tem dicas",
+  "ImagesMenu.acceptsText": "Tipos suportados de arquivos: {acceptedFormats}",
+  "ImagesMenu.altTextHint": "A descrição da imagem é necessária para possibilitar que alunos com deficiência visual respondam a perguntas, e também é exibida quando a imagem falha ao carregar",
+  "ImagesMenu.altTextLabel": "Descrição da imagem",
   "ImagesMenu.btnLabelCancel": "Cancelar",
-  "ImagesMenu.btnLabelInsert": "Insert",
-  "ImagesMenu.currentImageDefaultText": "Current image",
-  "ImagesMenu.defaultDropText": "Drag and drop an image here, or upload manually",
-  "ImagesMenu.imageHeader": "Upload image",
-  "ImagesMenu.selectFile": "Select file",
-  "ImagesMenu.selectFileButton": "Select file",
+  "ImagesMenu.btnLabelInsert": "Inserir",
+  "ImagesMenu.currentImageDefaultText": "Imagem atual",
+  "ImagesMenu.defaultDropText": "Arraste e solte uma imagem aqui ou envie-a manualmente",
+  "ImagesMenu.imageHeader": "Enviar imagem",
+  "ImagesMenu.selectFile": "Selecionar arquivo",
+  "ImagesMenu.selectFileButton": "Selecionar arquivo",
   "ImportFromChannelsModal.addButton": "Adicionar",
   "ImportFromChannelsModal.addedText": "Adicionado",
   "ImportFromChannelsModal.importAction": "Importar",
-  "ImportFromChannelsModal.importTitle": "Import from other channels",
+  "ImportFromChannelsModal.importTitle": "Importar de outros canais",
   "ImportFromChannelsModal.removeButton": "Remover",
-  "ImportFromChannelsModal.resourcesAddedSnackbar": "{count, number} {count, plural, one {resource selected} other {resources selected}}",
+  "ImportFromChannelsModal.resourcesAddedSnackbar": "{count, number} {count, plural, one {conteúdo selecionado} other {conteúdos selecionados}}",
   "ImportFromChannelsModal.resourcesRemovedSnackbar": "{count, number} {count, plural, one {conteúdo eliminado} other {conteúdos eliminados}}",
-  "ImportFromChannelsModal.resourcesSelected": "{count, number} {count, plural, one {resource selected} other {resources selected}}",
-  "ImportFromChannelsModal.reviewAction": "Review",
-  "ImportFromChannelsModal.reviewTitle": "Resource selection",
-  "InfoModal.close": "Fechar",
+  "ImportFromChannelsModal.resourcesSelected": "{count, number} {count, plural, one {conteúdo selecionado} other {conteúdos selecionados}}",
+  "ImportFromChannelsModal.reviewAction": "Revisar",
+  "ImportFromChannelsModal.reviewTitle": "Seleção de conteúdos",
   "LanguageDropdown.labelText": "Idioma",
   "LanguageDropdown.languageItemText": "{language} ({code})",
-  "LanguageDropdown.languageRequired": "Field is required",
-  "LanguageDropdown.noDataText": "Language not found",
+  "LanguageDropdown.languageRequired": "Campo obrigatório",
+  "LanguageDropdown.noDataText": "Idioma não encontrado",
   "LanguageFilter.languageLabel": "Idiomas",
-  "LanguageFilter.noMatchingLanguageText": "No language matches the search",
-  "LanguageSwitcherList.showMoreLanguagesSelector": "More languages",
-  "LanguageSwitcherModal.cancelAction": "Cancel",
-  "LanguageSwitcherModal.changeLanguageModalHeader": "Change language",
-  "LanguageSwitcherModal.confirmAction": "Confirm",
-  "LicenseDropdown.learnMoreButton": "Learn More",
-  "LicenseDropdown.licenseDescriptionLabel": "License description",
-  "LicenseDropdown.licenseInfoHeader": "About licenses",
+  "LanguageFilter.noMatchingLanguageText": "Nenhum idioma corresponde à pesquisa",
+  "LanguageSwitcherList.showMoreLanguagesSelector": "Mais idiomas",
+  "LanguageSwitcherModal.cancelAction": "Cancelar",
+  "LanguageSwitcherModal.changeLanguageModalHeader": "Alterar idioma",
+  "LanguageSwitcherModal.confirmAction": "Confirmar",
+  "LicenseDropdown.learnMoreButton": "Saiba mais",
+  "LicenseDropdown.licenseDescriptionLabel": "Descrição da licença",
+  "LicenseDropdown.licenseInfoHeader": "Sobre licenças",
   "LicenseDropdown.licenseLabel": "Licença",
-  "Main.TOSLink": "Terms of service",
+  "Main.TOSLink": "Termos de serviço",
   "Main.copyright": "© {year} Learning Equality",
   "Main.createAccountButton": "Criar uma conta",
-  "Main.forgotPasswordLink": "Forgot your password?",
-  "Main.guestModeLink": "Explore without an account",
+  "Main.forgotPasswordLink": "Esqueceu sua senha?",
+  "Main.guestModeLink": "Explorar sem uma conta",
   "Main.kolibriStudio": "Kolibri Studio",
-  "Main.loginFailed": "Email or password is incorrect",
-  "Main.loginToProceed": "You must sign in to view that page",
+  "Main.loginFailed": "E-mail ou senha incorretos",
+  "Main.loginToProceed": "Você precisa fazer login para ver esta página",
   "Main.passwordLabel": "Senha",
-  "Main.privacyPolicyLink": "Privacy policy",
+  "Main.privacyPolicyLink": "Política de privacidade",
   "Main.signInButton": "Iniciar sessão",
-  "MainNavigationDrawer.administrationLink": "Administration",
+  "MainNavigationDrawer.administrationLink": "Administração",
   "MainNavigationDrawer.channelsLink": "Canais",
   "MainNavigationDrawer.copyright": "© {year} Learning Equality",
-  "MainNavigationDrawer.giveFeedback": "Give feedback",
-  "MainNavigationDrawer.helpLink": "Help and support",
+  "MainNavigationDrawer.giveFeedback": "Deixar um comentário",
+  "MainNavigationDrawer.helpLink": "Ajuda e suporte",
   "MainNavigationDrawer.logoutLink": "Terminar sessão",
   "MainNavigationDrawer.settingsLink": "Configurações",
-  "MarkdownEditor.bold": "Bold (Ctrl+B)",
-  "MarkdownEditor.formulas": "Insert formula (Ctrl+F)",
-  "MarkdownEditor.image": "Insert image (Ctrl+P)",
-  "MarkdownEditor.italic": "Italic (Ctrl+I)",
-  "MarkdownEditor.minimize": "Minimize (Ctrl+M)",
+  "MarkdownEditor.bold": "Negrito (Ctrl+B)",
+  "MarkdownEditor.formulas": "Inserir fórmula (Ctrl+F)",
+  "MarkdownEditor.image": "Inserir imagem (Ctrl+P)",
+  "MarkdownEditor.italic": "Itálico (Ctrl+I)",
+  "MarkdownEditor.minimize": "Minimizar (Ctrl+M)",
   "MarkdownImageField.editImageOption": "Editar",
   "MarkdownImageField.removeImageOption": "Remover",
-  "MarkdownImageField.resizeImageOption": "Resize",
-  "MasteryDropdown.exerciseDescripiton": "Exercises contain a set of interactive questions that a learner can engage with in Kolibri. Learners receive instant feedback for each answer (correct or incorrect). Kolibri will display available questions in an exercise until the learner achieves mastery.",
-  "MasteryDropdown.exerciseHeader": "About exercises",
-  "MasteryDropdown.labelText": "Mastery criteria",
-  "MasteryDropdown.mHint": "Correct answers needed",
-  "MasteryDropdown.masteryDescripiton": "Kolibri marks an exercise as \"completed\" when the mastery criteria is met. Here are the different types of mastery criteria for an exercise:",
-  "MasteryDropdown.nHint": "Recent answers",
-  "MessageLayout.backToLogin": "Continue to sign-in page",
-  "MoveModal.addTopic": "Add new topic",
+  "MarkdownImageField.resizeImageOption": "Redimensionar",
+  "MasteryDropdown.exerciseDescripiton": "Exercícios contêm um conjunto de perguntas interativas que estudantes podem responder no Kolibri. Eles recebem comentários instantâneos para cada resposta (correta ou incorreta). O Kolibri mostrará perguntas disponíveis em um exercício até que o estudante atinja domínio.",
+  "MasteryDropdown.exerciseHeader": "Sobre exercícios",
+  "MasteryDropdown.labelText": "Critérios de domínio",
+  "MasteryDropdown.mHint": "Respostas corretas são necessárias",
+  "MasteryDropdown.masteryDescripiton": "O Kolibri marca um exercício como \"completado\" quando o critério de domínio é alcançado. Veja os diferentes tipos de critério de domínio para um exercício:",
+  "MasteryDropdown.nHint": "Respostas recentes",
+  "MessageLayout.backToLogin": "Continuar para a página de login",
+  "MoveModal.addTopic": "Adicionar um novo tema",
   "MoveModal.cancel": "Cancelar",
-  "MoveModal.emptyTopicText": "No resources found",
-  "MoveModal.goToLocationButton": "Go to location",
-  "MoveModal.moveHere": "Move here",
-  "MoveModal.moveItems": "Move {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}} into:",
-  "MoveModal.movedMessage": "Moved to {title}",
-  "MoveModal.resourcesCount": "{count, plural,\n =1 {# resource}\n other {# resources}}",
-  "MoveModal.topicCreatedMessage": "New topic created",
-  "MultiSelect.noItemsFound": "No items found",
+  "MoveModal.emptyTopicText": "Nenhum conteúdo encontrado",
+  "MoveModal.goToLocationButton": "Ir para o local",
+  "MoveModal.moveHere": "Mover para cá",
+  "MoveModal.moveItems": "Mover {topicCount, plural, one {}\n =1 {# tema}\n other {# temas}}, {resourceCount, plural,\n =1 {# conteúdo}\n other {# conteúdos}} para:",
+  "MoveModal.movedMessage": "Movido para {title}",
+  "MoveModal.resourcesCount": "{count, plural, one {}\n =1 {# conteúdo}\n other {# conteúdos}}",
+  "MoveModal.topicCreatedMessage": "Novo tema criado",
+  "MultiSelect.noItemsFound": "Nenhum item encontrado",
   "NewTopicModal.cancel": "Cancelar",
   "NewTopicModal.create": "Criar",
-  "NewTopicModal.createTopic": "Create new topic",
-  "NewTopicModal.topicTitle": "Topic title",
-  "NewTopicModal.topicTitleRequired": "Title is required",
-  "NodePanel.emptyChannelSubText": "Create, upload, or import resources from other channels",
-  "NodePanel.emptyChannelText": "Click \"ADD\" to start building your channel",
-  "NodePanel.emptyTopicText": "Nothing in this topic yet",
-  "NodePanel.emptyViewOnlyChannelText": "Nothing in this channel yet",
-  "NodeTreeNavigation.noResourcesDefaultText": "No resources found",
+  "NewTopicModal.createTopic": "Criar um novo tema",
+  "NewTopicModal.topicTitle": "Título do tema",
+  "NewTopicModal.topicTitleRequired": "Título obrigatório",
+  "NodePanel.emptyChannelSubText": "Criar, enviar ou importar conteúdos de outros canais",
+  "NodePanel.emptyChannelText": "Clique em \"ADICIONAR\" para começar a construir o seu canal",
+  "NodePanel.emptyTopicText": "Ainda não há nada neste tema",
+  "NodePanel.emptyViewOnlyChannelText": "Ainda não há nada neste canal",
+  "NodeTreeNavigation.noResourcesDefaultText": "Nenhum conteúdo encontrado",
   "OfflineText.offlineIndicatorText": "Offline",
-  "OfflineText.offlineText": "You seem to be offline. Your changes will be saved once your connection is back.",
+  "OfflineText.offlineText": "Você parece estar desconectado. Suas mudanças serão salvas quando a sua conexão voltar.",
   "PageNotFoundError.backToHomeAction": "Voltar à página inicial",
-  "PageNotFoundError.pageNotFoundDetails": "Sorry, that page does not exist",
-  "PageNotFoundError.pageNotFoundHeader": "Page not found",
-  "PasswordField.fieldRequiredMessage": "Field is required",
+  "PageNotFoundError.pageNotFoundDetails": "Infelizmente esta página não existe",
+  "PageNotFoundError.pageNotFoundHeader": "Página não encontrada",
+  "PasswordField.fieldRequiredMessage": "Campo obrigatório",
   "PasswordField.passwordLabel": "Senha",
-  "PasswordInstructionsSent.passwordInstructionsHeader": "Instructions sent. Thank you!",
-  "PasswordInstructionsSent.passwordInstructionsText": "If there is already an account with the email address provided, you should receive the instructions shortly. If you don't see an email from us, please check your spam folder.",
+  "PasswordInstructionsSent.passwordInstructionsHeader": "Instruções enviadas. Obrigado!",
+  "PasswordInstructionsSent.passwordInstructionsText": "Se uma conta com o e-mail fornecido já existe, você receberá as instruções em breve. Se não encontrar um e-mail nosso, por favor, verifique a sua pasta de spam.",
   "PermissionsError.goToHomePageAction": "Ir para a página inicial",
   "PermissionsError.permissionDeniedHeader": "Você se esqueceu de fazer o login?",
-  "PoliciesModal.ToSHeader": "Terms of Service",
-  "PoliciesModal.checkboxText": "I have agreed to the above terms",
-  "PoliciesModal.checkboxValidationErrorMessage": "Field is required",
+  "PoliciesModal.ToSHeader": "Termos de serviço",
+  "PoliciesModal.checkboxText": "Eu concordo com os termos acima",
+  "PoliciesModal.checkboxValidationErrorMessage": "Campo obrigatório",
   "PoliciesModal.closeButton": "Fechar",
-  "PoliciesModal.communityStandardsHeader": "Community Standards",
+  "PoliciesModal.communityStandardsHeader": "Normas comunitárias",
   "PoliciesModal.continueButton": "Continuar",
-  "PoliciesModal.lastUpdated": "Last updated {date}",
-  "PoliciesModal.privacyHeader": "Privacy policy",
-  "PoliciesModal.updatedPrivacyHeader": "Updated privacy policy",
-  "PoliciesModal.updatedToSHeader": "Updated terms of service",
-  "PrivacyPolicyModal.linkText": "Learn more about Learning Equality's core values.",
-  "PrivacyPolicyModal.paragraph1": "This Privacy Policy informs you of our privacy practices and your choices and rights around the personal data that we collect. This Privacy Policy applies to the Kolibri application (\"Application\"), Kolibri Studio (\"Studio\"), and all related websites (herein collectively referred to as \"Kolibri\"). This Privacy Statement does not apply to third party applications or partner organizations that may use our software or be used in conjunction with our software.",
-  "PrivacyPolicyModal.paragraph2": "Learning Equality recognizes your right to privacy, and will take reasonable steps to protect this. Some parts of Kolibri allow you to give us personal information, such as your name and email address. We may use the information you provide to improve Kolibri. Where you have choices about how we use the information you provide, we will indicate this at the point of collection. Because of the way Kolibri operates, we may also use information from your browser or browsing activities to personalize or route you to relevant information. For example, we may use your IP address, browser information, cookies or web beacons in ways that help us maintain some of your preferences, or understand how our visitors navigate the site so we can improve it. We may store your personal information outside of the European Union.",
-  "PrivacyPolicyModal.paragraph3": "Learning Equality is committed to learning constantly and improving the quality of Kolibri, and records related to your interactions with Kolibri may be used for research. Research findings will typically be reported at the aggregate level, and your personal identity will never be publicly disclosed in any research findings without your express consent.",
-  "PrivacyPolicyModal.paragraph4": "If you have any questions about these practices or use of your personal information, please email legal@learningequality.org.",
+  "PoliciesModal.lastUpdated": "Data da última atualização {date}",
+  "PoliciesModal.privacyHeader": "Política de privacidade",
+  "PoliciesModal.updatedPrivacyHeader": "Política de privacidade atualizada",
+  "PoliciesModal.updatedToSHeader": "Termos de serviço atualizados",
+  "PrivacyPolicyModal.privacyHeader": "Política de privacidade",
+  "PrivacyPolicyModal.updatedPrivacyHeader": "Política de privacidade atualizada",
+  "PrivacyPolicyModal.linkText": "Saiba mais sobre os valores fundamentais da Learning Equality.",
+  "PrivacyPolicyModal.paragraph1": "Esta Política de privacidade te informa sobre nossas práticas de privacidade e suas escolhas e direitos em relação aos dados pessoais que coletamos. Esta Política de privacidade se aplica ao aplicativo do Kolibri (\"Aplicativo\"), Kolibri Studio (\"Studio\"), e todos os websites relacionados (referidos coletivamente aqui como \"Kolibri\"). Esta Declaração de privacidade não se aplica a aplicativos de terceiros ou organizações parceiras que possam usar o nosso software ou serem usados em conjunto com o mesmo.",
+  "PrivacyPolicyModal.paragraph2": "A Learning Equality reconhece o seu direito à privacidade e tomará medidas plausíveis para protegê-la. Algumas partes do Kolibri te permitem nos comunicar informações pessoais, como o seu nome e endereço de e-mail. Podemos usar as informações que você fornece para melhorar o Kolibri. Quando for possível escolher sobre como usaremos as suas informações fornecidas, te indicaremos no momento da sua coleta. Devido à forma que o Kolibri opera, podemos também usar informações do seu navegador ou atividades de navegação para personalizar ou te orientar até informações relevantes. Por exemplo, podemos usar o seu endereço de IP, informações do navegador, cookies ou web beacons de maneiras que nos ajudem a manter algumas das suas preferências, ou compreender como os nossos visitantes navegam no site para podermos melhorá-lo. Podemos armazenar suas informações pessoais fora da União Europeia.",
+  "PrivacyPolicyModal.paragraph3": "A Learning Equality se compromete a aprender constantemente e melhorar a qualidade do Kolibri, e registros relacionados às suas interações com o Kolibri podem ser usados para fins de pesquisa. Resultados de pesquisas serão geralmente reportados a nível agregado, e sua identidade pessoal jamais será revelada publicamente em nenhum resultado de pesquisa sem o seu consentimento expresso.",
+  "PrivacyPolicyModal.paragraph4": "Se você tiver qualquer pergunta sobre essas práticas ou o uso das suas informações pessoais, por favor, envie um e-mail para legal@learningequality.org.",
   "ProgressBar.progressText": "{percent}%",
-  "ProgressModal.cancel": "No, go back",
-  "ProgressModal.cancelHeader": "Are you sure?",
-  "ProgressModal.cancelText": "Are you sure you would like to cancel this task?",
-  "ProgressModal.confirmStopButton": "Yes, stop task",
-  "ProgressModal.copyDescription": "Import is in progress, please wait...",
-  "ProgressModal.copyHeader": "Importing resources",
-  "ProgressModal.defaultDescription": "Update is in progress, please wait...",
-  "ProgressModal.defaultErrorText": "An unexpected error has occurred. Please try again, and if you continue to see this message, please contact support via the Help menu.",
-  "ProgressModal.defaultHeader": "Updating channel",
-  "ProgressModal.finishedMessage": "Operation complete! Click \"Refresh\" to update the page.",
-  "ProgressModal.moveDescription": "Move operation is in progress, please wait...",
-  "ProgressModal.moveHeader": "Moving Content",
-  "ProgressModal.publishDescription": "Once publishing is complete, you will receive an email notification and will be able to make further edits to your channel.",
-  "ProgressModal.publishHeader": "Publishing channel",
+  "ProgressModal.cancel": "Não, voltar",
+  "ProgressModal.cancelHeader": "Tem certeza?",
+  "ProgressModal.cancelText": "Tem certeza que deseja cancelar esta tarefa?",
+  "ProgressModal.confirmStopButton": "Sim, parar tarefa",
+  "ProgressModal.copyDescription": "Importação em andamento, por favor aguarde...",
+  "ProgressModal.copyHeader": "Importando conteúdos",
+  "ProgressModal.defaultDescription": "Atualização em andamento, por favor aguarde...",
+  "ProgressModal.defaultErrorText": "Ocorreu um erro inesperado. Por favor, tente novamente e, se continuar a ver esta mensagem, entre em contato com o suporte através do menu Ajuda.",
+  "ProgressModal.defaultHeader": "Atualizando o canal",
+  "ProgressModal.finishedMessage": "Operação concluída! Clique em \"Atualizar\" para atualizar a página.",
+  "ProgressModal.moveDescription": "Transferência em andamento, por favor aguarde...",
+  "ProgressModal.moveHeader": "Transferindo o conteúdo",
+  "ProgressModal.publishDescription": "Quando a publicação estiver completa, você receberá uma notificação de e-mail e poderá fazer mais edições no seu canal.",
+  "ProgressModal.publishHeader": "Publicando canal",
   "ProgressModal.refreshButton": "Atualizar",
   "ProgressModal.stopButton": "Interromper",
-  "ProgressModal.syncDescription": "Channel syncing is in progress, please wait...",
-  "ProgressModal.syncHeader": "Syncing channel",
+  "ProgressModal.syncDescription": "Sincronização do canal em andamento, por favor aguarde...",
+  "ProgressModal.syncHeader": "Sincronizando canal",
   "PublishModal.cancelButton": "Cancelar",
-  "PublishModal.descriptionDescriptionTooltip": "This description will be shown to Kolibri admins before they update channel versions",
-  "PublishModal.descriptionRequiredMessage": "Please describe what's new in this version before publishing",
-  "PublishModal.incompleteCount": "{count, plural, =1 {# incomplete resource} other {# incomplete resources}}",
-  "PublishModal.incompleteInstructions": "Click 'Continue' to confirm that you would like to publish anyway.",
-  "PublishModal.incompleteWarning": "Incomplete resources will be not be published and made available for download in Kolibri.",
+  "PublishModal.descriptionDescriptionTooltip": "Esta descrição será mostrada aos administradores do Kolibri antes de atualizarem as versões dos canais",
+  "PublishModal.descriptionRequiredMessage": "Por favor, descreva o que há de novo nesta versão antes de publicar",
+  "PublishModal.incompleteCount": "{count, plural, one {} =1 {# conteúdo incompleto} other {# conteúdos incompletos}}",
+  "PublishModal.incompleteInstructions": "Clique em 'Continuar' para confirmar que deseja publicar mesmo assim.",
+  "PublishModal.incompleteWarning": "Conteúdos incompletos não serão publicados e disponibilizados para serem baixados no Kolibri.",
   "PublishModal.nextButton": "Continuar",
-  "PublishModal.publishButton": "Publish",
-  "PublishModal.publishMessageLabel": "Describe what's new in this channel version",
-  "PublishModal.publishingSizeText": "{count, plural, =1 {# resource} other {# resources}}",
-  "PublishModal.unpublishedText": "Unpublished",
-  "PublishModal.versionDescriptionLabel": "Version description",
-  "PublishModal.versionText": "Current Version: {version}",
+  "PublishModal.publishButton": "Publicar",
+  "PublishModal.publishMessageLabel": "Descreva o que há de novo nesta versão do canal",
+  "PublishModal.publishingSizeText": "{count, plural, one {} =1 {# conteúdo} other {# conteúdos}}",
+  "PublishModal.unpublishedText": "Não publicado",
+  "PublishModal.versionDescriptionLabel": "Descrição da versão",
+  "PublishModal.versionText": "Versão atual: {version}",
   "RelatedResourcesList.removeBtnLabel": "Remover",
-  "RelatedResourcesTab.addNextStepBtnLabel": "Add next step",
-  "RelatedResourcesTab.addPreviousStepBtnLabel": "Add previous step",
+  "RelatedResourcesTab.addNextStepBtnLabel": "Adicionar próximo passo",
+  "RelatedResourcesTab.addPreviousStepBtnLabel": "Adicionar passo anterior",
   "RelatedResourcesTab.dialogCloseBtnLabel": "Fechar",
-  "RelatedResourcesTab.nextStepsExplanation": "Recommended resources that build on skills or concepts learned in this resource",
+  "RelatedResourcesTab.nextStepsExplanation": "Conteúdos recomendados que se baseiam em habilidades ou conceitos aprendidos neste conteúdo",
   "RelatedResourcesTab.nextStepsTitle": "Próximos passos",
-  "RelatedResourcesTab.previewHelpText": "Related resources are displayed as recommendations when learners engage with this resource",
-  "RelatedResourcesTab.previousStepsExplanation": "Recommended resources that introduce skills or concepts needed in order to use this resource",
-  "RelatedResourcesTab.previousStepsTitle": "Previous steps",
-  "RelatedResourcesTab.removeNextStepBtnLabel": "Remove next step",
-  "RelatedResourcesTab.removePreviousStepBtnLabel": "Remove previous step",
-  "RelatedResourcesTab.removedNextStepSnackbar": "Removed next step",
-  "RelatedResourcesTab.removedPreviousStepSnackbar": "Removed previous step",
-  "RelatedResourcesTab.resourcePreviewDialogHelpText": "Related resources in Kolibri display as recommendations alongside the resource that a learner is currently engaging with",
-  "RelatedResourcesTab.resourcePreviewDialogTitle": "Related resources",
-  "RelatedResourcesTab.showPreviewBtnLabel": "Show me",
-  "RelatedResourcesTab.tooManyNextStepsWarning": "Limit the number of next steps to create a more guided learning experience",
-  "RelatedResourcesTab.tooManyPreviousStepsWarning": "Limit the number of previous steps to create a more guided learning experience",
+  "RelatedResourcesTab.previewHelpText": "Conteúdos relacionados são mostrados como recomendações quando estudantes interagem com este conteúdo",
+  "RelatedResourcesTab.previousStepsExplanation": "Conteúdos recomendados que introduzem habilidades ou conceitos necessários para usar este conteúdo",
+  "RelatedResourcesTab.previousStepsTitle": "Passos anteriores",
+  "RelatedResourcesTab.removeNextStepBtnLabel": "Remover próximo passo",
+  "RelatedResourcesTab.removePreviousStepBtnLabel": "Remover passo anterior",
+  "RelatedResourcesTab.removedNextStepSnackbar": "Próximo passo removido",
+  "RelatedResourcesTab.removedPreviousStepSnackbar": "Passo anterior removido",
+  "RelatedResourcesTab.resourcePreviewDialogHelpText": "Conteúdos relacionados no Kolibri são mostrados como recomendações junto a conteúdos que o estudante está interagindo no momento",
+  "RelatedResourcesTab.resourcePreviewDialogTitle": "Conteúdos relacionados",
+  "RelatedResourcesTab.showPreviewBtnLabel": "Mostrar",
+  "RelatedResourcesTab.tooManyNextStepsWarning": "Limite o número de próximos passos para criar uma experiência de aprendizagem mais guiada",
+  "RelatedResourcesTab.tooManyPreviousStepsWarning": "Limite o número de passos anteriores para criar uma experiência de aprendizagem mais guiada",
   "ReportErrorModal.closeAction": "Fechar",
   "ReportErrorModal.emailDescription": "Entre em contato com o nosso suporte técnico detalhando o erro e faremos o possível para ajudar.",
   "ReportErrorModal.emailPrompt": "Enviar um e-mail para os desenvolvedores",
   "ReportErrorModal.errorDetailsHeader": "Detalhes do erro",
   "ReportErrorModal.forumPostingTips": "Favor incluir uma descrição do que você estava tentando fazer e onde você clicou quando o erro apareceu.",
   "ReportErrorModal.forumPrompt": "Visitar os community forums",
-  "ReportErrorModal.forumUseTips": "Search the community forum to see if others encountered similar issues. If there are none reported, please open a new forum post and paste the error details below inside so we can rectify the error in a future version of Kolibri Studio.",
+  "ReportErrorModal.forumUseTips": "Faça uma busca no fórum da comunidade para ver se outros encontraram problemas similares. Se nenhum tiver sido relatado, por favor, abra uma nova postagem no fórum e copie os detalhes do erro abaixo para que possamos corrigí-lo em uma versão futura do Kolibri Studio.",
   "ReportErrorModal.reportErrorHeader": "Relatar erro",
-  "RequestForm.approximatelyHowManyResourcesLabel": "Approximately how many individual resources are you planning to upload?",
-  "RequestForm.audiencePlaceholder": "In-school learners, adult learners, teachers, etc",
-  "RequestForm.authorLabel": "Who is the author (creator), curator (organizer), and/or aggregator (maintainer) of your content? Please specify",
-  "RequestForm.averageSizeOfResourceLabel": "Average size of each resource",
-  "RequestForm.coupleMonthsLabel": "1-2 months",
-  "RequestForm.explainNeedsInDetailLabel": "Please write a paragraph explaining your needs and use case for Kolibri Studio, and how it will integrate into your programs. Include information about who is curating, deploying, and using the content. Is this work being coordinated by an organization, as part of an educational program? Include justification for the additional space being requested and explanation of the time sensitive nature of your request.",
-  "RequestForm.fieldRequiredText": "Field is required",
-  "RequestForm.forProfitLabel": "For-profit or social enterprise company",
-  "RequestForm.grassrootsLabel": "Grassroots and/or volunteer initiative",
-  "RequestForm.howAreYouUsingYourContentLabel": "How are you using your content?",
-  "RequestForm.howOftenImportedToKolibriLabel": "How many times will this content be imported from Studio into new Kolibri installations per month, on average?",
-  "RequestForm.intendedAudienceLabel": "Who is the intended audience for your channel? How big is your audience?",
-  "RequestForm.kindOfContentQuestionLabel": "What types of resources do you plan to upload? Please specify",
-  "RequestForm.largeIntlNgoLabel": "Larger international NGOs or government agencies",
-  "RequestForm.learnMoreButton": "Learn More",
-  "RequestForm.licenseInfoHeader": "About licenses",
-  "RequestForm.licensingQuestionLabel": "What is the licensing of the content you are uploading? (Check all that apply)",
-  "RequestForm.mediumNgoLabel": "Medium-sized NGO with budget < $500k",
-  "RequestForm.natureOfYourContentLabel": "Nature of your content",
-  "RequestForm.notAffiliatedLabel": "I am not affiliated with an organization for this work",
-  "RequestForm.numberOfResourcesPlaceholder": "Number of resources",
-  "RequestForm.oneWeekLabel": "1 week",
-  "RequestForm.organizationNamePlaceholder": "Organization name",
-  "RequestForm.organizationalAffiliationLabel": "Organizational affiliation",
+  "RequestForm.approximatelyHowManyResourcesLabel": "Aproximadamente quantos conteúdos individuais você planeja enviar?",
+  "RequestForm.audiencePlaceholder": "Estudantes na escola, estudantes adultos, professores, etc.",
+  "RequestForm.authorLabel": "Quem é o autor (criador), curador (organizador), e/ou agregador (mantenedor) do seu conteúdo? Por favor, especifique",
+  "RequestForm.averageSizeOfResourceLabel": "Tamanho médio de cada conteúdo",
+  "RequestForm.coupleMonthsLabel": "1 a 2 meses",
+  "RequestForm.explainNeedsInDetailLabel": "Por favor, escreva um parágrafo explicando suas necessidades e para qual fim o Kolibri Studio será utilizado, e como isso será integrado nos seus programas. Inclua informações sobre quem está fazendo a curadoria, implementando, e usando o conteúdo. Este trabalho está sendo coordenado por uma organização como parte de um programa educacional? Inclua justificativas para o espaço adicional sendo solicitado e explicações sobre o caráter urgente da sua solicitação.",
+  "RequestForm.fieldRequiredText": "Campo obrigatório",
+  "RequestForm.forProfitLabel": "Empresa com fins lucrativos ou sociais",
+  "RequestForm.grassrootsLabel": "Iniciativa popular e/ou voluntária",
+  "RequestForm.howAreYouUsingYourContentLabel": "Como você está usando o conteúdo?",
+  "RequestForm.howOftenImportedToKolibriLabel": "Em média, quantas vezes por mês este conteúdo será importado do Studio para novas instalações do Kolibri?",
+  "RequestForm.intendedAudienceLabel": "A quem o seu canal é destinado? Quão grande é o seu público?",
+  "RequestForm.kindOfContentQuestionLabel": "Que tipos de conteúdos você deseja enviar? Por favor, especifique",
+  "RequestForm.largeIntlNgoLabel": "Grandes ONG internacionais ou agências governamentais",
+  "RequestForm.learnMoreButton": "Saiba mais",
+  "RequestForm.licenseInfoHeader": "Sobre licenças",
+  "RequestForm.licensingQuestionLabel": "Qual é a licença do conteúdo que você está enviando? (Marque tudo que se aplica)",
+  "RequestForm.mediumNgoLabel": "ONG de tamanho médio com orçamento inferior a $ 500.000",
+  "RequestForm.natureOfYourContentLabel": "Natureza do seu conteúdo",
+  "RequestForm.notAffiliatedLabel": "Não sou afiliado a uma organização para este trabalho",
+  "RequestForm.numberOfResourcesPlaceholder": "Número de conteúdos",
+  "RequestForm.oneWeekLabel": "1 semana",
+  "RequestForm.organizationNamePlaceholder": "Nome da organização",
+  "RequestForm.organizationalAffiliationLabel": "Afiliação organizacional",
   "RequestForm.otherLabel": "Outro",
-  "RequestForm.pasteLinkPlaceholder": "Paste link here",
-  "RequestForm.provideSampleLinkLabel": "Please provide a link to a sample of your content (on Kolibri Studio or from source site)",
-  "RequestForm.requestFailed": "Unable to send request. Please try again.",
-  "RequestForm.requestSent": "Your storage request has been submitted for processing.",
-  "RequestForm.responsePlaceholder": "Response",
-  "RequestForm.selectAllThatApplyPlaceholder": "Select all that apply",
-  "RequestForm.sendRequestAction": "Send request",
-  "RequestForm.sixPlusMonthsLabel": "6+ months",
+  "RequestForm.pasteLinkPlaceholder": "Cole o link aqui",
+  "RequestForm.provideSampleLinkLabel": "Por favor, forneça um link para uma amostra do seu conteúdo (no Kolibri Studio ou do site de origem)",
+  "RequestForm.requestFailed": "Não foi possível enviar a solicitação. Por favor, tente novamente.",
+  "RequestForm.requestSent": "Sua solicitação de armazenamento foi enviada para processamento.",
+  "RequestForm.responsePlaceholder": "Resposta",
+  "RequestForm.selectAllThatApplyPlaceholder": "Selecione tudo que se aplica",
+  "RequestForm.sendRequestAction": "Enviar solicitação",
+  "RequestForm.sixPlusMonthsLabel": "Mais de 6 meses",
   "RequestForm.sizePlaceholder": "Tamanho",
-  "RequestForm.smallNgoLabel": "Small NGO with annual budget < $25k",
-  "RequestForm.storageAmountRequestedPlaceholder": "Amount requested (e.g. 10GB)",
-  "RequestForm.targetRegionsLabel": "Target region(s) for your content (if applicable)",
-  "RequestForm.threeToSixMonthsLabel": "3-6 months",
-  "RequestForm.timelineLabel": "To better understand the time sensitive nature of your request, please indicate an approximate timeline by when you need this additional storage:",
-  "RequestForm.twoToFourWeeksLabel": "2-4 weeks",
-  "RequestForm.typeOfContentPlaceholder": "Types of resources",
-  "RequestForm.typeOfOrganizationLabel": "What type of organization or group is coordinating the use of Kolibri (if applicable)?",
+  "RequestForm.smallNgoLabel": "ONG de tamanho pequeno com orçamento inferior a $ 25.000",
+  "RequestForm.storageAmountRequestedPlaceholder": "Quantidade solicitada (ex.: 10 GB)",
+  "RequestForm.targetRegionsLabel": "Região(ões)-alvo para o seu conteúdo (se aplicável)",
+  "RequestForm.threeToSixMonthsLabel": "3 a 6 meses",
+  "RequestForm.timelineLabel": "Para melhor compreender o caráter urgente da sua solicitação, por favor, indique um prazo estimado de para quando você precisa deste armazenamento adicional:",
+  "RequestForm.twoToFourWeeksLabel": "2 a 4 semanas",
+  "RequestForm.typeOfContentPlaceholder": "Tipos de conteúdos",
+  "RequestForm.typeOfOrganizationLabel": "Que tipo de organização ou grupo está coordenando o uso do Kolibri (se aplicável)?",
   "RequestForm.unknownLabel": "Desconhecido",
-  "RequestForm.uploadingOnBehalfLabel": "I am uploading content on behalf of:",
-  "RequestForm.usageLabel": "Tell us more about your use of Kolibri",
-  "RequestForm.whoCanUseContentLabel": "Who can use your content?",
-  "RequestForm.willYouMakeYourChannelPublicLabel": "If the content is openly licensed, would you be willing to consider making your channels public to other Kolibri users if requested in the future?",
-  "RequestNewActivationLink.activationExpiredText": "This activation link has been used already or has expired.",
-  "RequestNewActivationLink.activationExpiredTitle": "Activation failed",
-  "RequestNewActivationLink.activationRequestFailed": "Failed to send a new activation link. Please try again.",
-  "RequestNewActivationLink.submitButton": "Submit",
-  "ResetLinkExpired.requestNewLink": "Request a new password reset link",
-  "ResetLinkExpired.resetExpiredText": "This password reset link has been used already or has expired.",
-  "ResetLinkExpired.resetExpiredTitle": "Reset link expired",
-  "ResetPassword.passwordConfirmLabel": "Confirm password",
+  "RequestForm.uploadingOnBehalfLabel": "Estou enviando conteúdo por parte de:",
+  "RequestForm.usageLabel": "Conte-nos mais sobre o seu uso do Kolibri",
+  "RequestForm.whoCanUseContentLabel": "Quem pode usar seu conteúdo?",
+  "RequestForm.willYouMakeYourChannelPublicLabel": "Se o conteúdo possuir licença aberta, você estaria disposto a tornar seus canais públicos para outros usuários do Kolibri se solicitado no futuro?",
+  "RequestNewActivationLink.activationExpiredText": "Este link de ativação já foi usado ou expirou.",
+  "RequestNewActivationLink.activationExpiredTitle": "Falha na ativação",
+  "RequestNewActivationLink.activationRequestFailed": "Falha ao enviar um novo link de ativação. Por favor, tente novamente.",
+  "RequestNewActivationLink.submitButton": "Enviar",
+  "ResetLinkExpired.requestNewLink": "Solicitar um novo link de redefinição de senha",
+  "ResetLinkExpired.resetExpiredText": "Este link de redefinição de senha já foi usado ou expirou.",
+  "ResetLinkExpired.resetExpiredTitle": "Link de redefinição expirado",
+  "ResetPassword.passwordConfirmLabel": "Confirmar senha",
   "ResetPassword.passwordLabel": "Nova senha",
-  "ResetPassword.passwordMatchMessage": "Passwords don't match",
-  "ResetPassword.resetPasswordFailed": "Failed to reset password. Please try again.",
-  "ResetPassword.resetPasswordPrompt": "Enter and confirm your new password",
-  "ResetPassword.resetPasswordTitle": "Reset your password",
-  "ResetPassword.submitButton": "Submit",
-  "ResetPasswordSuccess.header": "Password reset successfully",
-  "ResetPasswordSuccess.text": "Your password has been reset. You may sign in now.",
+  "ResetPassword.passwordMatchMessage": "As senhas não coincidem",
+  "ResetPassword.resetPasswordFailed": "Falha ao redefinir a senha. Por favor, tente novamente.",
+  "ResetPassword.resetPasswordPrompt": "Digite e confirme sua nova senha",
+  "ResetPassword.resetPasswordTitle": "Redefinir sua senha",
+  "ResetPassword.submitButton": "Enviar",
+  "ResetPasswordSuccess.header": "Senha redefinida com sucesso",
+  "ResetPasswordSuccess.text": "Sua senha foi redefinida. Você pode fazer login agora.",
   "ResourcePanel.aggregator": "Agregador",
-  "ResourcePanel.audience": "Audience",
+  "ResourcePanel.audience": "Público",
   "ResourcePanel.author": "Autor",
-  "ResourcePanel.availableFormats": "Available formats",
-  "ResourcePanel.coachResources": "Resources for coaches",
+  "ResourcePanel.availableFormats": "Formatos disponíveis",
+  "ResourcePanel.coachResources": "Materiais para professores",
   "ResourcePanel.copyrightHolder": "Detentor dos direitos autorais",
   "ResourcePanel.description": "Descrição",
   "ResourcePanel.details": "Detalhes",
   "ResourcePanel.fileSize": "Tamanho",
-  "ResourcePanel.files": "Files",
-  "ResourcePanel.incompleteQuestionError": "{count, plural, one {# incomplete question} other {# incomplete questions}}",
+  "ResourcePanel.files": "Arquivos",
+  "ResourcePanel.incompleteQuestionError": "{count, plural, one {# pergunta incompleta} other {# perguntas incompletas}}",
   "ResourcePanel.language": "Idioma",
   "ResourcePanel.license": "Licença",
-  "ResourcePanel.masteryCriteria": "Mastery criteria",
-  "ResourcePanel.masteryMofN": "{m} out of {n}",
+  "ResourcePanel.masteryCriteria": "Critérios de domínio",
+  "ResourcePanel.masteryMofN": "{m} de {n}",
   "ResourcePanel.nextSteps": "Próximos passos",
-  "ResourcePanel.noCopyrightHolderError": "Missing copyright holder",
-  "ResourcePanel.noFilesError": "Missing files",
-  "ResourcePanel.noLicenseDescriptionError": "Missing license description",
-  "ResourcePanel.noLicenseError": "Missing license",
-  "ResourcePanel.noMasteryModelError": "Missing mastery criteria",
-  "ResourcePanel.noQuestionsError": "Exercise is empty",
-  "ResourcePanel.originalChannel": "Imported from",
-  "ResourcePanel.previousSteps": "Previous steps",
+  "ResourcePanel.noCopyrightHolderError": "Falta o detentor dos direitos autorais",
+  "ResourcePanel.noFilesError": "Faltam arquivos",
+  "ResourcePanel.noLicenseDescriptionError": "Falta a descrição da licença",
+  "ResourcePanel.noLicenseError": "Falta a licença",
+  "ResourcePanel.noMasteryModelError": "Faltam critérios de domínio",
+  "ResourcePanel.noQuestionsError": "O exercício está vazio",
+  "ResourcePanel.originalChannel": "Importado de",
+  "ResourcePanel.previousSteps": "Passos anteriores",
   "ResourcePanel.provider": "Provedor",
   "ResourcePanel.questionCount": "{value, number, integer} {value, plural, one {pergunta} other {perguntas}}",
   "ResourcePanel.questions": "Perguntas",
-  "ResourcePanel.relatedResources": "Related resources",
+  "ResourcePanel.relatedResources": "Conteúdos relacionados",
   "ResourcePanel.resources": "Conteúdos",
-  "ResourcePanel.showAnswers": "Show answers",
-  "ResourcePanel.source": "Source",
-  "ResourcePanel.subtitles": "Captions and subtitles",
+  "ResourcePanel.showAnswers": "Mostrar respostas",
+  "ResourcePanel.source": "Fonte",
+  "ResourcePanel.subtitles": "Legendas",
   "ResourcePanel.tags": "Marcadores",
-  "ResourcePanel.totalResources": "Total resources",
+  "ResourcePanel.totalResources": "Conteúdos totais",
   "ResourcePanel.visibleTo": "Visível para",
   "ResponsiveDialog.closeButtonLabel": "Fechar",
-  "ReviewSelectionsPage.noResourcesSelected": "No resources selected",
+  "ReviewSelectionsPage.noResourcesSelected": "Nenhum conteúdo selecionado",
   "ReviewSelectionsPage.removeAction": "Remover",
   "ReviewSelectionsPage.resourcesInTopic": "{count, number} {count, plural, one {recurso} other {recursos}}",
-  "ReviewSelectionsPage.reviewSelectionHeader": "Review selections",
+  "ReviewSelectionsPage.reviewSelectionHeader": "Revisar seleções",
   "SavedSearchesModal.cancelAction": "Cancelar",
-  "SavedSearchesModal.closeButtonLabel": "Fechar",
   "SavedSearchesModal.deleteAction": "Excluir",
-  "SavedSearchesModal.deleteConfirmation": "Are you sure you want to delete this saved search?",
-  "SavedSearchesModal.deleteSearchTitle": "Delete saved search",
+  "SavedSearchesModal.deleteConfirmation": "Tem certeza que deseja excluir esta busca salva?",
+  "SavedSearchesModal.deleteSearchTitle": "Excluir pesquisa salva",
   "SavedSearchesModal.editAction": "Editar",
-  "SavedSearchesModal.filterCount": "{count, number} {count, plural, one {filter} other {filters}}",
-  "SavedSearchesModal.noSavedSearches": "You do not have any saved searches",
-  "SavedSearchesModal.savedSearchesTitle": "Saved searches",
-  "SavedSearchesModal.searchDeletedSnackbar": "Saved search deleted",
-  "SavingIndicator.lastSaved": "Saved {saved}",
-  "SavingIndicator.savedNow": "Saved just now",
+  "SavedSearchesModal.filterCount": "{count, number} {count, plural, one {filtro} other {filtros}}",
+  "SavedSearchesModal.noSavedSearches": "Você não possui nenhuma busca salva",
+  "SavedSearchesModal.savedSearchesTitle": "Buscas salvas",
+  "SavedSearchesModal.searchDeletedSnackbar": "Busca salva excluída",
+  "SavingIndicator.lastSaved": "Salvo {saved}",
+  "SavingIndicator.savedNow": "Salvo há pouco",
   "SavingIndicator.savingIndicator": "Salvando...",
-  "SearchFilterBar.assessments": "Assessments",
-  "SearchFilterBar.clearAll": "Clear all",
-  "SearchFilterBar.coachContent": "Resources for coaches",
-  "SearchFilterBar.createdAfter": "Added after '{date}'",
-  "SearchFilterBar.topicsHidden": "No topics",
-  "SearchFilters.addedAfterDateLabel": "Added after",
-  "SearchFilters.assessmentsLabel": "Show assessments only",
-  "SearchFilters.channelSourceLabel": "Channel/source",
-  "SearchFilters.channelTypeLabel": "Channel type",
+  "SearchFilterBar.assessments": "Avaliações",
+  "SearchFilterBar.clearAll": "Limpar tudo",
+  "SearchFilterBar.coachContent": "Materiais para professores",
+  "SearchFilterBar.createdAfter": "Adicionado após '{date}'",
+  "SearchFilterBar.topicsHidden": "Nenhum tema",
+  "SearchFilters.addedAfterDateLabel": "Adicionado após",
+  "SearchFilters.assessmentsLabel": "Mostrar apenas as avaliações",
+  "SearchFilters.channelSourceLabel": "Canal/fonte",
+  "SearchFilters.channelTypeLabel": "Tipo de canal",
   "SearchFilters.channelsHeader": "Canais",
-  "SearchFilters.coachContentLabel": "Show resources for coaches",
-  "SearchFilters.filtersHeader": "Filter options",
-  "SearchFilters.hideTopicsLabel": "Hide topics",
-  "SearchFilters.kindLabel": "Format",
+  "SearchFilters.coachContentLabel": "Mostrar materiais para professores",
+  "SearchFilters.filtersHeader": "Opções de filtragem",
+  "SearchFilters.hideTopicsLabel": "Ocultar temas",
+  "SearchFilters.kindLabel": "Formato",
   "SearchFilters.licensesLabel": "Licença",
-  "SearchOrBrowseWindow.backToBrowseAction": "Back to browse",
+  "SearchOrBrowseWindow.backToBrowseAction": "Voltar a navegar",
   "SearchOrBrowseWindow.cancel": "Cancelar",
   "SearchOrBrowseWindow.copiedToClipboard": "Copiado para a área de transferência",
-  "SearchOrBrowseWindow.copyFailed": "Failed to copy to clipboard",
-  "SearchOrBrowseWindow.copyingToClipboard": "Copying to clipboard...",
+  "SearchOrBrowseWindow.copyFailed": "Falha ao copiar para área de transferência",
+  "SearchOrBrowseWindow.copyingToClipboard": "Copiando para área de transferência...",
   "SearchOrBrowseWindow.searchAction": "Buscar",
-  "SearchOrBrowseWindow.searchLabel": "Search for resources…",
+  "SearchOrBrowseWindow.searchLabel": "Buscar conteúdos...",
   "SearchOrBrowseWindow.undo": "Desfazer",
-  "SearchResultsList.failedToLoad": "Failed to load search results",
-  "SearchResultsList.resultsPerPageLabel": "Results per page",
-  "SearchResultsList.saveSearchAction": "Save search",
-  "SearchResultsList.savedSearchesLabel": "View saved searches",
-  "SearchResultsList.searchResultsCount": "{count, number} {count, plural, one {result} other {results}} for '{searchTerm}'",
-  "SearchResultsList.searchSavedSnackbar": "Search saved",
-  "SettingsIndex.accountLabel": "Account",
+  "SearchResultsList.failedToLoad": "Falha ao carregar os resultados da busca",
+  "SearchResultsList.resultsPerPageLabel": "Resultados por página",
+  "SearchResultsList.saveSearchAction": "Salvar busca",
+  "SearchResultsList.savedSearchesLabel": "Ver buscas salvas",
+  "SearchResultsList.searchResultsCount": "{count, number} {count, plural, one {resultado} other {resultados}} para '{searchTerm}'",
+  "SearchResultsList.searchSavedSnackbar": "Busca salva",
+  "SettingsIndex.accountLabel": "Conta",
   "SettingsIndex.settingsTitle": "Configurações",
-  "SettingsIndex.storageLabel": "Storage",
-  "SettingsIndex.usingStudioLabel": "About Studio",
-  "StagingTreePage.backToViewing": "Back to viewing",
+  "SettingsIndex.storageLabel": "Armazenamento",
+  "SettingsIndex.usingStudioLabel": "Sobre o Studio",
+  "StagingTreePage.backToViewing": "Voltar à visualização",
   "StagingTreePage.cancelDeployBtn": "Cancelar",
-  "StagingTreePage.channelDeployed": "Channel has been deployed",
+  "StagingTreePage.channelDeployed": "O canal foi implementado",
   "StagingTreePage.closeSummaryDetailsDialogBtn": "Fechar",
-  "StagingTreePage.collapseAllButton": "Collapse all",
-  "StagingTreePage.confirmDeployBtn": "Deploy channel",
-  "StagingTreePage.deploy": "Deploy",
-  "StagingTreePage.deployChannel": "Deploy channel",
-  "StagingTreePage.deployDialogDescription": "You are about to replace all live resources with staged resources.",
-  "StagingTreePage.emptyChannelSubText": "No changes to review! The channel contains all the latest topics and resources.",
-  "StagingTreePage.emptyChannelText": "No resources found",
-  "StagingTreePage.emptyTopicText": "This topic is empty",
-  "StagingTreePage.liveResources": "Live resources",
-  "StagingTreePage.openCurrentLocationButton": "Jump to current topic location",
-  "StagingTreePage.openSummaryDetailsDialogBtn": "View summary",
-  "StagingTreePage.resourcesCount": "{count, number} {count, plural, one { resource } other { resources }}",
-  "StagingTreePage.reviewMode": "Review mode",
-  "StagingTreePage.stagedResources": "Staged resources",
-  "StagingTreePage.summaryDetailsDialogTitle": "Summary details",
-  "StagingTreePage.topicsCount": "{count, number} {count, plural, one { topic } other { topics }}",
-  "StagingTreePage.totalResources": "Total resources",
+  "StagingTreePage.collapseAllButton": "Ocultar tudo",
+  "StagingTreePage.confirmDeployBtn": "Implementar canal",
+  "StagingTreePage.deploy": "Implementar",
+  "StagingTreePage.deployChannel": "Implementar canal",
+  "StagingTreePage.deployDialogDescription": "Você está prestes a substituir todos os conteúdos publicados por conteúdos preparados.",
+  "StagingTreePage.emptyChannelSubText": "Sem alterações para revisar! O canal contém todos os temas e conteúdos mais recentes.",
+  "StagingTreePage.emptyChannelText": "Nenhum conteúdo encontrado",
+  "StagingTreePage.emptyTopicText": "Este tema está vazio",
+  "StagingTreePage.liveResources": "Conteúdos ao vivo",
+  "StagingTreePage.openCurrentLocationButton": "Ir para a localização atual do tema",
+  "StagingTreePage.openSummaryDetailsDialogBtn": "Ver resumo",
+  "StagingTreePage.resourcesCount": "{count, number} {count, plural, one { conteúdo } other { conteúdos }}",
+  "StagingTreePage.reviewMode": "Modo de revisão",
+  "StagingTreePage.stagedResources": "Conteúdos preparados",
+  "StagingTreePage.summaryDetailsDialogTitle": "Detalhes do resumo",
+  "StagingTreePage.topicsCount": "{count, number} {count, plural, one { tema } other { temas }}",
+  "StagingTreePage.totalResources": "Conteúdos totais",
   "StagingTreePage.totalSize": "Tamanho total",
-  "StagingTreePage.viewDetails": "View details",
-  "StatusStrings.noStorageError": "Not enough space",
-  "StatusStrings.uploadFailedError": "Upload failed",
-  "StatusStrings.uploadFileSize": "{uploaded} of {total}",
-  "Storage.hideFormAction": "Close form",
-  "Storage.learnMoreAboutImportingContentFromChannels": "Learn more about how to import resources from other channels",
-  "Storage.requestMoreSpaceHeading": "Request more space",
-  "Storage.requestMoreSpaceMessage": "Please use this form to request additional uploading storage for your Kolibri Studio account. The resources you import from our public library to your channels do not count towards your storage limit.",
-  "Storage.showFormAction": "Open form",
-  "Storage.spaceUsedOfMax": "{qty} of {max}",
-  "Storage.storagePercentageUsed": "{qty}% storage used",
-  "StudioTree.missingTitle": "Missing title",
+  "StagingTreePage.viewDetails": "Ver detalhes",
+  "StatusStrings.noStorageError": "Espaço insuficiente",
+  "StatusStrings.uploadFailedError": "Falha ao enviar",
+  "StatusStrings.uploadFileSize": "{uploaded} de {total}",
+  "Storage.hideFormAction": "Fechar formulário",
+  "Storage.learnMoreAboutImportingContentFromChannels": "Saiba mais sobre como importar conteúdos de outros canais",
+  "Storage.requestMoreSpaceHeading": "Solicitar espaço adicional",
+  "Storage.requestMoreSpaceMessage": "Por favor, use este formulário para solicitar espaço adicional de envio para a sua conta do Kolibri Studio. Os conteúdos da nossa biblioteca pública que você importa para o seu canal não contam para o seu limite de armazenamento.",
+  "Storage.showFormAction": "Abrir formulário",
+  "Storage.spaceUsedOfMax": "{qty} de {max}",
+  "Storage.storagePercentageUsed": "{qty}% do armazenamento usado",
+  "StudioTree.missingTitle": "Falta o título",
   "StudioTree.optionsTooltip": "Opções",
-  "SubtitlesList.acceptedFormatsTooltip": "Supported formats: {extensions}",
-  "SubtitlesList.addSubtitleText": "Add captions",
-  "SubtitlesList.subtitlesHeader": "Captions and subtitles",
+  "SubtitlesList.acceptedFormatsTooltip": "Formatos suportados: {extensions}",
+  "SubtitlesList.addSubtitleText": "Adicionar legendas",
+  "SubtitlesList.subtitlesHeader": "Legendas",
   "SupplementaryItem.languageText": "{language} ({code})",
-  "SupplementaryItem.retryUpload": "Retry upload",
-  "SupplementaryItem.uploadFailed": "Upload failed",
-  "SupplementaryList.selectFileText": "Select file",
+  "SupplementaryItem.retryUpload": "Tentar o envio novamente",
+  "SupplementaryItem.uploadFailed": "Falha ao enviar",
+  "SupplementaryList.selectFileText": "Selecionar arquivo",
   "SyncResourcesModal.backButtonLabel": "Voltar",
   "SyncResourcesModal.cancelButtonLabel": "Cancelar",
-  "SyncResourcesModal.confirmSyncModalExplainer": "You are about to sync and update the following:",
-  "SyncResourcesModal.confirmSyncModalTitle": "Confirm sync",
+  "SyncResourcesModal.confirmSyncModalExplainer": "Você está prestes a sincronizar e atualizar o seguinte:",
+  "SyncResourcesModal.confirmSyncModalTitle": "Confirmar sincronização",
   "SyncResourcesModal.continueButtonLabel": "Continuar",
   "SyncResourcesModal.syncButtonLabel": "Sincronizar",
-  "SyncResourcesModal.syncExercisesExplainer": "Update questions, answers, and hints",
-  "SyncResourcesModal.syncExercisesTitle": "Assessment details",
-  "SyncResourcesModal.syncFilesExplainer": "Update all file information",
-  "SyncResourcesModal.syncFilesTitle": "Files",
-  "SyncResourcesModal.syncModalExplainer": "Sync and update your resources with their original source.",
-  "SyncResourcesModal.syncModalTitle": "Sync resources",
-  "SyncResourcesModal.syncTagsExplainer": "Update all tags",
+  "SyncResourcesModal.syncExercisesExplainer": "Atualizar perguntas, respostas e dicas",
+  "SyncResourcesModal.syncExercisesTitle": "Detalhes da avaliação",
+  "SyncResourcesModal.syncFilesExplainer": "Atualizar todas as informações do arquivo",
+  "SyncResourcesModal.syncFilesTitle": "Arquivos",
+  "SyncResourcesModal.syncModalExplainer": "Sincronize e atualize seus conteúdos com sua fonte original.",
+  "SyncResourcesModal.syncModalTitle": "Sincronizar conteúdos",
+  "SyncResourcesModal.syncTagsExplainer": "Atualizar todos os marcadores",
   "SyncResourcesModal.syncTagsTitle": "Marcadores",
-  "SyncResourcesModal.syncTitlesAndDescriptionsExplainer": "Update resource titles and descriptions",
-  "SyncResourcesModal.syncTitlesAndDescriptionsTitle": "Titles and descriptions",
+  "SyncResourcesModal.syncTitlesAndDescriptionsExplainer": "Atualizar títulos e descrições dos conteúdos",
+  "SyncResourcesModal.syncTitlesAndDescriptionsTitle": "Títulos e descrições",
   "TechnicalTextBlock.copiedToClipboardConfirmation": "Copiado para a área de transferência",
-  "TechnicalTextBlock.copiedToClipboardFailure": "Copy to clipboard failed",
+  "TechnicalTextBlock.copiedToClipboardFailure": "Falha ao copiar para área de transferência",
   "TechnicalTextBlock.copyToClipboardButtonPrompt": "Copiar para área de transferência",
-  "Template.templateString": "You have {count, plural,\n =1 {# node for testing}\n other {# nodes for testing}}",
+  "Template.templateString": "Você possui {count, plural, one {}\n =1 {# nodo para testar}\n other {# nodos para testar}}",
+  "TermsOfServiceModal.ToSHeader": "Termos de serviço",
+  "TermsOfServiceModal.updatedToSHeader": "Termos de serviço atualizados",
   "TermsOfServiceModal.acceptableUseHeader": "Acceptable Use Restrictions",
   "TermsOfServiceModal.acceptableUseItem1": "Will be in strict accordance with these Terms;",
   "TermsOfServiceModal.acceptableUseItem10": "Will not interfere with, disrupt, or attack any service or network; and",
@@ -1303,114 +1305,114 @@
   "TermsOfServiceModal.yourPrivacyHeader": "Your Privacy",
   "TermsOfServiceModal.yourPrivacyLink": "Learn more about Studio's privacy policy",
   "TermsOfServiceModal.yourPrivacyP1": "We take your privacy seriously. Please read our Privacy Policy to see how we collect, use and protect your personal data.",
-  "TextArea.fieldRequiredMessage": "Field is required",
-  "TextField.fieldRequiredMessage": "Field is required",
-  "Thumbnail.thumbnail": "{title} thumbnail",
-  "ThumbnailGenerator.generatedDefaultFilename": "Generated thumbnail",
-  "ThumbnailGenerator.thumbnailGenerationFailedHeader": "Unable to generate thumbnail",
-  "ThumbnailGenerator.thumbnailGenerationFailedText": "There was a problem generating a thumbnail",
-  "TitleStrings.catalogTitle": "Kolibri Content Library Catalog",
+  "TextArea.fieldRequiredMessage": "Campo obrigatório",
+  "TextField.fieldRequiredMessage": "Campo obrigatório",
+  "Thumbnail.thumbnail": "{title} miniatura",
+  "ThumbnailGenerator.generatedDefaultFilename": "Miniatura gerada",
+  "ThumbnailGenerator.thumbnailGenerationFailedHeader": "Não foi possível gerar miniatura",
+  "ThumbnailGenerator.thumbnailGenerationFailedText": "Ocorreu um erro ao gerar uma miniatura",
+  "TitleStrings.catalogTitle": "Catálogo da biblioteca de conteúdo do Kolibri",
   "TitleStrings.defaultTitle": "Kolibri Studio",
   "TitleStrings.tabTitle": "{title} - {site}",
-  "ToggleText.less": "Show less",
+  "ToggleText.less": "Mostrar menos",
   "ToggleText.more": "Mostrar mais",
   "TrashModal.deleteButton": "Excluir",
   "TrashModal.deleteConfirmationCancelButton": "Cancelar",
-  "TrashModal.deleteConfirmationDeleteButton": "Delete permanently",
-  "TrashModal.deleteConfirmationHeader": "Permanently delete {topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}?",
-  "TrashModal.deleteConfirmationText": "You cannot undo this action. Are you sure you want to continue?",
-  "TrashModal.deleteSuccessMessage": "Permanently deleted",
+  "TrashModal.deleteConfirmationDeleteButton": "Excluir permanentemente",
+  "TrashModal.deleteConfirmationHeader": "Excluir permanentemente {topicCount, plural, one {}\n =1 {# tema}\n other {# temas}}, {resourceCount, plural,\n =1 {# conteúdo}\n other {# conteúdos}}?",
+  "TrashModal.deleteConfirmationText": "Você não pode desfazer esta ação. Tem certeza que deseja continuar?",
+  "TrashModal.deleteSuccessMessage": "Excluído permanentemente",
   "TrashModal.deletedHeader": "Removido",
-  "TrashModal.restoreButton": "Restore",
+  "TrashModal.restoreButton": "Restaurar",
   "TrashModal.selectAllHeader": "Selecionar todos",
-  "TrashModal.selectedCountText": "{topicCount, plural,\n =1 {# topic}\n other {# topics}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}",
-  "TrashModal.trashEmptySubtext": "Resources removed from this channel will appear here",
-  "TrashModal.trashEmptyText": "Trash is empty",
-  "TrashModal.trashModalTitle": "Trash",
+  "TrashModal.selectedCountText": "{topicCount, plural, one {}\n =1 {# tema}\n other {# temas}}, {resourceCount, plural,\n =1 {# conteúdo}\n other {# conteúdos}}",
+  "TrashModal.trashEmptySubtext": "Conteúdos removidos deste canal aparecerão aqui",
+  "TrashModal.trashEmptyText": "A lixeira está vazia",
+  "TrashModal.trashModalTitle": "Lixeira",
   "TreeView.closeDrawer": "Fechar",
-  "TreeView.collapseAllButton": "Collapse all",
-  "TreeView.openCurrentLocationButton": "Expand to current topic location",
-  "TreeView.showSidebar": "Show sidebar",
-  "TreeView.updatedResourcesReadyForReview": "Updated resources are ready for review",
-  "TreeViewBase.apiGenerated": "Generated by API",
-  "TreeViewBase.cancel": "Cancel",
-  "TreeViewBase.channelDeletedSnackbar": "Channel deleted",
-  "TreeViewBase.channelDetails": "View channel details",
-  "TreeViewBase.deleteChannel": "Delete channel",
-  "TreeViewBase.deleteChannelButton": "Delete channel",
-  "TreeViewBase.deletePrompt": "This channel will be permanently deleted. This cannot be undone.",
-  "TreeViewBase.deleteTitle": "Delete this channel",
-  "TreeViewBase.editChannel": "Edit channel details",
-  "TreeViewBase.emptyChannelTooltip": "You cannot publish an empty channel",
-  "TreeViewBase.getToken": "Get token",
-  "TreeViewBase.incompleteDescendantsText": "{count, number, integer} {count, plural, one {resource is incomplete and cannot be published} other {resources are incomplete and cannot be published}}",
-  "TreeViewBase.noChangesText": "No changes found in channel",
-  "TreeViewBase.noLanguageSetError": "Missing channel language",
-  "TreeViewBase.openTrash": "Open trash",
-  "TreeViewBase.publishButton": "Publish",
-  "TreeViewBase.publishButtonTitle": "Make this channel available for import into Kolibri",
-  "TreeViewBase.shareChannel": "Share channel",
-  "TreeViewBase.syncChannel": "Sync resources",
-  "TreeViewBase.viewOnly": "View-only",
+  "TreeView.collapseAllButton": "Ocultar tudo",
+  "TreeView.openCurrentLocationButton": "Expandir para a localização atual do tema",
+  "TreeView.showSidebar": "Mostrar a barra lateral",
+  "TreeView.updatedResourcesReadyForReview": "Conteúdos atualizados estão prontos para revisão",
+  "TreeViewBase.apiGenerated": "Gerado pela API",
+  "TreeViewBase.cancel": "Cancelar",
+  "TreeViewBase.channelDeletedSnackbar": "Canal excluído",
+  "TreeViewBase.channelDetails": "Ver detalhes do canal",
+  "TreeViewBase.deleteChannel": "Excluir canal",
+  "TreeViewBase.deleteChannelButton": "Excluir canal",
+  "TreeViewBase.deletePrompt": "Este canal será excluído permanentemente. Esta ação não pode ser desfeita.",
+  "TreeViewBase.deleteTitle": "Excluir este canal",
+  "TreeViewBase.editChannel": "Editar detalhes do canal",
+  "TreeViewBase.emptyChannelTooltip": "Você não pode publicar um canal vazio",
+  "TreeViewBase.getToken": "Obter token",
+  "TreeViewBase.incompleteDescendantsText": "{count, number, integer} {count, plural, one {conteúdo está incompleto e não pode ser publicado} other {conteúdos estão incompletos e não podem ser publicados}}",
+  "TreeViewBase.noChangesText": "Nenhuma alteração encontrada no canal",
+  "TreeViewBase.noLanguageSetError": "Falta o idioma do canal",
+  "TreeViewBase.openTrash": "Abrir lixeira",
+  "TreeViewBase.publishButton": "Publicar",
+  "TreeViewBase.publishButtonTitle": "Tornar este canal disponível para importação no Kolibri",
+  "TreeViewBase.shareChannel": "Compartilhar canal",
+  "TreeViewBase.syncChannel": "Sincronizar conteúdos",
+  "TreeViewBase.viewOnly": "Apenas modo de leitura",
   "Uploader.listDelimiter": ", ",
-  "Uploader.maxFileSizeText": "{count, plural,\n =1 {# file will not be uploaded.}\n other {# files will not be uploaded.}} File size must be under {size}",
-  "Uploader.noStorageHeader": "Not enough space",
-  "Uploader.remainingStorage": "Remaining storage: {size}",
-  "Uploader.tooLargeFilesHeader": "Max file size exceeded",
-  "Uploader.unsupportedFilesHeader": "Unsupported files",
-  "Uploader.unsupportedFilesText": "{count, plural,\n =1 {# file will not be uploaded.}\n other {# files will not be uploaded.}} \n {extensionCount, plural,\n =1 {Supported file type is}\n other {Supported file types are}} {extensions}",
-  "Uploader.uploadSize": "Upload is too large: {size}",
-  "UsingStudio.aboutStudio": "About Kolibri Studio",
-  "UsingStudio.aboutStudioText": "Kolibri Studio is undergoing active development, and as such, some changes could cause unexpected behavior or challenges (also known as \"issues\"). If you encounter an issue, please  notify us as soon as they occur to help us resolve them. (See below for instructions on how to report issues.)",
-  "UsingStudio.bestPractice1": "When using import and clipboard operations, work with small subsets of topics instead of whole channels at once (especially for large channels).",
-  "UsingStudio.bestPractice2": "It is preferable to create multiple small channels rather than one giant channel with many layers of topics.",
-  "UsingStudio.bestPractice3": "Reload the page often to ensure your work is saved to the server and no network errors have occurred. Use CTRL+R on Linux/Windows or ⌘+R on Mac.",
-  "UsingStudio.bestPractice4": "Avoid simultaneous edits on the same channel. Channels should not be edited by multiple users at the same time or by the same user in multiple browser windows.",
-  "UsingStudio.bestPractice5": "It is possible that you will encounter timeout errors in your browser when performing operations like import and sync, on large channels. Don't be alarmed by this error message and do not repeat the same operation again right away. It doesn't mean the operation has failed- Kolibri Studio is still working in the background. Wait a few minutes and reload the page before continuing your edits.",
-  "UsingStudio.bestPractice6": "Compress videos before uploading them (see these instructions).",
-  "UsingStudio.bestPractice7": "PUBLISH periodically and import your channel into Kolibri to preview the content and obtain a local backup copy of your channel.",
-  "UsingStudio.bestPractice8": "Do not edit the channel after you click PUBLISH. Wait for the notification email before resuming editing operations.",
-  "UsingStudio.bestPractice9": "Report issues as you encounter them.",
-  "UsingStudio.bestPractices": "Best practices",
-  "UsingStudio.communityStandardsLink": "Community standards",
-  "UsingStudio.issue1": "Two users have reported isolated incidents where content they imported from another channel disappeared, leaving only empty topics and subtopics. In one report, the content later re-appeared. They did not experience these problems consistently, and the incidents may possibly involve issues with a slow or unstable internet connection. If you run into this issue, please contact us as soon as possible and let us know as much information as you can remember.",
-  "UsingStudio.issue2": "Some operations in Studio are currently very slow, and so it may appear that the change you attempted to make timed out or did not take effect. In many cases, the change is still being processed and will appear once it is complete. If, after 5-10 minutes, the change still has not taken effect even after a browser refresh, please file an issue. We are working on solutions to these issues.",
-  "UsingStudio.issueLink1": "Reports of disappearing content",
-  "UsingStudio.issueLink2": "Slow performance can lead to unexpected errors in the interface",
-  "UsingStudio.issuesPageLink": "View all issues",
-  "UsingStudio.notableIssues": "Notable issues",
-  "UsingStudio.policiesLink": "Privacy policy",
-  "UsingStudio.resourcesHeader": "Kolibri Studio resources",
-  "UsingStudio.termsOfServiceLink": "Terms of service",
-  "UsingStudio.userDocsLink": "User guide",
-  "VisibilityDropdown.coach": "Resources are visible only to coaches (teachers, facilitators, administrators)",
+  "Uploader.maxFileSizeText": "{count, plural, one {}\n =1 {# arquivo não será enviado.}\n other {# arquivos não serão enviados.}} O tamanho do(s) arquivo(s) deve ser menor que {size}",
+  "Uploader.noStorageHeader": "Espaço insuficiente",
+  "Uploader.remainingStorage": "Armazenamento restante: {size}",
+  "Uploader.tooLargeFilesHeader": "Tamanho máximo de arquivo excedido",
+  "Uploader.unsupportedFilesHeader": "Arquivos não suportados",
+  "Uploader.unsupportedFilesText": "{count, plural, one {}\n =1 {# arquivo não será enviado.}\n other {# arquivos não serão enviados.}} \n {extensionCount, plural,\n =1 {O tipo suportado de arquivo é}\n other {Os tipos suportados de arquivo são}} {extensions}",
+  "Uploader.uploadSize": "O envio é muito grande: {size}",
+  "UsingStudio.aboutStudio": "Sobre o Kolibri Studio",
+  "UsingStudio.aboutStudioText": "O Kolibri Studio está em desenvolvimento ativo e, sendo assim, algumas alterações podem causar comportamentos inesperados ou desafios (também conhecidos como \"problemas\". Se você encontrar um problema, por favor, nos notifique assim que ocorrerem para nos ajudar a resolvê-los. (Veja as instruções abaixo de como relatar problemas).",
+  "UsingStudio.bestPractice1": "Ao usar as operações de importação e área de transferência, trabalhe com pequenos subconjuntos de temas ao invés de canais inteiros de uma vez (principalmente para canais grandes).",
+  "UsingStudio.bestPractice2": "É preferível criar vários canais pequenos do que um canal grande com diversas camadas de temas.",
+  "UsingStudio.bestPractice3": "Recarregue a página com frequência para ter certeza que seu trabalho seja salvo no servidor e que nenhum erro de conexão tenha ocorrido. Use CTRL+R no Linux/Windows ou ⌘+R no Mac.",
+  "UsingStudio.bestPractice4": "Evite edições simultâneas no mesmo canal. Os canais não devem ser editados por vários usuários ao mesmo tempo ou pelo mesmo usuário em várias janelas do navegador.",
+  "UsingStudio.bestPractice5": "É possível que você encontre erros de timeout no seu navegador quando estiver fazendo operações como importar ou sincronizar em canais grandes. Não se alarme com essa mensagem de erro e não repita a mesma operação logo em seguida. Isso não significa que a operação falhou, pois o Kolibri Studio continua trabalhando em segundo plano. Espere alguns minutos e recarregue a página antes de continuar as suas edições.",
+  "UsingStudio.bestPractice6": "Comprima vídeos antes de enviá-los (veja estas instruções).",
+  "UsingStudio.bestPractice7": "PUBLICAR periodicamente e importe seu canal para o Kolibri para pré-visualizar o conteúdo e obter uma cópia de backup local do seu canal.",
+  "UsingStudio.bestPractice8": "Não edite o canal após clicar em PUBLICAR. Aguarde o e-mail de notificação antes de retomar as operações de edição.",
+  "UsingStudio.bestPractice9": "Relate problemas na medida em que os encontra.",
+  "UsingStudio.bestPractices": "Práticas recomendadas",
+  "UsingStudio.communityStandardsLink": "Normas comunitárias",
+  "UsingStudio.issue1": "Dois usuários relataram incidentes isolados onde conteúdos que importaram de outro canal desapareceram, deixando apenas temas vazios e subtemas. Em um relatório, o conteúdo reapareceu depois. Não passaram por esses problemas consistentemente, e os incidentes podem possivelmente envolver problemas de conexão à internet lenta ou instável. Se você se deparar com esse problema, por favor, contate-nos assim que possível e nos envie o máximo de informações que se lembrar.",
+  "UsingStudio.issue2": "Algumas operações no Studio são atualmente muito lentas e, sendo assim, podem parecer que as alterações que você tentou fazer foram interrompidas ou não tiveram efeito. Muitas vezes, a alteração ainda está sendo processada e aparecerá assim que estiver completa. Se após 5 a 10 minutos a alteração ainda não teve efeito, mesmo após recarregar o navegador, por favor, registre o seu problema. Estamos trabalhando em soluções para estes transtornos.",
+  "UsingStudio.issueLink1": "Relatórios de conteúdo desaparecendo",
+  "UsingStudio.issueLink2": "O desempenho lento pode levar a erros inesperados na interface",
+  "UsingStudio.issuesPageLink": "Ver todos os problemas",
+  "UsingStudio.notableIssues": "Problemas notáveis",
+  "UsingStudio.policiesLink": "Política de privacidade",
+  "UsingStudio.resourcesHeader": "Conteúdos do Kolibri Studio",
+  "UsingStudio.termsOfServiceLink": "Termos de serviço",
+  "UsingStudio.userDocsLink": "Guia do usuário",
+  "VisibilityDropdown.coach": "Os conteúdos são visíveis apenas para professores (facilitadores, administradores)",
   "VisibilityDropdown.labelText": "Visível para",
-  "VisibilityDropdown.learner": "Resources are visible to anyone",
-  "VisibilityDropdown.visibilityDescription": "Visibility determines what type of Kolibri users can see resources.",
-  "VisibilityDropdown.visibilityHeader": "About resource visibility",
-  "VisibilityDropdown.visibilityRequired": "Field is required",
-  "channelEditVue.errorChooseAtLeastOneCorrectAnswer": "Choose at least one correct answer",
-  "channelEditVue.errorMissingAnswer": "Choose a correct answer",
-  "channelEditVue.errorProvideAtLeastOneCorrectAnswer": "Provide at least one correct answer",
-  "channelEditVue.errorQuestionRequired": "Question is required",
+  "VisibilityDropdown.learner": "Os conteúdos são visíveis para todos",
+  "VisibilityDropdown.visibilityDescription": "A visibilidade determina que tipo de usuários do Kolibri podem ver os conteúdos.",
+  "VisibilityDropdown.visibilityHeader": "Sobre a visibilidade dos conteúdos",
+  "VisibilityDropdown.visibilityRequired": "Campo obrigatório",
+  "channelEditVue.errorChooseAtLeastOneCorrectAnswer": "Escolha ao menos uma resposta correta",
+  "channelEditVue.errorMissingAnswer": "Escolha uma resposta correta",
+  "channelEditVue.errorProvideAtLeastOneCorrectAnswer": "Forneça ao menos uma resposta correta",
+  "channelEditVue.errorQuestionRequired": "A pergunta é obrigatória",
   "channelEditVue.false": "Falso",
-  "channelEditVue.questionTypeInput": "Numeric input",
-  "channelEditVue.questionTypeMultipleSelection": "Multiple choice",
+  "channelEditVue.questionTypeInput": "Entrada numérica",
+  "channelEditVue.questionTypeMultipleSelection": "Múltipla escolha",
   "channelEditVue.questionTypePerseus": "Perseus",
-  "channelEditVue.questionTypeSingleSelection": "Single choice",
-  "channelEditVue.questionTypeTrueFalse": "True/False",
+  "channelEditVue.questionTypeSingleSelection": "Única escolha",
+  "channelEditVue.questionTypeTrueFalse": "Verdadeiro/Falso",
   "channelEditVue.true": "Verdadeiro",
-  "formStrings.errorText": "Please fix {count, plural,\n =1 {# error}\n other {# errors}} below",
-  "sharedVue.copyrightHolderRequired": "Copyright holder is required",
-  "sharedVue.licenseDescriptionRequired": "Special permissions license must have a description",
-  "sharedVue.licenseRequired": "License is required",
-  "sharedVue.masteryModelMGtZero": "Must be at least 1",
-  "sharedVue.masteryModelMLteN": "Must be lesser than or equal to N",
+  "formStrings.errorText": "Por favor, corrija {count, plural, one {}\n =1 {# erro}\n other {# erros}} abaixo",
+  "sharedVue.copyrightHolderRequired": "O detentor dos direitos autorais é obrigatório",
+  "sharedVue.licenseDescriptionRequired": "A licença de permissões especiais deve possuir uma descrição",
+  "sharedVue.licenseRequired": "A licença é obrigatória",
+  "sharedVue.masteryModelMGtZero": "Deve ser pelo menos 1",
+  "sharedVue.masteryModelMLteN": "Deve ser menor ou igual a N",
   "sharedVue.masteryModelMRequired": "Obrigatório",
-  "sharedVue.masteryModelMWholeNumber": "Must be a whole number",
-  "sharedVue.masteryModelNGtZero": "Must be at least 1",
+  "sharedVue.masteryModelMWholeNumber": "Deve ser um número inteiro",
+  "sharedVue.masteryModelNGtZero": "Deve ser pelo menos 1",
   "sharedVue.masteryModelNRequired": "Obrigatório",
-  "sharedVue.masteryModelNWholeNumber": "Must be a whole number",
-  "sharedVue.masteryModelRequired": "Mastery is required",
-  "sharedVue.titleRequired": "Title is required"
+  "sharedVue.masteryModelNWholeNumber": "Deve ser um número inteiro",
+  "sharedVue.masteryModelRequired": "O critério de domínio é obrigatório",
+  "sharedVue.titleRequired": "O título é obrigatório"
 }
diff --git a/contentcuration/search/migrations/0002_auto_20201215_2110.py b/contentcuration/search/migrations/0002_auto_20201215_2110.py
new file mode 100644
index 0000000000..43eee63e55
--- /dev/null
+++ b/contentcuration/search/migrations/0002_auto_20201215_2110.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2020-12-15 21:10
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('search', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='savedsearch',
+            name='params',
+            field=models.JSONField(default=dict),
+        ),
+    ]
diff --git a/contentcuration/search/models.py b/contentcuration/search/models.py
index 36a440e318..e1e550576b 100644
--- a/contentcuration/search/models.py
+++ b/contentcuration/search/models.py
@@ -1,7 +1,6 @@
 import uuid
 
 from django.conf import settings
-from django.contrib.postgres.fields import JSONField
 from django.db import models
 
 
@@ -10,5 +9,7 @@ class SavedSearch(models.Model):
     name = models.CharField(max_length=200, blank=True)
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
-    params = JSONField(default=dict)
-    saved_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='searches')
+    params = models.JSONField(default=dict)
+    saved_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL, related_name="searches", on_delete=models.CASCADE
+    )
diff --git a/contentcuration/search/tests.py b/contentcuration/search/tests.py
index a39b155ac3..2341fc9d1b 100644
--- a/contentcuration/search/tests.py
+++ b/contentcuration/search/tests.py
@@ -1 +1,31 @@
-# Create your tests here.
+from __future__ import absolute_import
+
+from django.urls import reverse
+
+from contentcuration.tests import testdata
+from contentcuration.tests.base import StudioAPITestCase
+
+
+class SearchViewsetTestCase(StudioAPITestCase):
+
+    def test_filter_exclude_channels(self):
+        user = testdata.user()
+        self.client.force_authenticate(user=user)
+        channel = testdata.channel()
+        channel.editors.add(user)
+        response = self.client.get(
+            reverse("search-list"), data={"exclude_channel": channel.id}, format="json",
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response.data["results"], [])
+
+    def test_filter_channels_by_edit(self):
+        user = testdata.user()
+        self.client.force_authenticate(user=user)
+        channel = testdata.channel()
+        channel.editors.add(user)
+        response = self.client.get(
+            reverse("search-list"), data={"channel_list": "edit"}, format="json",
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertNotEqual(response.data["results"], [])
diff --git a/contentcuration/search/viewsets/contentnode.py b/contentcuration/search/viewsets/contentnode.py
index f49f23abaf..54b5f437aa 100644
--- a/contentcuration/search/viewsets/contentnode.py
+++ b/contentcuration/search/viewsets/contentnode.py
@@ -1,7 +1,6 @@
 import re
 
 from django.db.models import Case
-from django.db.models import CharField
 from django.db.models import F
 from django.db.models import IntegerField
 from django.db.models import OuterRef
@@ -23,6 +22,8 @@
 from contentcuration.viewsets.common import NotNullMapArrayAgg
 from contentcuration.viewsets.common import SQArrayAgg
 from contentcuration.viewsets.common import SQCount
+from contentcuration.viewsets.common import UUIDFilter
+from contentcuration.viewsets.common import UUIDInFilter
 from contentcuration.viewsets.contentnode import ContentNodeViewSet
 
 
@@ -31,12 +32,6 @@ class ListPagination(CachedListPagination):
     page_size_query_param = "page_size"
     max_page_size = 100
 
-    def get_page_number(self, request):
-        try:
-            return int(request.query_params[self.page_query_param])
-        except (KeyError, ValueError):
-            return 1
-
 
 uuid_re = re.compile("([a-f0-9]{32})")
 
@@ -51,6 +46,22 @@ class ContentNodeFilter(RequiredFilterSet):
     resources = BooleanFilter(method="filter_resources")
     assessments = BooleanFilter(method="filter_assessments")
     created_after = CharFilter(method="filter_created_after")
+    channel_id__in = UUIDInFilter(field_name="channel_id")
+    channel_list = CharFilter(method="filter_channel_list")
+    exclude_channel = UUIDFilter(field_name="channel_id", exclude=True)
+
+    def filter_channel_list(self, queryset, name, value):
+        user = not self.request.user.is_anonymous and self.request.user
+        channel_ids = []
+        if value == "public":
+            channel_ids = Channel.objects.filter(public=True, deleted=False).values_list("id", flat=True)
+        elif value == "edit" and user:
+            channel_ids = user.editable_channels.values_list("id", flat=True)
+        elif value == "bookmark" and user:
+            channel_ids = user.bookmarked_channels.values_list("id", flat=True)
+        elif value == "view" and user:
+            channel_ids = user.view_only_channels.values_list("id", flat=True)
+        return queryset.filter(channel_id__in=list(channel_ids))
 
     def filter_keywords(self, queryset, name, value):
         filter_query = Q(title__icontains=value) | Q(description__icontains=value)
@@ -120,14 +131,12 @@ class Meta:
 
 
 class SearchContentNodeViewSet(ContentNodeViewSet):
-    filter_class = ContentNodeFilter
+    filterset_class = ContentNodeFilter
     pagination_class = ListPagination
     values = (
         "id",
         "content_id",
         "node_id",
-    )
-    base_values = (
         "title",
         "description",
         "author",
@@ -147,57 +156,13 @@ class SearchContentNodeViewSet(ContentNodeViewSet):
         "original_channel_name",
     )
 
-    def paginate_queryset(self, queryset):
-        page_results = self.paginator.paginate_queryset(
-            queryset, self.request, view=self
-        )
-        ids = [result["id"] for result in page_results]
-        queryset = self._annotate_channel_id(ContentNode.objects.filter(id__in=ids))
-        queryset = self.complete_annotations(queryset)
-        self.values = self.values + self.base_values
-        return list(queryset.values(*self.values))
-
-    def get_accessible_nodes_queryset(self):
-        # jayoshih: May the force be with you, optimizations team...
-        user_id = not self.request.user.is_anonymous() and self.request.user.id
-
-        # Filter by channel type
-        channel_type = self.request.query_params.get("channel_list", "public")
-        if channel_type == "public":
-            channel_args = {"public": True}
-        elif channel_type == "edit":
-            channel_args = {"editors": user_id}
-        elif channel_type == "bookmark":
-            channel_args = {"bookmarked_by": user_id}
-        elif channel_type == "view":
-            channel_args = {"viewers": user_id}
-        else:
-            channel_args = {}
-
-        # Filter by specific channels
-        if self.request.query_params.get("channels"):
-            channel_args.update({"pk__in": self.request.query_params["channels"]})
-
-        return ContentNode.objects.filter(
-            tree_id__in=Channel.objects.filter(deleted=False, **channel_args)
-            .exclude(pk=self.request.query_params.get("exclude_channel", ""))
-            .values_list("main_tree__tree_id", flat=True)
-            .order_by()
-            .distinct()
-        ).annotate(
-            channel_id=Value("", output_field=CharField()),
-        )
-
-    def get_queryset(self):
-        return self.get_accessible_nodes_queryset()
-
     def annotate_queryset(self, queryset):
         """
         1. Do a distinct by 'content_id,' using the original node if possible
         2. Annotate lists of content node and channel pks
         """
         # Get accessible content nodes that match the content id
-        content_id_query = self.get_accessible_nodes_queryset().filter(
+        content_id_query = ContentNode.filter_view_queryset(ContentNode.objects.all(), self.request.user).filter(
             content_id=OuterRef("content_id")
         )
 
@@ -216,9 +181,7 @@ def annotate_queryset(self, queryset):
         queryset = queryset.filter(
             pk__in=Subquery(deduped_content_query.values_list("id", flat=True)[:1])
         ).order_by()
-        return queryset
 
-    def complete_annotations(self, queryset):
         thumbnails = File.objects.filter(
             contentnode=OuterRef("id"), preset__thumbnail=True
         )
@@ -233,9 +196,6 @@ def complete_annotations(self, queryset):
             .values("id", "role_visibility", "changed")
             .order_by()
         )
-        content_id_query = self.get_accessible_nodes_queryset().filter(
-            content_id=OuterRef("content_id")
-        )
         original_channel_name = Coalesce(
             Subquery(
                 Channel.objects.filter(pk=OuterRef("original_channel_id")).values(
diff --git a/contentcuration/search/viewsets/savedsearch.py b/contentcuration/search/viewsets/savedsearch.py
index ef26e50c54..e45900883d 100644
--- a/contentcuration/search/viewsets/savedsearch.py
+++ b/contentcuration/search/viewsets/savedsearch.py
@@ -1,4 +1,3 @@
-from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.serializers import PrimaryKeyRelatedField
 from search.models import SavedSearch
@@ -37,7 +36,6 @@ class SavedSearchViewSet(ValuesViewset):
     queryset = SavedSearch.objects.all()
     serializer_class = SavedSearchSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
     values = (
         "id",
         "name",
@@ -48,5 +46,9 @@ class SavedSearchViewSet(ValuesViewset):
     )
 
     def get_queryset(self):
-        user_id = not self.request.user.is_anonymous() and self.request.user.id
-        return SavedSearch.objects.filter(saved_by_id=user_id).distinct().order_by('-created')
+        user_id = not self.request.user.is_anonymous and self.request.user.id
+        return (
+            SavedSearch.objects.filter(saved_by_id=user_id)
+            .distinct()
+            .order_by("-created")
+        )
diff --git a/integration_testing/features/README.md b/integration_testing/features/README.md
new file mode 100644
index 0000000000..e34813adf7
--- /dev/null
+++ b/integration_testing/features/README.md
@@ -0,0 +1,47 @@
+
+# Style guide for Kolibri Studio `.feature` files
+
+The purpose of this document is to compile and keep the record of our internal conventions used to write and format the `.feature` files for testing Kolibri Studio.
+
+Style guide is a `Work-In-Progress` as we keep adding the testing scenarios and refining our strategies.
+
+## File naming
+
+- Use the `role-name-feature-name.feature` naming strategy.
+- Feature name part should be expressed as **action** whenever possible, instead of the *need*. Examples: `move-learners-between-groups`, or `modify-facility-settings`. Do not use verbs as *can* or *should* in filenames.
+- Separate all filename parts with dashes `-`, not underscores `_`.
+
+## Feature naming
+
+Feature name and description (the first part of the content inside the `.feature` file), should express the **need**. Try to formulate the name as: "This `role-name` needs to be able to achieve `feature-name`". Add more detailed background explanation if needed. Most feature descriptions can be expressed in one sentence, but other, more complex ones that include various `Background` settings or `Scenarios` might need more than one sentence.
+
+## Other recommendations
+
+- List the `Background` "givens" in order to cover the more general conditions **first** (`there are groups created`, meaning that the groups should be created even before the user arrived to the groups page), and the more specific ones (`I am on *Coach > Groups* page`)
+- Keep the *point of view* consistent by writing all the steps as **I**.
+- Use present tense and avoid conditionals: *When I scroll... Then I see...* instead of *When I have scrolled... Then I should see...*
+- Whenever possible and not too laborious, let's try recording the values in `Examples` table and use the placeholders `<>`in the steps:
+
+	```
+	Examples:
+	| username | password |
+	| coach    | coach    |
+	```
+
+
+## UI elements conventions
+
+- Enclose strings of **all** the UI elements (buttons, menu options, headings, modal titles, etc.) inside `**` chars.
+- Enclose any messages displayed to the user inside `**` chars.
+- Capitalize just the first letter (even when they appear fully capitalized in the UI, for readability purposes).
+- Use the `*Plugin name > Tab name*` convention for indicating the current or position or the desired destination of the user in Kolibri. Examples: `*Coach > Groups*`, `*Learn > Recommended*`, `*Facility > Settings*`, `*Device > Info*`, etc.
+
+
+## Some useful BDD resources
+
+- [How to describe user stories using Gherkin language](https://medium.com/@SteelKiwiDev/how-to-describe-user-stories-using-gherkin-language-8cffc6b888df)
+- [Gherkin Syntax](http://docs.behat.org/en/v2.5/guides/1.gherkin.html#gherkin-syntax)
+- [Obey the testing goat BDD](https://www.obeythetestinggoat.com/book/appendix_bdd.html#_writing_an_ft_as_a_feature_using_gherkin_syntax)
+- [Gherkin Reference](https://docs.cucumber.io/gherkin/reference/)
+- [Gherkin: Feature Testing Language](http://behave.readthedocs.io/en/latest/gherkin.html#features)
+- [Syntax formatter for Sublime](https://packagecontrol.io/packages/Gherkin%20(Cucumber)%20Formatter)
diff --git a/integration_testing/features/add-channel-to-starred.feature b/integration_testing/features/add-channel-to-starred.feature
index 854af3cbe3..00b6c9aabd 100755
--- a/integration_testing/features/add-channel-to-starred.feature
+++ b/integration_testing/features/add-channel-to-starred.feature
@@ -1,32 +1,37 @@
-Feature: Add channel to *Starred* tab
-	User needs to be able to mark channels with a star to label them as favorite for easy access
+Feature: Add a channel to the *Starred* tab
+	A user needs to be able to mark channels with a star to label them as favorite for easy access
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
-			And I am on any of the tabs (*My Channels*, *Starred*, *View only*, or *Content Library*)
-			And I see a <channel> channel that is not starred (empty star)
+		Given I am signed in to Studio
+			And I am on any of the tabs (*My Channels*, *Starred*, *View-only*, or *Content Library*)
+			And I see a channel that is not starred (white star)
 
-	Scenario: Add channel to *Starred* tab
-		When I click the *Star* button for the desired <channel>
-		Then I see <channel> channel star is now full 
+	Scenario: Add channel to the *Starred* tab
+		When I click the *Add to starred channels* button for the desired channel
+		Then I see that the channel's *Add to starred channels* button is now black
+			And I see a message that the channel was added to the starred channels 
 		When I click and open the *Starred* tab 
-		Then I see <channel> channel is on the list
+		Then I see that the channel is displayed among the starred channels
 
-	Scenario: Remove channel from *Starred* tab 
+	Scenario: Unstar a channel
 		Given I am on *My Channels*, *View only*, or *Public* tabs
-			And I see a <channel> channel that is starred (full star)
-		When I click the *Star* button for the <channel>
-		Then I see the star is now empty
+			And I see a channel that is starred (black star)
+		When I click the *Remove from starred channels* button for the channel
+		Then I see that the channel's *Remove from starred channels* button is now white
+			And I see a message that the channel was removed from the starred channels
 		When I click and open the *Starred* tab 
-		Then I see the list of channels
-			But I don't see the <channel> channel on the list
+		Then I see the list of starred channels
+			But I don't see the unstarred channel on the list
 
-	Scenario: Remove channel directly from *Starred* tab 
-		Given I am on *Starred* tabs
-			And I see a <channel> channel on the list with a full star
-		When I click the *Star* button for the <channel>
-		Then I don't see the <channel> channel any more
+	Scenario: Remove channel directly from the *Starred* tab 
+		Given I am on the *Starred* tab
+			And I see a starred channel
+		When I click the *Remove from starred channels* button for the channel
+		Then I don't see the unstarred channel any more
 
-	Examples:
-	| channel |
-	| CK-12		|
\ No newline at end of file
+	Scenario: Remove a starred channel form the *Content Library* tab with *Starred* filter on
+		Given I am on the *Content Library* tab
+			And I've selected the *Starred* checkbox
+		When I click on the star button of a starred channel.
+		Then I should see a message that the channel was removed from the starred channels
+			And the channel should no longer be displayed in the list with the filtered channels
\ No newline at end of file
diff --git a/integration_testing/features/cancel-copy.feature b/integration_testing/features/cancel-copy.feature
index 8e96d8a3df..99fce69b6d 100755
--- a/integration_testing/features/cancel-copy.feature
+++ b/integration_testing/features/cancel-copy.feature
@@ -1,7 +1,7 @@
 Feature: Cancel copy
 	
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Cancel copy of single resource
diff --git a/integration_testing/features/change-language.feature b/integration_testing/features/change-language.feature
new file mode 100755
index 0000000000..e5eb75523a
--- /dev/null
+++ b/integration_testing/features/change-language.feature
@@ -0,0 +1,18 @@
+Feature: Change language
+	A user needs to be able to change the interface language.
+
+	Scenario: Change language when you are not signed-in
+		Given I am not signed-in to Studio
+			And I am on the Studio home page
+		When I click on one of the available languages
+		Then the language interface changes to the selected language
+			And the selected language is no longer clickable
+
+	Scenario: Change language as a signed-in user
+		Given I am signed-in to Studio
+			And I click the user profile icon
+		When I click *Change language*
+		Then I see a *Change language* modal window displayed with several languages to choose from
+		When I click on a language which is not currently selected
+			And I click the *Confirm* button
+		Then the interface language changes to the selected language
diff --git a/integration_testing/features/copy-resource-via-right-click.feature b/integration_testing/features/copy-resource-via-right-click.feature
index 4ee887e1c0..63819337f8 100755
--- a/integration_testing/features/copy-resource-via-right-click.feature
+++ b/integration_testing/features/copy-resource-via-right-click.feature
@@ -1,7 +1,7 @@
 Feature: Copy resource via right click
 	
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Copy resource via right click
diff --git a/integration_testing/features/copy-resource-via-selection-bar.feature b/integration_testing/features/copy-resource-via-selection-bar.feature
index 566a65c75b..7a8d8aabd4 100755
--- a/integration_testing/features/copy-resource-via-selection-bar.feature
+++ b/integration_testing/features/copy-resource-via-selection-bar.feature
@@ -1,7 +1,7 @@
 Feature: Copy resource via selection bar
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Copy resource via selection bar
diff --git a/integration_testing/features/copy-to-clipboard.feature b/integration_testing/features/copy-to-clipboard.feature
index 0c76c0198c..ec378942d5 100755
--- a/integration_testing/features/copy-to-clipboard.feature
+++ b/integration_testing/features/copy-to-clipboard.feature
@@ -1,7 +1,7 @@
 Feature: Copy to clipboard
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editor page
 			And I have edit permissions for <channel>
 
diff --git a/integration_testing/features/create-a-channel.feature b/integration_testing/features/create-a-channel.feature
index 501cc1c38b..a14a694bb3 100755
--- a/integration_testing/features/create-a-channel.feature
+++ b/integration_testing/features/create-a-channel.feature
@@ -1,7 +1,7 @@
 Feature: Create a channel
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the *My Channels* tab
 
 	Scenario: Create a channel
diff --git a/integration_testing/features/create-a-topic.feature b/integration_testing/features/create-a-topic.feature
index 089609584d..882c0d82d5 100755
--- a/integration_testing/features/create-a-topic.feature
+++ b/integration_testing/features/create-a-topic.feature
@@ -1,7 +1,7 @@
 Feature: Create a topic
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the directory selection screen
 			And I find a destination I want to move content into
 
diff --git a/integration_testing/features/create-account.feature b/integration_testing/features/create-account.feature
index e4d4c4eba8..84038a2a02 100755
--- a/integration_testing/features/create-account.feature
+++ b/integration_testing/features/create-account.feature
@@ -1,7 +1,7 @@
 Feature: Create account on Studio
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on Studio home page
 			And I do not have an account registered with my <email>
 
diff --git a/integration_testing/features/create-exercise.feature b/integration_testing/features/create-exercise.feature
new file mode 100755
index 0000000000..b731b2f884
--- /dev/null
+++ b/integration_testing/features/create-exercise.feature
@@ -0,0 +1,28 @@
+Feature: Create an exercise
+
+	Background:
+		Given I am signed in to Studio
+			And I am on the channel editor page
+
+	Scenario: Create an exercise
+		When I click the *Add* button
+			And I select the *New exercise* option
+		Then I see the *Details* tab of the *New exercise* modal
+			And I can set the exercise title, description and tags
+			And I can select the mastery criteria
+			And I can choose if the questions are randomized
+			And I can add/change a thumbnail
+			And I can select language and visibility
+			And I can fill in the copyright information
+		When I click the *Questions* tab
+			And I click the *New question* button
+		Then I can add the question text and images in the question editor field
+			And I can select the response type
+			And I can provide answers for each question
+			And I can provide hints for each question
+			And I can randomize the answer order
+		When I click the *Related* tab
+			Then I can click *Add previous step* and or *Add next step*
+				And I can click the *Add* button to add a step
+		When I click the *Finish* button
+		Then I am returned at the main topic tree view
diff --git a/integration_testing/features/delete-account.feature b/integration_testing/features/delete-account.feature
index cc0c392062..917214450d 100755
--- a/integration_testing/features/delete-account.feature
+++ b/integration_testing/features/delete-account.feature
@@ -1,7 +1,7 @@
 Feature: Delete account
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the *Settings > Account* page
 
 	Scenario: Delete account without active channels
diff --git a/integration_testing/features/delete-channel.feature b/integration_testing/features/delete-channel.feature
new file mode 100755
index 0000000000..512eacc2fd
--- /dev/null
+++ b/integration_testing/features/delete-channel.feature
@@ -0,0 +1,33 @@
+Feature: Delete channel 
+
+	Background: 
+		Given I am signed in to Studio
+			And I have permissions to edit
+			And I am on *My Channels* tab
+
+	Scenario: Delete channel
+		When I click the *Options* button of a channel #the three dots to the right
+		Then I see a *Delete channel* option
+		When I click the *Delete channel* option
+			And I click the *Delete channel* button
+		Then I see a message that the channel is deleted
+			And the deleted channel is no longer displayed on *My Channels* tab
+
+	Scenario: Cancel deleting a channel
+		When I click the *Options* button of a channel #the three dots to the right
+		Then I see a *Delete channel* option
+		When I click the *Delete channel* option
+			And I click the *Cancel* button
+		Then the *Delete this channel* modal window is closed
+			And the channel is not deleted
+
+	Scenario: Delete a channel while viewing the contents of a channel
+		When I click on the channel name
+		Then I see the channel resources page
+		When I click the *Options* button to the right side of the topbar
+		Then I see a *Delete channel* option colored in red
+		When I click the *Delete channel* option
+			And I click the *Delete channel* button
+		Then I see a message that the channel is deleted
+			And I am brought back on *My channels* tab
+			And the deleted channel is no longer displayed on *My Channels* tab
\ No newline at end of file
diff --git a/integration_testing/features/delete-resources.feature b/integration_testing/features/delete-resources.feature
index 25fd2d287a..15ef0dc307 100755
--- a/integration_testing/features/delete-resources.feature
+++ b/integration_testing/features/delete-resources.feature
@@ -1,7 +1,7 @@
 Feature: Delete resources permanently
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor page
 			And I have one removed resource from my channel editor tree
 
diff --git a/integration_testing/features/drag-drop-out-of-clipboard.feature b/integration_testing/features/drag-drop-out-of-clipboard.feature
index e21bcbc813..f5ea12c8b9 100755
--- a/integration_testing/features/drag-drop-out-of-clipboard.feature
+++ b/integration_testing/features/drag-drop-out-of-clipboard.feature
@@ -1,7 +1,7 @@
 Feature: Drag-drop resources out of the clipboard
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Drag-drop content nodes out of the clipboard
diff --git a/integration_testing/features/drag-drop-to-clipboard.feature b/integration_testing/features/drag-drop-to-clipboard.feature
index 1c6474a2dc..f01b4402fb 100755
--- a/integration_testing/features/drag-drop-to-clipboard.feature
+++ b/integration_testing/features/drag-drop-to-clipboard.feature
@@ -1,7 +1,7 @@
 Feature: Drag-drop to clipboard
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Drag-drop resources to an open clipboard
diff --git a/integration_testing/features/edit-account-information.feature b/integration_testing/features/edit-account-information.feature
index ec1f68e432..cfc8ce4bfe 100755
--- a/integration_testing/features/edit-account-information.feature
+++ b/integration_testing/features/edit-account-information.feature
@@ -1,7 +1,7 @@
 Feature: Edit account information
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on Studio *Settings > Account* page
 
 	Scenario: Changing password
diff --git a/integration_testing/features/edit-channel-details.feature b/integration_testing/features/edit-channel-details.feature
new file mode 100755
index 0000000000..b527f3ea28
--- /dev/null
+++ b/integration_testing/features/edit-channel-details.feature
@@ -0,0 +1,14 @@
+Feature: Edit channel details 
+
+	Background: 
+		Given I am signed in to Studio
+			And I am on the channel editor view
+
+		Scenario: Edit channel details
+			When I click the pencil icon next to the channel name
+			Then I see a modal window with the channel details
+				And I see the details for the channel - channel name, language, channel description etc.
+			When I modify any of the details
+				And I click the *Save changes* button
+			Then I see a message: Changes saved
+				And I can close the modal window
diff --git a/integration_testing/features/edit-resource-details.feature b/integration_testing/features/edit-resource-details.feature
new file mode 100755
index 0000000000..1c8624a494
--- /dev/null
+++ b/integration_testing/features/edit-resource-details.feature
@@ -0,0 +1,16 @@
+Feature: Edit resource details 
+
+	Background: 
+		Given I am signed in to Studio
+			And I am on the channel editor page
+
+		Scenario: Edit details
+			When I click the *⋮* (Options) button for a resource
+				And I click the *Edit details* option
+			Then I see the *Edit details* window
+				And I can edit different properties of the resource such as - *Basic information*, *Thumbnail*, *Audience*, *Source* etc.
+			When I modify any of the details
+			Then I see a message: *Changes saved*
+			When I click the *Finish* button
+			Then I am returned at the main topic tree view
+			
\ No newline at end of file
diff --git a/integration_testing/features/expand-and-collapse-clipboard-topics.feature b/integration_testing/features/expand-and-collapse-clipboard-topics.feature
index 5f4455da73..25bf522b02 100755
--- a/integration_testing/features/expand-and-collapse-clipboard-topics.feature
+++ b/integration_testing/features/expand-and-collapse-clipboard-topics.feature
@@ -1,7 +1,7 @@
 Feature: Expand and collapse topics in the clipboard
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Expand and collapse topics in the clipboard
diff --git a/integration_testing/features/explore-without-an-account.feature b/integration_testing/features/explore-without-an-account.feature
new file mode 100755
index 0000000000..46e5572ac6
--- /dev/null
+++ b/integration_testing/features/explore-without-an-account.feature
@@ -0,0 +1,11 @@
+Feature: Explore without an account
+
+	Background:
+		Given I am not signed in to Studio
+			And I am on Studio sign-in page
+
+	Scenario: Explore without an account
+		When I click the *Explore without an account* link
+		Then I see the *Content Library* page with available public channels
+			And I can filter the search results
+			And I can view or download the channel summary
\ No newline at end of file
diff --git a/integration_testing/features/export-account-information.feature b/integration_testing/features/export-account-information.feature
index 33d719f03b..a497529897 100755
--- a/integration_testing/features/export-account-information.feature
+++ b/integration_testing/features/export-account-information.feature
@@ -2,7 +2,7 @@ Feature: Export account information
 
 	Background: 
 		Given I have a Studio account
-			And I am signed in to Studio as a non-admin user
+			And I am signed in to Studio
 			And I have interacted with various data and channels
 			And I am on the *Settings > Account* page
 
diff --git a/integration_testing/features/get-channel-token-after-publishing.feature b/integration_testing/features/get-channel-token-after-publishing.feature
index 1667acd2e2..6f5fdd47fe 100755
--- a/integration_testing/features/get-channel-token-after-publishing.feature
+++ b/integration_testing/features/get-channel-token-after-publishing.feature
@@ -1,7 +1,7 @@
 Feature: Get channel token after publishing the channel
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editor page
 			And the <channel> has recently been published
 
diff --git a/integration_testing/features/go-back-from-review-import-selections-to-channel-list.feature b/integration_testing/features/go-back-from-review-import-selections-to-channel-list.feature
index 60cfd3c606..9d4c7815a0 100755
--- a/integration_testing/features/go-back-from-review-import-selections-to-channel-list.feature
+++ b/integration_testing/features/go-back-from-review-import-selections-to-channel-list.feature
@@ -1,7 +1,7 @@
 Feature: Go back from Review selections for import to channel list
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on *My Channels > edit* page
 
 	Scenario: Go back from Review selections for import to channel list
diff --git a/integration_testing/features/go-to-resource-original-location.feature b/integration_testing/features/go-to-resource-original-location.feature
index 02f98784a8..cc605ead7c 100755
--- a/integration_testing/features/go-to-resource-original-location.feature
+++ b/integration_testing/features/go-to-resource-original-location.feature
@@ -1,7 +1,7 @@
 Feature: Go to resource original location
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Go to resource original location
diff --git a/integration_testing/features/import-content-from-another-channel.feature b/integration_testing/features/import-content-from-another-channel.feature
index 1e8b437d43..880e78c106 100755
--- a/integration_testing/features/import-content-from-another-channel.feature
+++ b/integration_testing/features/import-content-from-another-channel.feature
@@ -1,7 +1,7 @@
 Feature: Import content from another channel
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editing page
 
 	Scenario: Import content from another channel
diff --git a/integration_testing/features/import-from-search-results-at-my-channels-channel-2.feature b/integration_testing/features/import-from-search-results-at-my-channels-channel-2.feature
index 0636f6c151..4ea2f3f37e 100755
--- a/integration_testing/features/import-from-search-results-at-my-channels-channel-2.feature
+++ b/integration_testing/features/import-from-search-results-at-my-channels-channel-2.feature
@@ -2,7 +2,7 @@ Feature: Import content from the search results at *My Channels* <channel>
 
 	Background: 
 		Given I am already a registered user
-			And I am signed in to Studio as a non-admin user
+			And I am signed in to Studio
 			And I am on *My Channels > edit* page
 
 	Scenario: Import content from the search results at *My Channels* <channel>
diff --git a/integration_testing/features/import-from-search-results-at-my-channels-channel.feature b/integration_testing/features/import-from-search-results-at-my-channels-channel.feature
index 0fdda833e7..6f74ecb217 100755
--- a/integration_testing/features/import-from-search-results-at-my-channels-channel.feature
+++ b/integration_testing/features/import-from-search-results-at-my-channels-channel.feature
@@ -1,7 +1,7 @@
 Feature: Import content from the search results
 	
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editing page
 
 	Scenario: Import content from the search results
diff --git a/integration_testing/features/manage-additional-channel-options.feature b/integration_testing/features/manage-additional-channel-options.feature
index 1df6615755..ab249a52d5 100755
--- a/integration_testing/features/manage-additional-channel-options.feature
+++ b/integration_testing/features/manage-additional-channel-options.feature
@@ -1,14 +1,39 @@
-Feature: Access and use additional options on channel list
-	User needs to be able to access additional options to manage channels from the channel list
-
-	Background: 
-		Given I am signed in to Studio as a non-admin user
-			And I am on any of the tabs (*My Channels*, *Starred*, *View only*, or *Content Library*)
-
-	Scenario: Edit channel details
-		When I click the *⋮* button (ellipsis button) for more options
-			And I select *Edit channel details*
-		Then I 
-			And I 
-		When I 
-		Then I
\ No newline at end of file
+Feature: Access and use additional options on channel list
+	User needs to be able to access additional options to manage channels from the channel list
+
+	Background: 
+		Given I am signed in to Studio
+			And I am at *My Channels* tab
+
+	Scenario: Edit channel details
+		When I click the *⋮* button
+			And I click the *Edit channel details* option
+		Then I see a modal window with the channel details
+			And I see the details for the channel - channel name, language, channel description etc.
+		When I modify any of the details
+			And I click the *Save changes* button
+		Then I see a message: Changes saved
+			And I can close the modal window
+
+	Scenario: Copy channel token
+		When I click the *⋮* button
+			And I click the *Copy channel token* option
+		Then I see the *Copy channel token* modal window
+		When I click on the icon to the right of the token
+		Then I see a *Token copied* message
+			And I can paste the copied token wherever I need to paste it
+
+	Scenario: Delete channel
+		When I click the *⋮* button
+			And I click the *Delete channel* option
+		Then I see the *Delete this channel* modal window
+			And I see a message *This channel will be permanently deleted. This cannot be undone.*
+		When I click the *Delete channel* button
+		Then the channel is deleted and is no longer displayed
+
+	Scenario: View channel details
+		When I click the *i* button
+		Then I see a modal window with the channel details
+		When I click the *Download channel summary button*
+			And I click one of the available options
+		Then I can download the channel summary either as a .pdf or a .csv file
diff --git a/integration_testing/features/move-resources-from-clipboard.feature b/integration_testing/features/move-resources-from-clipboard.feature
index 33eca3e2c4..e65797d6fe 100755
--- a/integration_testing/features/move-resources-from-clipboard.feature
+++ b/integration_testing/features/move-resources-from-clipboard.feature
@@ -1,7 +1,7 @@
 Feature: Move multiple resources from Clipboard
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 	
 	Scenario: Move multiple resources
diff --git a/integration_testing/features/move-resources.feature b/integration_testing/features/move-resources.feature
index df3d6d3705..eb2fc6b360 100755
--- a/integration_testing/features/move-resources.feature
+++ b/integration_testing/features/move-resources.feature
@@ -1,7 +1,7 @@
 Feature: Move resources to a new destination
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I select some resources on the channel editor
 		Then I see a move button appears in the actions bar
 
diff --git a/integration_testing/features/move-to-clipboard-via-right-click.feature b/integration_testing/features/move-to-clipboard-via-right-click.feature
index dc7a85a2b2..4424414187 100755
--- a/integration_testing/features/move-to-clipboard-via-right-click.feature
+++ b/integration_testing/features/move-to-clipboard-via-right-click.feature
@@ -1,7 +1,7 @@
 Feature: Move resource in the clipboard via right click
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Move an item in the clipboard via right click
diff --git a/integration_testing/features/open-a-channel-in-a-new-tab.feature b/integration_testing/features/open-a-channel-in-a-new-tab.feature
index aecf2dbd73..cc566cf714 100755
--- a/integration_testing/features/open-a-channel-in-a-new-tab.feature
+++ b/integration_testing/features/open-a-channel-in-a-new-tab.feature
@@ -1,7 +1,7 @@
 Feature: Open channel in new tab
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Open channel in new tab
diff --git a/integration_testing/features/open-sidebar-and-user-menus.feature b/integration_testing/features/open-sidebar-and-user-menus.feature
index b515e28819..9de7b076ee 100755
--- a/integration_testing/features/open-sidebar-and-user-menus.feature
+++ b/integration_testing/features/open-sidebar-and-user-menus.feature
@@ -2,7 +2,7 @@ Feature: Open and close sidebar and user menus
 User needs to be able to open and close the sidebar menu and the user menu 
 
   Background: 
-    Given I am signed in to Studio as a non-admin user
+    Given I am signed in to Studio
 		  And I am on any of the tabs (*My Channels*, *Starred*, *View only*, *Content Library*, or *Collections*)
 
   Scenario: Open and close the sidebar menu
diff --git a/integration_testing/features/preview-resource-in-clipboard.feature b/integration_testing/features/preview-resource-in-clipboard.feature
index 25c4021999..26d43e3391 100755
--- a/integration_testing/features/preview-resource-in-clipboard.feature
+++ b/integration_testing/features/preview-resource-in-clipboard.feature
@@ -1,7 +1,7 @@
 Feature: Preview resource in the clipboard
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Preview resource in the clipboard
diff --git a/integration_testing/features/publish-channel.feature b/integration_testing/features/publish-channel.feature
index 6b24e45c5a..bcf8d4732f 100755
--- a/integration_testing/features/publish-channel.feature
+++ b/integration_testing/features/publish-channel.feature
@@ -1,7 +1,7 @@
 Feature: Publish a channel
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am in the channel editor page
 			And I have write access to the channel
 			And the channel has had modifications
diff --git a/integration_testing/features/remove-from-clipboard-via-right-click.feature b/integration_testing/features/remove-from-clipboard-via-right-click.feature
index 3db40cf0d4..3f98a70842 100755
--- a/integration_testing/features/remove-from-clipboard-via-right-click.feature
+++ b/integration_testing/features/remove-from-clipboard-via-right-click.feature
@@ -1,7 +1,7 @@
 Feature: Remove resource from the clipboard via right click
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Remove resource from the clipboard via right click
diff --git a/integration_testing/features/remove-from-clipboard-via-selection-bar.feature b/integration_testing/features/remove-from-clipboard-via-selection-bar.feature
index 4f6e53d284..168c54d865 100755
--- a/integration_testing/features/remove-from-clipboard-via-selection-bar.feature
+++ b/integration_testing/features/remove-from-clipboard-via-selection-bar.feature
@@ -1,7 +1,7 @@
 Feature: Remove resource from the clipboard via selection bar
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Remove resource from the clipboard via selection bar
diff --git a/integration_testing/features/remove-multiple-resources-from-the-clipboard.feature b/integration_testing/features/remove-multiple-resources-from-the-clipboard.feature
index f6c423898f..094c0a6ad4 100755
--- a/integration_testing/features/remove-multiple-resources-from-the-clipboard.feature
+++ b/integration_testing/features/remove-multiple-resources-from-the-clipboard.feature
@@ -1,7 +1,7 @@
 Feature: Remove multiple resources from the clipboard
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Remove multiple resources from the clipboard
diff --git a/integration_testing/features/remove-resource-from-channel.feature b/integration_testing/features/remove-resource-from-channel.feature
index ec1d985e52..9a31174087 100755
--- a/integration_testing/features/remove-resource-from-channel.feature
+++ b/integration_testing/features/remove-resource-from-channel.feature
@@ -1,7 +1,7 @@
 Feature: Remove a topic or a resource from a channel
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editor page
 			And I have edit permissions for <channel>
 
diff --git a/integration_testing/features/report-issue.feature b/integration_testing/features/report-issue.feature
index 6e0cdf987d..91d7f95fe8 100755
--- a/integration_testing/features/report-issue.feature
+++ b/integration_testing/features/report-issue.feature
@@ -1,7 +1,7 @@
 Feature: Report an issue
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the *Settings > About Studio* page
 
 	Scenario: Report an issue
diff --git a/integration_testing/features/request-more-storage-space.feature b/integration_testing/features/request-more-storage-space.feature
index ec280338f8..8e1f8c4bc3 100755
--- a/integration_testing/features/request-more-storage-space.feature
+++ b/integration_testing/features/request-more-storage-space.feature
@@ -1,7 +1,7 @@
 Feature: Request more storage space
 
 	Background:
-		Given I am signed in to Studio as a non-admin user 
+		Given I am signed in to Studio 
 			And I am on Studio *Settings > Storage* page
 			And I click *Show form* on the page
 
diff --git a/integration_testing/features/reset-your-password.feature b/integration_testing/features/reset-your-password.feature
new file mode 100755
index 0000000000..4e8b9274df
--- /dev/null
+++ b/integration_testing/features/reset-your-password.feature
@@ -0,0 +1,42 @@
+Feature: Reset your password
+	Users should be able to reset their password if they have an existing account.
+
+	Background:
+		Given I am not signed in to Studio
+			And I am on Studio's sign-in page
+
+	Scenario: Request a link to reset my password
+		When I click the *Forgot your password?* link
+		Then I see a page with option to enter my email address
+		When I type an existing valid email address in the *Email* field
+			And I press the *Submit* button
+		Then I see a message that the instructions are sent
+			And I can see that I have received a *Password reset on Kolibri Studio* email
+			And I can follow the link in the email to reset my password
+
+	Scenario: Reset my password
+		Given I've requested and received an email with a link to reset my password
+		When I click the link in the email
+		Then I see a page with a *Reset your password* form
+			And I fill in the *New password* field
+			And I fill in the *Confirm password* field with the same password
+			And I press the *Submit* button
+		Then I see the following message: Password reset successfully
+
+	Scenario: Sign in using the new password
+		Given I've reset my password successfully
+			And I'm on a page where I see the following message: Password reset successfully
+		When I click the *Continue to sign-in page* link
+		Then I am at the sign-in page
+		When I enter my email address in the *Email* field
+			And I enter my password in the *Password* field
+			And I press the *Sign in* button
+		Then I'm signed in successfully
+
+	Scenario: Expired Reset password link
+		Given I've requested and received an email with a link to reset my password
+			And I've already reset my password with that link
+		When I click the link in the email again
+		Then I see a page with the following message: Reset link expired
+			And I see a *Request a new password reset link* button
+
diff --git a/integration_testing/features/resource-count-updates-properly.feature b/integration_testing/features/resource-count-updates-properly.feature
index deb5fd9551..a8d047f0e8 100755
--- a/integration_testing/features/resource-count-updates-properly.feature
+++ b/integration_testing/features/resource-count-updates-properly.feature
@@ -1,7 +1,7 @@
 Feature: Resource count gets updated properly
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editing page
 
 	Scenario: Resource count gets updated properly
diff --git a/integration_testing/features/restore-resources-from-trash.feature b/integration_testing/features/restore-resources-from-trash.feature
index 96a8597b46..d6a1ee12f6 100755
--- a/integration_testing/features/restore-resources-from-trash.feature
+++ b/integration_testing/features/restore-resources-from-trash.feature
@@ -1,7 +1,7 @@
 Feature: Restore resources from trash
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editing page
 
 	Scenario: Restore a single resource from trash to a channel
diff --git a/integration_testing/features/review-import-selection-at-my-channels.feature b/integration_testing/features/review-import-selection-at-my-channels.feature
index f7793d7c5d..68629ca715 100755
--- a/integration_testing/features/review-import-selection-at-my-channels.feature
+++ b/integration_testing/features/review-import-selection-at-my-channels.feature
@@ -1,7 +1,7 @@
 Feature: Review import selection at *My Channels*
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on *My Channels > edit* page
 
 	Scenario: Review import selection at *My Channels*
diff --git a/integration_testing/features/review-used-storage.feature b/integration_testing/features/review-used-storage.feature
index dbc9233bd9..ef0d9fccc8 100755
--- a/integration_testing/features/review-used-storage.feature
+++ b/integration_testing/features/review-used-storage.feature
@@ -1,7 +1,7 @@
 Feature: Review used storage
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the *Settings > Storage* page
 
 	Scenario: Review used storage
diff --git a/integration_testing/features/search-for-resources.feature b/integration_testing/features/search-for-resources.feature
index 9f32dc91be..4279dff09f 100755
--- a/integration_testing/features/search-for-resources.feature
+++ b/integration_testing/features/search-for-resources.feature
@@ -1,16 +1,42 @@
 Feature: Search for resources
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editing page
-
-	Scenario: Search for resources
 		When I click the *Add* button
 			And I select the *Import from Channels* option
 		Then I see the *Import from Other Channels* modal
-		When I enter the <search_term> in the search bar
+
+	Scenario: Search for resources from the *Content library*
+		When I enter a <search_term> in the search bar # *Content library* is selected by default in the *Channels* drop-down
+			And I click the *Search* button
+		Then I see all the search results from the *Content library* for my <search_term>
+
+	Scenario: Search for resources from *My channels*
+		When I enter a <search_term> in the search bar
+			And I select *My channels* from the *Channels* drop-down
+			And I click the *Search* button
+		Then I see all the search results from *My channels* for my <search_term>
+
+	Scenario: Search for resources from *Starred*
+		When I enter a <search_term> in the search bar
+			And I select *Starred* from the *Channels* drop-down
 			And I click the *Search* button
-		Then I see all the search results for my <search_term>
+		Then I see all the search results from *Starred* for my <search_term>
+
+	Scenario: Search for resources from *View-only*
+		When I enter a <search_term> in the search bar
+			And I select *View-only* from the *Channels* drop-down
+			And I click the *Search* button
+		Then I see all the search results from *View-only* for my <search_term>
+
+	Scenario: Search for resources by applying the *Language* filter
+		When I enter a <search_term> in the search bar
+			And I select a <language> from the *Language* drop-down
+			And I click the *Search* button
+		Then I see search results only from channels in the selected <language>
+
 
 	Examples:
-	| channel | search_term |
\ No newline at end of file
+	| channel | search_term | language |
+	| CK-12 | addition | English (en) |
diff --git a/integration_testing/features/share-channels.feature b/integration_testing/features/share-channels.feature
new file mode 100755
index 0000000000..9cc7f1dd39
--- /dev/null
+++ b/integration_testing/features/share-channels.feature
@@ -0,0 +1,23 @@
+Feature: Share channels
+	A user needs to be able to invite collaborators to view or edit channels
+
+	Background: 
+		Given I am signed in to Studio
+			And I am on the channel editor page
+		When I click the *...* (options) button in the topbar
+			And select the *Share channel* option
+		Then I am at the *Sharing* tab for the channel
+
+	Scenario: Invite collaborators with *Can edit* permissions
+		When I type the email of the person I want to invite
+			And I don't change the preselected *Can edit* option in the drop-down
+			And I click the *Send invitation* button
+		Then the collaborator will be notified on their *My Channels* page, where they can accept or reject the pending invitation
+			And the collaborator will receive an email allowing them to accept/reject the pending invitation
+
+	Scenario: Invite collaborators with *Can view* permissions
+		When I type the email of the person I want to invite
+			And I select the *Can view* option in the drop-down
+			And I click the *Send invitation* button
+		Then the collaborator will be notified on their *My Channels* page, where they can accept or reject the pending invitation
+			And the collaborator will receive an email allowing them to accept/reject the pending invitation
diff --git a/integration_testing/features/sync-channel.feature b/integration_testing/features/sync-channel.feature
index 8f7d3b0dcf..b607a9f97a 100755
--- a/integration_testing/features/sync-channel.feature
+++ b/integration_testing/features/sync-channel.feature
@@ -1,4 +1,4 @@
-Feature: Sync resources
+Feature: Sync resources		
 	Studio users need to be able to sync and update the resources in their channels that have been imported from other channels, but have been modified since the original import.
 
 	Background:
diff --git a/integration_testing/features/undo-removal-of-clipboard-resources.feature b/integration_testing/features/undo-removal-of-clipboard-resources.feature
index afefbcc7bf..f919301f4b 100755
--- a/integration_testing/features/undo-removal-of-clipboard-resources.feature
+++ b/integration_testing/features/undo-removal-of-clipboard-resources.feature
@@ -1,7 +1,7 @@
 Feature: Undo the removal of a clipboard resources
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the channel editor view
 
 	Scenario: Undo the removal of a clipboard resource
diff --git a/integration_testing/features/upload-files.feature b/integration_testing/features/upload-files.feature
new file mode 100755
index 0000000000..1f65efbbe7
--- /dev/null
+++ b/integration_testing/features/upload-files.feature
@@ -0,0 +1,22 @@
+Feature: Upload files
+	Users should be able to upload individual learning resources into their channel
+
+	Background: 
+		Given I am signed in to Studio
+			And I am on the channel editor page
+
+	Scenario: Upload files
+		When I click the *Add* button
+			And I select the *Upload files* option
+		Then I see the *Upload files* modal
+			And I see the *Total storage used* value
+			And I can see which are the supported file types: mp3, pdf, epub, mp4, webm, zip
+		When I click the *Select files* button
+		Then I see a file explorer window
+			And I can select one or several supported files for upload
+		When I click the *Open* button
+		Then I see the *Edit files* modal
+		When I fill in all the required fields
+			And I click the *Finish* button
+		Then I am returned to the main topic tree view
+			And I can see the uploaded files
diff --git a/integration_testing/features/url-updates.feature b/integration_testing/features/url-updates.feature
index 13dad1e0f7..86f441dee6 100755
--- a/integration_testing/features/url-updates.feature
+++ b/integration_testing/features/url-updates.feature
@@ -2,7 +2,7 @@ Feature: URL update when the user switches between channel list
 User can see changes at the URL when they switch between channel list
 
   Background: 
-    Given I am signed in to Studio as a non-admin user
+    Given I am signed in to Studio
 
     Scenario: URL update at the *My Channels* nav
       When I click *My Channels* nav 
diff --git a/integration_testing/features/use-channels-with-view-only-access.feature b/integration_testing/features/use-channels-with-view-only-access.feature
index 13bed157c3..d7415fd9b7 100755
--- a/integration_testing/features/use-channels-with-view-only-access.feature
+++ b/integration_testing/features/use-channels-with-view-only-access.feature
@@ -1,7 +1,7 @@
 Feature: Use channels with view-only access
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on the <channel> editor page
 			And I have view-only permissions for <channel>
 
diff --git a/integration_testing/features/view-channel-details.feature b/integration_testing/features/view-channel-details.feature
index 743ec2d1eb..3a3aeda641 100755
--- a/integration_testing/features/view-channel-details.feature
+++ b/integration_testing/features/view-channel-details.feature
@@ -1,7 +1,7 @@
 Feature: View channel details 
 
 	Background: 
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on any of the tabs (*My Channels*, *Starred*, *View only*, or *Content Library*)
 
 		Scenario: Open channel details
diff --git a/integration_testing/features/view-support-links.feature b/integration_testing/features/view-support-links.feature
index 741274a52d..795e5c4c08 100755
--- a/integration_testing/features/view-support-links.feature
+++ b/integration_testing/features/view-support-links.feature
@@ -1,7 +1,7 @@
 Feature: View support links 
 
 	Background:
-		Given I am signed in to Studio as a non-admin user
+		Given I am signed in to Studio
 			And I am on Studio *Settings > About Studio* page
 
 	Scenario: View resources
diff --git a/pytest.ini b/pytest.ini
index f75d210d11..466d04b19f 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -8,5 +8,3 @@ python_paths = contentcuration/
 filterwarnings =
     ignore::UserWarning
     ignore::DeprecationWarning
-    ignore::django.utils.deprecation.RemovedInDjango20Warning
-    ignore::django.utils.deprecation.RemovedInDjango21Warning
diff --git a/requirements-dev.in b/requirements-dev.in
index 48aceb23be..bb33682a2b 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -13,7 +13,7 @@ pyls-isort
 autoflake
 pylint
 mock
-mixer==5.6.6
+mixer==6.1.3
 pytest
 pytest-django
 pytest-logging
@@ -26,7 +26,7 @@ pytest-watch
 rope
 autopep8<=1.4.0
 pre-commit==1.15.1
-Faker==0.7.3
+Faker==0.9.1
 codecov
 coverage
 pytest-cov
diff --git a/requirements-dev.txt b/requirements-dev.txt
index e10af92029..780dcddf56 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,54 +4,58 @@
 #
 #    pip-compile requirements-dev.in
 #
-amqp==2.5.2
+amqp==2.6.1
     # via
     #   -c requirements.txt
     #   kombu
-appdirs==1.4.3
+appdirs==1.4.4
     # via virtualenv
+asgiref==3.3.4
+    # via
+    #   -c requirements.txt
+    #   django
 aspy.yaml==1.3.0
     # via pre-commit
-astroid==2.3.3
+astroid==2.5.6
     # via pylint
 attrs==19.3.0
     # via
     #   -c requirements.txt
     #   pytest
-autoflake==1.3.1
+autoflake==1.4
     # via -r requirements-dev.in
 autopep8==1.4
     # via -r requirements-dev.in
-backcall==0.1.0
+backcall==0.2.0
     # via ipython
-billiard==3.5.0.5
+billiard==3.6.4.0
     # via
     #   -c requirements.txt
     #   celery
-celery==4.1.1
+celery==4.4.7
     # via
     #   -c requirements.txt
     #   flower
-certifi==2019.11.28
+certifi==2020.12.5
     # via
     #   -c requirements.txt
     #   geventhttpclient
     #   requests
-cfgv==3.0.0
+cfgv==3.3.0
     # via pre-commit
-chardet==3.0.4
+chardet==4.0.0
     # via
     #   -c requirements.txt
     #   requests
-click==7.0
+click==8.0.0
     # via
     #   flask
     #   pip-tools
-codecov==2.0.15
+codecov==2.1.11
     # via -r requirements-dev.in
-colorama==0.4.3
+colorama==0.4.4
     # via pytest-watch
-configargparse==1.2.3
+configargparse==1.4.1
     # via locust
 coreapi==2.3.3
     # via drf-yasg
@@ -59,18 +63,20 @@ coreschema==0.0.4
     # via
     #   coreapi
     #   drf-yasg
-coverage==5.0.3
+coverage[toml]==5.5
     # via
     #   -r requirements-dev.in
     #   codecov
     #   pytest-cov
 git+https://github.com/someshchaturvedi/customizable-django-profiler.git#customizable-django-profiler
     # via -r requirements-dev.in
-decorator==4.4.1
+dataclasses==0.8
+    # via werkzeug
+decorator==5.0.9
     # via
     #   ipython
     #   traitlets
-distlib==0.3.0
+distlib==0.3.1
     # via virtualenv
 django-concurrent-test-helper==0.7.0
     # via -r requirements-dev.in
@@ -80,20 +86,21 @@ django-debug-toolbar==1.9.1
     # via
     #   -r requirements-dev.in
     #   django-debug-panel
-django==1.11.29
+django==3.2.3
     # via
     #   -c requirements.txt
     #   django-debug-toolbar
+    #   djangorestframework
     #   drf-yasg
-djangorestframework==3.9.1
+djangorestframework==3.12.4
     # via
     #   -c requirements.txt
     #   drf-yasg
 docopt==0.6.2
     # via pytest-watch
-drf-yasg==1.17.1
+drf-yasg==1.20.0
     # via -r requirements-dev.in
-faker==0.7.3
+faker==0.9.1
     # via
     #   -r requirements-dev.in
     #   mixer
@@ -109,121 +116,125 @@ flask==1.1.2
     #   locust
 flower==0.9.4
     # via -r requirements-dev.in
-fonttools==4.17.1
+fonttools==4.24.0
     # via -r requirements-dev.in
-gevent==20.6.2
+gevent==21.1.2
     # via
     #   geventhttpclient
     #   locust
 geventhttpclient==1.4.4
     # via locust
-greenlet==0.4.16
+greenlet==1.1.0
     # via gevent
 humanize==0.5.1
     # via flower
-identify==1.4.11
+identify==2.2.4
     # via pre-commit
-idna==2.8
+idna==2.10
     # via
     #   -c requirements.txt
     #   requests
 importlib-metadata==1.7.0
     # via
     #   -c requirements.txt
-    #   importlib-resources
+    #   kombu
+    #   pep517
     #   pluggy
     #   pre-commit
     #   pytest
     #   virtualenv
-importlib-resources==1.5.0
+importlib-resources==5.1.3
     # via
     #   pre-commit
     #   virtualenv
 importmagic==0.1.7
     # via -r requirements-dev.in
-inflection==0.5.0
+inflection==0.5.1
     # via drf-yasg
-ipdb==0.12.3
+iniconfig==1.1.1
+    # via pytest
+ipdb==0.13.7
     # via -r requirements-dev.in
 ipython-genutils==0.2.0
     # via traitlets
-ipython==7.12.0
+ipython==7.16.1
     # via ipdb
-isort==4.3.21
+isort==5.8.0
     # via
     #   -r requirements-dev.in
     #   pylint
     #   pyls-isort
-itsdangerous==1.1.0
+itsdangerous==2.0.1
     # via flask
 itypes==1.2.0
     # via coreapi
-jedi==0.15.2
+jedi==0.17.2
     # via
     #   -r requirements-dev.in
     #   ipython
     #   python-language-server
-jinja2==2.11.3
+    #   python-lsp-server
+jinja2==3.0.1
     # via
     #   coreschema
     #   flask
 json-rpc==1.13.0
     # via -r requirements-dev.in
-kombu==4.3.0
+kombu==4.6.11
     # via
     #   -c requirements.txt
     #   celery
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.6.0
     # via astroid
-locust==1.1.1
+locust==1.5.3
     # via -r requirements-dev.in
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via jinja2
 mccabe==0.6.1
     # via
     #   flake8
     #   pylint
-mixer==5.6.6
+mixer==6.1.3
     # via -r requirements-dev.in
-mock==4.0.1
+mock==4.0.3
     # via
     #   -r requirements-dev.in
     #   django-concurrent-test-helper
-more-itertools==8.2.0
-    # via pytest
-msgpack==1.0.0
+msgpack==1.0.2
     # via locust
-nodeenv==1.3.5
+nodeenv==1.6.0
     # via
     #   -r requirements-dev.in
     #   pre-commit
-packaging==20.1
+packaging==20.9
     # via
+    #   -c requirements.txt
     #   drf-yasg
     #   pytest
-parso==0.6.1
+parso==0.7.1
     # via jedi
-pathtools==0.1.2
-    # via watchdog
+pep517==0.10.0
+    # via pip-tools
 pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-pip-tools==5.3.1
+pip-tools==6.1.0
     # via -r requirements-dev.in
 pluggy==0.13.1
     # via
     #   pytest
     #   python-language-server
+    #   python-lsp-server
 pre-commit==1.15.1
     # via -r requirements-dev.in
-prompt-toolkit==3.0.3
+prompt-toolkit==3.0.18
     # via ipython
-psutil==5.7.2
+psutil==5.8.0
     # via locust
-ptyprocess==0.6.0
+ptyprocess==0.7.0
     # via pexpect
-py==1.8.1
+py==1.10.0
     # via pytest
 pycodestyle==2.3.1
     # via
@@ -233,25 +244,27 @@ pyflakes==1.5.0
     # via
     #   autoflake
     #   flake8
-pygments==2.7.4
+pygments==2.9.0
     # via ipython
-pyinstrument-cext==0.2.2
+pyinstrument-cext==0.2.4
     # via pyinstrument
-pyinstrument==3.1.4
+pyinstrument==3.4.2
     # via -r requirements-dev.in
-pylint==2.4.4
+pylint==2.8.2
     # via -r requirements-dev.in
-pyls-isort==0.1.1
+pyls-isort==0.2.2
     # via -r requirements-dev.in
-pympler==0.8
+pympler==0.9
     # via -r requirements-dev.in
 pypandoc==1.5
     # via -r requirements-dev.in
-pyparsing==2.4.6
-    # via packaging
-pytest-cov==2.8.1
+pyparsing==2.4.7
+    # via
+    #   -c requirements.txt
+    #   packaging
+pytest-cov==2.12.0
     # via -r requirements-dev.in
-pytest-django==3.8.0
+pytest-django==4.3.0
     # via -r requirements-dev.in
 pytest-logging==2015.11.4
     # via -r requirements-dev.in
@@ -261,7 +274,7 @@ pytest-timeout==1.4.2
     # via -r requirements-dev.in
 pytest-watch==4.2.0
     # via -r requirements-dev.in
-pytest==5.3.5
+pytest==6.2.4
     # via
     #   -r requirements-dev.in
     #   pytest-cov
@@ -274,76 +287,91 @@ python-dateutil==2.8.1
     # via
     #   -c requirements.txt
     #   faker
-python-jsonrpc-server==0.3.4
+python-jsonrpc-server==0.4.0
     # via python-language-server
-python-language-server==0.31.8
-    # via
-    #   -r requirements-dev.in
-    #   pyls-isort
-pytz==2019.3
+python-language-server==0.36.2
+    # via -r requirements-dev.in
+python-lsp-jsonrpc==1.0.0
+    # via python-lsp-server
+python-lsp-server==1.0.1
+    # via pyls-isort
+pytz==2021.1
     # via
     #   -c requirements.txt
     #   celery
     #   django
     #   flower
-pyyaml==5.4
+pyyaml==5.4.1
     # via
     #   aspy.yaml
     #   pre-commit
-pyzmq==19.0.2
+pyzmq==22.0.3
     # via locust
-requests==2.22.0
+requests==2.25.1
     # via
     #   -c requirements.txt
     #   codecov
     #   coreapi
     #   locust
-rope==0.16.0
+rope==0.19.0
     # via -r requirements-dev.in
 ruamel.yaml.clib==0.2.2
     # via ruamel.yaml
-ruamel.yaml==0.16.10
+ruamel.yaml==0.17.4
     # via drf-yasg
 service-factory==0.1.6
     # via -r requirements-dev.in
-six==1.14.0
+six==1.16.0
     # via
     #   -c requirements.txt
-    #   astroid
     #   django-concurrent-test-helper
-    #   drf-yasg
     #   faker
     #   geventhttpclient
-    #   packaging
-    #   pip-tools
     #   pre-commit
     #   python-dateutil
     #   traitlets
     #   virtualenv
-sqlparse==0.3.0
-    # via django-debug-toolbar
+sqlparse==0.4.1
+    # via
+    #   -c requirements.txt
+    #   django
+    #   django-debug-toolbar
 tabulate==0.8.2
     # via -r requirements-dev.in
 tblib==1.7.0
     # via django-concurrent-test-helper
-toml==0.10.0
-    # via pre-commit
+text-unidecode==1.2
+    # via faker
+toml==0.10.2
+    # via
+    #   coverage
+    #   ipdb
+    #   pep517
+    #   pre-commit
+    #   pylint
+    #   pytest
 tornado==6.1
     # via flower
 traitlets==4.3.3
     # via ipython
 typed-ast==1.4.3
     # via astroid
-ujson==1.35
+typing-extensions==3.10.0.0
+    # via
+    #   -c requirements.txt
+    #   asgiref
+ujson==4.0.2
     # via
     #   python-jsonrpc-server
     #   python-language-server
+    #   python-lsp-jsonrpc
+    #   python-lsp-server
 uritemplate==3.0.1
     # via
     #   -c requirements.txt
     #   coreapi
     #   drf-yasg
-urllib3==1.25.8
+urllib3==1.26.4
     # via
     #   -c requirements.txt
     #   requests
@@ -351,30 +379,32 @@ vine==1.3.0
     # via
     #   -c requirements.txt
     #   amqp
-virtualenv==20.0.3
+    #   celery
+virtualenv==20.4.6
     # via pre-commit
-watchdog==0.10.2
+watchdog==2.1.2
     # via pytest-watch
-wcwidth==0.1.8
+wcwidth==0.2.5
+    # via prompt-toolkit
+werkzeug==2.0.1
     # via
-    #   prompt-toolkit
-    #   pytest
-werkzeug==1.0.1
-    # via flask
-wheel==0.35.1
+    #   flask
+    #   locust
+wheel==0.36.2
     # via pypandoc
-wrapt==1.11.2
+wrapt==1.12.1
     # via astroid
-yapf==0.29.0
+yapf==0.31.0
     # via -r requirements-dev.in
 zipp==3.4.1
     # via
     #   -c requirements.txt
     #   importlib-metadata
     #   importlib-resources
-zope.event==4.4
+    #   pep517
+zope.event==4.5.0
     # via gevent
-zope.interface==5.1.0
+zope.interface==5.4.0
     # via gevent
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements.in b/requirements.in
index 42fe97bcc0..7183a20c00 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,41 +1,40 @@
 attrs==19.3.0
-django-cte==1.1.4
-django-mptt==0.9.1
-django-filter==1.0.4
-djangorestframework==3.9.1
-psycopg2-binary==2.7.4
+django-cte==1.1.5
+django-mptt==0.11.0
+django-filter==2.4.0
+djangorestframework==3.12.4
+psycopg2-binary==2.8.6
 django-js-reverse==0.9.1
-django-registration==2.1.2
+django-registration==3.1.2
 le-utils>=0.1.30
 gunicorn==19.6.0
 django-postmark==0.1.6
-jsonfield==2.0.2
+jsonfield==3.1.0
 newrelic>=2.86.3.70
-celery==4.1.1
-redis==2.10.5
+celery<5
+redis
 pycountry==17.5.14
 minio==3.0.3
 pathlib
 progressbar2==3.38.0
 python-postmark==0.5.0
-Django==1.11.29
+Django==3.2.3
 django-webpack-loader==0.7.0
 google-cloud-error-reporting
 google-cloud-storage
-django-s3-storage==0.12.4
+django-s3-storage==0.13.4
 requests>=2.20.0
 google-cloud-core
 gspread==3.6.0
 google-api-python-client
-django-db-readonly==0.5.0
+django-db-readonly==0.7.0
 oauth2client
 django-mathfilters
 google-cloud-kms==0.2.1
 backoff
-kombu==4.3
 backports-abc==0.5
 whitenoise==4.1.4
-django-model-utils==3.2.0
+django-model-utils==4.0.0
 django-redis
 django-prometheus
 future
diff --git a/requirements.txt b/requirements.txt
index 8da5ecf489..37a32fe7aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,8 +4,10 @@
 #
 #    pip-compile requirements.in
 #
-amqp==2.5.2
+amqp==2.6.1
     # via kombu
+asgiref==3.3.4
+    # via django
 attrs==19.3.0
     # via
     #   -r requirements.in
@@ -14,32 +16,36 @@ backoff==1.10.0
     # via -r requirements.in
 backports-abc==0.5
     # via -r requirements.in
-billiard==3.5.0.5
+billiard==3.6.4.0
     # via celery
-boto3==1.12.1
+boto3==1.17.75
     # via django-s3-storage
-botocore==1.15.1
+botocore==1.20.75
     # via
     #   boto3
     #   s3transfer
-cachetools==4.0.0
+cachetools==4.2.2
     # via google-auth
-celery==4.1.1
+celery==4.4.7
     # via -r requirements.in
-certifi==2019.11.28
+certifi==2020.12.5
     # via
     #   minio
     #   requests
     #   sentry-sdk
-chardet==3.0.4
+cffi==1.14.5
+    # via google-crc32c
+chardet==4.0.0
     # via requests
+confusable-homoglyphs==3.2.0
+    # via django-registration
 django-bulk-update==2.2.0
     # via -r requirements.in
-django-cte==1.1.4
+django-cte==1.1.5
     # via -r requirements.in
-django-db-readonly==0.5.0
+django-db-readonly==0.7.0
     # via -r requirements.in
-django-filter==1.0.4
+django-filter==2.4.0
     # via -r requirements.in
 django-js-asset==1.2.2
     # via django-mptt
@@ -47,79 +53,86 @@ django-js-reverse==0.9.1
     # via -r requirements.in
 django-mathfilters==1.0.0
     # via -r requirements.in
-django-model-utils==3.2.0
+django-model-utils==4.0.0
     # via -r requirements.in
-django-mptt==0.9.1
+django-mptt==0.11.0
     # via -r requirements.in
 django-postmark==0.1.6
     # via -r requirements.in
-django-prometheus==2.0.0
+django-prometheus==2.1.0
     # via -r requirements.in
-django-redis==4.11.0
+django-redis==4.12.1
     # via -r requirements.in
-django-registration==2.1.2
+django-registration==3.1.2
     # via -r requirements.in
-django-s3-storage==0.12.4
+django-s3-storage==0.13.4
     # via -r requirements.in
 django-webpack-loader==0.7.0
     # via -r requirements.in
-django==1.11.29
+django==3.2.3
     # via
     #   -r requirements.in
     #   django-bulk-update
+    #   django-db-readonly
+    #   django-filter
     #   django-js-reverse
     #   django-model-utils
     #   django-mptt
     #   django-redis
+    #   django-registration
     #   django-s3-storage
+    #   djangorestframework
     #   jsonfield
-djangorestframework==3.9.1
+djangorestframework==3.12.4
     # via -r requirements.in
-docutils==0.15.2
-    # via botocore
 future==0.18.2
     # via -r requirements.in
-google-api-core[grpc]==1.16.0
+google-api-core[grpc]==1.27.0
     # via
+    #   google-api-python-client
     #   google-cloud-core
+    #   google-cloud-error-reporting
     #   google-cloud-kms
     #   google-cloud-logging
-google-api-python-client==1.7.11
+google-api-python-client==2.4.0
     # via -r requirements.in
-google-auth-httplib2==0.0.3
+google-auth-httplib2==0.1.0
     # via google-api-python-client
-google-auth-oauthlib==0.4.2
+google-auth-oauthlib==0.4.4
     # via gspread
-google-auth==1.23.0
+google-auth==1.30.0
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth-httplib2
     #   google-auth-oauthlib
+    #   google-cloud-core
     #   google-cloud-storage
     #   gspread
-google-cloud-core==1.3.0
+google-cloud-core==1.6.0
     # via
     #   -r requirements.in
     #   google-cloud-logging
     #   google-cloud-storage
-google-cloud-error-reporting==0.33.0
+google-cloud-error-reporting==1.1.2
     # via -r requirements.in
 google-cloud-kms==0.2.1
     # via -r requirements.in
-google-cloud-logging==1.14.0
+google-cloud-logging==2.3.1
     # via google-cloud-error-reporting
-google-cloud-storage==1.26.0
+google-cloud-storage==1.38.0
     # via -r requirements.in
-google-resumable-media==0.5.0
+google-crc32c==1.1.2
+    # via google-resumable-media
+google-resumable-media==1.3.0
     # via google-cloud-storage
-googleapis-common-protos[grpc]==1.51.0
+googleapis-common-protos[grpc]==1.53.0
     # via
     #   google-api-core
     #   grpc-google-iam-v1
 grpc-google-iam-v1==0.11.4
     # via google-cloud-kms
-grpcio==1.27.2
+grpcio==1.37.1
     # via
     #   google-api-core
     #   googleapis-common-protos
@@ -130,53 +143,56 @@ gunicorn==19.6.0
     # via -r requirements.in
 html5lib==1.1
     # via -r requirements.in
-httplib2==0.18.0
+httplib2==0.19.1
     # via
     #   django-postmark
     #   google-api-python-client
     #   google-auth-httplib2
     #   oauth2client
-idna==2.8
+idna==2.10
     # via requests
 importlib-metadata==1.7.0
-    # via
-    #   -r requirements.in
-    #   jsonschema
-jmespath==0.9.4
+    # via -r requirements.in
+jmespath==0.10.0
     # via
     #   boto3
     #   botocore
-jsonfield==2.0.2
+jsonfield==3.1.0
     # via -r requirements.in
 jsonschema==3.2.0
     # via -r requirements.in
-kombu==4.3.0
-    # via
-    #   -r requirements.in
-    #   celery
+kombu==4.6.11
+    # via celery
 le-utils==0.1.30
     # via -r requirements.in
 minio==3.0.3
     # via -r requirements.in
-newrelic==5.6.0.135
+newrelic==6.2.0.156
     # via -r requirements.in
 oauth2client==4.1.3
     # via -r requirements.in
 oauthlib==3.1.0
     # via requests-oauthlib
+packaging==20.9
+    # via google-api-core
 pathlib==1.0.1
     # via -r requirements.in
 pillow==8.1.1
     # via -r requirements.in
 progressbar2==3.38.0
     # via -r requirements.in
-prometheus-client==0.7.1
+prometheus-client==0.10.1
     # via django-prometheus
-protobuf==3.11.3
+proto-plus==1.18.1
+    # via
+    #   google-cloud-error-reporting
+    #   google-cloud-logging
+protobuf==3.17.0
     # via
     #   google-api-core
     #   googleapis-common-protos
-psycopg2-binary==2.7.4
+    #   proto-plus
+psycopg2-binary==2.8.6
     # via -r requirements.in
 pyasn1-modules==0.2.8
     # via
@@ -191,6 +207,12 @@ pycountry==17.5.14
     # via
     #   -r requirements.in
     #   le-utils
+pycparser==2.20
+    # via cffi
+pyparsing==2.4.7
+    # via
+    #   httplib2
+    #   packaging
 pyrsistent==0.17.3
     # via jsonschema
 python-dateutil==2.8.1
@@ -199,9 +221,9 @@ python-dateutil==2.8.1
     #   botocore
 python-postmark==0.5.0
     # via -r requirements.in
-python-utils==2.4.0
+python-utils==2.5.6
     # via progressbar2
-pytz==2019.3
+pytz==2021.1
     # via
     #   celery
     #   django
@@ -210,31 +232,34 @@ pytz==2019.3
     #   minio
 raven==6.10.0
     # via -r requirements.in
-redis==2.10.5
+redis==3.5.3
     # via
     #   -r requirements.in
     #   django-redis
 requests-oauthlib==1.3.0
     # via google-auth-oauthlib
-requests==2.22.0
+requests==2.25.1
     # via
     #   -r requirements.in
     #   google-api-core
+    #   google-cloud-storage
     #   gspread
     #   requests-oauthlib
-rsa==4.7
+rsa==4.7.2
     # via
     #   google-auth
     #   oauth2client
-s3transfer==0.3.3
+s3transfer==0.4.2
     # via boto3
-sentry-sdk==0.14.1
+sentry-sdk==1.1.0
     # via -r requirements.in
-six==1.14.0
+six==1.16.0
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth
+    #   google-auth-httplib2
+    #   google-cloud-core
     #   google-resumable-media
     #   grpcio
     #   html5lib
@@ -244,16 +269,20 @@ six==1.14.0
     #   protobuf
     #   python-dateutil
     #   python-utils
+sqlparse==0.4.1
+    # via django
 uritemplate==3.0.1
     # via google-api-python-client
-urllib3==1.25.8
+urllib3==1.26.4
     # via
     #   botocore
     #   minio
     #   requests
     #   sentry-sdk
 vine==1.3.0
-    # via amqp
+    # via
+    #   amqp
+    #   celery
 webencodings==0.5.1
     # via html5lib
 whitenoise==4.1.4