diff --git a/sapl/api/apps.py b/sapl/api/apps.py
index ced7e511b..d643d8967 100644
--- a/sapl/api/apps.py
+++ b/sapl/api/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/api/forms.py b/sapl/api/forms.py
index 94bc80de4..940eaf47b 100644
--- a/sapl/api/forms.py
+++ b/sapl/api/forms.py
@@ -2,7 +2,7 @@ from django.db.models import Q
 from django.forms.fields import CharField, MultiValueField
 from django.forms.widgets import MultiWidget, TextInput
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django_filters.filters import DateFilter, MethodFilter, ModelChoiceFilter
 from rest_framework import serializers
 from rest_framework.compat import django_filters
diff --git a/sapl/api/views.py b/sapl/api/views.py
index 9853e6af0..7f4f5f9cd 100644
--- a/sapl/api/views.py
+++ b/sapl/api/views.py
@@ -1,7 +1,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 from django.http import Http404
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from rest_framework.filters import DjangoFilterBackend
 from rest_framework.generics import ListAPIView
 from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
diff --git a/sapl/audiencia/apps.py b/sapl/audiencia/apps.py
index e9b3c890f..7b5121d98 100644
--- a/sapl/audiencia/apps.py
+++ b/sapl/audiencia/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/audiencia/forms.py b/sapl/audiencia/forms.py
index 9312a237b..616f5edee 100644
--- a/sapl/audiencia/forms.py
+++ b/sapl/audiencia/forms.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from sapl.audiencia.models import AudienciaPublica, TipoAudienciaPublica
 from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa
 from sapl.utils import timezone
diff --git a/sapl/audiencia/models.py b/sapl/audiencia/models.py
index 477a442d9..1a1d3fcfc 100644
--- a/sapl/audiencia/models.py
+++ b/sapl/audiencia/models.py
@@ -1,6 +1,6 @@
 import reversion
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_utils import Choices
 from sapl.materia.models import MateriaLegislativa
 from sapl.parlamentares.models import (CargoMesa, Parlamentar)
diff --git a/sapl/base/admin.py b/sapl/base/admin.py
index 88633b0fb..66adc1f09 100644
--- a/sapl/base/admin.py
+++ b/sapl/base/admin.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from reversion.models import Revision
 from sapl.utils import register_all_models_in_admin
 
diff --git a/sapl/base/apps.py b/sapl/base/apps.py
index c3af888b7..3fda89024 100644
--- a/sapl/base/apps.py
+++ b/sapl/base/apps.py
@@ -1,6 +1,6 @@
 
 import django
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/sapl/base/forms.py b/sapl/base/forms.py
index 12cc43564..6719aec5c 100644
--- a/sapl/base/forms.py
+++ b/sapl/base/forms.py
@@ -11,7 +11,7 @@ from django.contrib.auth.models import Group, User
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.forms import Form, ModelForm
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.utils.translation import string_concat
 
 from sapl.base.models import Autor, TipoAutor
diff --git a/sapl/base/migrations/0021_auto_20180825_1713.py b/sapl/base/migrations/0021_auto_20180825_1713.py
new file mode 100644
index 000000000..3e4cecbf6
--- /dev/null
+++ b/sapl/base/migrations/0021_auto_20180825_1713.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-08-25 20:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0020_auto_20180821_1421'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExpressaoTextual',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('bind', models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=False, verbose_name='Expressão encontrada no SAPL')),
+                ('value', models.CharField(max_length=10000, unique=True, verbose_name='Expressão Oficial')),
+                ('custom', models.CharField(blank=True, default='', max_length=10000, verbose_name='Expressão Customizada')),
+            ],
+            options={
+                'verbose_name': 'Expressão Textual do SAPL',
+                'verbose_name_plural': 'Expressões Textuais do SAPL',
+                'ordering': ('value',),
+            },
+        ),
+        migrations.AlterField(
+            model_name='casalegislativa',
+            name='codigo',
+            field=models.CharField(blank=True, max_length=100, verbose_name='Código'),
+        ),
+    ]
diff --git a/sapl/base/migrations/0022_auto_20180825_1716.py b/sapl/base/migrations/0022_auto_20180825_1716.py
new file mode 100644
index 000000000..3c25d4cb5
--- /dev/null
+++ b/sapl/base/migrations/0022_auto_20180825_1716.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-08-25 20:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0021_auto_20180825_1713'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='expressaotextual',
+            name='custom',
+            field=models.TextField(blank=True, default='', verbose_name='Expressão Customizada'),
+        ),
+        migrations.AlterField(
+            model_name='expressaotextual',
+            name='value',
+            field=models.TextField(unique=True, verbose_name='Expressão Oficial'),
+        ),
+    ]
diff --git a/sapl/base/models.py b/sapl/base/models.py
index afd4160ed..9dc18d4f7 100644
--- a/sapl/base/models.py
+++ b/sapl/base/models.py
@@ -1,14 +1,17 @@
-import reversion
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.db.models.signals import post_migrate
 from django.db.utils import DEFAULT_DB_ALIAS
-from django.utils.translation import ugettext_lazy as _
-#from model_utils import Choices
+
+import reversion
+
+from sapl.translation import ugettext_lazy as _
+
 from sapl.utils import (LISTA_DE_UFS, YES_NO_CHOICES,
                         get_settings_auth_user_model, models_with_gr_for_model)
 
+
 TIPO_DOCUMENTO_ADMINISTRATIVO = (('O', _('Ostensiva')),
                                  ('R', _('Restritiva')))
 
@@ -17,9 +20,9 @@ SEQUENCIA_NUMERACAO = (('A', _('Sequencial por ano')),
                        ('U', _('Sequencial único')))
 
 ESFERA_FEDERACAO_CHOICES = (('M', _('Municipal')),
-    ('E', _('Estadual')),
-    ('F', _('Federal')),
-)
+                            ('E', _('Estadual')),
+                            ('F', _('Federal')),
+                            )
 
 
 @reversion.register()
@@ -29,7 +32,7 @@ class CasaLegislativa(models.Model):
 
     codigo = models.CharField(max_length=100,
                               blank=True,
-                              verbose_name=_('Codigo'))
+                              verbose_name=_('Código'))
     nome = models.CharField(max_length=100, verbose_name=_('Nome'))
     sigla = models.CharField(max_length=100, verbose_name=_('Sigla'))
     endereco = models.CharField(max_length=100, verbose_name=_('Endereço'))
@@ -64,6 +67,27 @@ class CasaLegislativa(models.Model):
             'municipio': self.municipio}
 
 
+class ExpressaoTextual(models.Model):
+    bind = models.BooleanField(
+        verbose_name=_('Expressão encontrada no SAPL'),
+        choices=YES_NO_CHOICES, default=False)
+
+    value = models.TextField(
+        unique=True,
+        verbose_name=_('Expressão Oficial'), blank=False, null=False)
+
+    custom = models.TextField(
+        verbose_name=_('Expressão Customizada'), blank=True, default='')
+
+    class Meta:
+        verbose_name = _('Expressão Textual do SAPL')
+        verbose_name_plural = _('Expressões Textuais do SAPL')
+        ordering = ('value',)
+
+    def __str__(self):
+        return self.value
+
+
 @reversion.register()
 class AppConfig(models.Model):
 
@@ -86,7 +110,7 @@ class AppConfig(models.Model):
     esfera_federacao = models.CharField(
         max_length=1,
         blank=True,
-        default = "",
+        default="",
         verbose_name=_('Esfera Federação'),
         choices=ESFERA_FEDERACAO_CHOICES)
 
diff --git a/sapl/base/templatetags/i18n_sapl.py b/sapl/base/templatetags/i18n_sapl.py
new file mode 100644
index 000000000..0e43cefe3
--- /dev/null
+++ b/sapl/base/templatetags/i18n_sapl.py
@@ -0,0 +1,15 @@
+from django.templatetags.i18n import *
+from django.utils.encoding import force_text
+from sapl.translation import sapl_expressions
+
+
+@register.tag("trans")
+def do_translate_sapl(parser, token):
+    trans = do_translate(parser, token)
+    return sapl_expressions.swap_translate(trans)
+
+
+@register.tag("blocktrans")
+def do_block_translate_sapl(parser, token):
+    block_trans = do_block_translate(parser, token)
+    return sapl_expressions.swap_block_translate(block_trans)
diff --git a/sapl/base/templatetags/menus.py b/sapl/base/templatetags/menus.py
index f90a6940f..56038ce74 100644
--- a/sapl/base/templatetags/menus.py
+++ b/sapl/base/templatetags/menus.py
@@ -1,7 +1,7 @@
 import yaml
 from django import template
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.utils import sapl_logger
 
diff --git a/sapl/base/tests/test_form.py b/sapl/base/tests/test_form.py
index 35f1c82bf..4438c201d 100644
--- a/sapl/base/tests/test_form.py
+++ b/sapl/base/tests/test_form.py
@@ -1,5 +1,5 @@
 import pytest
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.base.forms import CasaLegislativaForm
 
diff --git a/sapl/base/tests/test_view_base.py b/sapl/base/tests/test_view_base.py
index fc61ac160..7594e9cff 100644
--- a/sapl/base/tests/test_view_base.py
+++ b/sapl/base/tests/test_view_base.py
@@ -1,6 +1,6 @@
 import pytest
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 @pytest.mark.django_db(transaction=False)
diff --git a/sapl/base/urls.py b/sapl/base/urls.py
index b52d46ad6..ae5e08859 100644
--- a/sapl/base/urls.py
+++ b/sapl/base/urls.py
@@ -8,7 +8,8 @@ from django.contrib.auth.views import (password_reset, password_reset_complete,
                                        password_reset_done)
 from django.views.generic.base import RedirectView, TemplateView
 
-from sapl.base.views import AutorCrud, ConfirmarEmailView, TipoAutorCrud
+from sapl.base.views import AutorCrud, ConfirmarEmailView, TipoAutorCrud,\
+    ExpressaoTextualCrud
 from sapl.settings import EMAIL_SEND_USER, MEDIA_URL
 
 from .apps import AppConfig
@@ -27,9 +28,12 @@ app_name = AppConfig.name
 
 admin_user = [
     url(r'^sistema/usuario/$', ListarUsuarioView.as_view(), name='user_list'),
-    url(r'^sistema/usuario/create$', CreateUsuarioView.as_view(), name='user_create'),
-    url(r'^sistema/usuario/(?P<pk>\d+)/edit$', EditUsuarioView.as_view(), name='user_edit'),
-    url(r'^sistema/usuario/(?P<pk>\d+)/delete$', DeleteUsuarioView.as_view(), name='user_delete')
+    url(r'^sistema/usuario/create$',
+        CreateUsuarioView.as_view(), name='user_create'),
+    url(r'^sistema/usuario/(?P<pk>\d+)/edit$',
+        EditUsuarioView.as_view(), name='user_edit'),
+    url(r'^sistema/usuario/(?P<pk>\d+)/delete$',
+        DeleteUsuarioView.as_view(), name='user_delete')
 ]
 
 alterar_senha = [
@@ -70,6 +74,8 @@ recuperar_senha = [
 
 
 urlpatterns = [
+    url(r'^sistema/expressao-textual/', include(ExpressaoTextualCrud.get_urls())),
+
     url(r'^sistema/autor/tipo/', include(TipoAutorCrud.get_urls())),
     url(r'^sistema/autor/', include(AutorCrud.get_urls())),
 
diff --git a/sapl/base/views.py b/sapl/base/views.py
index 65330fb78..6abba7db7 100644
--- a/sapl/base/views.py
+++ b/sapl/base/views.py
@@ -13,7 +13,6 @@ from django.template import TemplateDoesNotExist
 from django.template.loader import get_template
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
-from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import string_concat
 from django.views.generic import (CreateView, DeleteView, FormView, ListView,
                                   UpdateView)
@@ -23,12 +22,14 @@ from haystack.views import SearchView
 
 from sapl import settings
 from sapl.base.forms import AutorForm, AutorFormForAdmin, TipoAutorForm
-from sapl.base.models import Autor, TipoAutor
-from sapl.crud.base import CrudAux, make_pagination
+from sapl.base.models import Autor, TipoAutor, ExpressaoTextual
+from sapl.crud.base import CrudAux, make_pagination, Crud, ListWithSearchForm
 from sapl.materia.models import (Autoria, MateriaLegislativa,
                                  TipoMateriaLegislativa)
+from sapl.rules.apps import AppConfig as RulesAppConfig
 from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria,
                                 SessaoPlenariaPresenca)
+from sapl.translation import ugettext_lazy as _, sapl_expressions
 from sapl.utils import (parlamentares_ativos, sapl_logger,
                         show_results_filter_set)
 
@@ -71,6 +72,35 @@ class ConfirmarEmailView(TemplateView):
         return self.render_to_response(context)
 
 
+class ExpressaoTextualCrud(Crud):
+    model = ExpressaoTextual
+    CreateView = None
+    DeleteView = None
+
+    class BaseMixin(Crud.BaseMixin):
+        list_field_names = ['value', 'custom']
+        create_url = ''
+        delete_url = ''
+        cancel_url = Crud.BaseMixin.list_url
+
+    class UpdateView(Crud.UpdateView):
+
+        def post(self, request, *args, **kwargs):
+            response = Crud.UpdateView.post(self, request, *args, **kwargs)
+            sapl_expressions.rebuild_expressao(self.object)
+            return response
+
+    class DetailView(Crud.DetailView):
+        def get(self, request, *args, **kwargs):
+            return HttpResponseRedirect(
+                reverse('sapl.base:expressaotextual_update', kwargs=kwargs))
+
+    class ListView(Crud.ListView):
+        paginate_by = 30
+        form_search_class = ListWithSearchForm
+        lookup_search = 'value__icontains'
+
+
 class TipoAutorCrud(CrudAux):
     model = TipoAutor
     help_topic = 'tipo-autor'
diff --git a/sapl/comissoes/apps.py b/sapl/comissoes/apps.py
index 18cb03041..92a0bd2d3 100644
--- a/sapl/comissoes/apps.py
+++ b/sapl/comissoes/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py
index 0353e7734..a57f55a2d 100644
--- a/sapl/comissoes/forms.py
+++ b/sapl/comissoes/forms.py
@@ -4,7 +4,7 @@ from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db.models import Q
 from django.forms import ModelForm
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.base.models import Autor, TipoAutor
 from sapl.comissoes.models import (Comissao, Composicao, DocumentoAcessorio,
diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py
index 4c8c09393..4b3d3f515 100644
--- a/sapl/comissoes/models.py
+++ b/sapl/comissoes/models.py
@@ -1,6 +1,6 @@
 import reversion
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_utils import Choices
 
 from sapl.base.models import Autor
diff --git a/sapl/compilacao/apps.py b/sapl/compilacao/apps.py
index 96bd10b87..49b2c0e6e 100644
--- a/sapl/compilacao/apps.py
+++ b/sapl/compilacao/apps.py
@@ -4,7 +4,7 @@ from django import apps
 from django.conf import settings
 from django.db import connection, models
 from django.db.utils import DEFAULT_DB_ALIAS, IntegrityError
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.utils.translation import string_concat
 
 from sapl.settings import BASE_DIR
diff --git a/sapl/compilacao/forms.py b/sapl/compilacao/forms.py
index 6407f8925..9143c26f4 100644
--- a/sapl/compilacao/forms.py
+++ b/sapl/compilacao/forms.py
@@ -13,7 +13,7 @@ from django.forms import widgets
 from django.forms.forms import Form
 from django.forms.models import ModelForm
 from django.template import defaultfilters
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl import utils
 from sapl.compilacao.models import (NOTAS_PUBLICIDADE_CHOICES,
diff --git a/sapl/compilacao/models.py b/sapl/compilacao/models.py
index ff6cbdab1..081c23f91 100644
--- a/sapl/compilacao/models.py
+++ b/sapl/compilacao/models.py
@@ -11,7 +11,7 @@ from django.template import defaultfilters
 from django.utils import timezone
 from django.utils.decorators import classonlymethod
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 import reversion
 
 from sapl.compilacao.utils import (get_integrations_view_names, int_to_letter,
diff --git a/sapl/compilacao/templatetags/compilacao_filters.py b/sapl/compilacao/templatetags/compilacao_filters.py
index e56478bae..37fd05766 100644
--- a/sapl/compilacao/templatetags/compilacao_filters.py
+++ b/sapl/compilacao/templatetags/compilacao_filters.py
@@ -3,7 +3,7 @@ from django import template
 from django.core.signing import Signer
 from django.db.models import Q
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.compilacao.models import Dispositivo
 
diff --git a/sapl/compilacao/views.py b/sapl/compilacao/views.py
index a9ebf3fa4..4002d4337 100644
--- a/sapl/compilacao/views.py
+++ b/sapl/compilacao/views.py
@@ -20,7 +20,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.utils.dateparse import parse_date
 from django.utils.encoding import force_text
 from django.utils.translation import string_concat
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.views.generic.base import TemplateView
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import (CreateView, DeleteView, FormView,
diff --git a/sapl/crispy_layout_mixin.py b/sapl/crispy_layout_mixin.py
index 9b2f0867b..020353c1a 100644
--- a/sapl/crispy_layout_mixin.py
+++ b/sapl/crispy_layout_mixin.py
@@ -1,13 +1,14 @@
 from math import ceil
 
-import rtyaml
 from crispy_forms.bootstrap import FormActions
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import HTML, Div, Fieldset, Layout, Submit
 from django import template
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils import formats
-from django.utils.translation import ugettext as _
+import rtyaml
+
+from sapl.translation import ugettext_lazy as _
 
 
 def heads_and_tails(list_of_lists):
diff --git a/sapl/crud/base.py b/sapl/crud/base.py
index 739fc4f37..e8a1a658a 100644
--- a/sapl/crud/base.py
+++ b/sapl/crud/base.py
@@ -17,7 +17,6 @@ from django.http.response import Http404
 from django.shortcuts import redirect
 from django.utils.decorators import classonlymethod
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import string_concat
 from django.views.generic import (CreateView, DeleteView, DetailView, ListView,
                                   UpdateView)
@@ -28,8 +27,10 @@ from sapl.crispy_layout_mixin import CrispyLayoutFormMixin, get_field_display
 from sapl.rules.map_rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL,
                                   RP_LIST)
 from sapl.settings import BASE_DIR
+from sapl.translation import ugettext_lazy as _
 from sapl.utils import normalize
 
+
 logger = logging.getLogger(BASE_DIR.name)
 
 ACTION_LIST, ACTION_CREATE, ACTION_DETAIL, ACTION_UPDATE, ACTION_DELETE = \
@@ -382,6 +383,7 @@ class CrudBaseMixin(CrispyLayoutFormMixin):
 
 class CrudListView(PermissionRequiredContainerCrudMixin, ListView):
     permission_required = (RP_LIST, )
+    lookup_search = 'search__icontains'
 
     @classmethod
     def get_url_regex(cls):
@@ -520,7 +522,7 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView):
                     for item in query:
                         if not item:
                             continue
-                        q = q & models.Q(search__icontains=item)
+                        q = q & models.Q(**{self.lookup_search: item})
 
                     if q:
                         queryset = queryset.filter(q)
diff --git a/sapl/decorators.py b/sapl/decorators.py
index fac94344a..40842cc40 100644
--- a/sapl/decorators.py
+++ b/sapl/decorators.py
@@ -1,7 +1,7 @@
 from functools import wraps
 
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 def vigencia_atual(decorated_method):
diff --git a/sapl/lexml/apps.py b/sapl/lexml/apps.py
index 3a8bb3c72..b4fc36c03 100644
--- a/sapl/lexml/apps.py
+++ b/sapl/lexml/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/lexml/models.py b/sapl/lexml/models.py
index f6315d399..64ab702a4 100644
--- a/sapl/lexml/models.py
+++ b/sapl/lexml/models.py
@@ -1,6 +1,6 @@
 import reversion
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 @reversion.register()
diff --git a/sapl/materia/apps.py b/sapl/materia/apps.py
index bb4f72f73..2193860f7 100644
--- a/sapl/materia/apps.py
+++ b/sapl/materia/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py
index 97e0ef9b4..dad11d7c1 100644
--- a/sapl/materia/forms.py
+++ b/sapl/materia/forms.py
@@ -21,7 +21,7 @@ from django.utils import timezone
 from django.utils.encoding import force_text
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 import sapl
 from sapl.base.models import AppConfig, Autor, TipoAutor
diff --git a/sapl/materia/models.py b/sapl/materia/models.py
index 2cb6b679b..a53ce6174 100644
--- a/sapl/materia/models.py
+++ b/sapl/materia/models.py
@@ -7,7 +7,7 @@ from django.db import models
 from django.db.models.functions import Concat
 from django.template import defaultfilters
 from django.utils import formats, timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_utils import Choices
 import reversion
 
diff --git a/sapl/materia/views.py b/sapl/materia/views.py
index 1e4638e73..b9acfc577 100644
--- a/sapl/materia/views.py
+++ b/sapl/materia/views.py
@@ -15,7 +15,7 @@ from django.http.response import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
 from django.template import RequestContext, loader
 from django.utils import formats, timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.views.generic import ListView, TemplateView, CreateView, UpdateView
 from django.views.generic.base import RedirectView
 from django.views.generic.edit import FormView
diff --git a/sapl/norma/apps.py b/sapl/norma/apps.py
index effd4f271..2588b868d 100644
--- a/sapl/norma/apps.py
+++ b/sapl/norma/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/norma/forms.py b/sapl/norma/forms.py
index f21121c32..6512ef634 100644
--- a/sapl/norma/forms.py
+++ b/sapl/norma/forms.py
@@ -7,7 +7,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
 from django.forms import ModelForm, widgets
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.crispy_layout_mixin import form_actions, to_row
 from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa
diff --git a/sapl/norma/migrations/0013_auto_20180824_2301.py b/sapl/norma/migrations/0013_auto_20180824_2301.py
new file mode 100644
index 000000000..2535a5bf4
--- /dev/null
+++ b/sapl/norma/migrations/0013_auto_20180824_2301.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-08-25 02:01
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('norma', '0012_anexonormajuridica'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='anexonormajuridica',
+            options={'verbose_name': 'Anexo da Norma Jurídica', 'verbose_name_plural': 'Anexos da Norma Jurídica'},
+        ),
+        migrations.AlterField(
+            model_name='anexonormajuridica',
+            name='norma',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='norma', to='norma.NormaJuridica', verbose_name='Norma Jurídica'),
+        ),
+        migrations.AlterField(
+            model_name='normajuridica',
+            name='tipo',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='norma.TipoNormaJuridica', verbose_name='Tipo da Norma Jurídica'),
+        ),
+    ]
diff --git a/sapl/norma/models.py b/sapl/norma/models.py
index 5e34214a1..dd5d70741 100644
--- a/sapl/norma/models.py
+++ b/sapl/norma/models.py
@@ -1,12 +1,12 @@
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
 from django.template import defaultfilters
-from django.utils.translation import ugettext_lazy as _
 from model_utils import Choices
 import reversion
 
 from sapl.compilacao.models import TextoArticulado
 from sapl.materia.models import MateriaLegislativa
+from sapl.translation import ugettext_lazy as _
 from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES,
                         restringe_tipos_de_arquivo_txt, texto_upload_path)
 
