diff --git a/messages/nl/config.php b/messages/nl/config.php
index 72f3224d..c347bc59 100644
--- a/messages/nl/config.php
+++ b/messages/nl/config.php
@@ -1,8 +1,8 @@
 <?php
 return [
-  '<strong>Calendar</strong> module configuration' => '<strong>Agenda strong&gt;moduleconfiguratie</strong>',
+  '<strong>Calendar</strong> module configuration' => '<strong>Agenda</strong>moduleconfiguratie',
   '<strong>Confirm</strong> Deletion' => '<strong>Bevestig strong&gt; verwijderen</strong>',
-  'Add \'Calendar\' to the main menu' => 'Voeg \'Agenda\' toe aan het hoofdmenu',
+  'Add \'Calendar\' to the main menu' => 'Voeg <i>Agenda</i> toe aan het hoofdmenu',
   'Adds an snippet with upcoming events to your users dashboard.' => 'Voegt een fragment toe met aankomende gebeurtenissen aan het gebruikersprikbord.',
   'Basic' => 'Basis',
   'Calendar Configuration' => 'Kalender configuratie',
diff --git a/messages/nl/views.php b/messages/nl/views.php
index c17b2b9d..5c5d5271 100644
--- a/messages/nl/views.php
+++ b/messages/nl/views.php
@@ -1,59 +1,58 @@
 <?php
-
 return [
-    '%displayName% cannot attend %contentTitle%.' => '%displayName% kan %contentTitle% niet bijwonen.',
-    '%displayName% is attending %contentTitle%.' => '%displayName% gaat naar %contentTitle%.',
-    '%displayName% is invited to %contentTitle%.' => '%displayName% is uitgenodigd voor %contentTitle%.',
-    '%displayName% might be attending %contentTitle%.' => '%displayName% is mogelijk aanwezig op %contentTitle%.',
-    ':count Attending' => ':count aanwezig',
-    ':count Declined' => ':count afgewezen',
-    ':count Invited' => ':count uitgenodigd',
-    ':count Undecided' => ':count onbepaald',
-    '<strong>Create</strong> Event' => '<strong>Maak</strong> gebeurtenis',
-    '<strong>Create</strong> new event type' => '<strong>Maak</strong> nieuw gebeurtenistype',
-    '<strong>Edit</strong> Event' => '<strong>Bewerk</strong> gebeurtenis',
-    '<strong>Edit</strong> calendar' => 'Agenda  <strong>bewerken</ strong>',
-    '<strong>Edit</strong> event type' => '<strong>Bewerk</strong> gebeurtenistype',
-    '<strong>Edit</strong> recurring event' => '<strong>Bewerk</strong> herhalende gebeurtenis',
-    '<strong>Upcoming</strong> events ' => '<strong>Aankomende</strong> gebeurtenissen ',
-    'Additional information' => 'Extra informatie',
-    'All' => 'Alle',
-    'Are you sure want to remove the participant from the event?' => 'Weet u zeker dat u de deelnemer uit het gebeurtenis wilt verwijderen?',
-    'Attend' => 'Deelnemen',
-    'Attending' => 'Bijwonen',
-    'Back' => 'Terug',
-    'Calendars' => 'Agenda\\\'s',
-    'Close' => 'Sluiten',
-    'Decline' => 'Afwijzen',
-    'Declined' => 'Afgewezen',
-    'Defaults' => 'Standaard instellingen',
-    'Event Types' => 'Gebeurtenis-types',
-    'Everybody can participate' => 'Iedereen kan deelnemen',
-    'Filter' => 'Filter',
-    'Filter events' => 'Gebeurtenissen filteren',
-    'Followed spaces' => 'Gevolgde ruimtes',
-    'Followed users' => 'Gevolgde gebruikers',
-    'General' => 'Algemeen',
-    'I\'m attending' => 'Ik ben aanwezig',
-    'Invited' => 'Uitgenodigd',
-    'Maybe' => 'Misschien',
-    'Menu' => 'Menu',
-    'My events' => 'Mijn gebeurtenissen',
-    'My profile' => 'Mijn profiel',
-    'My spaces' => 'Mijn ruimtes',
-    'Next' => 'Volgende',
-    'No participants' => 'Geen deelnemers',
-    'Only by Invite' => 'Alleen op uitnodiging',
-    'Open Calendar' => 'Open agenda',
-    'Participants' => 'Deelnemers',
-    'Recurrence' => 'Herhaling',
-    'Reminder' => 'Herinnering',
-    'Select calendars' => 'Kies kalenders',
-    'Select event type...' => 'Kies een gebeurtenis-type...',
-    'Settings' => 'Instellingen',
-    'Snippet' => 'Codefragment',
-    'Title' => 'Titel',
-    'Undecided' => 'Onbepaald',
-    'You are invited, please select your role:' => 'U bent uitgenodigd, selecteer uw rol:',
-    '{count} Participants' => '{count} deelnemers',
+  '%displayName% cannot attend %contentTitle%.' => '%displayName% kan %contentTitle% niet bijwonen.',
+  '%displayName% is attending %contentTitle%.' => '%displayName% gaat naar %contentTitle%.',
+  '%displayName% is invited to %contentTitle%.' => '%displayName% is uitgenodigd voor %contentTitle%.',
+  '%displayName% might be attending %contentTitle%.' => '%displayName% is mogelijk aanwezig op %contentTitle%.',
+  ':count Attending' => ':count aanwezig',
+  ':count Declined' => ':count afgewezen',
+  ':count Invited' => ':count uitgenodigd',
+  ':count Undecided' => ':count onbepaald',
+  '<strong>Create</strong> Event' => '<strong>Maak</strong> gebeurtenis',
+  '<strong>Create</strong> new event type' => '<strong>Maak</strong> nieuw gebeurtenistype',
+  '<strong>Edit</strong> Event' => '<strong>Bewerk</strong> gebeurtenis',
+  '<strong>Edit</strong> calendar' => 'Agenda  <strong>bewerken</ strong>',
+  '<strong>Edit</strong> event type' => '<strong>Bewerk</strong> gebeurtenistype',
+  '<strong>Edit</strong> recurring event' => '<strong>Bewerk</strong> herhalende gebeurtenis',
+  '<strong>Upcoming</strong> events ' => '<strong>Aankomende</strong> gebeurtenissen',
+  'Additional information' => 'Extra informatie',
+  'All' => 'Alle',
+  'Are you sure want to remove the participant from the event?' => 'Weet u zeker dat u de deelnemer uit het gebeurtenis wilt verwijderen?',
+  'Attend' => 'Deelnemen',
+  'Attending' => 'Bijwonen',
+  'Back' => 'Terug',
+  'Calendars' => 'Agenda\'s',
+  'Close' => 'Sluiten',
+  'Decline' => 'Afwijzen',
+  'Declined' => 'Afgewezen',
+  'Defaults' => 'Standaard instellingen',
+  'Event Types' => 'Gebeurtenis-types',
+  'Everybody can participate' => 'Iedereen kan deelnemen',
+  'Filter' => 'Filter',
+  'Filter events' => 'Gebeurtenissen filteren',
+  'Followed spaces' => 'Gevolgde ruimtes',
+  'Followed users' => 'Gevolgde gebruikers',
+  'General' => 'Algemeen',
+  'I\'m attending' => 'Ik ben aanwezig',
+  'Invited' => 'Uitgenodigd',
+  'Maybe' => 'Misschien',
+  'Menu' => 'Menu',
+  'My events' => 'Mijn gebeurtenissen',
+  'My profile' => 'Mijn profiel',
+  'My spaces' => 'Mijn ruimtes',
+  'Next' => 'Volgende',
+  'No participants' => 'Geen deelnemers',
+  'Only by Invite' => 'Alleen op uitnodiging',
+  'Open Calendar' => 'Open agenda',
+  'Participants' => 'Deelnemers',
+  'Recurrence' => 'Herhaling',
+  'Reminder' => 'Herinnering',
+  'Select calendars' => 'Kies kalenders',
+  'Select event type...' => 'Kies een gebeurtenis-type...',
+  'Settings' => 'Instellingen',
+  'Snippet' => 'Codefragment',
+  'Title' => 'Titel',
+  'Undecided' => 'Onbepaald',
+  'You are invited, please select your role:' => 'U bent uitgenodigd, selecteer uw rol:',
+  '{count} Participants' => '{count} deelnemers',
 ];
diff --git a/messages/pt-BR/base.php b/messages/pt-BR/base.php
index a358d491..abf0fa75 100644
--- a/messages/pt-BR/base.php
+++ b/messages/pt-BR/base.php
@@ -1,8 +1,8 @@
 <?php
 return [
   '<strong>Add</strong> profile calendar' => '<strong>Adicionar</strong> calendário de perfil',
-  '<strong>Choose</strong> target calendar' => '<strong>Escolha</strong> calendário de destino',
-  '<strong>Reminder</strong> settings' => 'Configurações de <strong> lembrete </strong>',
+  '<strong>Choose</strong> target calendar' => '<strong>Escolha</strong> o calendário de destino',
+  '<strong>Reminder</strong> settings' => 'Configurações de <strong>Lembrete</strong>',
   'Add all Space members with status {status}' => 'Adicione todos os membros do Space com status {status}',
   'Add participants...' => 'Adicione participantes...',
   'Added: {users}' => 'Adicionado: {users}',
@@ -15,7 +15,7 @@
   'Allow option \'Undecided\'' => 'Permitir opção \'Indeciso\'',
   'Allows the user to create new calendar entries' => 'Permitir que usuários criem novas entradas de calendário',
   'Allows the user to edit/delete existing calendar entries' => 'Permitir que usuários alterem/apaguem entradas de calendário existentes',
-  'Attending' => 'Comparecendo',
+  'Attending' => 'Participando',
   'Before a target calendar can be selected, the module must be activated in at least one Space.' => 'Antes que um calendário de destino possa ser selecionado, o módulo deve ser ativado em pelo menos um Espaço.',
   'Birthday' => 'Aniversário',
   'Calendar' => 'Calendário',
@@ -38,7 +38,7 @@
   'Edit this event' => 'Editar esse evento',
   'Email' => 'E-mail',
   'Enable' => 'Habilitar',
-  'Enable Reminder' => 'Ativar lembrete',
+  'Enable Reminder' => 'Ativar Lembrete',
   'End' => 'Fim',
   'End Date' => 'Data Final',
   'End Time' => 'Hora de término',
@@ -52,7 +52,7 @@
   'Export as {type}' => 'Exportar como {type}',
   'Files' => 'Arquivos',
   'Filter by types' => 'Filtrar por tipos',
-  'Friday' => 'sexta-feira',
+  'Friday' => 'Sexta-feira',
   'Here you can configure default settings for all calendar events.' => 'Aqui você pode definir as configurações padrão para todos os eventos do calendário.',
   'Here you can configure global default reminders. These settings can be overwritten on space/profile level.' => 'Aqui você pode configurar lembretes padrão globais. Essas configurações podem ser substituídas no nível de espaço / perfil.',
   'Here you can configure the default reminder settings for this event. Users are able to overwrite these settings by means of the
@@ -97,25 +97,25 @@
   'Recurring' => 'Recorrente',
   'Reopen Event' => 'Reabrir evento',
   'Repeat every' => 'Repita a cada',
-  'Saturday' => 'sábado',
+  'Saturday' => 'Sábado',
   'Set reminder' => 'Definir lembrete',
   'Start Date' => 'Data de Inicio',
   'Start Time' => 'Hora de início',
   'Status cannot be updated.' => 'O status não pode ser atualizado.',
   'Status updated.' => 'Status atualizado.',
-  'Sunday' => 'domingo',
+  'Sunday' => 'Domingo',
   'The event has already ended.' => 'O evento já terminou.',
   'This event does not support recurrent events' => 'Este evento não suporta eventos recorrentes',
-  'Thursday' => 'quinta-feira',
+  'Thursday' => 'Quinta-feira',
   'Time Zone' => 'Fuso Horário',
   'Title' => 'Título',
   'Today' => 'Hoje',
-  'Tuesday' => 'terça-feira',
+  'Tuesday' => 'Terça-feira',
   'Upcoming {type}' => 'Próximo {type}',
   'Upcoming {type}: {title}' => 'Próximo {type}: {title}',
   'Use default reminder' => 'Usar lembrete padrão',
   'User birthdays' => 'Aniversários do usuário',
-  'Wednesday' => 'quarta-feira',
+  'Wednesday' => 'Quarta-feira',
   'Week' => 'Semana',
   'Weeks' => 'Semanas',
   'Year' => 'Ano',
diff --git a/messages/pt-BR/notification.php b/messages/pt-BR/notification.php
index 6f7c0f06..bbd34dcd 100644
--- a/messages/pt-BR/notification.php
+++ b/messages/pt-BR/notification.php
@@ -2,14 +2,14 @@
 return [
   'Calendar' => 'Calendário',
   'Calendar: Invite' => 'Calendário: Convidar',
-  'Calendar: attend' => 'Calendário: Comparecer',
+  'Calendar: attend' => 'Calendário: Participar',
   'Calendar: decline' => 'Calendário: Recusar',
   'Calendar: maybe' => 'Calendário: Talvez',
   'Description' => 'Descrição',
   'Location' => 'Local',
   'Organizer' => 'Organizador(a)',
   'Participants info' => 'Informações dos participantes',
-  'Receive Calendar related Notifications.' => 'Receber notificações de calendário',
+  'Receive Calendar related Notifications.' => 'Receba notificações relacionadas ao calendário.',
   'Starting' => 'Começando',
   'View Online: {url}' => 'Ver online: {url}',
   'Whenever someone declines to participate in an event.' => 'Sempre que alguém se recusa a participar de um evento.',
diff --git a/messages/pt-BR/views.php b/messages/pt-BR/views.php
index e10f47b4..052f0821 100644
--- a/messages/pt-BR/views.php
+++ b/messages/pt-BR/views.php
@@ -1,59 +1,58 @@
 <?php
-
 return [
-    '%displayName% cannot attend %contentTitle%.' => '% displayName% não pode comparecer a% contentTitle%.',
-    '%displayName% is attending %contentTitle%.' => '% displayName% está participando de% contentTitle%.',
-    '%displayName% is invited to %contentTitle%.' => '%displayName% foi convidado para %contentTitle%.',
-    '%displayName% might be attending %contentTitle%.' => '% displayName% pode estar participando de% contentTitle%.',
-    ':count Attending' => ':count Comparecendo',
-    ':count Declined' => ':count Recusaram',
-    ':count Invited' => ':count Convidados',
-    ':count Undecided' => ':count Indecisos',
-    '<strong>Create</strong> Event' => '<strong>Criar</strong> Evento',
-    '<strong>Create</strong> new event type' => '<strong>Criar</strong> novo tipo de evento',
-    '<strong>Edit</strong> Event' => '<strong>Editar</strong> Evento',
-    '<strong>Edit</strong> calendar' => '<strong>Editar</strong> calendário',
-    '<strong>Edit</strong> event type' => '<strong>Alterar</strong> tipo de evento',
-    '<strong>Edit</strong> recurring event' => '<strong>Editar</strong> evento recorrente',
-    '<strong>Upcoming</strong> events ' => '<strong>Próximos</strong> eventos',
-    'Additional information' => 'Informações adicionais',
-    'All' => 'Todos',
-    'Are you sure want to remove the participant from the event?' => 'Tem certeza que deseja remover o participante do evento?',
-    'Attend' => 'Participar',
-    'Attending' => 'Comparecendo',
-    'Back' => 'Voltar',
-    'Calendars' => 'Calendários',
-    'Close' => 'Fechar',
-    'Decline' => 'Recusar',
-    'Declined' => 'Recusado',
-    'Defaults' => 'Padrões',
-    'Event Types' => 'Tipos de Eventos',
-    'Everybody can participate' => 'Todos podem participar',
-    'Filter' => 'Filtro',
-    'Filter events' => 'Filtrar eventos',
-    'Followed spaces' => 'Espaços seguidos',
-    'Followed users' => 'Usuários seguidos',
-    'General' => 'Geral',
-    'I\'m attending' => 'Estou participando',
-    'Invited' => 'Convidado',
-    'Maybe' => 'Talvez',
-    'Menu' => 'Menu',
-    'My events' => 'Meus eventos',
-    'My profile' => 'Meu perfil',
-    'My spaces' => 'Meus espaços',
-    'Next' => 'Avançar',
-    'No participants' => 'Sem participantes',
-    'Only by Invite' => 'Somente por convite',
-    'Open Calendar' => 'Abrir Calendário',
-    'Participants' => 'Participantes',
-    'Recurrence' => 'Recorrência',
-    'Reminder' => 'Lembrete',
-    'Select calendars' => 'Selecionar calendários',
-    'Select event type...' => 'Selecionar tipo de evento...',
-    'Settings' => 'Configurações',
-    'Snippet' => 'Fragmento',
-    'Title' => 'Título',
-    'Undecided' => 'Indeciso',
-    'You are invited, please select your role:' => 'Você está convidado, selecione sua função:',
-    '{count} Participants' => '{count} participantes',
+  '%displayName% cannot attend %contentTitle%.' => '%displayName% não pode participar a %contentTitle%.',
+  '%displayName% is attending %contentTitle%.' => '%displayName% está participando de %contentTitle%.',
+  '%displayName% is invited to %contentTitle%.' => '%displayName% foi convidado para %contentTitle%.',
+  '%displayName% might be attending %contentTitle%.' => '%displayName% pode estar participando de %contentTitle%.',
+  ':count Attending' => ':count Participando',
+  ':count Declined' => ':count Recusaram',
+  ':count Invited' => ':count Convidados',
+  ':count Undecided' => ':count Indecisos',
+  '<strong>Create</strong> Event' => '<strong>Criar</strong> Evento',
+  '<strong>Create</strong> new event type' => '<strong>Criar</strong> novo tipo de evento',
+  '<strong>Edit</strong> Event' => '<strong>Editar</strong> Evento',
+  '<strong>Edit</strong> calendar' => '<strong>Editar</strong> calendário',
+  '<strong>Edit</strong> event type' => '<strong>Alterar</strong> tipo de evento',
+  '<strong>Edit</strong> recurring event' => '<strong>Editar</strong> evento recorrente',
+  '<strong>Upcoming</strong> events ' => '<strong>Próximos</strong> eventos',
+  'Additional information' => 'Informações adicionais',
+  'All' => 'Todos',
+  'Are you sure want to remove the participant from the event?' => 'Tem certeza que deseja remover o participante do evento?',
+  'Attend' => 'Participar',
+  'Attending' => 'Participando',
+  'Back' => 'Voltar',
+  'Calendars' => 'Calendários',
+  'Close' => 'Fechar',
+  'Decline' => 'Recusar',
+  'Declined' => 'Recusado',
+  'Defaults' => 'Padrões',
+  'Event Types' => 'Tipos de Eventos',
+  'Everybody can participate' => 'Todos podem participar',
+  'Filter' => 'Filtro',
+  'Filter events' => 'Filtrar eventos',
+  'Followed spaces' => 'Espaços seguidos',
+  'Followed users' => 'Usuários seguidos',
+  'General' => 'Geral',
+  'I\'m attending' => 'Estou participando',
+  'Invited' => 'Convidado',
+  'Maybe' => 'Talvez',
+  'Menu' => 'Menu',
+  'My events' => 'Meus eventos',
+  'My profile' => 'Meu perfil',
+  'My spaces' => 'Meus espaços',
+  'Next' => 'Avançar',
+  'No participants' => 'Sem participantes',
+  'Only by Invite' => 'Somente por convite',
+  'Open Calendar' => 'Abrir Calendário',
+  'Participants' => 'Participantes',
+  'Recurrence' => 'Recorrência',
+  'Reminder' => 'Lembrete',
+  'Select calendars' => 'Selecionar calendários',
+  'Select event type...' => 'Selecionar tipo de evento...',
+  'Settings' => 'Configurações',
+  'Snippet' => 'Fragmento',
+  'Title' => 'Título',
+  'Undecided' => 'Indeciso',
+  'You are invited, please select your role:' => 'Você está convidado, selecione sua função:',
+  '{count} Participants' => '{count} participantes',
 ];