@@ -82,7 +82,7 @@ class NormaJuridica(models.Model):
     tipo = models.ForeignKey(
         TipoNormaJuridica,
         on_delete=models.PROTECT,
-        verbose_name=_('Tipo da Norma Juridica'))
+        verbose_name=_('Tipo da Norma Jurídica'))
     materia = models.ForeignKey(
         MateriaLegislativa, blank=True, null=True,
         on_delete=models.PROTECT, verbose_name=_('Matéria'))
@@ -272,7 +272,7 @@ class AnexoNormaJuridica(models.Model):
         NormaJuridica,
         related_name='norma',
         on_delete=models.PROTECT,
-        verbose_name=_('Norma Juridica'))
+        verbose_name=_('Norma Jurídica'))
     anexo_arquivo = models.FileField(
         blank=True,
         null=True,
@@ -283,8 +283,8 @@ class AnexoNormaJuridica(models.Model):
                                            choices=RANGE_ANOS)
 
     class Meta:
-        verbose_name = _('Anexo da Norma Juridica')
-        verbose_name_plural = _('Anexos da Norma Juridica')
+        verbose_name = _('Anexo da Norma Jurídica')
+        verbose_name_plural = _('Anexos da Norma Jurídica')
 
     def __str__(self):
         return _('Anexo: %(anexo)s da norma %(norma)s') % {
diff --git a/sapl/norma/tests/test_norma.py b/sapl/norma/tests/test_norma.py
index 6603d7167..da6599a9a 100644
--- a/sapl/norma/tests/test_norma.py
+++ b/sapl/norma/tests/test_norma.py
@@ -1,6 +1,6 @@
 import pytest
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_mommy import mommy
 
 from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa
diff --git a/sapl/norma/views.py b/sapl/norma/views.py
index c4a171da2..4c5299bd1 100644
--- a/sapl/norma/views.py
+++ b/sapl/norma/views.py
@@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse
 from django.http import HttpResponse, JsonResponse
 from django.template import RequestContext, loader
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.views.generic import TemplateView, UpdateView
 from django.views.generic.base import RedirectView
 from django.views.generic.edit import FormView
diff --git a/sapl/painel/apps.py b/sapl/painel/apps.py
index 7cd1002ec..137923978 100644
--- a/sapl/painel/apps.py
+++ b/sapl/painel/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/painel/models.py b/sapl/painel/models.py
index f999ca480..37ae9b317 100644
--- a/sapl/painel/models.py
+++ b/sapl/painel/models.py
@@ -1,6 +1,6 @@
 import reversion
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 @reversion.register()
diff --git a/sapl/painel/views.py b/sapl/painel/views.py
index 88d0aa785..eb1db1dc4 100644
--- a/sapl/painel/views.py
+++ b/sapl/painel/views.py
@@ -10,7 +10,7 @@ from django.http import HttpResponse, JsonResponse
 from django.http.response import Http404, HttpResponseRedirect
 from django.shortcuts import render
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.base.models import AppConfig as ConfiguracoesAplicacao
 from sapl.base.models import CasaLegislativa
diff --git a/sapl/parlamentares/apps.py b/sapl/parlamentares/apps.py
index 41f6d0b38..3669ec359 100644
--- a/sapl/parlamentares/apps.py
+++ b/sapl/parlamentares/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/parlamentares/forms.py b/sapl/parlamentares/forms.py
index 94ab7b169..a42377c22 100644
--- a/sapl/parlamentares/forms.py
+++ b/sapl/parlamentares/forms.py
@@ -11,7 +11,7 @@ from django.db import transaction
 from django.db.models import Q
 from django.forms import ModelForm
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from floppyforms.widgets import ClearableFileInput
 from image_cropping.widgets import CropWidget, ImageCropWidget
 
diff --git a/sapl/parlamentares/models.py b/sapl/parlamentares/models.py
index 43c4e2215..124bee8d4 100644
--- a/sapl/parlamentares/models.py
+++ b/sapl/parlamentares/models.py
@@ -2,7 +2,7 @@
 import reversion
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from image_cropping.fields import ImageCropField, ImageRatioField
 from model_utils import Choices
 
diff --git a/sapl/parlamentares/tests/test_parlamentares.py b/sapl/parlamentares/tests/test_parlamentares.py
index bc404757d..48bd58d03 100644
--- a/sapl/parlamentares/tests/test_parlamentares.py
+++ b/sapl/parlamentares/tests/test_parlamentares.py
@@ -1,7 +1,7 @@
-import pytest
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 from model_mommy import mommy
+import pytest
 
 from sapl.parlamentares.forms import FrenteForm, LegislaturaForm, MandatoForm
 from sapl.parlamentares.models import (Dependente, Filiacao, Legislatura,
diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py
index ad4a8f5e5..5578cc8c8 100644
--- a/sapl/parlamentares/views.py
+++ b/sapl/parlamentares/views.py
@@ -12,7 +12,7 @@ from django.http.response import HttpResponseRedirect
 from django.templatetags.static import static
 from django.utils import timezone
 from django.utils.datastructures import MultiValueDictKeyError
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic import FormView
 from django.views.generic.edit import UpdateView
diff --git a/sapl/protocoloadm/apps.py b/sapl/protocoloadm/apps.py
index 8697e58d9..7e65de4d1 100644
--- a/sapl/protocoloadm/apps.py
+++ b/sapl/protocoloadm/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py
index 22e649459..0b0d6af40 100644
--- a/sapl/protocoloadm/forms.py
+++ b/sapl/protocoloadm/forms.py
@@ -1,5 +1,4 @@
 
-import django_filters
 from crispy_forms.bootstrap import InlineRadios
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import HTML, Button, Fieldset, Layout
@@ -10,12 +9,13 @@ from django.db import models
 from django.db.models import Max
 from django.forms import ModelForm
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+import django_filters
 
 from sapl.base.models import Autor, TipoAutor
 from sapl.crispy_layout_mixin import SaplFormLayout, form_actions, to_row
 from sapl.materia.models import (MateriaLegislativa, TipoMateriaLegislativa,
                                  UnidadeTramitacao)
+from sapl.translation import ugettext_lazy as _
 from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, AnoNumeroOrderingFilter,
                         RangeWidgetOverride, autor_label, autor_modal)
 
@@ -23,8 +23,11 @@ from .models import (DocumentoAcessorioAdministrativo, DocumentoAdministrativo,
                      Protocolo, TipoDocumentoAdministrativo,
                      TramitacaoAdministrativo)
 
-TIPOS_PROTOCOLO = [('0', 'Recebido'), ('1', 'Enviado'), ('2', 'Interno'), ('', '---------')]
-TIPOS_PROTOCOLO_CREATE = [('0', 'Recebido'), ('1', 'Enviado'), ('2', 'Interno')]
+
+TIPOS_PROTOCOLO = [('0', 'Recebido'), ('1', 'Enviado'),
+                   ('2', 'Interno'), ('', '---------')]
+TIPOS_PROTOCOLO_CREATE = [
+    ('0', 'Recebido'), ('1', 'Enviado'), ('2', 'Interno')]
 
 NATUREZA_PROCESSO = [('', '---------'),
                      ('0', 'Administrativo'),
@@ -142,7 +145,7 @@ class DocumentoAdministrativoFilterSet(django_filters.FilterSet):
                                       choices=ANO_CHOICES)
 
     tramitacao = django_filters.ChoiceFilter(required=False,
-                                             label='Em Tramitação?',
+                                             label=_('Em Tramitação?'),
                                              choices=EM_TRAMITACAO)
 
     assunto = django_filters.CharFilter(lookup_expr='icontains')
@@ -197,16 +200,15 @@ class DocumentoAdministrativoFilterSet(django_filters.FilterSet):
             Fieldset(_('Pesquisar Documento'),
                      row1, row2,
                      row3, row4, row5,
-                     form_actions(label='Pesquisar'))
+                     form_actions(label=_('Pesquisar')))
         )
 
 
 class AnularProcoloAdmForm(ModelForm):
 
     numero = forms.CharField(required=True,
-                             label=Protocolo._meta.
-                             get_field('numero').verbose_name
-                             )
+                             label=Protocolo._meta.get_field(
+                                 'numero').verbose_name)
     ano = forms.ChoiceField(required=True,
                             label=Protocolo._meta.
                             get_field('ano').verbose_name,
@@ -312,7 +314,8 @@ class ProtocoloDocumentForm(ModelForm):
     observacao = forms.CharField(required=False,
                                  widget=forms.Textarea, label='Observação')
 
-    numero = forms.IntegerField(required=False, label='Número de Protocolo (opcional)')
+    numero = forms.IntegerField(
+        required=False, label='Número de Protocolo (opcional)')
 
     class Meta:
         model = Protocolo
@@ -399,7 +402,8 @@ class ProtocoloMateriaForm(ModelForm):
     assunto_ementa = forms.CharField(required=True,
                                      widget=forms.Textarea, label='Ementa')
 
-    numero = forms.IntegerField(required=False, label='Número de Protocolo (opcional)')
+    numero = forms.IntegerField(
+        required=False, label='Número de Protocolo (opcional)')
 
     class Meta:
         model = Protocolo
@@ -445,7 +449,8 @@ class ProtocoloMateriaForm(ModelForm):
                         raise ValidationError(_('Matéria Legislativa informada já possui o protocolo {}/{} vinculado.'
                                                 .format(self.materia.numero_protocolo, self.materia.ano)))
                 except ObjectDoesNotExist:
-                    raise ValidationError(_('Matéria Legislativa informada não existente.'))
+                    raise ValidationError(
+                        _('Matéria Legislativa informada não existente.'))
 
         return data
 
@@ -478,9 +483,9 @@ class ProtocoloMateriaForm(ModelForm):
                      ),
             Fieldset(_('Número do Protocolo (Apenas se quiser que a numeração comece'
                        ' a partir do número a ser informado)'),
-                row5,
-                HTML("&nbsp;"),
-                form_actions(label=_('Protocolar Matéria')))
+                     row5,
+                     HTML("&nbsp;"),
+                     form_actions(label=_('Protocolar Matéria')))
         )
 
         super(ProtocoloMateriaForm, self).__init__(
@@ -674,8 +679,8 @@ class DocumentoAdministrativoForm(ModelForm):
         # não permite atualizar para numero/ano/tipo existente
         if self.instance.pk:
             mudanca_doc = numero_documento != self.instance.numero \
-                            or ano_documento != self.instance.ano \
-                            or tipo_documento != self.instance.tipo.pk
+                or ano_documento != self.instance.ano \
+                or tipo_documento != self.instance.tipo.pk
 
         if not self.instance.pk or mudanca_doc:
             doc_exists = DocumentoAdministrativo.objects.filter(numero=numero_documento,
@@ -705,12 +710,12 @@ class DocumentoAdministrativoForm(ModelForm):
 
             if str(protocolo_antigo) != numero_protocolo:
                 exist_materia = MateriaLegislativa.objects.filter(
-                                                    numero_protocolo=numero_protocolo,
-                                                    ano=ano_protocolo).exists()
+                    numero_protocolo=numero_protocolo,
+                    ano=ano_protocolo).exists()
 
                 exist_doc = DocumentoAdministrativo.objects.filter(
-                                                        protocolo__numero=numero_protocolo,
-                                                        protocolo__ano=ano_protocolo).exists()
+                    protocolo__numero=numero_protocolo,
+                    protocolo__ano=ano_protocolo).exists()
                 if exist_materia or exist_doc:
                     raise ValidationError(_('Protocolo %s/%s já possui'
                                             ' documento vinculado'
@@ -786,7 +791,8 @@ class DesvincularDocumentoForm(ModelForm):
         tipo = cleaned_data['tipo']
 
         try:
-            documento = DocumentoAdministrativo.objects.get(numero=numero, ano=ano, tipo=tipo)
+            documento = DocumentoAdministrativo.objects.get(
+                numero=numero, ano=ano, tipo=tipo)
             if not documento.protocolo:
                 raise forms.ValidationError(
                     _("%s %s/%s não se encontra vinculado a nenhum protocolo" % (tipo, numero, ano)))
@@ -848,7 +854,8 @@ class DesvincularMateriaForm(forms.Form):
         tipo = cleaned_data['tipo']
 
         try:
-            materia = MateriaLegislativa.objects.get(numero=numero, ano=ano, tipo=tipo)
+            materia = MateriaLegislativa.objects.get(
+                numero=numero, ano=ano, tipo=tipo)
             if not materia.numero_protocolo:
                 raise forms.ValidationError(
                     _("%s %s/%s não se encontra vinculada a nenhum protocolo" % (tipo, numero, ano)))
diff --git a/sapl/protocoloadm/models.py b/sapl/protocoloadm/models.py
index 1fd38e720..da42dcf55 100644
--- a/sapl/protocoloadm/models.py
+++ b/sapl/protocoloadm/models.py
@@ -1,7 +1,7 @@
 import reversion
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_utils import Choices
 
 from sapl.base.models import Autor
diff --git a/sapl/protocoloadm/tests/test_protocoloadm.py b/sapl/protocoloadm/tests/test_protocoloadm.py
index f74c4dd7b..e6770e8d6 100644
--- a/sapl/protocoloadm/tests/test_protocoloadm.py
+++ b/sapl/protocoloadm/tests/test_protocoloadm.py
@@ -1,10 +1,11 @@
 from datetime import date, timedelta
 
-import pytest
 from django.core.urlresolvers import reverse
+from django.utils import timezone
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 from model_mommy import mommy
+import pytest
 
 from sapl.materia.models import UnidadeTramitacao
 from sapl.protocoloadm.forms import (AnularProcoloAdmForm,
@@ -191,7 +192,7 @@ def test_create_tramitacao(admin_client):
          'unidade_tramitacao_destino': unidade_tramitacao_destino_2.pk,
          'documento': documento_adm.pk,
          'status': status.pk,
-         'data_tramitacao': date.today() + timedelta(
+         'data_tramitacao': timezone.now().date() + timedelta(
              days=1)},
         follow=True)
 
diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py
index d86063887..b35acc66a 100644
--- a/sapl/protocoloadm/views.py
+++ b/sapl/protocoloadm/views.py
@@ -11,7 +11,7 @@ from django.http import Http404, HttpResponse, JsonResponse
 from django.http.response import HttpResponseRedirect
 from django.shortcuts import redirect
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.views.generic import ListView, CreateView
 from django.views.generic.base import RedirectView, TemplateView
 from django.views.generic.edit import FormView
diff --git a/sapl/redireciona_urls/apps.py b/sapl/redireciona_urls/apps.py
index 8ee8742bc..67cc380ce 100644
--- a/sapl/redireciona_urls/apps.py
+++ b/sapl/redireciona_urls/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/redireciona_urls/exceptions.py b/sapl/redireciona_urls/exceptions.py
index e1a994bcb..76fdab663 100644
--- a/sapl/redireciona_urls/exceptions.py
+++ b/sapl/redireciona_urls/exceptions.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from sapl.translation import ugettext_lazy as _
 
 
 class UnknownUrlNameError(Exception):
diff --git a/sapl/relatorios/apps.py b/sapl/relatorios/apps.py
index 9e560eb1c..e11eb3a56 100644
--- a/sapl/relatorios/apps.py
+++ b/sapl/relatorios/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py
index 50aa9c44d..63b3a0c04 100644
--- a/sapl/relatorios/views.py
+++ b/sapl/relatorios/views.py
@@ -5,7 +5,7 @@ from datetime import datetime as dt
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import Http404, HttpResponse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.base.models import Autor, CasaLegislativa
 from sapl.comissoes.models import Comissao
diff --git a/sapl/rules/__init__.py b/sapl/rules/__init__.py
index bc4d27653..ee183561d 100644
--- a/sapl/rules/__init__.py
+++ b/sapl/rules/__init__.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 default_app_config = 'sapl.rules.apps.AppConfig'
 
diff --git a/sapl/rules/apps.py b/sapl/rules/apps.py
index dbdfce8ce..3b5b1e8c8 100644
--- a/sapl/rules/apps.py
+++ b/sapl/rules/apps.py
@@ -1,23 +1,23 @@
 from builtins import LookupError
+import sys
 
-import django
-from django.apps import apps
+from django import apps
 from django.contrib.auth import get_user_model
 from django.contrib.auth.management import _get_all_permissions
 from django.core import exceptions
 from django.db import models, router
 from django.db.utils import DEFAULT_DB_ALIAS
 from django.utils.translation import string_concat
-from django.utils.translation import ugettext_lazy as _
 import reversion
 
 from sapl.rules import (SAPL_GROUP_ADMINISTRATIVO, SAPL_GROUP_COMISSOES,
                         SAPL_GROUP_GERAL, SAPL_GROUP_MATERIA, SAPL_GROUP_NORMA,
                         SAPL_GROUP_PAINEL, SAPL_GROUP_PROTOCOLO,
                         SAPL_GROUP_SESSAO)
+from sapl.translation import ugettext_lazy as _
 
 
-class AppConfig(django.apps.AppConfig):
+class AppConfig(apps.AppConfig):
     name = 'sapl.rules'
     label = 'rules'
     verbose_name = _('Regras de Acesso')
@@ -32,7 +32,7 @@ def create_proxy_permissions(
     # print(app_config)
 
     try:
-        Permission = apps.get_model('auth', 'Permission')
+        Permission = apps.apps.get_model('auth', 'Permission')
     except LookupError:
         return
 
diff --git a/sapl/rules/map_rules.py b/sapl/rules/map_rules.py
index bba114149..d2b2b873b 100644
--- a/sapl/rules/map_rules.py
+++ b/sapl/rules/map_rules.py
@@ -1,23 +1,3 @@
-from sapl.base import models as base
-from sapl.comissoes import models as comissoes
-from sapl.compilacao import models as compilacao
-from sapl.lexml import models as lexml
-from sapl.materia import models as materia
-from sapl.norma import models as norma
-from sapl.painel import models as painel
-from sapl.parlamentares import models as parlamentares
-from sapl.protocoloadm import models as protocoloadm
-from sapl.audiencia import models as audiencia
-from sapl.rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL, RP_LIST,
-                        SAPL_GROUP_ADMINISTRATIVO, SAPL_GROUP_ANONYMOUS,
-                        SAPL_GROUP_AUTOR, SAPL_GROUP_COMISSOES,
-                        SAPL_GROUP_GERAL, SAPL_GROUP_LOGIN_SOCIAL,
-                        SAPL_GROUP_MATERIA, SAPL_GROUP_NORMA,
-                        SAPL_GROUP_PAINEL, SAPL_GROUP_PARLAMENTAR,
-                        SAPL_GROUP_PROTOCOLO, SAPL_GROUP_SESSAO,
-                        SAPL_GROUP_VOTANTE)
-from sapl.sessao import models as sessao
-
 """
 Todas as permissões do django framework seguem o padrão
 
@@ -46,6 +26,26 @@ negócio trabalham com os cinco radiais de permissão
 e com qualquer outro tipo de permissão customizada, nesta ordem de precedência.
 
 """
+from sapl.audiencia import models as audiencia
+from sapl.base import models as base
+from sapl.comissoes import models as comissoes
+from sapl.compilacao import models as compilacao
+from sapl.lexml import models as lexml
+from sapl.materia import models as materia
+from sapl.norma import models as norma
+from sapl.painel import models as painel
+from sapl.parlamentares import models as parlamentares
+from sapl.protocoloadm import models as protocoloadm
+from sapl.rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL, RP_LIST,
+                        SAPL_GROUP_ADMINISTRATIVO, SAPL_GROUP_ANONYMOUS,
+                        SAPL_GROUP_AUTOR, SAPL_GROUP_COMISSOES,
+                        SAPL_GROUP_GERAL, SAPL_GROUP_LOGIN_SOCIAL,
+                        SAPL_GROUP_MATERIA, SAPL_GROUP_NORMA,
+                        SAPL_GROUP_PAINEL, SAPL_GROUP_PARLAMENTAR,
+                        SAPL_GROUP_PROTOCOLO, SAPL_GROUP_SESSAO,
+                        SAPL_GROUP_VOTANTE)
+from sapl.sessao import models as sessao
+
 
 __base__ = [RP_LIST, RP_DETAIL, RP_ADD, RP_CHANGE, RP_DELETE]
 __listdetailchange__ = [RP_LIST, RP_DETAIL, RP_CHANGE]
@@ -211,6 +211,7 @@ rules_group_geral = {
         (base.CasaLegislativa, __listdetailchange__ + [RP_ADD]),
         (base.TipoAutor, __base__),
         (base.Autor, __base__),
+        (base.ExpressaoTextual, []),
 
         (protocoloadm.StatusTramitacaoAdministrativo, __base__),
         (protocoloadm.TipoDocumentoAdministrativo, __base__),
@@ -219,8 +220,8 @@ rules_group_geral = {
         (comissoes.TipoComissao, __base__),
         (comissoes.Periodo, __base__),
 
-        (materia.AssuntoMateria, __base__),  # não há implementação
-        (materia.MateriaAssunto, __base__),  # não há implementação
+        (materia.AssuntoMateria, __base__),
+        (materia.MateriaAssunto, __base__),
         (materia.MateriaLegislativa, ['can_access_impressos']),
         (materia.TipoProposicao, __base__),
         (materia.TipoMateriaLegislativa, __base__),
diff --git a/sapl/rules/tests/test_rules.py b/sapl/rules/tests/test_rules.py
index 07302bae5..f13de9e08 100644
--- a/sapl/rules/tests/test_rules.py
+++ b/sapl/rules/tests/test_rules.py
@@ -1,22 +1,23 @@
-import pytest
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.utils import six
-from django.utils.translation import ugettext_lazy as _
+import pytest
 
-from sapl.base.models import CasaLegislativa
+from sapl.base.models import CasaLegislativa, ExpressaoTextual
 from sapl.compilacao.models import (PerfilEstruturalTextoArticulado,
                                     TipoDispositivo,
                                     TipoDispositivoRelationship)
 from sapl.materia.models import AcompanhamentoMateria
 from sapl.rules import SAPL_GROUPS, map_rules
 from sapl.test_urls import create_perms_post_migrate
+from sapl.translation import ugettext_lazy as _
 from scripts.lista_permissions_in_decorators import \
     lista_permissions_in_decorators
 from scripts.lista_urls import lista_urls
 
+
 sapl_appconfs = [apps.get_app_config(n[5:]) for n in settings.SAPL_APPS]
 
 sapl_models = []
@@ -58,27 +59,32 @@ __fp__in__test_permission_of_models_in_rules_patterns = {
     map_rules.RP_ADD: [CasaLegislativa,
                        TipoDispositivo,
                        TipoDispositivoRelationship,
-                       PerfilEstruturalTextoArticulado],
+                       PerfilEstruturalTextoArticulado,
+                       ExpressaoTextual],
 
     map_rules.RP_CHANGE: [AcompanhamentoMateria,
                           TipoDispositivo,
                           TipoDispositivoRelationship,
-                          PerfilEstruturalTextoArticulado],
+                          PerfilEstruturalTextoArticulado,
+                          ExpressaoTextual],
 
     map_rules.RP_DELETE: [CasaLegislativa,
                           TipoDispositivo,
                           TipoDispositivoRelationship,
-                          PerfilEstruturalTextoArticulado],
+                          PerfilEstruturalTextoArticulado,
+                          ExpressaoTextual],
 
     map_rules.RP_LIST: [AcompanhamentoMateria,
                         TipoDispositivo,
                         TipoDispositivoRelationship,
-                        PerfilEstruturalTextoArticulado],
+                        PerfilEstruturalTextoArticulado,
+                        ExpressaoTextual],
 
     map_rules.RP_DETAIL: [AcompanhamentoMateria,
                           TipoDispositivo,
                           TipoDispositivoRelationship,
-                          PerfilEstruturalTextoArticulado]
+                          PerfilEstruturalTextoArticulado,
+                          ExpressaoTextual]
 
 }
 
diff --git a/sapl/sessao/apps.py b/sapl/sessao/apps.py
index 281847b56..ab18fe539 100644
--- a/sapl/sessao/apps.py
+++ b/sapl/sessao/apps.py
@@ -1,5 +1,5 @@
 from django import apps
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 
 class AppConfig(apps.AppConfig):
diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py
index cc68df531..45c0f1a23 100644
--- a/sapl/sessao/forms.py
+++ b/sapl/sessao/forms.py
@@ -8,7 +8,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import transaction
 from django.forms import ModelForm
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 
 from sapl.base.models import Autor, TipoAutor
 from sapl.crispy_layout_mixin import form_actions, to_row
diff --git a/sapl/sessao/models.py b/sapl/sessao/models.py
index 6af5f490f..a47c56ac1 100644
--- a/sapl/sessao/models.py
+++ b/sapl/sessao/models.py
@@ -3,7 +3,7 @@ from operator import xor
 import reversion
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_utils import Choices
 
 from sapl.base.models import Autor
diff --git a/sapl/sessao/tests/test_sessao.py b/sapl/sessao/tests/test_sessao.py
index 336c62ad0..b84224a4e 100644
--- a/sapl/sessao/tests/test_sessao.py
+++ b/sapl/sessao/tests/test_sessao.py
@@ -1,7 +1,7 @@
 import pytest
 from datetime import datetime
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_mommy import mommy
 
 from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa
diff --git a/sapl/sessao/tests/test_sessao_view.py b/sapl/sessao/tests/test_sessao_view.py
index 082652c19..6c6c32e95 100644
--- a/sapl/sessao/tests/test_sessao_view.py
+++ b/sapl/sessao/tests/test_sessao_view.py
@@ -1,6 +1,6 @@
 import pytest
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from model_mommy import mommy
 
 from sapl.parlamentares.models import Legislatura, SessaoLegislativa
diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py
index 5a2b0785a..d93acd746 100644
--- a/sapl/sessao/views.py
+++ b/sapl/sessao/views.py
@@ -14,7 +14,7 @@ from django.utils import timezone
 from django.utils.datastructures import MultiValueDictKeyError
 from django.utils.decorators import method_decorator
 from django.utils.html import strip_tags
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import FormView, ListView, TemplateView, CreateView, UpdateView
 from django.views.generic.base import RedirectView
diff --git a/sapl/templates/ajuda.html b/sapl/templates/ajuda.html
index 7e2cda99d..e7fc910ae 100644
--- a/sapl/templates/ajuda.html
+++ b/sapl/templates/ajuda.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
 <div class="conteudo">
diff --git a/sapl/templates/ajuda/acessando_alimenta.html b/sapl/templates/ajuda/acessando_alimenta.html
index 57e8e1a7d..03954d803 100644
--- a/sapl/templates/ajuda/acessando_alimenta.html
+++ b/sapl/templates/ajuda/acessando_alimenta.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/acomp_materia.html b/sapl/templates/ajuda/acomp_materia.html
index 766e40c94..e9ee0f7d7 100644
--- a/sapl/templates/ajuda/acomp_materia.html
+++ b/sapl/templates/ajuda/acomp_materia.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/anexos.html b/sapl/templates/ajuda/anexos.html
index cb073465e..1ec583d63 100644
--- a/sapl/templates/ajuda/anexos.html
+++ b/sapl/templates/ajuda/anexos.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/autor.html b/sapl/templates/ajuda/autor.html
index be20634f4..dfbceaac8 100644
--- a/sapl/templates/ajuda/autor.html
+++ b/sapl/templates/ajuda/autor.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/cadastro_comissoes.html b/sapl/templates/ajuda/cadastro_comissoes.html
index a085d08ab..b3c70c0f0 100644
--- a/sapl/templates/ajuda/cadastro_comissoes.html
+++ b/sapl/templates/ajuda/cadastro_comissoes.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/cadastro_materia.html b/sapl/templates/ajuda/cadastro_materia.html
index 9f12c2653..39dfb2791 100644
--- a/sapl/templates/ajuda/cadastro_materia.html
+++ b/sapl/templates/ajuda/cadastro_materia.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/cadastro_mesa_diretora.html b/sapl/templates/ajuda/cadastro_mesa_diretora.html
index bacd2389b..d3bb92f14 100644
--- a/sapl/templates/ajuda/cadastro_mesa_diretora.html
+++ b/sapl/templates/ajuda/cadastro_mesa_diretora.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/cadastro_parlamentares.html b/sapl/templates/ajuda/cadastro_parlamentares.html
index 4f663f3da..1528862d2 100644
--- a/sapl/templates/ajuda/cadastro_parlamentares.html
+++ b/sapl/templates/ajuda/cadastro_parlamentares.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/cargo_comissao.html b/sapl/templates/ajuda/cargo_comissao.html
index 40fb8abeb..1b2c73c7d 100644
--- a/sapl/templates/ajuda/cargo_comissao.html
+++ b/sapl/templates/ajuda/cargo_comissao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/cargo_mesa.html b/sapl/templates/ajuda/cargo_mesa.html
index 5efb9c63f..61131d9c1 100644
--- a/sapl/templates/ajuda/cargo_mesa.html
+++ b/sapl/templates/ajuda/cargo_mesa.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/casa_legislativa.html b/sapl/templates/ajuda/casa_legislativa.html
index 0aec9edd2..9e9caf5c5 100644
--- a/sapl/templates/ajuda/casa_legislativa.html
+++ b/sapl/templates/ajuda/casa_legislativa.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/coligacao.html b/sapl/templates/ajuda/coligacao.html
index 1f5b48d05..dad030603 100644
--- a/sapl/templates/ajuda/coligacao.html
+++ b/sapl/templates/ajuda/coligacao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/consultas.html b/sapl/templates/ajuda/consultas.html
index 66e9574b8..e385437b9 100644
--- a/sapl/templates/ajuda/consultas.html
+++ b/sapl/templates/ajuda/consultas.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/dependentes.html b/sapl/templates/ajuda/dependentes.html
index 3ae847137..42c1bb44e 100644
--- a/sapl/templates/ajuda/dependentes.html
+++ b/sapl/templates/ajuda/dependentes.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/despacho_autoria.html b/sapl/templates/ajuda/despacho_autoria.html
index ae864f7db..6132c5509 100644
--- a/sapl/templates/ajuda/despacho_autoria.html
+++ b/sapl/templates/ajuda/despacho_autoria.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/envio_proposicao.html b/sapl/templates/ajuda/envio_proposicao.html
index b943dc469..0588b6417 100644
--- a/sapl/templates/ajuda/envio_proposicao.html
+++ b/sapl/templates/ajuda/envio_proposicao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/filiacoes_partidarias.html b/sapl/templates/ajuda/filiacoes_partidarias.html
index 6599bd35c..b91ca4c38 100644
--- a/sapl/templates/ajuda/filiacoes_partidarias.html
+++ b/sapl/templates/ajuda/filiacoes_partidarias.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/fim_relatoria.html b/sapl/templates/ajuda/fim_relatoria.html
index c0e463682..db3f58f42 100644
--- a/sapl/templates/ajuda/fim_relatoria.html
+++ b/sapl/templates/ajuda/fim_relatoria.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/gerenciamento_usuarios.html b/sapl/templates/ajuda/gerenciamento_usuarios.html
index c57134ae0..1f0f616c2 100644
--- a/sapl/templates/ajuda/gerenciamento_usuarios.html
+++ b/sapl/templates/ajuda/gerenciamento_usuarios.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/glossario.html b/sapl/templates/ajuda/glossario.html
index 3a1d6eccd..cab6951bd 100644
--- a/sapl/templates/ajuda/glossario.html
+++ b/sapl/templates/ajuda/glossario.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/impressos.html b/sapl/templates/ajuda/impressos.html
index 30884eb35..de8b92d85 100644
--- a/sapl/templates/ajuda/impressos.html
+++ b/sapl/templates/ajuda/impressos.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/legislacao_cita_matanexada.html b/sapl/templates/ajuda/legislacao_cita_matanexada.html
index 341a061e9..1d973f1fd 100644
--- a/sapl/templates/ajuda/legislacao_cita_matanexada.html
+++ b/sapl/templates/ajuda/legislacao_cita_matanexada.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/legislatura.html b/sapl/templates/ajuda/legislatura.html
index 5467ccc65..211cefb22 100644
--- a/sapl/templates/ajuda/legislatura.html
+++ b/sapl/templates/ajuda/legislatura.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/lexml.html b/sapl/templates/ajuda/lexml.html
index f2eb85028..3ee64e98b 100644
--- a/sapl/templates/ajuda/lexml.html
+++ b/sapl/templates/ajuda/lexml.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/mandatos_parlamentar.html b/sapl/templates/ajuda/mandatos_parlamentar.html
index d53dc254c..1943f1473 100644
--- a/sapl/templates/ajuda/mandatos_parlamentar.html
+++ b/sapl/templates/ajuda/mandatos_parlamentar.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/materia_anexada.html b/sapl/templates/ajuda/materia_anexada.html
index eabda993c..6d0f8f6b3 100644
--- a/sapl/templates/ajuda/materia_anexada.html
+++ b/sapl/templates/ajuda/materia_anexada.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/modulo_comissoes.html b/sapl/templates/ajuda/modulo_comissoes.html
index a469e9bef..c80df13d9 100644
--- a/sapl/templates/ajuda/modulo_comissoes.html
+++ b/sapl/templates/ajuda/modulo_comissoes.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/modulo_mesa_diretora.html b/sapl/templates/ajuda/modulo_mesa_diretora.html
index 5b2cce0ca..c0897ebe4 100644
--- a/sapl/templates/ajuda/modulo_mesa_diretora.html
+++ b/sapl/templates/ajuda/modulo_mesa_diretora.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/modulo_norma_juridica.html b/sapl/templates/ajuda/modulo_norma_juridica.html
index c8662e517..9ea6ee5ac 100644
--- a/sapl/templates/ajuda/modulo_norma_juridica.html
+++ b/sapl/templates/ajuda/modulo_norma_juridica.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/modulo_parlamentares.html b/sapl/templates/ajuda/modulo_parlamentares.html
index 1636b3e8c..067d552c1 100644
--- a/sapl/templates/ajuda/modulo_parlamentares.html
+++ b/sapl/templates/ajuda/modulo_parlamentares.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/modulo_tramitacao_materias.html b/sapl/templates/ajuda/modulo_tramitacao_materias.html
index 8e4c1a866..6fa7356a0 100644
--- a/sapl/templates/ajuda/modulo_tramitacao_materias.html
+++ b/sapl/templates/ajuda/modulo_tramitacao_materias.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/nivel_instrucao.html b/sapl/templates/ajuda/nivel_instrucao.html
index f883fc643..086addf70 100644
--- a/sapl/templates/ajuda/nivel_instrucao.html
+++ b/sapl/templates/ajuda/nivel_instrucao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/norma_juridica.html b/sapl/templates/ajuda/norma_juridica.html
index e1e9ec94d..ac70117d1 100644
--- a/sapl/templates/ajuda/norma_juridica.html
+++ b/sapl/templates/ajuda/norma_juridica.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/numeracao_docsacess.html b/sapl/templates/ajuda/numeracao_docsacess.html
index 912bf0ac0..54d8d8971 100644
--- a/sapl/templates/ajuda/numeracao_docsacess.html
+++ b/sapl/templates/ajuda/numeracao_docsacess.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/ordem_dia.html b/sapl/templates/ajuda/ordem_dia.html
index dc4ffed50..919e2e691 100644
--- a/sapl/templates/ajuda/ordem_dia.html
+++ b/sapl/templates/ajuda/ordem_dia.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/orgao.html b/sapl/templates/ajuda/orgao.html
index 0027e3478..bcd72b10b 100644
--- a/sapl/templates/ajuda/orgao.html
+++ b/sapl/templates/ajuda/orgao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/origem.html b/sapl/templates/ajuda/origem.html
index 6205e8aa9..2bb0cf7c1 100644
--- a/sapl/templates/ajuda/origem.html
+++ b/sapl/templates/ajuda/origem.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/partidos.html b/sapl/templates/ajuda/partidos.html
index cee860f62..e0451d122 100644
--- a/sapl/templates/ajuda/partidos.html
+++ b/sapl/templates/ajuda/partidos.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/periodo_composicao_comissao.html b/sapl/templates/ajuda/periodo_composicao_comissao.html
index f98e2c6ae..19a7d7b86 100644
--- a/sapl/templates/ajuda/periodo_composicao_comissao.html
+++ b/sapl/templates/ajuda/periodo_composicao_comissao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/proposicao.html b/sapl/templates/ajuda/proposicao.html
index bc5f2c926..b71b9ec99 100644
--- a/sapl/templates/ajuda/proposicao.html
+++ b/sapl/templates/ajuda/proposicao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/proposicao_editor.html b/sapl/templates/ajuda/proposicao_editor.html
index 054c61aaf..f6c6ca274 100644
--- a/sapl/templates/ajuda/proposicao_editor.html
+++ b/sapl/templates/ajuda/proposicao_editor.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/proposicao_legislativa.html b/sapl/templates/ajuda/proposicao_legislativa.html
index b0ca6d600..becd2b73b 100644
--- a/sapl/templates/ajuda/proposicao_legislativa.html
+++ b/sapl/templates/ajuda/proposicao_legislativa.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/protocolo_administrativo.html b/sapl/templates/ajuda/protocolo_administrativo.html
index 5d43134fe..33132a5d7 100644
--- a/sapl/templates/ajuda/protocolo_administrativo.html
+++ b/sapl/templates/ajuda/protocolo_administrativo.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/protocolo_anular.html b/sapl/templates/ajuda/protocolo_anular.html
index 5d43134fe..33132a5d7 100644
--- a/sapl/templates/ajuda/protocolo_anular.html
+++ b/sapl/templates/ajuda/protocolo_anular.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/protocolo_geral.html b/sapl/templates/ajuda/protocolo_geral.html
index 15393822b..ca52b39ce 100644
--- a/sapl/templates/ajuda/protocolo_geral.html
+++ b/sapl/templates/ajuda/protocolo_geral.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/protocolo_gerar_etiqueta_processo.html b/sapl/templates/ajuda/protocolo_gerar_etiqueta_processo.html
index 5d43134fe..33132a5d7 100644
--- a/sapl/templates/ajuda/protocolo_gerar_etiqueta_processo.html
+++ b/sapl/templates/ajuda/protocolo_gerar_etiqueta_processo.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/protocolo_gerar_etiqueta_protocolo.html b/sapl/templates/ajuda/protocolo_gerar_etiqueta_protocolo.html
index 5d43134fe..33132a5d7 100644
--- a/sapl/templates/ajuda/protocolo_gerar_etiqueta_protocolo.html
+++ b/sapl/templates/ajuda/protocolo_gerar_etiqueta_protocolo.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/protocolo_legislativo.html b/sapl/templates/ajuda/protocolo_legislativo.html
index 5d43134fe..33132a5d7 100644
--- a/sapl/templates/ajuda/protocolo_legislativo.html
+++ b/sapl/templates/ajuda/protocolo_legislativo.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/recebimento_proposicao.html b/sapl/templates/ajuda/recebimento_proposicao.html
index 24ad025ea..60bc54ab0 100644
--- a/sapl/templates/ajuda/recebimento_proposicao.html
+++ b/sapl/templates/ajuda/recebimento_proposicao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/regime_tramitacao.html b/sapl/templates/ajuda/regime_tramitacao.html
index 6b679457d..07e08aeb2 100644
--- a/sapl/templates/ajuda/regime_tramitacao.html
+++ b/sapl/templates/ajuda/regime_tramitacao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/relatorios.html b/sapl/templates/ajuda/relatorios.html
index 00c860e12..eee1baa89 100644
--- a/sapl/templates/ajuda/relatorios.html
+++ b/sapl/templates/ajuda/relatorios.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_legislativa.html b/sapl/templates/ajuda/sessao_legislativa.html
index 674129fbe..9d174e2c2 100644
--- a/sapl/templates/ajuda/sessao_legislativa.html
+++ b/sapl/templates/ajuda/sessao_legislativa.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria.html b/sapl/templates/ajuda/sessao_plenaria.html
index 3aa513d0b..249f7d3a5 100644
--- a/sapl/templates/ajuda/sessao_plenaria.html
+++ b/sapl/templates/ajuda/sessao_plenaria.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_ata.html b/sapl/templates/ajuda/sessao_plenaria_ata.html
index e5a7a43f7..1bb5076ca 100644
--- a/sapl/templates/ajuda/sessao_plenaria_ata.html
+++ b/sapl/templates/ajuda/sessao_plenaria_ata.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_expedientes.html b/sapl/templates/ajuda/sessao_plenaria_expedientes.html
index 525bbe7bd..8eb933531 100644
--- a/sapl/templates/ajuda/sessao_plenaria_expedientes.html
+++ b/sapl/templates/ajuda/sessao_plenaria_expedientes.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_lista_presenca_sessao.html b/sapl/templates/ajuda/sessao_plenaria_lista_presenca_sessao.html
index d9cfd2354..29bf6f0b5 100644
--- a/sapl/templates/ajuda/sessao_plenaria_lista_presenca_sessao.html
+++ b/sapl/templates/ajuda/sessao_plenaria_lista_presenca_sessao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_materias_expediente.html b/sapl/templates/ajuda/sessao_plenaria_materias_expediente.html
index f19047aa1..a6790c02b 100644
--- a/sapl/templates/ajuda/sessao_plenaria_materias_expediente.html
+++ b/sapl/templates/ajuda/sessao_plenaria_materias_expediente.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_materias_ordem_dia.html b/sapl/templates/ajuda/sessao_plenaria_materias_ordem_dia.html
index 015e5e3cd..d8a0b9b29 100644
--- a/sapl/templates/ajuda/sessao_plenaria_materias_ordem_dia.html
+++ b/sapl/templates/ajuda/sessao_plenaria_materias_ordem_dia.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_mesa.html b/sapl/templates/ajuda/sessao_plenaria_mesa.html
index d90ef647d..afb5ca453 100644
--- a/sapl/templates/ajuda/sessao_plenaria_mesa.html
+++ b/sapl/templates/ajuda/sessao_plenaria_mesa.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_oradores.html b/sapl/templates/ajuda/sessao_plenaria_oradores.html
index 634eb46a4..d2de22564 100644
--- a/sapl/templates/ajuda/sessao_plenaria_oradores.html
+++ b/sapl/templates/ajuda/sessao_plenaria_oradores.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_oradores_expediente.html b/sapl/templates/ajuda/sessao_plenaria_oradores_expediente.html
index 634eb46a4..d2de22564 100644
--- a/sapl/templates/ajuda/sessao_plenaria_oradores_expediente.html
+++ b/sapl/templates/ajuda/sessao_plenaria_oradores_expediente.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_oradores_explicacoes_pessoais.html b/sapl/templates/ajuda/sessao_plenaria_oradores_explicacoes_pessoais.html
index 634eb46a4..d2de22564 100644
--- a/sapl/templates/ajuda/sessao_plenaria_oradores_explicacoes_pessoais.html
+++ b/sapl/templates/ajuda/sessao_plenaria_oradores_explicacoes_pessoais.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_presenca_ordem_dia.html b/sapl/templates/ajuda/sessao_plenaria_presenca_ordem_dia.html
index e0572a4b3..cbd9016fc 100644
--- a/sapl/templates/ajuda/sessao_plenaria_presenca_ordem_dia.html
+++ b/sapl/templates/ajuda/sessao_plenaria_presenca_ordem_dia.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/sessao_plenaria_votacao.html b/sapl/templates/ajuda/sessao_plenaria_votacao.html
index 4a392d378..23c8647c4 100644
--- a/sapl/templates/ajuda/sessao_plenaria_votacao.html
+++ b/sapl/templates/ajuda/sessao_plenaria_votacao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/status_tramitacao.html b/sapl/templates/ajuda/status_tramitacao.html
index ca9ddca1a..58902b168 100644
--- a/sapl/templates/ajuda/status_tramitacao.html
+++ b/sapl/templates/ajuda/status_tramitacao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_afastamento.html b/sapl/templates/ajuda/tipo_afastamento.html
index e2aa59883..4a89d84cc 100644
--- a/sapl/templates/ajuda/tipo_afastamento.html
+++ b/sapl/templates/ajuda/tipo_afastamento.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_autor.html b/sapl/templates/ajuda/tipo_autor.html
index 8a76bd013..e795eaf34 100644
--- a/sapl/templates/ajuda/tipo_autor.html
+++ b/sapl/templates/ajuda/tipo_autor.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_comissao.html b/sapl/templates/ajuda/tipo_comissao.html
index e97b86678..a97d4b5d7 100644
--- a/sapl/templates/ajuda/tipo_comissao.html
+++ b/sapl/templates/ajuda/tipo_comissao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_dependente.html b/sapl/templates/ajuda/tipo_dependente.html
index cae9f9f55..1aed8e252 100644
--- a/sapl/templates/ajuda/tipo_dependente.html
+++ b/sapl/templates/ajuda/tipo_dependente.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_documento.html b/sapl/templates/ajuda/tipo_documento.html
index b2215801b..796d9101c 100644
--- a/sapl/templates/ajuda/tipo_documento.html
+++ b/sapl/templates/ajuda/tipo_documento.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_materia_legislativa.html b/sapl/templates/ajuda/tipo_materia_legislativa.html
index f72ad5cc6..0d8ff553c 100644
--- a/sapl/templates/ajuda/tipo_materia_legislativa.html
+++ b/sapl/templates/ajuda/tipo_materia_legislativa.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_norma_juridica.html b/sapl/templates/ajuda/tipo_norma_juridica.html
index f50caa5a6..1a94f19e1 100644
--- a/sapl/templates/ajuda/tipo_norma_juridica.html
+++ b/sapl/templates/ajuda/tipo_norma_juridica.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_proposicao.html b/sapl/templates/ajuda/tipo_proposicao.html
index 0149bfc03..52efc4a8b 100644
--- a/sapl/templates/ajuda/tipo_proposicao.html
+++ b/sapl/templates/ajuda/tipo_proposicao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_sessao_plenaria.html b/sapl/templates/ajuda/tipo_sessao_plenaria.html
index 154c0a16f..d73a9969b 100644
--- a/sapl/templates/ajuda/tipo_sessao_plenaria.html
+++ b/sapl/templates/ajuda/tipo_sessao_plenaria.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tipo_situa_militar.html b/sapl/templates/ajuda/tipo_situa_militar.html
index 32f4902b6..b8769ad3c 100644
--- a/sapl/templates/ajuda/tipo_situa_militar.html
+++ b/sapl/templates/ajuda/tipo_situa_militar.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tramitacao_lote.html b/sapl/templates/ajuda/tramitacao_lote.html
index 438b204f8..339c9e24e 100644
--- a/sapl/templates/ajuda/tramitacao_lote.html
+++ b/sapl/templates/ajuda/tramitacao_lote.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/tramitacao_relatoria.html b/sapl/templates/ajuda/tramitacao_relatoria.html
index 3a9c2487f..1c8501bed 100644
--- a/sapl/templates/ajuda/tramitacao_relatoria.html
+++ b/sapl/templates/ajuda/tramitacao_relatoria.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/troca_senha.html b/sapl/templates/ajuda/troca_senha.html
index 72be948f4..e7bd0a743 100644
--- a/sapl/templates/ajuda/troca_senha.html
+++ b/sapl/templates/ajuda/troca_senha.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/ajuda/unidade_tramitacao.html b/sapl/templates/ajuda/unidade_tramitacao.html
index c88dba904..cb89799cd 100644
--- a/sapl/templates/ajuda/unidade_tramitacao.html
+++ b/sapl/templates/ajuda/unidade_tramitacao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/audiencia/layouts.yaml b/sapl/templates/audiencia/layouts.yaml
index 90433db63..f20a5b1e0 100644
--- a/sapl/templates/audiencia/layouts.yaml
+++ b/sapl/templates/audiencia/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 AudienciaPublica:
   {% trans 'Audiência Pública' %}:
   - nome:10 numero
diff --git a/sapl/templates/auth/user_form.html b/sapl/templates/auth/user_form.html
index 3b19ee162..a228efc2e 100644
--- a/sapl/templates/auth/user_form.html
+++ b/sapl/templates/auth/user_form.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/auth/user_list.html b/sapl/templates/auth/user_list.html
index b24cb764e..8dc955969 100644
--- a/sapl/templates/auth/user_list.html
+++ b/sapl/templates/auth/user_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% load common_tags %}
 {% block base_content %}
diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index 8c4e24b6c..e10152e9f 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -1,4 +1,4 @@
-{% load i18n staticfiles sass_tags menus %}
+{% load i18n_sapl staticfiles sass_tags menus %}
 {% load common_tags %}
 <!DOCTYPE html>
 <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
diff --git a/sapl/templates/base/RelatorioAtas_filter.html b/sapl/templates/base/RelatorioAtas_filter.html
index e83971d42..15b3d693a 100644
--- a/sapl/templates/base/RelatorioAtas_filter.html
+++ b/sapl/templates/base/RelatorioAtas_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags staticfiles %}
 
 {% block base_content %}
diff --git a/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html b/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html
index 1fccf1268..4da8dd443 100644
--- a/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html
+++ b/sapl/templates/base/RelatorioDataFimPrazoTramitacao_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html b/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html
index 421be8d06..c8527900a 100644
--- a/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html
+++ b/sapl/templates/base/RelatorioHistoricoTramitacao_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html b/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html
index 890733053..7d48a85d0 100644
--- a/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html
+++ b/sapl/templates/base/RelatorioMateriasPorAnoAutorTipo_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/base/RelatorioMateriasPorAutor_filter.html b/sapl/templates/base/RelatorioMateriasPorAutor_filter.html
index bf0b7702f..1b829a762 100644
--- a/sapl/templates/base/RelatorioMateriasPorAutor_filter.html
+++ b/sapl/templates/base/RelatorioMateriasPorAutor_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
index db6065266..1194adb5c 100644
--- a/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
+++ b/sapl/templates/base/RelatorioMateriasPorTramitacao_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/base/RelatorioPresencaSessao_filter.html b/sapl/templates/base/RelatorioPresencaSessao_filter.html
index e3e447f8d..c6bd3815c 100644
--- a/sapl/templates/base/RelatorioPresencaSessao_filter.html
+++ b/sapl/templates/base/RelatorioPresencaSessao_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/base/alterar_senha.html b/sapl/templates/base/alterar_senha.html
index 20956a763..c33d205c1 100644
--- a/sapl/templates/base/alterar_senha.html
+++ b/sapl/templates/base/alterar_senha.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/base/autor_form.html b/sapl/templates/base/autor_form.html
index b5c16fd9f..c286f4d13 100644
--- a/sapl/templates/base/autor_form.html
+++ b/sapl/templates/base/autor_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block extra_js %}
 
 <script type="text/javascript">
diff --git a/sapl/templates/base/casalegislativa_list.html b/sapl/templates/base/casalegislativa_list.html
index 223d33b1b..ddb106f5f 100644
--- a/sapl/templates/base/casalegislativa_list.html
+++ b/sapl/templates/base/casalegislativa_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
   {% if not rows %}
diff --git a/sapl/templates/base/layouts.yaml b/sapl/templates/base/layouts.yaml
index 3f7941d64..4968245fb 100644
--- a/sapl/templates/base/layouts.yaml
+++ b/sapl/templates/base/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 CasaLegislativa:
   {% trans 'Casa Legislativa' %}:
   - codigo:2 nome sigla
@@ -10,6 +10,10 @@ CasaLegislativa:
   - email
   - informacao_geral
 
+ExpressaoTextual:
+  {% trans 'Expressão Textual' %}:
+  - custom
+
 AppConfig:
   {% trans 'Configurações da Aplicação' %}:
   - documentos_administrativos
diff --git a/sapl/templates/base/login.html b/sapl/templates/base/login.html
index c2c7aa2c6..daa272f01 100644
--- a/sapl/templates/base/login.html
+++ b/sapl/templates/base/login.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block base_content %}
   
   <!-- O bloco comentado é para ser implementado após as autorizacoes -->
diff --git a/sapl/templates/base/recupera_senha_email_enviado.html b/sapl/templates/base/recupera_senha_email_enviado.html
index 42dbc414d..3717283b3 100644
--- a/sapl/templates/base/recupera_senha_email_enviado.html
+++ b/sapl/templates/base/recupera_senha_email_enviado.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 {% block base_content %}
 
     <div class="container">
diff --git a/sapl/templates/base/relatorios_list.html b/sapl/templates/base/relatorios_list.html
index 1bd0f5eda..942620d86 100644
--- a/sapl/templates/base/relatorios_list.html
+++ b/sapl/templates/base/relatorios_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
 <fieldset>
diff --git a/sapl/templates/base/tipoautor_list.html b/sapl/templates/base/tipoautor_list.html
index e6996dc7f..23da8e984 100644
--- a/sapl/templates/base/tipoautor_list.html
+++ b/sapl/templates/base/tipoautor_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list_tabaux.html" %}
-{% load i18n base_tags %}
+{% load i18n_sapl base_tags %}
 
 
 {% block container_table_list %}
diff --git a/sapl/templates/comissoes/cadastro_reuniao.html b/sapl/templates/comissoes/cadastro_reuniao.html
index 9682c56d5..c0cbc5381 100644
--- a/sapl/templates/comissoes/cadastro_reuniao.html
+++ b/sapl/templates/comissoes/cadastro_reuniao.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/comissoes/cadastro_reuniao_edit.html b/sapl/templates/comissoes/cadastro_reuniao_edit.html
index 9682c56d5..c0cbc5381 100644
--- a/sapl/templates/comissoes/cadastro_reuniao_edit.html
+++ b/sapl/templates/comissoes/cadastro_reuniao_edit.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/comissoes/comissao_parlamentar.html b/sapl/templates/comissoes/comissao_parlamentar.html
index 9682c56d5..c0cbc5381 100644
--- a/sapl/templates/comissoes/comissao_parlamentar.html
+++ b/sapl/templates/comissoes/comissao_parlamentar.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/comissoes/comissao_parlamentar_edit.html b/sapl/templates/comissoes/comissao_parlamentar_edit.html
index 9682c56d5..c0cbc5381 100644
--- a/sapl/templates/comissoes/comissao_parlamentar_edit.html
+++ b/sapl/templates/comissoes/comissao_parlamentar_edit.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/comissoes/composicao_list.html b/sapl/templates/comissoes/composicao_list.html
index 29071c85d..4225591d0 100644
--- a/sapl/templates/comissoes/composicao_list.html
+++ b/sapl/templates/comissoes/composicao_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n common_tags crispy_forms_tags%}
+{% load i18n_sapl common_tags crispy_forms_tags%}
 
 {% block base_content %}
   {% if user.is_authenticated and perms.comissoes.add_composicao %}
diff --git a/sapl/templates/comissoes/layouts.yaml b/sapl/templates/comissoes/layouts.yaml
index b06fb9ae9..7df99909f 100644
--- a/sapl/templates/comissoes/layouts.yaml
+++ b/sapl/templates/comissoes/layouts.yaml
@@ -1,4 +1,4 @@
- {% load i18n %}
+ {% load i18n_sapl %}
 CargoComissao:
   {% trans 'Cargo de Comissão' %}:
   - nome:10  unico
diff --git a/sapl/templates/comissoes/materias.html b/sapl/templates/comissoes/materias.html
index 0573ea9a8..157c6be04 100644
--- a/sapl/templates/comissoes/materias.html
+++ b/sapl/templates/comissoes/materias.html
@@ -1,5 +1,5 @@
 {% extends "comissoes/comissao_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block actions %}{% endblock actions %}
 
diff --git a/sapl/templates/comissoes/materias_em_tramitacao.html b/sapl/templates/comissoes/materias_em_tramitacao.html
index 9f197d1ce..5efdfffba 100644
--- a/sapl/templates/comissoes/materias_em_tramitacao.html
+++ b/sapl/templates/comissoes/materias_em_tramitacao.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %} {% endblock %}
 
diff --git a/sapl/templates/comissoes/subnav.yaml b/sapl/templates/comissoes/subnav.yaml
index e7e49837b..55a62c9df 100644
--- a/sapl/templates/comissoes/subnav.yaml
+++ b/sapl/templates/comissoes/subnav.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 - title: {% trans 'Início' %}
   url: comissao_detail
 - title: {% trans 'Composição' %}
diff --git a/sapl/templates/compilacao/ajax_actions_dinamic_edit.html b/sapl/templates/compilacao/ajax_actions_dinamic_edit.html
index d0812ff6c..e0a2edc81 100644
--- a/sapl/templates/compilacao/ajax_actions_dinamic_edit.html
+++ b/sapl/templates/compilacao/ajax_actions_dinamic_edit.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 
 <div class="btn-toolbar pull-right" role="toolbar" >
   {% if perms.compilacao.change_dispositivo_registros_compilacao %}
diff --git a/sapl/templates/compilacao/ajax_actions_registro_inclusao.html b/sapl/templates/compilacao/ajax_actions_registro_inclusao.html
index 2d452b74a..4d4c3225e 100644
--- a/sapl/templates/compilacao/ajax_actions_registro_inclusao.html
+++ b/sapl/templates/compilacao/ajax_actions_registro_inclusao.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% if object.dispositivo_subsequente == None %}
   <div class="row">
diff --git a/sapl/templates/compilacao/dispositivo_form.html b/sapl/templates/compilacao/dispositivo_form.html
index 15d383600..e50dde25c 100644
--- a/sapl/templates/compilacao/dispositivo_form.html
+++ b/sapl/templates/compilacao/dispositivo_form.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags compilacao_filters staticfiles sass_tags %}
+{% load i18n_sapl crispy_forms_tags compilacao_filters staticfiles sass_tags %}
 
 {% block head_content %}{{block.super}}
   <link rel="stylesheet" href="{% sass_src 'styles/compilacao.scss' %}" type="text/css">
diff --git a/sapl/templates/compilacao/dispositivo_form_alteracao.html b/sapl/templates/compilacao/dispositivo_form_alteracao.html
index 08f123d57..1da528a1e 100644
--- a/sapl/templates/compilacao/dispositivo_form_alteracao.html
+++ b/sapl/templates/compilacao/dispositivo_form_alteracao.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/dispositivo_form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block extra_js %}{{block.super}}
   <script type="text/javascript">
diff --git a/sapl/templates/compilacao/dispositivo_form_definidor_vigencia.html b/sapl/templates/compilacao/dispositivo_form_definidor_vigencia.html
index 868935970..5b46ded3b 100644
--- a/sapl/templates/compilacao/dispositivo_form_definidor_vigencia.html
+++ b/sapl/templates/compilacao/dispositivo_form_definidor_vigencia.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/dispositivo_form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block extra_js %}{{block.super}}
   <script type="text/javascript">
diff --git a/sapl/templates/compilacao/dispositivo_form_edicao_basica.html b/sapl/templates/compilacao/dispositivo_form_edicao_basica.html
index 45ab34594..2b6c4f251 100644
--- a/sapl/templates/compilacao/dispositivo_form_edicao_basica.html
+++ b/sapl/templates/compilacao/dispositivo_form_edicao_basica.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/dispositivo_form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block extra_js %}{{block.super}}
 
diff --git a/sapl/templates/compilacao/dispositivo_form_parents.html b/sapl/templates/compilacao/dispositivo_form_parents.html
index 167671a4b..a9706b69f 100644
--- a/sapl/templates/compilacao/dispositivo_form_parents.html
+++ b/sapl/templates/compilacao/dispositivo_form_parents.html
@@ -1,4 +1,4 @@
-{% load i18n compilacao_filters %}
+{% load i18n_sapl compilacao_filters %}
 
 {% if not node.dispositivos_filhos_set.exists %}
   <a href="{% url view.get_url_this_view node.ta_id node.pk %}" class="btn btn-default {%if active%}btn-primary{%endif%}">
diff --git a/sapl/templates/compilacao/dispositivo_form_search.html b/sapl/templates/compilacao/dispositivo_form_search.html
index 9bcb1cba2..3c82cdb89 100644
--- a/sapl/templates/compilacao/dispositivo_form_search.html
+++ b/sapl/templates/compilacao/dispositivo_form_search.html
@@ -1,4 +1,4 @@
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 <div class="modal fade" id="modal-ds" tabindex="-1" role="dialog" aria-labelledby="gridSystemModalLabel">
   <div class="modal-dialog modal-lg" role="document">
diff --git a/sapl/templates/compilacao/dispositivo_form_search_fragment.html b/sapl/templates/compilacao/dispositivo_form_search_fragment.html
index a66b59245..161b4698e 100644
--- a/sapl/templates/compilacao/dispositivo_form_search_fragment.html
+++ b/sapl/templates/compilacao/dispositivo_form_search_fragment.html
@@ -1,4 +1,4 @@
-{% load i18n compilacao_filters %}
+{% load i18n_sapl compilacao_filters %}
 
 {% if object_list.count >= 100 %}
   <div class="alert-box success radius">
diff --git a/sapl/templates/compilacao/dispositivo_form_vigencia.html b/sapl/templates/compilacao/dispositivo_form_vigencia.html
index f5055fd96..96c95cc6e 100644
--- a/sapl/templates/compilacao/dispositivo_form_vigencia.html
+++ b/sapl/templates/compilacao/dispositivo_form_vigencia.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/dispositivo_form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block extra_js %}{{block.super}}
   <script type="text/javascript">
     var change_inconstitucionalidade = function() {
diff --git a/sapl/templates/compilacao/layout/dispositivo_checkbox.html b/sapl/templates/compilacao/layout/dispositivo_checkbox.html
index 6f29a171a..f0f33876c 100644
--- a/sapl/templates/compilacao/layout/dispositivo_checkbox.html
+++ b/sapl/templates/compilacao/layout/dispositivo_checkbox.html
@@ -1,5 +1,5 @@
 {% load crispy_forms_filters %}
-{% load i18n compilacao_filters common_tags%}
+{% load i18n_sapl compilacao_filters common_tags%}
 
 <div class="controls cp lista-dispositivo"{% if flat_attrs %} {{ flat_attrs|safe }}{% endif %}>
   {% include 'bootstrap/layout/field_errors_block.html' %}
diff --git a/sapl/templates/compilacao/layout/dispositivo_radio.html b/sapl/templates/compilacao/layout/dispositivo_radio.html
index 93d10eef1..551a7010f 100644
--- a/sapl/templates/compilacao/layout/dispositivo_radio.html
+++ b/sapl/templates/compilacao/layout/dispositivo_radio.html
@@ -1,5 +1,5 @@
 {% load crispy_forms_filters %}
-{% load i18n compilacao_filters common_tags%}
+{% load i18n_sapl compilacao_filters common_tags%}
 
 
 <div class="controls lista-dispositivo"{% if flat_attrs %} {{ flat_attrs|safe }}{% endif %}>
diff --git a/sapl/templates/compilacao/layouts.yaml b/sapl/templates/compilacao/layouts.yaml
index 60895b185..702bd6baf 100644
--- a/sapl/templates/compilacao/layouts.yaml
+++ b/sapl/templates/compilacao/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 TipoNota:
   {% trans 'Tipo da Nota' %}:
   - sigla:2  nome
diff --git a/sapl/templates/compilacao/publicacao_detail.html b/sapl/templates/compilacao/publicacao_detail.html
index 949eb668b..b491e3554 100644
--- a/sapl/templates/compilacao/publicacao_detail.html
+++ b/sapl/templates/compilacao/publicacao_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 
diff --git a/sapl/templates/compilacao/publicacao_list.html b/sapl/templates/compilacao/publicacao_list.html
index 11c5e452a..a74830972 100644
--- a/sapl/templates/compilacao/publicacao_list.html
+++ b/sapl/templates/compilacao/publicacao_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 
diff --git a/sapl/templates/compilacao/text_edit.html b/sapl/templates/compilacao/text_edit.html
index 953f00a84..5831771a7 100644
--- a/sapl/templates/compilacao/text_edit.html
+++ b/sapl/templates/compilacao/text_edit.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/textoarticulado_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load staticfiles %}
 {% load sass_tags %}
diff --git a/sapl/templates/compilacao/text_edit_bloco.html b/sapl/templates/compilacao/text_edit_bloco.html
index 27b6c38fc..371223ece 100644
--- a/sapl/templates/compilacao/text_edit_bloco.html
+++ b/sapl/templates/compilacao/text_edit_bloco.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 
diff --git a/sapl/templates/compilacao/text_list.html b/sapl/templates/compilacao/text_list.html
index 7d3526cc1..7a382ce63 100644
--- a/sapl/templates/compilacao/text_list.html
+++ b/sapl/templates/compilacao/text_list.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/textoarticulado_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 {% load staticfiles %}
diff --git a/sapl/templates/compilacao/text_list__print_version.html b/sapl/templates/compilacao/text_list__print_version.html
index 8aad1409c..1964b0dff 100644
--- a/sapl/templates/compilacao/text_list__print_version.html
+++ b/sapl/templates/compilacao/text_list__print_version.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/text_list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 {% load staticfiles %}
diff --git a/sapl/templates/compilacao/text_list_bloco.html b/sapl/templates/compilacao/text_list_bloco.html
index 0c2900734..4e3752a74 100644
--- a/sapl/templates/compilacao/text_list_bloco.html
+++ b/sapl/templates/compilacao/text_list_bloco.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 
diff --git a/sapl/templates/compilacao/text_notificacoes.html b/sapl/templates/compilacao/text_notificacoes.html
index 78e3a5354..2f46c7748 100644
--- a/sapl/templates/compilacao/text_notificacoes.html
+++ b/sapl/templates/compilacao/text_notificacoes.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/textoarticulado_detail.html" %}
-{% load i18n crispy_forms_tags compilacao_filters common_tags sass_tags%}
+{% load i18n_sapl crispy_forms_tags compilacao_filters common_tags sass_tags%}
 
 {% block base_content %}
   {% block head_content %}{{block.super}}
diff --git a/sapl/templates/compilacao/textoarticulado_detail.html b/sapl/templates/compilacao/textoarticulado_detail.html
index ea76214ba..8ead050eb 100644
--- a/sapl/templates/compilacao/textoarticulado_detail.html
+++ b/sapl/templates/compilacao/textoarticulado_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 
diff --git a/sapl/templates/compilacao/textoarticulado_list.html b/sapl/templates/compilacao/textoarticulado_list.html
index c6de147cd..bdc2b80a5 100644
--- a/sapl/templates/compilacao/textoarticulado_list.html
+++ b/sapl/templates/compilacao/textoarticulado_list.html
@@ -1,5 +1,5 @@
 {% extends "compilacao/textoarticulado_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load compilacao_filters %}
 {% load common_tags %}
 
diff --git a/sapl/templates/compilacao/textoarticulado_menu_config.html b/sapl/templates/compilacao/textoarticulado_menu_config.html
index dc6000c9d..b7ede5187 100644
--- a/sapl/templates/compilacao/textoarticulado_menu_config.html
+++ b/sapl/templates/compilacao/textoarticulado_menu_config.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 {% if user.is_superuser %}
diff --git a/sapl/templates/compilacao/tipotextoarticulado_detail.html b/sapl/templates/compilacao/tipotextoarticulado_detail.html
index 5deffd227..8f87e0aa4 100644
--- a/sapl/templates/compilacao/tipotextoarticulado_detail.html
+++ b/sapl/templates/compilacao/tipotextoarticulado_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %} {% load i18n %} {% load compilacao_filters %}
+{% extends "base.html" %} {% load i18n_sapl %} {% load compilacao_filters %}
 {% load common_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/compilacao/tipotextoarticulado_list.html b/sapl/templates/compilacao/tipotextoarticulado_list.html
index 509c9c0d3..dbc69f521 100644
--- a/sapl/templates/compilacao/tipotextoarticulado_list.html
+++ b/sapl/templates/compilacao/tipotextoarticulado_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n compilacao_filters common_tags menus%}
+{% load i18n_sapl compilacao_filters common_tags menus%}
 
 {% block base_content %}
 
diff --git a/sapl/templates/crud/ajax_form.html b/sapl/templates/crud/ajax_form.html
index 1f2fecbf6..87e84bd37 100644
--- a/sapl/templates/crud/ajax_form.html
+++ b/sapl/templates/crud/ajax_form.html
@@ -1,2 +1,2 @@
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 {% crispy form %}
\ No newline at end of file
diff --git a/sapl/templates/crud/confirm_delete.html b/sapl/templates/crud/confirm_delete.html
index f41a4c76a..dc6e34a81 100644
--- a/sapl/templates/crud/confirm_delete.html
+++ b/sapl/templates/crud/confirm_delete.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block base_content %}
   <form action="" method="post">{% csrf_token %}
diff --git a/sapl/templates/crud/detail.html b/sapl/templates/crud/detail.html
index 4a1cad276..cbd330b9d 100644
--- a/sapl/templates/crud/detail.html
+++ b/sapl/templates/crud/detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n common_tags%}
+{% load i18n_sapl common_tags%}
 
 {% block base_content %}
 
diff --git a/sapl/templates/crud/detail_detail.html b/sapl/templates/crud/detail_detail.html
index b2312ec51..e4675c46a 100644
--- a/sapl/templates/crud/detail_detail.html
+++ b/sapl/templates/crud/detail_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n common_tags%}
+{% load i18n_sapl common_tags%}
 
 {% block base_content %}
 
diff --git a/sapl/templates/crud/form.html b/sapl/templates/crud/form.html
index 65882a09e..1c78de09f 100644
--- a/sapl/templates/crud/form.html
+++ b/sapl/templates/crud/form.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
   {% crispy form %}
diff --git a/sapl/templates/crud/list.html b/sapl/templates/crud/list.html
index 8e911913c..3cbdf4862 100644
--- a/sapl/templates/crud/list.html
+++ b/sapl/templates/crud/list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n common_tags crispy_forms_tags%}
+{% load i18n_sapl common_tags crispy_forms_tags%}
 
 {% block base_content %}
 
diff --git a/sapl/templates/crud/list_tabaux.html b/sapl/templates/crud/list_tabaux.html
index 77c81f651..f6b66585e 100644
--- a/sapl/templates/crud/list_tabaux.html
+++ b/sapl/templates/crud/list_tabaux.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n menus%}
+{% load i18n_sapl menus%}
 {% block base_content %}
   <div class="row container-tabaux">
     <div class="{% if perms.base.menu_tabelas_auxiliares %}col-sm-9{% endif %}">
diff --git a/sapl/templates/email/acompanhar.html b/sapl/templates/email/acompanhar.html
index bd1a20263..954befebc 100644
--- a/sapl/templates/email/acompanhar.html
+++ b/sapl/templates/email/acompanhar.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load static %}
 <html><head></head><body bgcolor='#ffffff'>
 
diff --git a/sapl/templates/email/confirma.html b/sapl/templates/email/confirma.html
index 64dd05849..71be1517e 100644
--- a/sapl/templates/email/confirma.html
+++ b/sapl/templates/email/confirma.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 Sua conta foi confirmada via e-mail. Clique <a href="{% url 'sapl.base:login' %}">aqui</a> para fazer seu login.
diff --git a/sapl/templates/email/tramitacao.html b/sapl/templates/email/tramitacao.html
index 4b30a1dc5..902d11e0e 100644
--- a/sapl/templates/email/tramitacao.html
+++ b/sapl/templates/email/tramitacao.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load static %}
 <html>
 <head></head>
diff --git a/sapl/templates/floppyforms/image_thumbnail.html b/sapl/templates/floppyforms/image_thumbnail.html
index a085fb873..9f5e012dd 100644
--- a/sapl/templates/floppyforms/image_thumbnail.html
+++ b/sapl/templates/floppyforms/image_thumbnail.html
@@ -1,4 +1,4 @@
-{% load i18n staticfiles thumbnail %}
+{% load i18n_sapl staticfiles thumbnail %}
 
 <div id="div_{{ field.auto_id }}"
     class="control-group
diff --git a/sapl/templates/index.html b/sapl/templates/index.html
index 7eab8dbc0..04730c152 100644
--- a/sapl/templates/index.html
+++ b/sapl/templates/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n staticfiles %}
+{% load i18n_sapl staticfiles %}
 
 {% block title%}
 <head>
@@ -126,7 +126,7 @@
             <div class="homeIcon">
                 <img src="{% static 'img/icon_normas_juridicas.png' %}" alt="Normas Jurídicas">
             </div>
-            <h2>Normas Jurídicas</h2>
+            <h2>{% trans 'Normas Jurídicas'%}</h2>
         </div>
         <div class="homeContent">
             <div class="homeTitle">
diff --git a/sapl/templates/lexml/layouts.yaml b/sapl/templates/lexml/layouts.yaml
index 1dc354bd2..88aacd7c0 100644
--- a/sapl/templates/lexml/layouts.yaml
+++ b/sapl/templates/lexml/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 LexmlProvedor:
   {% trans 'Provedor Lexml' %}:
   - id_provedor:2  nome
diff --git a/sapl/templates/materia/acompanhamento_materia.html b/sapl/templates/materia/acompanhamento_materia.html
index d22e90e61..ea2563ff9 100644
--- a/sapl/templates/materia/acompanhamento_materia.html
+++ b/sapl/templates/materia/acompanhamento_materia.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %} {% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/materia/adicionar_varias_autorias.html b/sapl/templates/materia/adicionar_varias_autorias.html
index f7ddf1c81..5ff96d00b 100644
--- a/sapl/templates/materia/adicionar_varias_autorias.html
+++ b/sapl/templates/materia/adicionar_varias_autorias.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 
diff --git a/sapl/templates/materia/autoria_form.html b/sapl/templates/materia/autoria_form.html
index 9d2e314af..64674787b 100644
--- a/sapl/templates/materia/autoria_form.html
+++ b/sapl/templates/materia/autoria_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/materia/autoria_list.html b/sapl/templates/materia/autoria_list.html
index 9574ed3b7..dade4b5cf 100644
--- a/sapl/templates/materia/autoria_list.html
+++ b/sapl/templates/materia/autoria_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 
diff --git a/sapl/templates/materia/autoria_multicreate_form.html b/sapl/templates/materia/autoria_multicreate_form.html
index 59c3ece91..60c829b15 100644
--- a/sapl/templates/materia/autoria_multicreate_form.html
+++ b/sapl/templates/materia/autoria_multicreate_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/materia/confirmar_proposicao.html b/sapl/templates/materia/confirmar_proposicao.html
index f3193aeec..22dc2c43a 100644
--- a/sapl/templates/materia/confirmar_proposicao.html
+++ b/sapl/templates/materia/confirmar_proposicao.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags common_tags %}
+{% load i18n_sapl crispy_forms_tags common_tags %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/materia/documentoacessorio_form.html b/sapl/templates/materia/documentoacessorio_form.html
index e25d5d3ab..a7d5a2a20 100644
--- a/sapl/templates/materia/documentoacessorio_form.html
+++ b/sapl/templates/materia/documentoacessorio_form.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
   {% crispy form %}
diff --git a/sapl/templates/materia/em_lote/acessorio.html b/sapl/templates/materia/em_lote/acessorio.html
index cdf7a85c1..9a717b7a5 100644
--- a/sapl/templates/materia/em_lote/acessorio.html
+++ b/sapl/templates/materia/em_lote/acessorio.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
 
diff --git a/sapl/templates/materia/em_lote/excluir_tramitacao.html b/sapl/templates/materia/em_lote/excluir_tramitacao.html
index b74faa593..fc08a3363 100644
--- a/sapl/templates/materia/em_lote/excluir_tramitacao.html
+++ b/sapl/templates/materia/em_lote/excluir_tramitacao.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block actions %}{% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/materia/em_lote/subnav_em_lote.yaml b/sapl/templates/materia/em_lote/subnav_em_lote.yaml
index 3469c9262..cfe94d6a4 100644
--- a/sapl/templates/materia/em_lote/subnav_em_lote.yaml
+++ b/sapl/templates/materia/em_lote/subnav_em_lote.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 - title: {% trans 'Primeira Tramitação' %}
   url: primeira_tramitacao_em_lote
 - title: {% trans 'Tramitação em Lote' %}
diff --git a/sapl/templates/materia/em_lote/tramitacao.html b/sapl/templates/materia/em_lote/tramitacao.html
index 9ed94c84d..045137bd7 100644
--- a/sapl/templates/materia/em_lote/tramitacao.html
+++ b/sapl/templates/materia/em_lote/tramitacao.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
 
diff --git a/sapl/templates/materia/formulario_simplificado.html b/sapl/templates/materia/formulario_simplificado.html
index ec4d3a6eb..c4b027542 100644
--- a/sapl/templates/materia/formulario_simplificado.html
+++ b/sapl/templates/materia/formulario_simplificado.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 {% block detail_content %}
diff --git a/sapl/templates/materia/impressos/etiqueta.html b/sapl/templates/materia/impressos/etiqueta.html
index 03d1c8580..02a9c45d6 100644
--- a/sapl/templates/materia/impressos/etiqueta.html
+++ b/sapl/templates/materia/impressos/etiqueta.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
   <h1 class="page-header">Impressos</h1>
diff --git a/sapl/templates/materia/impressos/ficha.html b/sapl/templates/materia/impressos/ficha.html
index 03d1c8580..02a9c45d6 100644
--- a/sapl/templates/materia/impressos/ficha.html
+++ b/sapl/templates/materia/impressos/ficha.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
   <h1 class="page-header">Impressos</h1>
diff --git a/sapl/templates/materia/impressos/ficha_seleciona.html b/sapl/templates/materia/impressos/ficha_seleciona.html
index 818b7c3a3..2b4b8b509 100644
--- a/sapl/templates/materia/impressos/ficha_seleciona.html
+++ b/sapl/templates/materia/impressos/ficha_seleciona.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
   {% crispy form %}
diff --git a/sapl/templates/materia/impressos/impressos.html b/sapl/templates/materia/impressos/impressos.html
index 71f9f6f6f..91a490aba 100644
--- a/sapl/templates/materia/impressos/impressos.html
+++ b/sapl/templates/materia/impressos/impressos.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 
 {% block actions %}
diff --git a/sapl/templates/materia/impressos/norma.html b/sapl/templates/materia/impressos/norma.html
index 03d1c8580..02a9c45d6 100644
--- a/sapl/templates/materia/impressos/norma.html
+++ b/sapl/templates/materia/impressos/norma.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block base_content %}
   <h1 class="page-header">Impressos</h1>
diff --git a/sapl/templates/materia/layouts.yaml b/sapl/templates/materia/layouts.yaml
index 7c0c17e4e..d65c31346 100644
--- a/sapl/templates/materia/layouts.yaml
+++ b/sapl/templates/materia/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 Origem:
   {% trans 'Origem' %}:
   - nome:8  sigla
diff --git a/sapl/templates/materia/materialegislativa_detail.html b/sapl/templates/materia/materialegislativa_detail.html
index 607ed049c..05922eb90 100644
--- a/sapl/templates/materia/materialegislativa_detail.html
+++ b/sapl/templates/materia/materialegislativa_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block sub_actions %}
     {{ block.super }}
     {% if object.em_tramitacao %}
diff --git a/sapl/templates/materia/materialegislativa_filter.html b/sapl/templates/materia/materialegislativa_filter.html
index d3184fda2..0e66cba3a 100644
--- a/sapl/templates/materia/materialegislativa_filter.html
+++ b/sapl/templates/materia/materialegislativa_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
   {% block actions %}
diff --git a/sapl/templates/materia/materialegislativa_form.html b/sapl/templates/materia/materialegislativa_form.html
index bb435be91..3c0303606 100644
--- a/sapl/templates/materia/materialegislativa_form.html
+++ b/sapl/templates/materia/materialegislativa_form.html
@@ -1,6 +1,6 @@
 
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/materia/materialegislativa_list.html b/sapl/templates/materia/materialegislativa_list.html
index 16c6cdf8d..cf842992b 100644
--- a/sapl/templates/materia/materialegislativa_list.html
+++ b/sapl/templates/materia/materialegislativa_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block more_buttons %}
   <a href="{% url 'sapl.materia:pesquisar_materia' %}" class="btn btn-default">
     {% blocktrans with verbose_name=view.verbose_name %} Pesquisar {{ verbose_name }} {% endblocktrans %}
diff --git a/sapl/templates/materia/prop_devolvidas_list.html b/sapl/templates/materia/prop_devolvidas_list.html
index 8ec29f177..82d214c7f 100644
--- a/sapl/templates/materia/prop_devolvidas_list.html
+++ b/sapl/templates/materia/prop_devolvidas_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% block base_content %}
   <fieldset>
diff --git a/sapl/templates/materia/prop_pendentes_list.html b/sapl/templates/materia/prop_pendentes_list.html
index 251c4ed22..835a5a451 100644
--- a/sapl/templates/materia/prop_pendentes_list.html
+++ b/sapl/templates/materia/prop_pendentes_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% load common_tags %}
 {% block base_content %}
diff --git a/sapl/templates/materia/prop_recebidas_list.html b/sapl/templates/materia/prop_recebidas_list.html
index 4c437d6b9..9ad665017 100644
--- a/sapl/templates/materia/prop_recebidas_list.html
+++ b/sapl/templates/materia/prop_recebidas_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% block base_content %}
   <fieldset>
diff --git a/sapl/templates/materia/proposicao_confirm_delete.html b/sapl/templates/materia/proposicao_confirm_delete.html
index be402a125..68a4dde07 100644
--- a/sapl/templates/materia/proposicao_confirm_delete.html
+++ b/sapl/templates/materia/proposicao_confirm_delete.html
@@ -1,5 +1,5 @@
 {% extends "crud/confirm_delete.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block msg %}
   {% if proposicao.data_envio %}
diff --git a/sapl/templates/materia/proposicao_confirm_return.html b/sapl/templates/materia/proposicao_confirm_return.html
index 8b5be7eee..5028773d5 100644
--- a/sapl/templates/materia/proposicao_confirm_return.html
+++ b/sapl/templates/materia/proposicao_confirm_return.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block sections_nav %}{% endblock sections_nav %}
     {% block title %}
diff --git a/sapl/templates/materia/proposicao_detail.html b/sapl/templates/materia/proposicao_detail.html
index e9779f2fd..8266318e2 100644
--- a/sapl/templates/materia/proposicao_detail.html
+++ b/sapl/templates/materia/proposicao_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 {% load tz %}
 {% block sub_actions %}{{block.super}}
 
diff --git a/sapl/templates/materia/proposicao_form.html b/sapl/templates/materia/proposicao_form.html
index f9f9414b6..eb93fc8dd 100644
--- a/sapl/templates/materia/proposicao_form.html
+++ b/sapl/templates/materia/proposicao_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block extra_js %}
    <script type="text/javascript">
diff --git a/sapl/templates/materia/recibo_proposicao.html b/sapl/templates/materia/recibo_proposicao.html
index a839250f9..1c1ef4e5d 100644
--- a/sapl/templates/materia/recibo_proposicao.html
+++ b/sapl/templates/materia/recibo_proposicao.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% load crispy_forms_tags %}
 {% load static %}
diff --git a/sapl/templates/materia/relatoria_form.html b/sapl/templates/materia/relatoria_form.html
index 34cffd3db..907e0771d 100644
--- a/sapl/templates/materia/relatoria_form.html
+++ b/sapl/templates/materia/relatoria_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/materia/subnav.yaml b/sapl/templates/materia/subnav.yaml
index c2ea4cd71..306077ec1 100644
--- a/sapl/templates/materia/subnav.yaml
+++ b/sapl/templates/materia/subnav.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 - title: {% trans 'Início' %}
   url: materialegislativa_detail
 - title: {% trans 'Anexada' %}
diff --git a/sapl/templates/materia/subnav_prop.yaml b/sapl/templates/materia/subnav_prop.yaml
index facfe876f..5d8bb6767 100644
--- a/sapl/templates/materia/subnav_prop.yaml
+++ b/sapl/templates/materia/subnav_prop.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 - title: {% trans 'Receber Proposição' %}
   url: receber-proposicao
 - title: {% trans 'Proposições Não Recebidas' %}
diff --git a/sapl/templates/materia/tipoproposicao_form.html b/sapl/templates/materia/tipoproposicao_form.html
index 11493e6fe..27a7d244e 100644
--- a/sapl/templates/materia/tipoproposicao_form.html
+++ b/sapl/templates/materia/tipoproposicao_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block extra_js %}
 
diff --git a/sapl/templates/materia/tramitacao_form.html b/sapl/templates/materia/tramitacao_form.html
index 4e79e3fd2..d8d407149 100644
--- a/sapl/templates/materia/tramitacao_form.html
+++ b/sapl/templates/materia/tramitacao_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block extra_js %}
 
diff --git a/sapl/templates/menu_tabelas_auxiliares.yaml b/sapl/templates/menu_tabelas_auxiliares.yaml
index c1ae1767f..53a6f7fe4 100644
--- a/sapl/templates/menu_tabelas_auxiliares.yaml
+++ b/sapl/templates/menu_tabelas_auxiliares.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 - title: {% trans 'Configurações Gerais' %}
   css_class: head_title
   children:
diff --git a/sapl/templates/menus/menu.html b/sapl/templates/menus/menu.html
index 9b0a086f4..5b753fc99 100644
--- a/sapl/templates/menus/menu.html
+++ b/sapl/templates/menus/menu.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% if menu %}
     {% for item in menu %}
       {% if item.children %}
diff --git a/sapl/templates/menus/nav.html b/sapl/templates/menus/nav.html
index 548c54a63..49521f81d 100644
--- a/sapl/templates/menus/nav.html
+++ b/sapl/templates/menus/nav.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% if menu %}
 
   <ul class="nav navbar-nav">
diff --git a/sapl/templates/menus/subnav.html b/sapl/templates/menus/subnav.html
index 580d4160c..420b71846 100644
--- a/sapl/templates/menus/subnav.html
+++ b/sapl/templates/menus/subnav.html
@@ -1,5 +1,5 @@
 
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% if menu %}
 <ul class="nav nav-pills navbar-right">
diff --git a/sapl/templates/navbar.yaml b/sapl/templates/navbar.yaml
index b80cb7acd..496a70b56 100644
--- a/sapl/templates/navbar.yaml
+++ b/sapl/templates/navbar.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 
 - title: {% trans 'Início' %}
   url: '/'
@@ -75,6 +75,9 @@
     - title: {% trans 'Administração de Usuários' %}
       url: {% url 'sapl.base:user_list' %}
       check_permission: user.is_superuser
+    - title: {% trans 'Expressões Textuais' %}
+      url: {% url 'sapl.base:expressaotextual_list' %}
+      check_permission: user.is_superuser
 
 {% comment %}
 <li class="nav__sub-item"><a class="nav__sub-link" href="#">Provedor LexML</a></li>
diff --git a/sapl/templates/norma/layouts.yaml b/sapl/templates/norma/layouts.yaml
index 591faed38..edbcb822d 100644
--- a/sapl/templates/norma/layouts.yaml
+++ b/sapl/templates/norma/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 
 AssuntoNormaRelationship:
   {% trans 'Assunto Norma Jurídica' %}:
diff --git a/sapl/templates/norma/normajuridica_detail.html b/sapl/templates/norma/normajuridica_detail.html
index c2d236a96..c5d727200 100644
--- a/sapl/templates/norma/normajuridica_detail.html
+++ b/sapl/templates/norma/normajuridica_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n common_tags%}
+{% load i18n_sapl common_tags%}
 
 {% block detail_content %}
       {% for fieldset in view.layout_display %}
diff --git a/sapl/templates/norma/normajuridica_filter.html b/sapl/templates/norma/normajuridica_filter.html
index 8119ce4d1..9ac32dab4 100644
--- a/sapl/templates/norma/normajuridica_filter.html
+++ b/sapl/templates/norma/normajuridica_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block actions %}
diff --git a/sapl/templates/norma/normajuridica_form.html b/sapl/templates/norma/normajuridica_form.html
index 2ed25c693..aadfcb719 100644
--- a/sapl/templates/norma/normajuridica_form.html
+++ b/sapl/templates/norma/normajuridica_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/norma/normarelacionada_form.html b/sapl/templates/norma/normarelacionada_form.html
index 7fbd03c45..1e4594a87 100644
--- a/sapl/templates/norma/normarelacionada_form.html
+++ b/sapl/templates/norma/normarelacionada_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/norma/subnav.yaml b/sapl/templates/norma/subnav.yaml
index 9358787ff..03b2e6054 100644
--- a/sapl/templates/norma/subnav.yaml
+++ b/sapl/templates/norma/subnav.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags%}
+{% load i18n_sapl common_tags%}
 
 - title: {% trans 'Início' %}
   url: normajuridica_detail
diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html
index d0336a2f1..48c6bb41f 100644
--- a/sapl/templates/painel/index.html
+++ b/sapl/templates/painel/index.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load staticfiles sass_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/painel/layouts.yaml b/sapl/templates/painel/layouts.yaml
index e0d01ac66..9c54dd791 100644
--- a/sapl/templates/painel/layouts.yaml
+++ b/sapl/templates/painel/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 Cronometro:
   {% trans 'Cronometro' %}:
   - status:3  data_cronometro:6  tipo
diff --git a/sapl/templates/painel/mensagem.html b/sapl/templates/painel/mensagem.html
index 011ea967c..3d3d177fe 100644
--- a/sapl/templates/painel/mensagem.html
+++ b/sapl/templates/painel/mensagem.html
@@ -1,4 +1,4 @@
-{% load i18n %}                                                                                                              
+{% load i18n_sapl %}                                                                                                              
 {% load staticfiles %}
 <!DOCTYPE HTML>
 <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
diff --git a/sapl/templates/painel/parlamentares.html b/sapl/templates/painel/parlamentares.html
index ab48a4ef6..6fe3a10f5 100644
--- a/sapl/templates/painel/parlamentares.html
+++ b/sapl/templates/painel/parlamentares.html
@@ -1,4 +1,4 @@
-{% load i18n %}                                                                                                              
+{% load i18n_sapl %}                                                                                                              
 {% load staticfiles %}
 <!DOCTYPE HTML>
 <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
diff --git a/sapl/templates/painel/votacao.html b/sapl/templates/painel/votacao.html
index 66cdaf2f2..9cd2fd2a4 100644
--- a/sapl/templates/painel/votacao.html
+++ b/sapl/templates/painel/votacao.html
@@ -1,4 +1,4 @@
-{% load i18n %}                                                                                                              
+{% load i18n_sapl %}                                                                                                              
 {% load staticfiles %}
 <!DOCTYPE HTML>
 <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
diff --git a/sapl/templates/painel/voto_nominal.html b/sapl/templates/painel/voto_nominal.html
index a1830a54a..516298135 100644
--- a/sapl/templates/painel/voto_nominal.html
+++ b/sapl/templates/painel/voto_nominal.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load staticfiles sass_tags %}
 <!DOCTYPE HTML>
 <html lang="pt-br">
diff --git a/sapl/templates/parlamentares/composicaomesa_form.html b/sapl/templates/parlamentares/composicaomesa_form.html
index f1b2b7578..ddc9a515b 100644
--- a/sapl/templates/parlamentares/composicaomesa_form.html
+++ b/sapl/templates/parlamentares/composicaomesa_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block actions %} {% endblock %}
 
 {% block detail_content %}
diff --git a/sapl/templates/parlamentares/frente_form.html b/sapl/templates/parlamentares/frente_form.html
index bbab780ae..b9566d454 100644
--- a/sapl/templates/parlamentares/frente_form.html
+++ b/sapl/templates/parlamentares/frente_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/parlamentares/layouts.yaml b/sapl/templates/parlamentares/layouts.yaml
index ded7ca647..83315bf09 100644
--- a/sapl/templates/parlamentares/layouts.yaml
+++ b/sapl/templates/parlamentares/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 CargoMesa:
   {% trans 'Cargo na Mesa'%}:
   - descricao:10  unico
diff --git a/sapl/templates/parlamentares/materias.html b/sapl/templates/parlamentares/materias.html
index c5e1448c8..0c5843272 100644
--- a/sapl/templates/parlamentares/materias.html
+++ b/sapl/templates/parlamentares/materias.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 {% block actions %}{% endblock %}
diff --git a/sapl/templates/parlamentares/parlamentar_perfil_publico.html b/sapl/templates/parlamentares/parlamentar_perfil_publico.html
index 705eac9f5..2379ef8b9 100644
--- a/sapl/templates/parlamentares/parlamentar_perfil_publico.html
+++ b/sapl/templates/parlamentares/parlamentar_perfil_publico.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/parlamentares/parlamentares_list.html b/sapl/templates/parlamentares/parlamentares_list.html
index bc3955b06..5dd380e0a 100644
--- a/sapl/templates/parlamentares/parlamentares_list.html
+++ b/sapl/templates/parlamentares/parlamentares_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags cropping%}
 {% block extra_content %}
   <fieldset class="form-group">
diff --git a/sapl/templates/parlamentares/public_composicaomesa_form.html b/sapl/templates/parlamentares/public_composicaomesa_form.html
index e50a0458e..55f98d619 100644
--- a/sapl/templates/parlamentares/public_composicaomesa_form.html
+++ b/sapl/templates/parlamentares/public_composicaomesa_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n cropping%}
+{% load i18n_sapl cropping%}
 {% block actions %} {% endblock %}
 
 {% block detail_content %}
diff --git a/sapl/templates/parlamentares/subnav.yaml b/sapl/templates/parlamentares/subnav.yaml
index 9199589fc..b0428f714 100644
--- a/sapl/templates/parlamentares/subnav.yaml
+++ b/sapl/templates/parlamentares/subnav.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 - title: {% trans 'Início' %}
   url: parlamentar_detail
 - title: {% trans 'Mandatos' %}
diff --git a/sapl/templates/parlamentares/subnav_coligacao.yaml b/sapl/templates/parlamentares/subnav_coligacao.yaml
index 513d92ef8..66135e952 100644
--- a/sapl/templates/parlamentares/subnav_coligacao.yaml
+++ b/sapl/templates/parlamentares/subnav_coligacao.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 - title: {% trans 'Início' %}
   url: coligacao_detail
 - title: {% trans 'Composição da Coligação' %}
diff --git a/sapl/templates/parlamentares/votante_list.html b/sapl/templates/parlamentares/votante_list.html
index 58756f6be..f5483b0f7 100644
--- a/sapl/templates/parlamentares/votante_list.html
+++ b/sapl/templates/parlamentares/votante_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block actions %}
diff --git a/sapl/templates/protocoloadm/MateriaTemplate.html b/sapl/templates/protocoloadm/MateriaTemplate.html
index 05d1f65ad..17f84f775 100644
--- a/sapl/templates/protocoloadm/MateriaTemplate.html
+++ b/sapl/templates/protocoloadm/MateriaTemplate.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n common_tags%}
+{% load i18n_sapl common_tags%}
 
 {% block base_content %}
 <div class="alert alert-success alert-dismissible fade in" role="alert">
diff --git a/sapl/templates/protocoloadm/anular_protocoloadm.html b/sapl/templates/protocoloadm/anular_protocoloadm.html
index cb4af2399..6346307ce 100644
--- a/sapl/templates/protocoloadm/anular_protocoloadm.html
+++ b/sapl/templates/protocoloadm/anular_protocoloadm.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 
diff --git a/sapl/templates/protocoloadm/comprovante.html b/sapl/templates/protocoloadm/comprovante.html
index 795eecb9c..40fa3d535 100644
--- a/sapl/templates/protocoloadm/comprovante.html
+++ b/sapl/templates/protocoloadm/comprovante.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load static %}
 
diff --git a/sapl/templates/protocoloadm/criar_documento.html b/sapl/templates/protocoloadm/criar_documento.html
index 50ce32213..9e62b7fbe 100644
--- a/sapl/templates/protocoloadm/criar_documento.html
+++ b/sapl/templates/protocoloadm/criar_documento.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/detail_doc_adm.html b/sapl/templates/protocoloadm/detail_doc_adm.html
index baf9e5c8c..0950e0892 100644
--- a/sapl/templates/protocoloadm/detail_doc_adm.html
+++ b/sapl/templates/protocoloadm/detail_doc_adm.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/detail_doc_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/detail_doc_detail.html b/sapl/templates/protocoloadm/detail_doc_detail.html
index afaf7a773..c18465ba5 100644
--- a/sapl/templates/protocoloadm/detail_doc_detail.html
+++ b/sapl/templates/protocoloadm/detail_doc_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block actions %} {% endblock %}
 {% block sections_nav %}
 	<div class="actions btn-group pull-right" role="group">
diff --git a/sapl/templates/protocoloadm/documento_acessorio_administrativo.html b/sapl/templates/protocoloadm/documento_acessorio_administrativo.html
index 044db33d2..8654f0be0 100644
--- a/sapl/templates/protocoloadm/documento_acessorio_administrativo.html
+++ b/sapl/templates/protocoloadm/documento_acessorio_administrativo.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/detail_doc_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/documento_acessorio_administrativo_edit.html b/sapl/templates/protocoloadm/documento_acessorio_administrativo_edit.html
index 5583cd34c..c2d461090 100644
--- a/sapl/templates/protocoloadm/documento_acessorio_administrativo_edit.html
+++ b/sapl/templates/protocoloadm/documento_acessorio_administrativo_edit.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/detail_doc_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/documentoadministrativo_filter.html b/sapl/templates/protocoloadm/documentoadministrativo_filter.html
index 719efcd04..4e3579515 100644
--- a/sapl/templates/protocoloadm/documentoadministrativo_filter.html
+++ b/sapl/templates/protocoloadm/documentoadministrativo_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/protocoloadm/documentoadministrativo_form.html b/sapl/templates/protocoloadm/documentoadministrativo_form.html
index 627271dcf..9f70009ce 100644
--- a/sapl/templates/protocoloadm/documentoadministrativo_form.html
+++ b/sapl/templates/protocoloadm/documentoadministrativo_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block extra_js %}
 <script language="Javascript">
     function atualizar_numero_documento(){
diff --git a/sapl/templates/protocoloadm/layouts.yaml b/sapl/templates/protocoloadm/layouts.yaml
index b1bb2f31b..83fb2aedb 100644
--- a/sapl/templates/protocoloadm/layouts.yaml
+++ b/sapl/templates/protocoloadm/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 TipoDocumentoAdministrativo:
   {% trans 'Tipo Documento Administrativo' %}:
   - sigla:4  descricao
diff --git a/sapl/templates/protocoloadm/pesquisa_documento_detail.html b/sapl/templates/protocoloadm/pesquisa_documento_detail.html
index 9e4a5ebb4..9e43c62f3 100644
--- a/sapl/templates/protocoloadm/pesquisa_documento_detail.html
+++ b/sapl/templates/protocoloadm/pesquisa_documento_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block sections_nav %}
 <div class="actions btn-group pull-right" role="group">
diff --git a/sapl/templates/protocoloadm/proposicao_receber.html b/sapl/templates/protocoloadm/proposicao_receber.html
index d3496e6e7..7ddd7185e 100644
--- a/sapl/templates/protocoloadm/proposicao_receber.html
+++ b/sapl/templates/protocoloadm/proposicao_receber.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/proposicoes_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/proposicao_view.html b/sapl/templates/protocoloadm/proposicao_view.html
index ffccb66a4..ebd3bc59d 100644
--- a/sapl/templates/protocoloadm/proposicao_view.html
+++ b/sapl/templates/protocoloadm/proposicao_view.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/proposicoes.html b/sapl/templates/protocoloadm/proposicoes.html
index 7343227bd..141e1230a 100644
--- a/sapl/templates/protocoloadm/proposicoes.html
+++ b/sapl/templates/protocoloadm/proposicoes.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/proposicoes_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/proposicoes_detail.html b/sapl/templates/protocoloadm/proposicoes_detail.html
index 068cd0417..c1340bf8c 100644
--- a/sapl/templates/protocoloadm/proposicoes_detail.html
+++ b/sapl/templates/protocoloadm/proposicoes_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block sections_nav %}
 <div class="actions btn-group pull-right" role="group">
diff --git a/sapl/templates/protocoloadm/proposicoes_incorporadas.html b/sapl/templates/protocoloadm/proposicoes_incorporadas.html
index 0a6abef4c..a81d71021 100644
--- a/sapl/templates/protocoloadm/proposicoes_incorporadas.html
+++ b/sapl/templates/protocoloadm/proposicoes_incorporadas.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/proposicoes_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/proposicoes_naoincorporadas.html b/sapl/templates/protocoloadm/proposicoes_naoincorporadas.html
index 84213dc88..91bfd5a34 100644
--- a/sapl/templates/protocoloadm/proposicoes_naoincorporadas.html
+++ b/sapl/templates/protocoloadm/proposicoes_naoincorporadas.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/proposicoes_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/proposicoes_naorecebidas.html b/sapl/templates/protocoloadm/proposicoes_naorecebidas.html
index 4757c6bff..aade68672 100644
--- a/sapl/templates/protocoloadm/proposicoes_naorecebidas.html
+++ b/sapl/templates/protocoloadm/proposicoes_naorecebidas.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/proposicoes_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
diff --git a/sapl/templates/protocoloadm/protocolar_documento.html b/sapl/templates/protocoloadm/protocolar_documento.html
index 5cb1fa789..39dd28224 100644
--- a/sapl/templates/protocoloadm/protocolar_documento.html
+++ b/sapl/templates/protocoloadm/protocolar_documento.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 
diff --git a/sapl/templates/protocoloadm/protocolar_materia.html b/sapl/templates/protocoloadm/protocolar_materia.html
index db3785bd6..496a5c064 100644
--- a/sapl/templates/protocoloadm/protocolar_materia.html
+++ b/sapl/templates/protocoloadm/protocolar_materia.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block actions %}
diff --git a/sapl/templates/protocoloadm/protocolo_filter.html b/sapl/templates/protocoloadm/protocolo_filter.html
index 02c0673fa..1b189458f 100644
--- a/sapl/templates/protocoloadm/protocolo_filter.html
+++ b/sapl/templates/protocoloadm/protocolo_filter.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% load crispy_forms_tags %}
 {% load static %}
diff --git a/sapl/templates/protocoloadm/protocolo_list.html b/sapl/templates/protocoloadm/protocolo_list.html
index f525745c5..67bd5388d 100644
--- a/sapl/templates/protocoloadm/protocolo_list.html
+++ b/sapl/templates/protocoloadm/protocolo_list.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% load crispy_forms_tags %}
 {% load static %}
diff --git a/sapl/templates/protocoloadm/protocolo_mostrar.html b/sapl/templates/protocoloadm/protocolo_mostrar.html
index c45c70bec..ae53d5c62 100644
--- a/sapl/templates/protocoloadm/protocolo_mostrar.html
+++ b/sapl/templates/protocoloadm/protocolo_mostrar.html
@@ -1,5 +1,5 @@
 {% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load tz %}
 {% load crispy_forms_tags %}
 {% load static %}
diff --git a/sapl/templates/protocoloadm/protocoloadm_detail.html b/sapl/templates/protocoloadm/protocoloadm_detail.html
index 3db9ea6d8..de1a0eef6 100644
--- a/sapl/templates/protocoloadm/protocoloadm_detail.html
+++ b/sapl/templates/protocoloadm/protocoloadm_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block editions %}
   <div class="actions btn-group pull-right" role="group">
     <a href="{% url 'sapl.protocoloadm:protocolar_mat' %}" class="btn btn-default">{% trans 'Protocolar Matéria' %}</a>
diff --git a/sapl/templates/protocoloadm/subnav.yaml b/sapl/templates/protocoloadm/subnav.yaml
index ff4feb42e..1c0b71320 100644
--- a/sapl/templates/protocoloadm/subnav.yaml
+++ b/sapl/templates/protocoloadm/subnav.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 - title: {% trans 'Início' %}
   url: documentoadministrativo_detail
 - title: {% trans 'Tramitação' %}
diff --git a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html
index c3493ee66..0a082773f 100644
--- a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html
+++ b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block actions %}
 {% load common_tags %}
 
diff --git a/sapl/templates/protocoloadm/tramitacaoadministrativo_form.html b/sapl/templates/protocoloadm/tramitacaoadministrativo_form.html
index 2bd266314..4c4578a84 100644
--- a/sapl/templates/protocoloadm/tramitacaoadministrativo_form.html
+++ b/sapl/templates/protocoloadm/tramitacaoadministrativo_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block extra_js %}
 <script language="Javascript">
     // Caso o campo esteja desabilitado (quando não é a primeira tramitação),
diff --git a/sapl/templates/sessao/adicionar_varias_materias_expediente.html b/sapl/templates/sessao/adicionar_varias_materias_expediente.html
index c9c8c5e5d..7122e5472 100644
--- a/sapl/templates/sessao/adicionar_varias_materias_expediente.html
+++ b/sapl/templates/sessao/adicionar_varias_materias_expediente.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% block actions %}{% endblock %}
 
diff --git a/sapl/templates/sessao/adicionar_varias_materias_ordem.html b/sapl/templates/sessao/adicionar_varias_materias_ordem.html
index 51d4fee23..277378e9f 100644
--- a/sapl/templates/sessao/adicionar_varias_materias_ordem.html
+++ b/sapl/templates/sessao/adicionar_varias_materias_ordem.html
@@ -1,5 +1,5 @@
 {% extends "sessao/adicionar_varias_materias_expediente.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block buttons %}
diff --git a/sapl/templates/sessao/expediente.html b/sapl/templates/sessao/expediente.html
index 106840b88..30305779d 100644
--- a/sapl/templates/sessao/expediente.html
+++ b/sapl/templates/sessao/expediente.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/sessao/expedientemateria_form.html b/sapl/templates/sessao/expedientemateria_form.html
index dc1fc1e96..18d9d4b6b 100644
--- a/sapl/templates/sessao/expedientemateria_form.html
+++ b/sapl/templates/sessao/expedientemateria_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/sessao/expedientemateria_list.html b/sapl/templates/sessao/expedientemateria_list.html
index 51f2815d5..dc7967072 100644
--- a/sapl/templates/sessao/expedientemateria_list.html
+++ b/sapl/templates/sessao/expedientemateria_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 
diff --git a/sapl/templates/sessao/layouts.yaml b/sapl/templates/sessao/layouts.yaml
index 0d756684c..c45e21d6f 100644
--- a/sapl/templates/sessao/layouts.yaml
+++ b/sapl/templates/sessao/layouts.yaml
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n_sapl %}
 TipoSessaoPlenaria:
   {% trans 'Tipo de Sessão Plenária' %}:
   - nome  quorum_minimo
diff --git a/sapl/templates/sessao/mesa.html b/sapl/templates/sessao/mesa.html
index 56e7f9989..bbc02fdcb 100644
--- a/sapl/templates/sessao/mesa.html
+++ b/sapl/templates/sessao/mesa.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 
diff --git a/sapl/templates/sessao/ordemdia_form.html b/sapl/templates/sessao/ordemdia_form.html
index dbb2739c8..78ce4ae31 100644
--- a/sapl/templates/sessao/ordemdia_form.html
+++ b/sapl/templates/sessao/ordemdia_form.html
@@ -1,4 +1,4 @@
 {% extends "sessao/expedientemateria_form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
diff --git a/sapl/templates/sessao/ordemdia_list.html b/sapl/templates/sessao/ordemdia_list.html
index 3ae16e2e8..acf647236 100644
--- a/sapl/templates/sessao/ordemdia_list.html
+++ b/sapl/templates/sessao/ordemdia_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 
diff --git a/sapl/templates/sessao/painel.html b/sapl/templates/sessao/painel.html
index d83c99e86..8c7dca3fd 100644
--- a/sapl/templates/sessao/painel.html
+++ b/sapl/templates/sessao/painel.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load staticfiles %}
 {% block actions %} {% endblock %}
 
diff --git a/sapl/templates/sessao/pauta_inexistente.html b/sapl/templates/sessao/pauta_inexistente.html
index 59b43370c..ad8b99371 100644
--- a/sapl/templates/sessao/pauta_inexistente.html
+++ b/sapl/templates/sessao/pauta_inexistente.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/sessao/pauta_sessao_detail.html b/sapl/templates/sessao/pauta_sessao_detail.html
index 0ceea3125..fe0840f3b 100644
--- a/sapl/templates/sessao/pauta_sessao_detail.html
+++ b/sapl/templates/sessao/pauta_sessao_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block base_content %}
diff --git a/sapl/templates/sessao/pauta_sessao_filter.html b/sapl/templates/sessao/pauta_sessao_filter.html
index fd7ff0bd4..faddff067 100644
--- a/sapl/templates/sessao/pauta_sessao_filter.html
+++ b/sapl/templates/sessao/pauta_sessao_filter.html
@@ -1,7 +1,7 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
-{% load i18n staticfiles %}
+{% load i18n_sapl staticfiles %}
 
 {% block sections_nav %} {% endblock %}
 
diff --git a/sapl/templates/sessao/pauta_sessao_list.html b/sapl/templates/sessao/pauta_sessao_list.html
index ce3e5c77b..24dc892d6 100644
--- a/sapl/templates/sessao/pauta_sessao_list.html
+++ b/sapl/templates/sessao/pauta_sessao_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n staticfiles %}
+{% load i18n_sapl staticfiles %}
 
 {% block base_content %}
 
diff --git a/sapl/templates/sessao/pauta_subnav.yaml b/sapl/templates/sessao/pauta_subnav.yaml
index 17c0ed93d..ef2333367 100644
--- a/sapl/templates/sessao/pauta_subnav.yaml
+++ b/sapl/templates/sessao/pauta_subnav.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 
 - title: {% trans 'Pesquisar Pauta da Sessão' %}
   url: pesquisar_pauta
diff --git a/sapl/templates/sessao/presenca.html b/sapl/templates/sessao/presenca.html
index 3b9ebf541..fa07c54dc 100644
--- a/sapl/templates/sessao/presenca.html
+++ b/sapl/templates/sessao/presenca.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 {% block actions %}{% endblock %}
diff --git a/sapl/templates/sessao/presenca_ordemdia.html b/sapl/templates/sessao/presenca_ordemdia.html
index ccc730bcd..c9000938b 100644
--- a/sapl/templates/sessao/presenca_ordemdia.html
+++ b/sapl/templates/sessao/presenca_ordemdia.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load common_tags %}
 
 {% block actions %}{% endblock %}
diff --git a/sapl/templates/sessao/resumo.html b/sapl/templates/sessao/resumo.html
index b5831bdca..51c757286 100644
--- a/sapl/templates/sessao/resumo.html
+++ b/sapl/templates/sessao/resumo.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block title %}
diff --git a/sapl/templates/sessao/resumo_ordenacao.html b/sapl/templates/sessao/resumo_ordenacao.html
index 5d9fe816f..e6b707058 100644
--- a/sapl/templates/sessao/resumo_ordenacao.html
+++ b/sapl/templates/sessao/resumo_ordenacao.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block title %}
diff --git a/sapl/templates/sessao/sessaoplenaria_filter.html b/sapl/templates/sessao/sessaoplenaria_filter.html
index 40d19bdac..46085dc55 100644
--- a/sapl/templates/sessao/sessaoplenaria_filter.html
+++ b/sapl/templates/sessao/sessaoplenaria_filter.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 
 {% block actions %}
diff --git a/sapl/templates/sessao/sessaoplenaria_form.html b/sapl/templates/sessao/sessaoplenaria_form.html
index 81057ba57..43d98fb93 100644
--- a/sapl/templates/sessao/sessaoplenaria_form.html
+++ b/sapl/templates/sessao/sessaoplenaria_form.html
@@ -1,5 +1,5 @@
 {% extends "crud/form.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% load crispy_forms_tags %}
 {% load common_tags %}
 
diff --git a/sapl/templates/sessao/sessaoplenaria_list.html b/sapl/templates/sessao/sessaoplenaria_list.html
index 1f3dace27..018b2b434 100644
--- a/sapl/templates/sessao/sessaoplenaria_list.html
+++ b/sapl/templates/sessao/sessaoplenaria_list.html
@@ -1,5 +1,5 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 {% block more_buttons %}
   <a href="{% url 'sapl.sessao:pesquisar_sessao' %}" class="btn btn-default">
     {% blocktrans with verbose_name=view.verbose_name %} Pesquisar {{ verbose_name }} {% endblocktrans %}
diff --git a/sapl/templates/sessao/subnav.yaml b/sapl/templates/sessao/subnav.yaml
index e80201f46..877c3d84a 100644
--- a/sapl/templates/sessao/subnav.yaml
+++ b/sapl/templates/sessao/subnav.yaml
@@ -1,4 +1,4 @@
-{% load i18n common_tags %}
+{% load i18n_sapl common_tags %}
 
 - title: {% trans 'Abertura' %}
   children:
diff --git a/sapl/templates/sessao/votacao/nominal.html b/sapl/templates/sessao/votacao/nominal.html
index 96dd28622..a380ae502 100644
--- a/sapl/templates/sessao/votacao/nominal.html
+++ b/sapl/templates/sessao/votacao/nominal.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n_sapl crispy_forms_tags %}
 
 {% block detail_content %}
 <form method="post">
diff --git a/sapl/templates/sessao/votacao/nominal_detail.html b/sapl/templates/sessao/votacao/nominal_detail.html
index 53d41084b..3eaedff74 100644
--- a/sapl/templates/sessao/votacao/nominal_detail.html
+++ b/sapl/templates/sessao/votacao/nominal_detail.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 <form method="post">
diff --git a/sapl/templates/sessao/votacao/nominal_edit.html b/sapl/templates/sessao/votacao/nominal_edit.html
index f751e21d9..c82fac84c 100644
--- a/sapl/templates/sessao/votacao/nominal_edit.html
+++ b/sapl/templates/sessao/votacao/nominal_edit.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 <form method="post">
diff --git a/sapl/templates/sessao/votacao/nominal_transparencia.html b/sapl/templates/sessao/votacao/nominal_transparencia.html
index cb0bb25e2..1b0f2eef9 100644
--- a/sapl/templates/sessao/votacao/nominal_transparencia.html
+++ b/sapl/templates/sessao/votacao/nominal_transparencia.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 <form method="post">
diff --git a/sapl/templates/sessao/votacao/simbolica_transparencia.html b/sapl/templates/sessao/votacao/simbolica_transparencia.html
index 159dc1f94..50f63f59a 100644
--- a/sapl/templates/sessao/votacao/simbolica_transparencia.html
+++ b/sapl/templates/sessao/votacao/simbolica_transparencia.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 <form method="post">
diff --git a/sapl/templates/sessao/votacao/votacao.html b/sapl/templates/sessao/votacao/votacao.html
index 958c8b9a6..a7bbc60ef 100644
--- a/sapl/templates/sessao/votacao/votacao.html
+++ b/sapl/templates/sessao/votacao/votacao.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 <form id="form-votacao" method="post">
diff --git a/sapl/templates/sessao/votacao/votacao_edit.html b/sapl/templates/sessao/votacao/votacao_edit.html
index 753c49541..08e3d4c85 100644
--- a/sapl/templates/sessao/votacao/votacao_edit.html
+++ b/sapl/templates/sessao/votacao/votacao_edit.html
@@ -1,5 +1,5 @@
 {% extends "crud/detail.html" %}
-{% load i18n %}
+{% load i18n_sapl %}
 
 {% block detail_content %}
 <form method="post">
diff --git a/sapl/templates/sistema.html b/sapl/templates/sistema.html
index 8e3882369..f857c97d2 100644
--- a/sapl/templates/sistema.html
+++ b/sapl/templates/sistema.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags menus%}
+{% load i18n_sapl crispy_forms_tags menus%}
 
 {% block base_content %}
 
diff --git a/sapl/test_urls.py b/sapl/test_urls.py
index 851b1995b..cf8bbfdca 100644
--- a/sapl/test_urls.py
+++ b/sapl/test_urls.py
@@ -5,7 +5,7 @@ from django.contrib.auth.management import _get_all_permissions
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
 from django.utils.translation import string_concat
 
 from sapl.crud.base import PermissionRequiredForAppCrudMixin
diff --git a/sapl/translation.py b/sapl/translation.py
new file mode 100644
index 000000000..2bd16f6e8
--- /dev/null
+++ b/sapl/translation.py
@@ -0,0 +1,149 @@
+
+import traceback
+
+from django import apps
+from django.conf import settings
+from django.template.base import TOKEN_TEXT
+from django.utils.encoding import force_text
+from django.utils.translation import ugettext_lazy as django_ugettext_lazy
+
+
+ExpressaoTextual = None
+
+
+class ExpressaoTextualManage(object):
+    __catalog = {'preprocess': [], 'indice': {}}
+
+    def swap_translate(self, node):
+        literal = node.filter_expression.var.literal
+        swap = self._swap(literal)
+        node.filter_expression.token = swap
+        node.filter_expression.var.var = swap
+        node.filter_expression.var.literal = swap
+        return node
+
+    def swap_block_translate(self, node):
+        for item in node.singular + node.plural:
+            if item.token_type != TOKEN_TEXT:
+                continue
+            item.contents = self._swap(item.contents)
+
+        return node
+
+    def swap_ugettext_lazy(self, proxy):
+        return self._swap(proxy)
+
+    def _swap(self, swap_value):
+
+        msg = self._catalog(swap_value)
+
+        return msg['custom'] if msg and msg['custom'] else swap_value
+
+    def _catalog(self, item):
+        global ExpressaoTextual
+        if not ExpressaoTextual and apps.apps.models_ready:
+            ExpressaoTextual = apps.apps.get_app_config(
+                'base').get_model('ExpressaoTextual')
+
+            exprs = ExpressaoTextual.objects.values_list('value', 'custom')
+            try:
+                expr = list(exprs)
+            except:
+                ExpressaoTextual = None
+                self.__catalog['preprocess'].append(item)
+                return None
+
+            for value, custom in exprs:
+                if value not in self.__catalog['indice']:
+                    self.__catalog['indice'][value] = {
+                        'proxy': [],
+                        'value': value,
+                        'custom': custom}
+
+            for value in self.__catalog['preprocess']:
+                text = force_text(value).strip()
+                if not text:
+                    continue
+                if text in self.__catalog['indice']:
+                    self.__catalog['indice'][text]['proxy'].append(value)
+                else:
+                    self.__catalog['indice'][text] = {
+                        'proxy': [value, ],
+                        'value': text,
+                        'custom': None}
+                    try:
+                        et = ExpressaoTextual(value=text, bind=True)
+                        et.save()
+                    except:
+                        pass
+
+            self.__catalog['preprocess'] = []
+
+        elif not ExpressaoTextual:
+            self.__catalog['preprocess'].append(item)
+            return None
+
+        indice = self.__catalog['indice']
+        text = force_text(item).strip()
+        if not text:
+            return None
+        msg = indice.get(text, None)
+        if not msg:
+            msg = indice[text] = {
+                'proxy': [item, ],
+                'value': text,
+                'custom': None}
+            try:
+                et = ExpressaoTextual(value=text, bind=True)
+                et.save()
+            except:
+                pass
+
+        else:
+            if hasattr(item, '_proxy____args'):
+                if not self._source_from_object():
+                    msg['proxy'].append(item)
+        return msg
+
+    def _source_from_object(self):
+        # Falso negativo: expressões dentro de função lambda, mesmo sendo
+        # atributo de uma classe.
+
+        # ação: se passa por um <module> antes de sair do SAPL,
+        # não é string criada a partir de um objeto de classe
+
+        PROJECT_DIR = settings.PROJECT_DIR
+
+        trace = traceback.extract_stack()
+        trace.reverse()
+        while len(trace) > 0 and trace[0].filename.startswith(PROJECT_DIR):
+            trace.pop(0)
+            if trace[0].name == '<module>':
+                return False
+        return True
+
+    def rebuild_expressao(self, et):
+        catalog = self.__catalog
+        value_catalog = catalog['indice'][et.value]
+        value_catalog['custom'] = et.custom
+        for p in catalog['indice'][et.value]['proxy']:
+            try:
+                p._proxy____args = (et.custom,)
+            except:
+                pass
+
+    def reset(self):
+        # Serviço SAPL deve ser reiniciado depois de rodar um reset
+        global ExpressaoTextual
+        if apps.apps.models_ready:
+            ExpressaoTextual = apps.apps.get_app_config(
+                'base').get_model('ExpressaoTextual')
+            ExpressaoTextual.objects.filter(custom__exact='').delete()
+
+
+sapl_expressions = ExpressaoTextualManage()
+
+
+def ugettext_lazy(message):
+    proxy = django_ugettext_lazy(message)
+    return sapl_expressions.swap_ugettext_lazy(proxy)
diff --git a/sapl/utils.py b/sapl/utils.py
index 691034789..10bb266c6 100644
--- a/sapl/utils.py
+++ b/sapl/utils.py
@@ -1,14 +1,12 @@
+from functools import wraps
 import hashlib
 import logging
+from operator import itemgetter
 import os
 import re
-import unicodedata
-from functools import wraps
-from operator import itemgetter
 from unicodedata import normalize as unicodedata_normalize
+import unicodedata
 
-import django_filters
-import magic
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import HTML, Button
 from django import forms
@@ -20,10 +18,12 @@ from django.contrib.contenttypes.fields import (GenericForeignKey, GenericRel,
 from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.utils import six, timezone
-from django.utils.translation import ugettext_lazy as _
+from sapl.translation import ugettext_lazy as _
+import django_filters
 from django_filters.filterset import STRICTNESS
 from easy_thumbnails import source_generators
 from floppyforms import ClearableFileInput
+import magic
 from reversion.admin import VersionAdmin
 from reversion_compare.admin import CompareVersionAdmin
 from unipath.path import Path
@@ -31,6 +31,7 @@ from unipath.path import Path
 from sapl.crispy_layout_mixin import SaplFormLayout, form_actions, to_row
 from sapl.settings import BASE_DIR
 
+
 sapl_logger = logging.getLogger(BASE_DIR.name)
 
 
@@ -765,5 +766,6 @@ def RemoveTag(texto):
 
     return textoSaida
 
+
 def remover_acentos(string):
-     return unicodedata.normalize('NFKD', string).encode('ASCII', 'ignore').decode()
+    return unicodedata.normalize('NFKD', string).encode('ASCII', 'ignore').decode()
diff --git a/scripts/hooks/pre-commit b/scripts/hooks/pre-commit
old mode 100644
new mode 100755