From 0e0a694585b4f2d98bfe29bb25bbe54e5e6ed3cc Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Fri, 18 Oct 2024 09:12:56 +0200
Subject: [PATCH] Reduce translation message categories

---
 docs/CHANGELOG.md                             |   1 +
 messages/am/base.php                          | 185 ++++++++++-------
 messages/am/forms_CreateMessageForm.php       |   8 -
 messages/am/forms_InviteRecipientForm.php     |   8 -
 messages/am/forms_ReplyMessageForm.php        |   4 -
 messages/am/models_Message.php                |   6 -
 messages/am/models_MessageEntry.php           |   5 -
 messages/am/views_emails_NewMessage.php       |   7 -
 messages/am/views_emails_NewMessageEntry.php  |   6 -
 messages/am/views_mail_adduser.php            |   5 -
 messages/am/views_mail_create.php             |   7 -
 messages/am/views_mail_edit.php               |   5 -
 messages/am/views_mail_index.php              |   6 -
 messages/am/views_mail_list.php               |   5 -
 messages/am/views_mail_show.php               |  18 --
 .../am/widgets_views_mailNotification.php     |   5 -
 .../am/widgets_views_newMessageButton.php     |   5 -
 messages/an/base.php                          | 190 +++++++++++-------
 messages/an/forms_CreateMessageForm.php       |   7 -
 messages/an/forms_InviteRecipientForm.php     |   8 -
 messages/an/forms_ReplyMessageForm.php        |   4 -
 messages/an/models_Message.php                |   6 -
 messages/an/models_MessageEntry.php           |  21 --
 messages/an/views_emails_NewMessage.php       |   7 -
 messages/an/views_emails_NewMessageEntry.php  |   6 -
 messages/an/views_mail_adduser.php            |   5 -
 messages/an/views_mail_create.php             |   6 -
 messages/an/views_mail_edit.php               |   5 -
 messages/an/views_mail_index.php              |   6 -
 messages/an/views_mail_list.php               |   4 -
 messages/an/views_mail_show.php               |  18 --
 messages/an/views_mail_sidebar.php            |   7 -
 messages/an/views_mails_UserInviteSpace.php   |   4 -
 .../an/widgets_views_mailNotification.php     |   5 -
 .../an/widgets_views_newMessageButton.php     |   5 -
 messages/ar/base.php                          |  37 +++-
 messages/ar/forms_CreateMessageForm.php       |   7 -
 messages/ar/forms_InviteRecipientForm.php     |   8 -
 messages/ar/forms_ReplyMessageForm.php        |   4 -
 messages/ar/models_Message.php                |   6 -
 messages/ar/models_MessageEntry.php           |   4 -
 messages/ar/views_emails_NewMessage.php       |   7 -
 messages/ar/views_emails_NewMessageEntry.php  |   6 -
 messages/ar/views_mail_adduser.php            |   5 -
 messages/ar/views_mail_create.php             |   6 -
 messages/ar/views_mail_edit.php               |   5 -
 messages/ar/views_mail_index.php              |   6 -
 messages/ar/views_mail_list.php               |   4 -
 messages/ar/views_mail_show.php               |  18 --
 messages/ar/views_mails_UserInviteSpace.php   |   4 -
 .../ar/widgets_views_mailNotification.php     |   5 -
 .../ar/widgets_views_newMessageButton.php     |   5 -
 messages/bg/base.php                          | 190 +++++++++++-------
 messages/bg/forms_CreateMessageForm.php       |   7 -
 messages/bg/forms_InviteRecipientForm.php     |   7 -
 messages/bg/forms_ReplyMessageForm.php        |   4 -
 messages/bg/models_Message.php                |   6 -
 messages/bg/models_MessageEntry.php           |   4 -
 messages/bg/views_emails_NewMessage.php       |   7 -
 messages/bg/views_emails_NewMessageEntry.php  |   6 -
 messages/bg/views_mail_adduser.php            |   4 -
 messages/bg/views_mail_create.php             |   6 -
 messages/bg/views_mail_edit.php               |   4 -
 messages/bg/views_mail_index.php              |   6 -
 messages/bg/views_mail_list.php               |   4 -
 messages/bg/views_mail_show.php               |  18 --
 messages/bg/views_mail_sidebar.php            |   7 -
 messages/bg/views_mails_UserInviteSpace.php   |   4 -
 .../bg/widgets_views_mailNotification.php     |   4 -
 .../bg/widgets_views_newMessageButton.php     |   4 -
 messages/br/base.php                          | 185 ++++++++++-------
 messages/br/forms_CreateMessageForm.php       |   8 -
 messages/br/forms_InviteRecipientForm.php     |   8 -
 messages/br/forms_ReplyMessageForm.php        |   5 -
 messages/br/models_Message.php                |   6 -
 messages/br/models_MessageEntry.php           |   5 -
 messages/br/views_emails_NewMessage.php       |   7 -
 messages/br/views_emails_NewMessageEntry.php  |   6 -
 messages/br/views_mail_adduser.php            |   5 -
 messages/br/views_mail_create.php             |   7 -
 messages/br/views_mail_edit.php               |   5 -
 messages/br/views_mail_index.php              |   6 -
 messages/br/views_mail_list.php               |   5 -
 messages/br/views_mail_show.php               |  18 --
 .../br/widgets_views_mailNotification.php     |   5 -
 .../br/widgets_views_newMessageButton.php     |   5 -
 messages/ca/base.php                          | 190 +++++++++++-------
 messages/ca/forms_CreateMessageForm.php       |   7 -
 messages/ca/forms_InviteRecipientForm.php     |   7 -
 messages/ca/forms_ReplyMessageForm.php        |   4 -
 messages/ca/models_Message.php                |   5 -
 messages/ca/models_MessageEntry.php           |   4 -
 messages/ca/views_emails_NewMessage.php       |   6 -
 messages/ca/views_emails_NewMessageEntry.php  |   5 -
 messages/ca/views_mail_adduser.php            |   5 -
 messages/ca/views_mail_create.php             |   6 -
 messages/ca/views_mail_edit.php               |   4 -
 messages/ca/views_mail_index.php              |   6 -
 messages/ca/views_mail_list.php               |   4 -
 messages/ca/views_mail_show.php               |  17 --
 messages/ca/views_mail_sidebar.php            |   7 -
 messages/ca/views_mails_UserInviteSpace.php   |   4 -
 .../ca/widgets_views_mailNotification.php     |   5 -
 .../ca/widgets_views_newMessageButton.php     |   4 -
 messages/cs/base.php                          | 190 +++++++++++-------
 messages/cs/forms_CreateMessageForm.php       |   7 -
 messages/cs/forms_InviteRecipientForm.php     |   8 -
 messages/cs/forms_ReplyMessageForm.php        |   4 -
 messages/cs/models_Message.php                |   6 -
 messages/cs/models_MessageEntry.php           |   4 -
 messages/cs/views_emails_NewMessage.php       |   7 -
 messages/cs/views_emails_NewMessageEntry.php  |   6 -
 messages/cs/views_mail_adduser.php            |   5 -
 messages/cs/views_mail_create.php             |   6 -
 messages/cs/views_mail_edit.php               |   5 -
 messages/cs/views_mail_index.php              |   6 -
 messages/cs/views_mail_list.php               |   4 -
 messages/cs/views_mail_show.php               |  18 --
 messages/cs/views_mail_sidebar.php            |   7 -
 messages/cs/views_mails_UserInviteSpace.php   |   4 -
 .../cs/widgets_views_mailNotification.php     |   5 -
 .../cs/widgets_views_newMessageButton.php     |   5 -
 messages/cy/base.php                          | 184 ++++++++++-------
 messages/cy/forms_CreateMessageForm.php       |   8 -
 messages/cy/forms_InviteRecipientForm.php     |   8 -
 messages/cy/forms_ReplyMessageForm.php        |   5 -
 messages/cy/models_Message.php                |   6 -
 messages/cy/views_emails_NewMessage.php       |   7 -
 messages/cy/views_emails_NewMessageEntry.php  |   6 -
 messages/cy/views_mail_adduser.php            |   5 -
 messages/cy/views_mail_create.php             |   7 -
 messages/cy/views_mail_edit.php               |   5 -
 messages/cy/views_mail_index.php              |   6 -
 messages/cy/views_mail_list.php               |   5 -
 messages/cy/views_mail_show.php               |  18 --
 .../cy/widgets_views_mailNotification.php     |   5 -
 .../cy/widgets_views_newMessageButton.php     |   5 -
 messages/da/base.php                          | 190 +++++++++++-------
 messages/da/forms_CreateMessageForm.php       |   7 -
 messages/da/forms_InviteRecipientForm.php     |   8 -
 messages/da/forms_ReplyMessageForm.php        |   4 -
 messages/da/models_Message.php                |   6 -
 messages/da/models_MessageEntry.php           |   4 -
 messages/da/views_emails_NewMessage.php       |   7 -
 messages/da/views_emails_NewMessageEntry.php  |   6 -
 messages/da/views_mail_adduser.php            |   5 -
 messages/da/views_mail_create.php             |   6 -
 messages/da/views_mail_edit.php               |   5 -
 messages/da/views_mail_index.php              |   6 -
 messages/da/views_mail_list.php               |   4 -
 messages/da/views_mail_show.php               |  18 --
 messages/da/views_mail_sidebar.php            |   7 -
 messages/da/views_mails_UserInviteSpace.php   |   4 -
 .../da/widgets_views_mailNotification.php     |   5 -
 .../da/widgets_views_newMessageButton.php     |   5 -
 messages/de/base.php                          | 190 +++++++++++-------
 messages/de/forms_CreateMessageForm.php       |   7 -
 messages/de/forms_InviteRecipientForm.php     |   7 -
 messages/de/forms_ReplyMessageForm.php        |   4 -
 messages/de/models_Message.php                |   5 -
 messages/de/models_MessageEntry.php           |   4 -
 messages/de/views_emails_NewMessage.php       |   6 -
 messages/de/views_emails_NewMessageEntry.php  |   5 -
 messages/de/views_mail_adduser.php            |   4 -
 messages/de/views_mail_create.php             |   6 -
 messages/de/views_mail_edit.php               |   5 -
 messages/de/views_mail_index.php              |   6 -
 messages/de/views_mail_list.php               |   4 -
 messages/de/views_mail_show.php               |  17 --
 messages/de/views_mail_sidebar.php            |   7 -
 messages/de/views_mails_UserInviteSpace.php   |   4 -
 .../de/widgets_views_mailNotification.php     |   5 -
 .../de/widgets_views_newMessageButton.php     |   5 -
 messages/el/base.php                          | 190 +++++++++++-------
 messages/el/forms_CreateMessageForm.php       |   7 -
 messages/el/forms_InviteRecipientForm.php     |   8 -
 messages/el/forms_ReplyMessageForm.php        |   4 -
 messages/el/models_Message.php                |   6 -
 messages/el/models_MessageEntry.php           |  21 --
 messages/el/views_emails_NewMessage.php       |   7 -
 messages/el/views_emails_NewMessageEntry.php  |   6 -
 messages/el/views_mail_adduser.php            |   5 -
 messages/el/views_mail_create.php             |   7 -
 messages/el/views_mail_edit.php               |   5 -
 messages/el/views_mail_index.php              |   6 -
 messages/el/views_mail_list.php               |  21 --
 messages/el/views_mail_show.php               |  18 --
 messages/el/views_mail_sidebar.php            |   7 -
 messages/el/views_mails_UserInviteSpace.php   |  21 --
 .../el/widgets_views_mailNotification.php     |   5 -
 .../el/widgets_views_newMessageButton.php     |   5 -
 messages/es/base.php                          |  41 +++-
 messages/es/forms_CreateMessageForm.php       |   7 -
 messages/es/forms_InviteRecipientForm.php     |   7 -
 messages/es/forms_ReplyMessageForm.php        |   4 -
 messages/es/models_Message.php                |   5 -
 messages/es/models_MessageEntry.php           |   4 -
 messages/es/views_emails_NewMessage.php       |   6 -
 messages/es/views_emails_NewMessageEntry.php  |   5 -
 messages/es/views_mail_adduser.php            |   5 -
 messages/es/views_mail_create.php             |   6 -
 messages/es/views_mail_edit.php               |   5 -
 messages/es/views_mail_index.php              |   6 -
 messages/es/views_mail_list.php               |   4 -
 messages/es/views_mail_show.php               |  17 --
 messages/es/views_mail_sidebar.php            |   7 -
 messages/es/views_mails_UserInviteSpace.php   |   4 -
 .../es/widgets_views_mailNotification.php     |   5 -
 .../es/widgets_views_newMessageButton.php     |   5 -
 messages/et/base.php                          | 184 ++++++++++-------
 messages/et/forms_CreateMessageForm.php       |   8 -
 messages/et/forms_InviteRecipientForm.php     |   8 -
 messages/et/forms_ReplyMessageForm.php        |   5 -
 messages/et/models_Message.php                |   6 -
 messages/et/views_emails_NewMessage.php       |   7 -
 messages/et/views_emails_NewMessageEntry.php  |   6 -
 messages/et/views_mail_adduser.php            |   5 -
 messages/et/views_mail_create.php             |   7 -
 messages/et/views_mail_edit.php               |   5 -
 messages/et/views_mail_index.php              |   6 -
 messages/et/views_mail_list.php               |   5 -
 messages/et/views_mail_show.php               |  18 --
 .../et/widgets_views_mailNotification.php     |   5 -
 .../et/widgets_views_newMessageButton.php     |   5 -
 messages/eu/base.php                          |  34 +++-
 messages/eu/forms_CreateMessageForm.php       |   7 -
 messages/eu/forms_InviteRecipientForm.php     |   8 -
 messages/eu/forms_ReplyMessageForm.php        |   4 -
 messages/eu/models_Message.php                |   6 -
 messages/eu/views_emails_NewMessage.php       |   7 -
 messages/eu/views_emails_NewMessageEntry.php  |   6 -
 messages/eu/views_mail_create.php             |   6 -
 messages/eu/views_mail_edit.php               |   5 -
 messages/eu/views_mail_index.php              |   6 -
 messages/eu/views_mail_list.php               |   5 -
 messages/eu/views_mail_show.php               |  17 --
 .../eu/widgets_views_mailNotification.php     |   5 -
 .../eu/widgets_views_newMessageButton.php     |   5 -
 messages/fa-IR/base.php                       | 190 +++++++++++-------
 messages/fa-IR/forms_CreateMessageForm.php    |   7 -
 messages/fa-IR/forms_InviteRecipientForm.php  |   8 -
 messages/fa-IR/forms_ReplyMessageForm.php     |   4 -
 messages/fa-IR/models_Message.php             |   6 -
 messages/fa-IR/models_MessageEntry.php        |   4 -
 messages/fa-IR/views_emails_NewMessage.php    |   7 -
 .../fa-IR/views_emails_NewMessageEntry.php    |   6 -
 messages/fa-IR/views_mail_adduser.php         |   5 -
 messages/fa-IR/views_mail_create.php          |   6 -
 messages/fa-IR/views_mail_edit.php            |   5 -
 messages/fa-IR/views_mail_index.php           |   6 -
 messages/fa-IR/views_mail_list.php            |   4 -
 messages/fa-IR/views_mail_show.php            |  18 --
 messages/fa-IR/views_mail_sidebar.php         |   7 -
 .../fa-IR/views_mails_UserInviteSpace.php     |   4 -
 .../fa-IR/widgets_views_mailNotification.php  |   5 -
 .../fa-IR/widgets_views_newMessageButton.php  |   5 -
 messages/fi/base.php                          | 190 +++++++++++-------
 messages/fi/forms_CreateMessageForm.php       |   7 -
 messages/fi/forms_InviteRecipientForm.php     |   7 -
 messages/fi/forms_ReplyMessageForm.php        |   4 -
 messages/fi/models_Message.php                |   6 -
 messages/fi/models_MessageEntry.php           |  21 --
 messages/fi/views_emails_NewMessage.php       |   7 -
 messages/fi/views_emails_NewMessageEntry.php  |   6 -
 messages/fi/views_mail_adduser.php            |   5 -
 messages/fi/views_mail_create.php             |   6 -
 messages/fi/views_mail_edit.php               |   5 -
 messages/fi/views_mail_index.php              |   6 -
 messages/fi/views_mail_list.php               |  21 --
 messages/fi/views_mail_show.php               |  18 --
 messages/fi/views_mail_sidebar.php            |   7 -
 messages/fi/views_mails_UserInviteSpace.php   |  21 --
 .../fi/widgets_views_mailNotification.php     |   5 -
 .../fi/widgets_views_newMessageButton.php     |   5 -
 messages/fr/base.php                          |  41 +++-
 messages/fr/forms_CreateMessageForm.php       |   7 -
 messages/fr/forms_InviteRecipientForm.php     |   7 -
 messages/fr/forms_ReplyMessageForm.php        |   4 -
 messages/fr/models_Message.php                |   5 -
 messages/fr/models_MessageEntry.php           |   4 -
 messages/fr/views_emails_NewMessage.php       |   6 -
 messages/fr/views_emails_NewMessageEntry.php  |   5 -
 messages/fr/views_mail_adduser.php            |   5 -
 messages/fr/views_mail_create.php             |   6 -
 messages/fr/views_mail_edit.php               |   5 -
 messages/fr/views_mail_index.php              |   6 -
 messages/fr/views_mail_list.php               |   4 -
 messages/fr/views_mail_show.php               |  17 --
 messages/fr/views_mail_sidebar.php            |   7 -
 messages/fr/views_mails_UserInviteSpace.php   |   4 -
 .../fr/widgets_views_mailNotification.php     |   5 -
 .../fr/widgets_views_newMessageButton.php     |   5 -
 messages/he/base.php                          | 184 ++++++++++-------
 messages/he/forms_CreateMessageForm.php       |   8 -
 messages/he/forms_InviteRecipientForm.php     |   8 -
 messages/he/forms_ReplyMessageForm.php        |   5 -
 messages/he/models_Message.php                |   6 -
 messages/he/views_emails_NewMessage.php       |   7 -
 messages/he/views_emails_NewMessageEntry.php  |   6 -
 messages/he/views_mail_adduser.php            |   5 -
 messages/he/views_mail_create.php             |   7 -
 messages/he/views_mail_edit.php               |   5 -
 messages/he/views_mail_index.php              |   6 -
 messages/he/views_mail_list.php               |   5 -
 messages/he/views_mail_show.php               |  18 --
 .../he/widgets_views_mailNotification.php     |   4 -
 .../he/widgets_views_newMessageButton.php     |   5 -
 messages/hr/base.php                          | 185 ++++++++++-------
 messages/hr/forms_CreateMessageForm.php       |   7 -
 messages/hr/forms_InviteRecipientForm.php     |   7 -
 messages/hr/forms_ReplyMessageForm.php        |   4 -
 messages/hr/models_Message.php                |   6 -
 messages/hr/models_MessageEntry.php           |   4 -
 messages/hr/views_emails_NewMessage.php       |   7 -
 messages/hr/views_emails_NewMessageEntry.php  |   6 -
 messages/hr/views_mail_adduser.php            |   5 -
 messages/hr/views_mail_create.php             |   6 -
 messages/hr/views_mail_edit.php               |   5 -
 messages/hr/views_mail_index.php              |   6 -
 messages/hr/views_mail_list.php               |   4 -
 messages/hr/views_mail_show.php               |  18 --
 .../hr/widgets_views_mailNotification.php     |   4 -
 .../hr/widgets_views_newMessageButton.php     |   5 -
 messages/ht/base.php                          | 185 ++++++++++-------
 messages/ht/forms_CreateMessageForm.php       |   8 -
 messages/ht/forms_InviteRecipientForm.php     |   8 -
 messages/ht/forms_ReplyMessageForm.php        |  21 --
 messages/ht/models_Message.php                |   6 -
 messages/ht/models_MessageEntry.php           |  21 --
 messages/ht/views_emails_NewMessage.php       |   7 -
 messages/ht/views_emails_NewMessageEntry.php  |   6 -
 messages/ht/views_mail_adduser.php            |   5 -
 messages/ht/views_mail_create.php             |   7 -
 messages/ht/views_mail_edit.php               |   5 -
 messages/ht/views_mail_index.php              |   6 -
 messages/ht/views_mail_list.php               |  21 --
 messages/ht/views_mail_show.php               |  18 --
 .../ht/widgets_views_mailNotification.php     |   5 -
 .../ht/widgets_views_newMessageButton.php     |   5 -
 messages/hu/base.php                          |  41 +++-
 messages/hu/forms_CreateMessageForm.php       |   7 -
 messages/hu/forms_InviteRecipientForm.php     |   7 -
 messages/hu/forms_ReplyMessageForm.php        |   4 -
 messages/hu/models_Message.php                |   5 -
 messages/hu/models_MessageEntry.php           |   4 -
 messages/hu/views_emails_NewMessage.php       |   6 -
 messages/hu/views_emails_NewMessageEntry.php  |   5 -
 messages/hu/views_mail_adduser.php            |   4 -
 messages/hu/views_mail_create.php             |   6 -
 messages/hu/views_mail_edit.php               |   5 -
 messages/hu/views_mail_index.php              |   6 -
 messages/hu/views_mail_list.php               |   4 -
 messages/hu/views_mail_show.php               |  17 --
 messages/hu/views_mail_sidebar.php            |   7 -
 messages/hu/views_mails_UserInviteSpace.php   |   4 -
 .../hu/widgets_views_mailNotification.php     |   5 -
 .../hu/widgets_views_newMessageButton.php     |   5 -
 messages/id/base.php                          | 185 ++++++++++-------
 messages/id/forms_CreateMessageForm.php       |   8 -
 messages/id/forms_InviteRecipientForm.php     |   8 -
 messages/id/forms_ReplyMessageForm.php        |   4 -
 messages/id/models_Message.php                |   6 -
 messages/id/models_MessageEntry.php           |   4 -
 messages/id/views_emails_NewMessage.php       |   7 -
 messages/id/views_emails_NewMessageEntry.php  |   6 -
 messages/id/views_mail_adduser.php            |   5 -
 messages/id/views_mail_create.php             |   7 -
 messages/id/views_mail_edit.php               |   5 -
 messages/id/views_mail_index.php              |   6 -
 messages/id/views_mail_list.php               |   4 -
 messages/id/views_mail_show.php               |  18 --
 .../id/widgets_views_mailNotification.php     |   5 -
 .../id/widgets_views_newMessageButton.php     |   5 -
 messages/it/base.php                          | 190 +++++++++++-------
 messages/it/forms_CreateMessageForm.php       |   7 -
 messages/it/forms_InviteRecipientForm.php     |   7 -
 messages/it/forms_ReplyMessageForm.php        |   4 -
 messages/it/models_Message.php                |   5 -
 messages/it/models_MessageEntry.php           |   4 -
 messages/it/views_emails_NewMessage.php       |   6 -
 messages/it/views_emails_NewMessageEntry.php  |   5 -
 messages/it/views_mail_adduser.php            |   5 -
 messages/it/views_mail_create.php             |   6 -
 messages/it/views_mail_edit.php               |   5 -
 messages/it/views_mail_index.php              |   6 -
 messages/it/views_mail_list.php               |   4 -
 messages/it/views_mail_show.php               |  17 --
 messages/it/views_mail_sidebar.php            |   7 -
 messages/it/views_mails_UserInviteSpace.php   |   4 -
 .../it/widgets_views_mailNotification.php     |   5 -
 .../it/widgets_views_newMessageButton.php     |   5 -
 messages/ja/base.php                          |  41 +++-
 messages/ja/forms_CreateMessageForm.php       |   7 -
 messages/ja/forms_InviteRecipientForm.php     |   7 -
 messages/ja/forms_ReplyMessageForm.php        |   4 -
 messages/ja/models_Message.php                |   5 -
 messages/ja/models_MessageEntry.php           |   4 -
 messages/ja/views_emails_NewMessage.php       |   6 -
 messages/ja/views_emails_NewMessageEntry.php  |   5 -
 messages/ja/views_mail_adduser.php            |   5 -
 messages/ja/views_mail_create.php             |   6 -
 messages/ja/views_mail_edit.php               |   4 -
 messages/ja/views_mail_index.php              |   6 -
 messages/ja/views_mail_list.php               |   4 -
 messages/ja/views_mail_show.php               |  17 --
 messages/ja/views_mail_sidebar.php            |   7 -
 messages/ja/views_mails_UserInviteSpace.php   |   4 -
 .../ja/widgets_views_mailNotification.php     |   4 -
 .../ja/widgets_views_newMessageButton.php     |   4 -
 messages/ko/base.php                          | 185 ++++++++++-------
 messages/ko/forms_CreateMessageForm.php       |   7 -
 messages/ko/forms_InviteRecipientForm.php     |   8 -
 messages/ko/forms_ReplyMessageForm.php        |   4 -
 messages/ko/models_Message.php                |   6 -
 messages/ko/models_MessageEntry.php           |   4 -
 messages/ko/views_emails_NewMessage.php       |   7 -
 messages/ko/views_emails_NewMessageEntry.php  |   6 -
 messages/ko/views_mail_adduser.php            |   5 -
 messages/ko/views_mail_create.php             |   6 -
 messages/ko/views_mail_edit.php               |   5 -
 messages/ko/views_mail_index.php              |   6 -
 messages/ko/views_mail_list.php               |   4 -
 messages/ko/views_mail_show.php               |  17 --
 .../ko/widgets_views_mailNotification.php     |   5 -
 .../ko/widgets_views_newMessageButton.php     |   5 -
 messages/lt/base.php                          | 185 ++++++++++-------
 messages/lt/forms_CreateMessageForm.php       |   7 -
 messages/lt/forms_InviteRecipientForm.php     |   7 -
 messages/lt/forms_ReplyMessageForm.php        |   4 -
 messages/lt/models_Message.php                |   5 -
 messages/lt/models_MessageEntry.php           |   4 -
 messages/lt/views_emails_NewMessage.php       |   6 -
 messages/lt/views_emails_NewMessageEntry.php  |   5 -
 messages/lt/views_mail_adduser.php            |   5 -
 messages/lt/views_mail_create.php             |   6 -
 messages/lt/views_mail_edit.php               |   5 -
 messages/lt/views_mail_index.php              |   5 -
 messages/lt/views_mail_list.php               |   4 -
 messages/lt/views_mail_show.php               |  17 --
 .../lt/widgets_views_mailNotification.php     |   5 -
 .../lt/widgets_views_newMessageButton.php     |   5 -
 messages/lv/base.php                          | 185 ++++++++++-------
 messages/lv/forms_CreateMessageForm.php       |   8 -
 messages/lv/forms_InviteRecipientForm.php     |   8 -
 messages/lv/forms_ReplyMessageForm.php        |   4 -
 messages/lv/models_Message.php                |   6 -
 messages/lv/models_MessageEntry.php           |   4 -
 messages/lv/views_emails_NewMessage.php       |   7 -
 messages/lv/views_emails_NewMessageEntry.php  |   6 -
 messages/lv/views_mail_adduser.php            |   5 -
 messages/lv/views_mail_create.php             |   6 -
 messages/lv/views_mail_edit.php               |   5 -
 messages/lv/views_mail_index.php              |   6 -
 messages/lv/views_mail_list.php               |   4 -
 messages/lv/views_mail_show.php               |  18 --
 .../lv/widgets_views_mailNotification.php     |   5 -
 .../lv/widgets_views_newMessageButton.php     |   5 -
 messages/nb-NO/base.php                       | 190 +++++++++++-------
 messages/nb-NO/forms_CreateMessageForm.php    |   7 -
 messages/nb-NO/forms_InviteRecipientForm.php  |   7 -
 messages/nb-NO/forms_ReplyMessageForm.php     |   4 -
 messages/nb-NO/models_Message.php             |   6 -
 messages/nb-NO/models_MessageEntry.php        |   4 -
 messages/nb-NO/views_emails_NewMessage.php    |   7 -
 .../nb-NO/views_emails_NewMessageEntry.php    |   6 -
 messages/nb-NO/views_mail_adduser.php         |   5 -
 messages/nb-NO/views_mail_create.php          |   6 -
 messages/nb-NO/views_mail_edit.php            |   5 -
 messages/nb-NO/views_mail_index.php           |   6 -
 messages/nb-NO/views_mail_list.php            |   4 -
 messages/nb-NO/views_mail_show.php            |  18 --
 messages/nb-NO/views_mail_sidebar.php         |   7 -
 .../nb-NO/views_mails_UserInviteSpace.php     |   4 -
 .../nb-NO/widgets_views_mailNotification.php  |   5 -
 .../nb-NO/widgets_views_newMessageButton.php  |   5 -
 messages/nl/base.php                          |  41 +++-
 messages/nl/forms_CreateMessageForm.php       |   7 -
 messages/nl/forms_InviteRecipientForm.php     |   7 -
 messages/nl/forms_ReplyMessageForm.php        |   4 -
 messages/nl/models_Message.php                |   5 -
 messages/nl/models_MessageEntry.php           |   4 -
 messages/nl/views_emails_NewMessage.php       |   6 -
 messages/nl/views_emails_NewMessageEntry.php  |   5 -
 messages/nl/views_mail_adduser.php            |   5 -
 messages/nl/views_mail_create.php             |   6 -
 messages/nl/views_mail_edit.php               |   5 -
 messages/nl/views_mail_index.php              |   6 -
 messages/nl/views_mail_list.php               |   4 -
 messages/nl/views_mail_show.php               |  17 --
 messages/nl/views_mail_sidebar.php            |   7 -
 messages/nl/views_mails_UserInviteSpace.php   |   4 -
 .../nl/widgets_views_mailNotification.php     |   5 -
 .../nl/widgets_views_newMessageButton.php     |   5 -
 messages/nn-NO/base.php                       | 185 ++++++++++-------
 messages/nn-NO/forms_CreateMessageForm.php    |   8 -
 messages/nn-NO/forms_InviteRecipientForm.php  |   8 -
 messages/nn-NO/forms_ReplyMessageForm.php     |  21 --
 messages/nn-NO/models_Message.php             |   6 -
 messages/nn-NO/models_MessageEntry.php        |  21 --
 messages/nn-NO/views_emails_NewMessage.php    |   7 -
 .../nn-NO/views_emails_NewMessageEntry.php    |   6 -
 messages/nn-NO/views_mail_adduser.php         |   5 -
 messages/nn-NO/views_mail_create.php          |   7 -
 messages/nn-NO/views_mail_edit.php            |   5 -
 messages/nn-NO/views_mail_index.php           |   6 -
 messages/nn-NO/views_mail_list.php            |  21 --
 messages/nn-NO/views_mail_show.php            |  18 --
 .../nn-NO/widgets_views_mailNotification.php  |   5 -
 .../nn-NO/widgets_views_newMessageButton.php  |   5 -
 messages/pl/base.php                          | 190 +++++++++++-------
 messages/pl/forms_CreateMessageForm.php       |   7 -
 messages/pl/forms_InviteRecipientForm.php     |   7 -
 messages/pl/forms_ReplyMessageForm.php        |   4 -
 messages/pl/models_Message.php                |   6 -
 messages/pl/models_MessageEntry.php           |   4 -
 messages/pl/views_emails_NewMessage.php       |   7 -
 messages/pl/views_emails_NewMessageEntry.php  |   6 -
 messages/pl/views_mail_adduser.php            |   5 -
 messages/pl/views_mail_create.php             |   6 -
 messages/pl/views_mail_edit.php               |   5 -
 messages/pl/views_mail_index.php              |   6 -
 messages/pl/views_mail_list.php               |   4 -
 messages/pl/views_mail_show.php               |  18 --
 messages/pl/views_mail_sidebar.php            |   7 -
 messages/pl/views_mails_UserInviteSpace.php   |   4 -
 .../pl/widgets_views_mailNotification.php     |   5 -
 .../pl/widgets_views_newMessageButton.php     |   5 -
 messages/pt-BR/base.php                       |  41 +++-
 messages/pt-BR/forms_CreateMessageForm.php    |   7 -
 messages/pt-BR/forms_InviteRecipientForm.php  |   7 -
 messages/pt-BR/forms_ReplyMessageForm.php     |   4 -
 messages/pt-BR/models_Message.php             |   5 -
 messages/pt-BR/models_MessageEntry.php        |   4 -
 messages/pt-BR/views_emails_NewMessage.php    |   6 -
 .../pt-BR/views_emails_NewMessageEntry.php    |   5 -
 messages/pt-BR/views_mail_adduser.php         |   5 -
 messages/pt-BR/views_mail_create.php          |   6 -
 messages/pt-BR/views_mail_edit.php            |   5 -
 messages/pt-BR/views_mail_index.php           |   6 -
 messages/pt-BR/views_mail_list.php            |   4 -
 messages/pt-BR/views_mail_show.php            |  17 --
 messages/pt-BR/views_mail_sidebar.php         |   7 -
 .../pt-BR/views_mails_UserInviteSpace.php     |   4 -
 .../pt-BR/widgets_views_mailNotification.php  |   5 -
 .../pt-BR/widgets_views_newMessageButton.php  |   5 -
 messages/pt/base.php                          | 190 +++++++++++-------
 messages/pt/forms_CreateMessageForm.php       |   7 -
 messages/pt/forms_InviteRecipientForm.php     |   7 -
 messages/pt/forms_ReplyMessageForm.php        |   4 -
 messages/pt/models_Message.php                |   6 -
 messages/pt/models_MessageEntry.php           |   4 -
 messages/pt/views_emails_NewMessage.php       |   7 -
 messages/pt/views_emails_NewMessageEntry.php  |   6 -
 messages/pt/views_mail_adduser.php            |   4 -
 messages/pt/views_mail_create.php             |   6 -
 messages/pt/views_mail_edit.php               |   4 -
 messages/pt/views_mail_index.php              |   6 -
 messages/pt/views_mail_list.php               |   4 -
 messages/pt/views_mail_show.php               |  18 --
 messages/pt/views_mail_sidebar.php            |   7 -
 messages/pt/views_mails_UserInviteSpace.php   |   4 -
 .../pt/widgets_views_mailNotification.php     |   4 -
 .../pt/widgets_views_newMessageButton.php     |   4 -
 messages/ro/base.php                          | 190 +++++++++++-------
 messages/ro/forms_CreateMessageForm.php       |   8 -
 messages/ro/forms_InviteRecipientForm.php     |   8 -
 messages/ro/forms_ReplyMessageForm.php        |   4 -
 messages/ro/models_Message.php                |   6 -
 messages/ro/models_MessageEntry.php           |   4 -
 messages/ro/views_emails_NewMessage.php       |   7 -
 messages/ro/views_emails_NewMessageEntry.php  |   6 -
 messages/ro/views_mail_adduser.php            |   5 -
 messages/ro/views_mail_create.php             |   7 -
 messages/ro/views_mail_edit.php               |   5 -
 messages/ro/views_mail_index.php              |   6 -
 messages/ro/views_mail_list.php               |   4 -
 messages/ro/views_mail_show.php               |  18 --
 messages/ro/views_mail_sidebar.php            |   7 -
 messages/ro/views_mails_UserInviteSpace.php   |   4 -
 .../ro/widgets_views_mailNotification.php     |   5 -
 .../ro/widgets_views_newMessageButton.php     |   5 -
 messages/ru/base.php                          | 190 +++++++++++-------
 messages/ru/forms_CreateMessageForm.php       |   7 -
 messages/ru/forms_InviteRecipientForm.php     |   7 -
 messages/ru/forms_ReplyMessageForm.php        |   4 -
 messages/ru/models_Message.php                |   5 -
 messages/ru/models_MessageEntry.php           |   4 -
 messages/ru/views_emails_NewMessage.php       |   7 -
 messages/ru/views_emails_NewMessageEntry.php  |   6 -
 messages/ru/views_mail_adduser.php            |   5 -
 messages/ru/views_mail_create.php             |   6 -
 messages/ru/views_mail_edit.php               |   5 -
 messages/ru/views_mail_index.php              |   6 -
 messages/ru/views_mail_list.php               |   4 -
 messages/ru/views_mail_show.php               |  17 --
 messages/ru/views_mail_sidebar.php            |   7 -
 messages/ru/views_mails_UserInviteSpace.php   |   4 -
 .../ru/widgets_views_mailNotification.php     |   5 -
 .../ru/widgets_views_newMessageButton.php     |   5 -
 messages/sk/base.php                          |  41 +++-
 messages/sk/forms_CreateMessageForm.php       |   7 -
 messages/sk/forms_InviteRecipientForm.php     |   7 -
 messages/sk/forms_ReplyMessageForm.php        |   4 -
 messages/sk/models_Message.php                |   5 -
 messages/sk/models_MessageEntry.php           |   4 -
 messages/sk/views_emails_NewMessage.php       |   6 -
 messages/sk/views_emails_NewMessageEntry.php  |   5 -
 messages/sk/views_mail_adduser.php            |   4 -
 messages/sk/views_mail_create.php             |   6 -
 messages/sk/views_mail_edit.php               |   4 -
 messages/sk/views_mail_index.php              |   5 -
 messages/sk/views_mail_list.php               |   4 -
 messages/sk/views_mail_show.php               |  17 --
 messages/sk/views_mail_sidebar.php            |   7 -
 messages/sk/views_mails_UserInviteSpace.php   |   4 -
 .../sk/widgets_views_mailNotification.php     |   4 -
 .../sk/widgets_views_newMessageButton.php     |   4 -
 messages/sl/base.php                          | 185 ++++++++++-------
 messages/sl/forms_CreateMessageForm.php       |   8 -
 messages/sl/forms_InviteRecipientForm.php     |   8 -
 messages/sl/forms_ReplyMessageForm.php        |  21 --
 messages/sl/models_Message.php                |   6 -
 messages/sl/models_MessageEntry.php           |  21 --
 messages/sl/views_emails_NewMessage.php       |   7 -
 messages/sl/views_emails_NewMessageEntry.php  |   6 -
 messages/sl/views_mail_adduser.php            |   5 -
 messages/sl/views_mail_create.php             |   7 -
 messages/sl/views_mail_edit.php               |   5 -
 messages/sl/views_mail_index.php              |   6 -
 messages/sl/views_mail_list.php               |  21 --
 messages/sl/views_mail_show.php               |  18 --
 .../sl/widgets_views_mailNotification.php     |   5 -
 .../sl/widgets_views_newMessageButton.php     |   5 -
 messages/sq/base.php                          | 184 ++++++++++-------
 messages/sq/forms_CreateMessageForm.php       |   8 -
 messages/sq/forms_InviteRecipientForm.php     |   8 -
 messages/sq/forms_ReplyMessageForm.php        |   5 -
 messages/sq/models_Message.php                |   6 -
 messages/sq/views_emails_NewMessage.php       |   7 -
 messages/sq/views_emails_NewMessageEntry.php  |   6 -
 messages/sq/views_mail_adduser.php            |   5 -
 messages/sq/views_mail_create.php             |   6 -
 messages/sq/views_mail_edit.php               |   5 -
 messages/sq/views_mail_index.php              |   6 -
 messages/sq/views_mail_list.php               |   5 -
 messages/sq/views_mail_show.php               |  18 --
 .../sq/widgets_views_mailNotification.php     |   5 -
 .../sq/widgets_views_newMessageButton.php     |   5 -
 messages/sr/base.php                          | 183 ++++++++++-------
 messages/sr/forms_CreateMessageForm.php       |   7 -
 messages/sr/forms_InviteRecipientForm.php     |   7 -
 messages/sr/forms_ReplyMessageForm.php        |   4 -
 messages/sr/models_Message.php                |   5 -
 messages/sr/views_emails_NewMessage.php       |   6 -
 messages/sr/views_emails_NewMessageEntry.php  |   6 -
 messages/sr/views_mail_create.php             |   6 -
 messages/sr/views_mail_edit.php               |   4 -
 messages/sr/views_mail_index.php              |   5 -
 messages/sr/views_mail_list.php               |   4 -
 messages/sr/views_mail_show.php               |  17 --
 .../sr/widgets_views_mailNotification.php     |   4 -
 .../sr/widgets_views_newMessageButton.php     |   4 -
 messages/sv/base.php                          | 190 +++++++++++-------
 messages/sv/forms_CreateMessageForm.php       |   7 -
 messages/sv/forms_InviteRecipientForm.php     |   7 -
 messages/sv/forms_ReplyMessageForm.php        |   4 -
 messages/sv/models_Message.php                |   5 -
 messages/sv/models_MessageEntry.php           |   4 -
 messages/sv/views_emails_NewMessage.php       |   6 -
 messages/sv/views_emails_NewMessageEntry.php  |   5 -
 messages/sv/views_mail_adduser.php            |   4 -
 messages/sv/views_mail_create.php             |   6 -
 messages/sv/views_mail_edit.php               |   5 -
 messages/sv/views_mail_index.php              |   6 -
 messages/sv/views_mail_list.php               |   4 -
 messages/sv/views_mail_show.php               |  17 --
 messages/sv/views_mail_sidebar.php            |   7 -
 messages/sv/views_mails_UserInviteSpace.php   |   4 -
 .../sv/widgets_views_mailNotification.php     |   5 -
 .../sv/widgets_views_newMessageButton.php     |   4 -
 messages/sw/base.php                          | 184 ++++++++++-------
 messages/sw/forms_CreateMessageForm.php       |   8 -
 messages/sw/forms_InviteRecipientForm.php     |   8 -
 messages/sw/forms_ReplyMessageForm.php        |   5 -
 messages/sw/models_Message.php                |   6 -
 messages/sw/views_emails_NewMessage.php       |   7 -
 messages/sw/views_emails_NewMessageEntry.php  |   6 -
 messages/sw/views_mail_adduser.php            |   5 -
 messages/sw/views_mail_create.php             |   7 -
 messages/sw/views_mail_edit.php               |   5 -
 messages/sw/views_mail_index.php              |   6 -
 messages/sw/views_mail_list.php               |   5 -
 messages/sw/views_mail_show.php               |  18 --
 .../sw/widgets_views_mailNotification.php     |   5 -
 .../sw/widgets_views_newMessageButton.php     |   5 -
 messages/th/base.php                          | 190 +++++++++++-------
 messages/th/forms_CreateMessageForm.php       |   7 -
 messages/th/forms_InviteRecipientForm.php     |   7 -
 messages/th/forms_ReplyMessageForm.php        |   4 -
 messages/th/models_Message.php                |   6 -
 messages/th/models_MessageEntry.php           |   4 -
 messages/th/views_emails_NewMessage.php       |   7 -
 messages/th/views_emails_NewMessageEntry.php  |   6 -
 messages/th/views_mail_adduser.php            |   4 -
 messages/th/views_mail_create.php             |   6 -
 messages/th/views_mail_edit.php               |   4 -
 messages/th/views_mail_index.php              |   6 -
 messages/th/views_mail_list.php               |   4 -
 messages/th/views_mail_show.php               |  18 --
 messages/th/views_mail_sidebar.php            |   7 -
 messages/th/views_mails_UserInviteSpace.php   |   4 -
 .../th/widgets_views_mailNotification.php     |   4 -
 .../th/widgets_views_newMessageButton.php     |   4 -
 messages/tr/base.php                          | 190 +++++++++++-------
 messages/tr/forms_CreateMessageForm.php       |   7 -
 messages/tr/forms_InviteRecipientForm.php     |   8 -
 messages/tr/forms_ReplyMessageForm.php        |   4 -
 messages/tr/models_Message.php                |   6 -
 messages/tr/models_MessageEntry.php           |   4 -
 messages/tr/views_emails_NewMessage.php       |   7 -
 messages/tr/views_emails_NewMessageEntry.php  |   6 -
 messages/tr/views_mail_adduser.php            |   5 -
 messages/tr/views_mail_create.php             |   6 -
 messages/tr/views_mail_edit.php               |   5 -
 messages/tr/views_mail_index.php              |   6 -
 messages/tr/views_mail_list.php               |   4 -
 messages/tr/views_mail_show.php               |  18 --
 messages/tr/views_mail_sidebar.php            |   7 -
 messages/tr/views_mails_UserInviteSpace.php   |   4 -
 .../tr/widgets_views_mailNotification.php     |   5 -
 .../tr/widgets_views_newMessageButton.php     |   5 -
 messages/uk/base.php                          | 190 +++++++++++-------
 messages/uk/forms_CreateMessageForm.php       |   7 -
 messages/uk/forms_InviteRecipientForm.php     |   8 -
 messages/uk/forms_ReplyMessageForm.php        |  21 --
 messages/uk/models_Message.php                |   6 -
 messages/uk/models_MessageEntry.php           |  21 --
 messages/uk/views_emails_NewMessage.php       |   7 -
 messages/uk/views_emails_NewMessageEntry.php  |   6 -
 messages/uk/views_mail_adduser.php            |   5 -
 messages/uk/views_mail_create.php             |   7 -
 messages/uk/views_mail_edit.php               |   5 -
 messages/uk/views_mail_index.php              |   6 -
 messages/uk/views_mail_list.php               |  21 --
 messages/uk/views_mail_show.php               |  17 --
 messages/uk/views_mail_sidebar.php            |   7 -
 messages/uk/views_mails_UserInviteSpace.php   |   4 -
 .../uk/widgets_views_mailNotification.php     |   5 -
 .../uk/widgets_views_newMessageButton.php     |   5 -
 messages/uz/base.php                          | 190 +++++++++++-------
 messages/uz/forms_CreateMessageForm.php       |   8 -
 messages/uz/forms_InviteRecipientForm.php     |   8 -
 messages/uz/forms_ReplyMessageForm.php        |  21 --
 messages/uz/models_Message.php                |   6 -
 messages/uz/models_MessageEntry.php           |  21 --
 messages/uz/views_emails_NewMessage.php       |   7 -
 messages/uz/views_emails_NewMessageEntry.php  |   6 -
 messages/uz/views_mail_adduser.php            |   5 -
 messages/uz/views_mail_create.php             |   7 -
 messages/uz/views_mail_edit.php               |   5 -
 messages/uz/views_mail_index.php              |   6 -
 messages/uz/views_mail_list.php               |  21 --
 messages/uz/views_mail_show.php               |  18 --
 messages/uz/views_mail_sidebar.php            |  24 ---
 messages/uz/views_mails_UserInviteSpace.php   |  21 --
 .../uz/widgets_views_mailNotification.php     |   5 -
 .../uz/widgets_views_newMessageButton.php     |   5 -
 messages/vi/base.php                          | 190 +++++++++++-------
 messages/vi/forms_CreateMessageForm.php       |   7 -
 messages/vi/forms_InviteRecipientForm.php     |   8 -
 messages/vi/forms_ReplyMessageForm.php        |   4 -
 messages/vi/models_Message.php                |   6 -
 messages/vi/models_MessageEntry.php           |   4 -
 messages/vi/views_emails_NewMessage.php       |   7 -
 messages/vi/views_emails_NewMessageEntry.php  |   6 -
 messages/vi/views_mail_adduser.php            |   5 -
 messages/vi/views_mail_create.php             |   6 -
 messages/vi/views_mail_edit.php               |   5 -
 messages/vi/views_mail_index.php              |   6 -
 messages/vi/views_mail_list.php               |   4 -
 messages/vi/views_mail_show.php               |  18 --
 messages/vi/views_mail_sidebar.php            |   7 -
 messages/vi/views_mails_UserInviteSpace.php   |   4 -
 .../vi/widgets_views_mailNotification.php     |   5 -
 .../vi/widgets_views_newMessageButton.php     |   5 -
 messages/zh-CN/base.php                       | 190 +++++++++++-------
 messages/zh-CN/forms_CreateMessageForm.php    |   7 -
 messages/zh-CN/forms_InviteRecipientForm.php  |   8 -
 messages/zh-CN/forms_ReplyMessageForm.php     |   4 -
 messages/zh-CN/models_Message.php             |   6 -
 messages/zh-CN/models_MessageEntry.php        |   4 -
 messages/zh-CN/views_emails_NewMessage.php    |   7 -
 .../zh-CN/views_emails_NewMessageEntry.php    |   6 -
 messages/zh-CN/views_mail_adduser.php         |   5 -
 messages/zh-CN/views_mail_create.php          |   6 -
 messages/zh-CN/views_mail_edit.php            |   5 -
 messages/zh-CN/views_mail_index.php           |   6 -
 messages/zh-CN/views_mail_list.php            |   4 -
 messages/zh-CN/views_mail_show.php            |  18 --
 messages/zh-CN/views_mail_sidebar.php         |   7 -
 .../zh-CN/views_mails_UserInviteSpace.php     |   4 -
 .../zh-CN/widgets_views_mailNotification.php  |   5 -
 .../zh-CN/widgets_views_newMessageButton.php  |   5 -
 messages/zh-TW/base.php                       | 190 +++++++++++-------
 messages/zh-TW/forms_CreateMessageForm.php    |   7 -
 messages/zh-TW/forms_InviteRecipientForm.php  |   7 -
 messages/zh-TW/forms_ReplyMessageForm.php     |   4 -
 messages/zh-TW/models_Message.php             |   5 -
 messages/zh-TW/models_MessageEntry.php        |   4 -
 messages/zh-TW/views_emails_NewMessage.php    |   6 -
 .../zh-TW/views_emails_NewMessageEntry.php    |   5 -
 messages/zh-TW/views_mail_adduser.php         |   4 -
 messages/zh-TW/views_mail_create.php          |   6 -
 messages/zh-TW/views_mail_edit.php            |   4 -
 messages/zh-TW/views_mail_index.php           |   6 -
 messages/zh-TW/views_mail_list.php            |   4 -
 messages/zh-TW/views_mail_show.php            |  17 --
 messages/zh-TW/views_mail_sidebar.php         |   7 -
 .../zh-TW/views_mails_UserInviteSpace.php     |   4 -
 .../zh-TW/widgets_views_mailNotification.php  |   4 -
 .../zh-TW/widgets_views_newMessageButton.php  |   4 -
 models/MessageNotification.php                |  12 +-
 models/forms/CreateMessage.php                |   8 +-
 models/forms/InviteParticipantForm.php        |   8 +-
 models/forms/ReplyForm.php                    |   2 +-
 views/emails/NewMessage.php                   |   2 +-
 views/emails/plaintext/NewMessage.php         |   2 +-
 views/mail/_conversation_sidebar.php          |   2 +-
 views/mail/conversation.php                   |   4 +-
 views/mail/create.php                         |   6 +-
 views/mail/editEntry.php                      |  10 +-
 views/mail/notificationList.php               |   4 +-
 widgets/NewMessageButton.php                  |   2 +-
 widgets/views/conversationSettingsMenu.php    |  18 +-
 widgets/views/inbox.php                       |   2 +-
 widgets/views/notificationInbox.php           |   4 +-
 836 files changed, 4704 insertions(+), 8301 deletions(-)
 delete mode 100644 messages/am/forms_CreateMessageForm.php
 delete mode 100644 messages/am/forms_InviteRecipientForm.php
 delete mode 100644 messages/am/forms_ReplyMessageForm.php
 delete mode 100644 messages/am/models_Message.php
 delete mode 100644 messages/am/models_MessageEntry.php
 delete mode 100644 messages/am/views_emails_NewMessage.php
 delete mode 100644 messages/am/views_emails_NewMessageEntry.php
 delete mode 100644 messages/am/views_mail_adduser.php
 delete mode 100644 messages/am/views_mail_create.php
 delete mode 100644 messages/am/views_mail_edit.php
 delete mode 100644 messages/am/views_mail_index.php
 delete mode 100644 messages/am/views_mail_list.php
 delete mode 100644 messages/am/views_mail_show.php
 delete mode 100644 messages/am/widgets_views_mailNotification.php
 delete mode 100644 messages/am/widgets_views_newMessageButton.php
 delete mode 100644 messages/an/forms_CreateMessageForm.php
 delete mode 100644 messages/an/forms_InviteRecipientForm.php
 delete mode 100644 messages/an/forms_ReplyMessageForm.php
 delete mode 100644 messages/an/models_Message.php
 delete mode 100644 messages/an/models_MessageEntry.php
 delete mode 100644 messages/an/views_emails_NewMessage.php
 delete mode 100644 messages/an/views_emails_NewMessageEntry.php
 delete mode 100644 messages/an/views_mail_adduser.php
 delete mode 100644 messages/an/views_mail_create.php
 delete mode 100644 messages/an/views_mail_edit.php
 delete mode 100644 messages/an/views_mail_index.php
 delete mode 100644 messages/an/views_mail_list.php
 delete mode 100644 messages/an/views_mail_show.php
 delete mode 100644 messages/an/views_mail_sidebar.php
 delete mode 100644 messages/an/views_mails_UserInviteSpace.php
 delete mode 100644 messages/an/widgets_views_mailNotification.php
 delete mode 100644 messages/an/widgets_views_newMessageButton.php
 delete mode 100644 messages/ar/forms_CreateMessageForm.php
 delete mode 100644 messages/ar/forms_InviteRecipientForm.php
 delete mode 100644 messages/ar/forms_ReplyMessageForm.php
 delete mode 100644 messages/ar/models_Message.php
 delete mode 100644 messages/ar/models_MessageEntry.php
 delete mode 100644 messages/ar/views_emails_NewMessage.php
 delete mode 100644 messages/ar/views_emails_NewMessageEntry.php
 delete mode 100644 messages/ar/views_mail_adduser.php
 delete mode 100644 messages/ar/views_mail_create.php
 delete mode 100644 messages/ar/views_mail_edit.php
 delete mode 100644 messages/ar/views_mail_index.php
 delete mode 100644 messages/ar/views_mail_list.php
 delete mode 100644 messages/ar/views_mail_show.php
 delete mode 100644 messages/ar/views_mails_UserInviteSpace.php
 delete mode 100644 messages/ar/widgets_views_mailNotification.php
 delete mode 100644 messages/ar/widgets_views_newMessageButton.php
 delete mode 100644 messages/bg/forms_CreateMessageForm.php
 delete mode 100644 messages/bg/forms_InviteRecipientForm.php
 delete mode 100644 messages/bg/forms_ReplyMessageForm.php
 delete mode 100644 messages/bg/models_Message.php
 delete mode 100644 messages/bg/models_MessageEntry.php
 delete mode 100644 messages/bg/views_emails_NewMessage.php
 delete mode 100644 messages/bg/views_emails_NewMessageEntry.php
 delete mode 100644 messages/bg/views_mail_adduser.php
 delete mode 100644 messages/bg/views_mail_create.php
 delete mode 100644 messages/bg/views_mail_edit.php
 delete mode 100644 messages/bg/views_mail_index.php
 delete mode 100644 messages/bg/views_mail_list.php
 delete mode 100644 messages/bg/views_mail_show.php
 delete mode 100644 messages/bg/views_mail_sidebar.php
 delete mode 100644 messages/bg/views_mails_UserInviteSpace.php
 delete mode 100644 messages/bg/widgets_views_mailNotification.php
 delete mode 100644 messages/bg/widgets_views_newMessageButton.php
 delete mode 100644 messages/br/forms_CreateMessageForm.php
 delete mode 100644 messages/br/forms_InviteRecipientForm.php
 delete mode 100644 messages/br/forms_ReplyMessageForm.php
 delete mode 100644 messages/br/models_Message.php
 delete mode 100644 messages/br/models_MessageEntry.php
 delete mode 100644 messages/br/views_emails_NewMessage.php
 delete mode 100644 messages/br/views_emails_NewMessageEntry.php
 delete mode 100644 messages/br/views_mail_adduser.php
 delete mode 100644 messages/br/views_mail_create.php
 delete mode 100644 messages/br/views_mail_edit.php
 delete mode 100644 messages/br/views_mail_index.php
 delete mode 100644 messages/br/views_mail_list.php
 delete mode 100644 messages/br/views_mail_show.php
 delete mode 100644 messages/br/widgets_views_mailNotification.php
 delete mode 100644 messages/br/widgets_views_newMessageButton.php
 delete mode 100644 messages/ca/forms_CreateMessageForm.php
 delete mode 100644 messages/ca/forms_InviteRecipientForm.php
 delete mode 100644 messages/ca/forms_ReplyMessageForm.php
 delete mode 100644 messages/ca/models_Message.php
 delete mode 100644 messages/ca/models_MessageEntry.php
 delete mode 100644 messages/ca/views_emails_NewMessage.php
 delete mode 100644 messages/ca/views_emails_NewMessageEntry.php
 delete mode 100644 messages/ca/views_mail_adduser.php
 delete mode 100644 messages/ca/views_mail_create.php
 delete mode 100644 messages/ca/views_mail_edit.php
 delete mode 100644 messages/ca/views_mail_index.php
 delete mode 100644 messages/ca/views_mail_list.php
 delete mode 100644 messages/ca/views_mail_show.php
 delete mode 100644 messages/ca/views_mail_sidebar.php
 delete mode 100644 messages/ca/views_mails_UserInviteSpace.php
 delete mode 100644 messages/ca/widgets_views_mailNotification.php
 delete mode 100644 messages/ca/widgets_views_newMessageButton.php
 delete mode 100644 messages/cs/forms_CreateMessageForm.php
 delete mode 100644 messages/cs/forms_InviteRecipientForm.php
 delete mode 100644 messages/cs/forms_ReplyMessageForm.php
 delete mode 100644 messages/cs/models_Message.php
 delete mode 100644 messages/cs/models_MessageEntry.php
 delete mode 100644 messages/cs/views_emails_NewMessage.php
 delete mode 100644 messages/cs/views_emails_NewMessageEntry.php
 delete mode 100644 messages/cs/views_mail_adduser.php
 delete mode 100644 messages/cs/views_mail_create.php
 delete mode 100644 messages/cs/views_mail_edit.php
 delete mode 100644 messages/cs/views_mail_index.php
 delete mode 100644 messages/cs/views_mail_list.php
 delete mode 100644 messages/cs/views_mail_show.php
 delete mode 100644 messages/cs/views_mail_sidebar.php
 delete mode 100644 messages/cs/views_mails_UserInviteSpace.php
 delete mode 100644 messages/cs/widgets_views_mailNotification.php
 delete mode 100644 messages/cs/widgets_views_newMessageButton.php
 delete mode 100644 messages/cy/forms_CreateMessageForm.php
 delete mode 100644 messages/cy/forms_InviteRecipientForm.php
 delete mode 100644 messages/cy/forms_ReplyMessageForm.php
 delete mode 100644 messages/cy/models_Message.php
 delete mode 100644 messages/cy/views_emails_NewMessage.php
 delete mode 100644 messages/cy/views_emails_NewMessageEntry.php
 delete mode 100644 messages/cy/views_mail_adduser.php
 delete mode 100644 messages/cy/views_mail_create.php
 delete mode 100644 messages/cy/views_mail_edit.php
 delete mode 100644 messages/cy/views_mail_index.php
 delete mode 100644 messages/cy/views_mail_list.php
 delete mode 100644 messages/cy/views_mail_show.php
 delete mode 100644 messages/cy/widgets_views_mailNotification.php
 delete mode 100644 messages/cy/widgets_views_newMessageButton.php
 delete mode 100644 messages/da/forms_CreateMessageForm.php
 delete mode 100644 messages/da/forms_InviteRecipientForm.php
 delete mode 100644 messages/da/forms_ReplyMessageForm.php
 delete mode 100644 messages/da/models_Message.php
 delete mode 100644 messages/da/models_MessageEntry.php
 delete mode 100644 messages/da/views_emails_NewMessage.php
 delete mode 100644 messages/da/views_emails_NewMessageEntry.php
 delete mode 100644 messages/da/views_mail_adduser.php
 delete mode 100644 messages/da/views_mail_create.php
 delete mode 100644 messages/da/views_mail_edit.php
 delete mode 100644 messages/da/views_mail_index.php
 delete mode 100644 messages/da/views_mail_list.php
 delete mode 100644 messages/da/views_mail_show.php
 delete mode 100644 messages/da/views_mail_sidebar.php
 delete mode 100644 messages/da/views_mails_UserInviteSpace.php
 delete mode 100644 messages/da/widgets_views_mailNotification.php
 delete mode 100644 messages/da/widgets_views_newMessageButton.php
 delete mode 100644 messages/de/forms_CreateMessageForm.php
 delete mode 100644 messages/de/forms_InviteRecipientForm.php
 delete mode 100644 messages/de/forms_ReplyMessageForm.php
 delete mode 100644 messages/de/models_Message.php
 delete mode 100644 messages/de/models_MessageEntry.php
 delete mode 100644 messages/de/views_emails_NewMessage.php
 delete mode 100644 messages/de/views_emails_NewMessageEntry.php
 delete mode 100644 messages/de/views_mail_adduser.php
 delete mode 100644 messages/de/views_mail_create.php
 delete mode 100644 messages/de/views_mail_edit.php
 delete mode 100644 messages/de/views_mail_index.php
 delete mode 100644 messages/de/views_mail_list.php
 delete mode 100644 messages/de/views_mail_show.php
 delete mode 100644 messages/de/views_mail_sidebar.php
 delete mode 100644 messages/de/views_mails_UserInviteSpace.php
 delete mode 100644 messages/de/widgets_views_mailNotification.php
 delete mode 100644 messages/de/widgets_views_newMessageButton.php
 delete mode 100644 messages/el/forms_CreateMessageForm.php
 delete mode 100644 messages/el/forms_InviteRecipientForm.php
 delete mode 100644 messages/el/forms_ReplyMessageForm.php
 delete mode 100644 messages/el/models_Message.php
 delete mode 100644 messages/el/models_MessageEntry.php
 delete mode 100644 messages/el/views_emails_NewMessage.php
 delete mode 100644 messages/el/views_emails_NewMessageEntry.php
 delete mode 100644 messages/el/views_mail_adduser.php
 delete mode 100644 messages/el/views_mail_create.php
 delete mode 100644 messages/el/views_mail_edit.php
 delete mode 100644 messages/el/views_mail_index.php
 delete mode 100644 messages/el/views_mail_list.php
 delete mode 100644 messages/el/views_mail_show.php
 delete mode 100644 messages/el/views_mail_sidebar.php
 delete mode 100644 messages/el/views_mails_UserInviteSpace.php
 delete mode 100644 messages/el/widgets_views_mailNotification.php
 delete mode 100644 messages/el/widgets_views_newMessageButton.php
 delete mode 100644 messages/es/forms_CreateMessageForm.php
 delete mode 100644 messages/es/forms_InviteRecipientForm.php
 delete mode 100644 messages/es/forms_ReplyMessageForm.php
 delete mode 100644 messages/es/models_Message.php
 delete mode 100644 messages/es/models_MessageEntry.php
 delete mode 100644 messages/es/views_emails_NewMessage.php
 delete mode 100644 messages/es/views_emails_NewMessageEntry.php
 delete mode 100644 messages/es/views_mail_adduser.php
 delete mode 100644 messages/es/views_mail_create.php
 delete mode 100644 messages/es/views_mail_edit.php
 delete mode 100644 messages/es/views_mail_index.php
 delete mode 100644 messages/es/views_mail_list.php
 delete mode 100644 messages/es/views_mail_show.php
 delete mode 100644 messages/es/views_mail_sidebar.php
 delete mode 100644 messages/es/views_mails_UserInviteSpace.php
 delete mode 100644 messages/es/widgets_views_mailNotification.php
 delete mode 100644 messages/es/widgets_views_newMessageButton.php
 delete mode 100644 messages/et/forms_CreateMessageForm.php
 delete mode 100644 messages/et/forms_InviteRecipientForm.php
 delete mode 100644 messages/et/forms_ReplyMessageForm.php
 delete mode 100644 messages/et/models_Message.php
 delete mode 100644 messages/et/views_emails_NewMessage.php
 delete mode 100644 messages/et/views_emails_NewMessageEntry.php
 delete mode 100644 messages/et/views_mail_adduser.php
 delete mode 100644 messages/et/views_mail_create.php
 delete mode 100644 messages/et/views_mail_edit.php
 delete mode 100644 messages/et/views_mail_index.php
 delete mode 100644 messages/et/views_mail_list.php
 delete mode 100644 messages/et/views_mail_show.php
 delete mode 100644 messages/et/widgets_views_mailNotification.php
 delete mode 100644 messages/et/widgets_views_newMessageButton.php
 delete mode 100644 messages/eu/forms_CreateMessageForm.php
 delete mode 100644 messages/eu/forms_InviteRecipientForm.php
 delete mode 100644 messages/eu/forms_ReplyMessageForm.php
 delete mode 100644 messages/eu/models_Message.php
 delete mode 100644 messages/eu/views_emails_NewMessage.php
 delete mode 100644 messages/eu/views_emails_NewMessageEntry.php
 delete mode 100644 messages/eu/views_mail_create.php
 delete mode 100644 messages/eu/views_mail_edit.php
 delete mode 100644 messages/eu/views_mail_index.php
 delete mode 100644 messages/eu/views_mail_list.php
 delete mode 100644 messages/eu/views_mail_show.php
 delete mode 100644 messages/eu/widgets_views_mailNotification.php
 delete mode 100644 messages/eu/widgets_views_newMessageButton.php
 delete mode 100644 messages/fa-IR/forms_CreateMessageForm.php
 delete mode 100644 messages/fa-IR/forms_InviteRecipientForm.php
 delete mode 100644 messages/fa-IR/forms_ReplyMessageForm.php
 delete mode 100644 messages/fa-IR/models_Message.php
 delete mode 100644 messages/fa-IR/models_MessageEntry.php
 delete mode 100644 messages/fa-IR/views_emails_NewMessage.php
 delete mode 100644 messages/fa-IR/views_emails_NewMessageEntry.php
 delete mode 100644 messages/fa-IR/views_mail_adduser.php
 delete mode 100644 messages/fa-IR/views_mail_create.php
 delete mode 100644 messages/fa-IR/views_mail_edit.php
 delete mode 100644 messages/fa-IR/views_mail_index.php
 delete mode 100644 messages/fa-IR/views_mail_list.php
 delete mode 100644 messages/fa-IR/views_mail_show.php
 delete mode 100644 messages/fa-IR/views_mail_sidebar.php
 delete mode 100644 messages/fa-IR/views_mails_UserInviteSpace.php
 delete mode 100644 messages/fa-IR/widgets_views_mailNotification.php
 delete mode 100644 messages/fa-IR/widgets_views_newMessageButton.php
 delete mode 100644 messages/fi/forms_CreateMessageForm.php
 delete mode 100644 messages/fi/forms_InviteRecipientForm.php
 delete mode 100644 messages/fi/forms_ReplyMessageForm.php
 delete mode 100644 messages/fi/models_Message.php
 delete mode 100644 messages/fi/models_MessageEntry.php
 delete mode 100644 messages/fi/views_emails_NewMessage.php
 delete mode 100644 messages/fi/views_emails_NewMessageEntry.php
 delete mode 100644 messages/fi/views_mail_adduser.php
 delete mode 100644 messages/fi/views_mail_create.php
 delete mode 100644 messages/fi/views_mail_edit.php
 delete mode 100644 messages/fi/views_mail_index.php
 delete mode 100644 messages/fi/views_mail_list.php
 delete mode 100644 messages/fi/views_mail_show.php
 delete mode 100644 messages/fi/views_mail_sidebar.php
 delete mode 100644 messages/fi/views_mails_UserInviteSpace.php
 delete mode 100644 messages/fi/widgets_views_mailNotification.php
 delete mode 100644 messages/fi/widgets_views_newMessageButton.php
 delete mode 100644 messages/fr/forms_CreateMessageForm.php
 delete mode 100644 messages/fr/forms_InviteRecipientForm.php
 delete mode 100644 messages/fr/forms_ReplyMessageForm.php
 delete mode 100644 messages/fr/models_Message.php
 delete mode 100644 messages/fr/models_MessageEntry.php
 delete mode 100644 messages/fr/views_emails_NewMessage.php
 delete mode 100644 messages/fr/views_emails_NewMessageEntry.php
 delete mode 100644 messages/fr/views_mail_adduser.php
 delete mode 100644 messages/fr/views_mail_create.php
 delete mode 100644 messages/fr/views_mail_edit.php
 delete mode 100644 messages/fr/views_mail_index.php
 delete mode 100644 messages/fr/views_mail_list.php
 delete mode 100644 messages/fr/views_mail_show.php
 delete mode 100644 messages/fr/views_mail_sidebar.php
 delete mode 100644 messages/fr/views_mails_UserInviteSpace.php
 delete mode 100644 messages/fr/widgets_views_mailNotification.php
 delete mode 100644 messages/fr/widgets_views_newMessageButton.php
 delete mode 100644 messages/he/forms_CreateMessageForm.php
 delete mode 100644 messages/he/forms_InviteRecipientForm.php
 delete mode 100644 messages/he/forms_ReplyMessageForm.php
 delete mode 100644 messages/he/models_Message.php
 delete mode 100644 messages/he/views_emails_NewMessage.php
 delete mode 100644 messages/he/views_emails_NewMessageEntry.php
 delete mode 100644 messages/he/views_mail_adduser.php
 delete mode 100644 messages/he/views_mail_create.php
 delete mode 100644 messages/he/views_mail_edit.php
 delete mode 100644 messages/he/views_mail_index.php
 delete mode 100644 messages/he/views_mail_list.php
 delete mode 100644 messages/he/views_mail_show.php
 delete mode 100644 messages/he/widgets_views_mailNotification.php
 delete mode 100644 messages/he/widgets_views_newMessageButton.php
 delete mode 100644 messages/hr/forms_CreateMessageForm.php
 delete mode 100644 messages/hr/forms_InviteRecipientForm.php
 delete mode 100644 messages/hr/forms_ReplyMessageForm.php
 delete mode 100644 messages/hr/models_Message.php
 delete mode 100644 messages/hr/models_MessageEntry.php
 delete mode 100644 messages/hr/views_emails_NewMessage.php
 delete mode 100644 messages/hr/views_emails_NewMessageEntry.php
 delete mode 100644 messages/hr/views_mail_adduser.php
 delete mode 100644 messages/hr/views_mail_create.php
 delete mode 100644 messages/hr/views_mail_edit.php
 delete mode 100644 messages/hr/views_mail_index.php
 delete mode 100644 messages/hr/views_mail_list.php
 delete mode 100644 messages/hr/views_mail_show.php
 delete mode 100644 messages/hr/widgets_views_mailNotification.php
 delete mode 100644 messages/hr/widgets_views_newMessageButton.php
 delete mode 100644 messages/ht/forms_CreateMessageForm.php
 delete mode 100644 messages/ht/forms_InviteRecipientForm.php
 delete mode 100644 messages/ht/forms_ReplyMessageForm.php
 delete mode 100644 messages/ht/models_Message.php
 delete mode 100644 messages/ht/models_MessageEntry.php
 delete mode 100644 messages/ht/views_emails_NewMessage.php
 delete mode 100644 messages/ht/views_emails_NewMessageEntry.php
 delete mode 100644 messages/ht/views_mail_adduser.php
 delete mode 100644 messages/ht/views_mail_create.php
 delete mode 100644 messages/ht/views_mail_edit.php
 delete mode 100644 messages/ht/views_mail_index.php
 delete mode 100644 messages/ht/views_mail_list.php
 delete mode 100644 messages/ht/views_mail_show.php
 delete mode 100644 messages/ht/widgets_views_mailNotification.php
 delete mode 100644 messages/ht/widgets_views_newMessageButton.php
 delete mode 100644 messages/hu/forms_CreateMessageForm.php
 delete mode 100644 messages/hu/forms_InviteRecipientForm.php
 delete mode 100644 messages/hu/forms_ReplyMessageForm.php
 delete mode 100644 messages/hu/models_Message.php
 delete mode 100644 messages/hu/models_MessageEntry.php
 delete mode 100644 messages/hu/views_emails_NewMessage.php
 delete mode 100644 messages/hu/views_emails_NewMessageEntry.php
 delete mode 100644 messages/hu/views_mail_adduser.php
 delete mode 100644 messages/hu/views_mail_create.php
 delete mode 100644 messages/hu/views_mail_edit.php
 delete mode 100644 messages/hu/views_mail_index.php
 delete mode 100644 messages/hu/views_mail_list.php
 delete mode 100644 messages/hu/views_mail_show.php
 delete mode 100644 messages/hu/views_mail_sidebar.php
 delete mode 100644 messages/hu/views_mails_UserInviteSpace.php
 delete mode 100644 messages/hu/widgets_views_mailNotification.php
 delete mode 100644 messages/hu/widgets_views_newMessageButton.php
 delete mode 100644 messages/id/forms_CreateMessageForm.php
 delete mode 100644 messages/id/forms_InviteRecipientForm.php
 delete mode 100644 messages/id/forms_ReplyMessageForm.php
 delete mode 100644 messages/id/models_Message.php
 delete mode 100644 messages/id/models_MessageEntry.php
 delete mode 100644 messages/id/views_emails_NewMessage.php
 delete mode 100644 messages/id/views_emails_NewMessageEntry.php
 delete mode 100644 messages/id/views_mail_adduser.php
 delete mode 100644 messages/id/views_mail_create.php
 delete mode 100644 messages/id/views_mail_edit.php
 delete mode 100644 messages/id/views_mail_index.php
 delete mode 100644 messages/id/views_mail_list.php
 delete mode 100644 messages/id/views_mail_show.php
 delete mode 100644 messages/id/widgets_views_mailNotification.php
 delete mode 100644 messages/id/widgets_views_newMessageButton.php
 delete mode 100644 messages/it/forms_CreateMessageForm.php
 delete mode 100644 messages/it/forms_InviteRecipientForm.php
 delete mode 100644 messages/it/forms_ReplyMessageForm.php
 delete mode 100644 messages/it/models_Message.php
 delete mode 100644 messages/it/models_MessageEntry.php
 delete mode 100644 messages/it/views_emails_NewMessage.php
 delete mode 100644 messages/it/views_emails_NewMessageEntry.php
 delete mode 100644 messages/it/views_mail_adduser.php
 delete mode 100644 messages/it/views_mail_create.php
 delete mode 100644 messages/it/views_mail_edit.php
 delete mode 100644 messages/it/views_mail_index.php
 delete mode 100644 messages/it/views_mail_list.php
 delete mode 100644 messages/it/views_mail_show.php
 delete mode 100644 messages/it/views_mail_sidebar.php
 delete mode 100644 messages/it/views_mails_UserInviteSpace.php
 delete mode 100644 messages/it/widgets_views_mailNotification.php
 delete mode 100644 messages/it/widgets_views_newMessageButton.php
 delete mode 100644 messages/ja/forms_CreateMessageForm.php
 delete mode 100644 messages/ja/forms_InviteRecipientForm.php
 delete mode 100644 messages/ja/forms_ReplyMessageForm.php
 delete mode 100644 messages/ja/models_Message.php
 delete mode 100644 messages/ja/models_MessageEntry.php
 delete mode 100644 messages/ja/views_emails_NewMessage.php
 delete mode 100644 messages/ja/views_emails_NewMessageEntry.php
 delete mode 100644 messages/ja/views_mail_adduser.php
 delete mode 100644 messages/ja/views_mail_create.php
 delete mode 100644 messages/ja/views_mail_edit.php
 delete mode 100644 messages/ja/views_mail_index.php
 delete mode 100644 messages/ja/views_mail_list.php
 delete mode 100644 messages/ja/views_mail_show.php
 delete mode 100644 messages/ja/views_mail_sidebar.php
 delete mode 100644 messages/ja/views_mails_UserInviteSpace.php
 delete mode 100644 messages/ja/widgets_views_mailNotification.php
 delete mode 100644 messages/ja/widgets_views_newMessageButton.php
 delete mode 100644 messages/ko/forms_CreateMessageForm.php
 delete mode 100644 messages/ko/forms_InviteRecipientForm.php
 delete mode 100644 messages/ko/forms_ReplyMessageForm.php
 delete mode 100644 messages/ko/models_Message.php
 delete mode 100644 messages/ko/models_MessageEntry.php
 delete mode 100644 messages/ko/views_emails_NewMessage.php
 delete mode 100644 messages/ko/views_emails_NewMessageEntry.php
 delete mode 100644 messages/ko/views_mail_adduser.php
 delete mode 100644 messages/ko/views_mail_create.php
 delete mode 100644 messages/ko/views_mail_edit.php
 delete mode 100644 messages/ko/views_mail_index.php
 delete mode 100644 messages/ko/views_mail_list.php
 delete mode 100644 messages/ko/views_mail_show.php
 delete mode 100644 messages/ko/widgets_views_mailNotification.php
 delete mode 100644 messages/ko/widgets_views_newMessageButton.php
 delete mode 100644 messages/lt/forms_CreateMessageForm.php
 delete mode 100644 messages/lt/forms_InviteRecipientForm.php
 delete mode 100644 messages/lt/forms_ReplyMessageForm.php
 delete mode 100644 messages/lt/models_Message.php
 delete mode 100644 messages/lt/models_MessageEntry.php
 delete mode 100644 messages/lt/views_emails_NewMessage.php
 delete mode 100644 messages/lt/views_emails_NewMessageEntry.php
 delete mode 100644 messages/lt/views_mail_adduser.php
 delete mode 100644 messages/lt/views_mail_create.php
 delete mode 100644 messages/lt/views_mail_edit.php
 delete mode 100644 messages/lt/views_mail_index.php
 delete mode 100644 messages/lt/views_mail_list.php
 delete mode 100644 messages/lt/views_mail_show.php
 delete mode 100644 messages/lt/widgets_views_mailNotification.php
 delete mode 100644 messages/lt/widgets_views_newMessageButton.php
 delete mode 100644 messages/lv/forms_CreateMessageForm.php
 delete mode 100644 messages/lv/forms_InviteRecipientForm.php
 delete mode 100644 messages/lv/forms_ReplyMessageForm.php
 delete mode 100644 messages/lv/models_Message.php
 delete mode 100644 messages/lv/models_MessageEntry.php
 delete mode 100644 messages/lv/views_emails_NewMessage.php
 delete mode 100644 messages/lv/views_emails_NewMessageEntry.php
 delete mode 100644 messages/lv/views_mail_adduser.php
 delete mode 100644 messages/lv/views_mail_create.php
 delete mode 100644 messages/lv/views_mail_edit.php
 delete mode 100644 messages/lv/views_mail_index.php
 delete mode 100644 messages/lv/views_mail_list.php
 delete mode 100644 messages/lv/views_mail_show.php
 delete mode 100644 messages/lv/widgets_views_mailNotification.php
 delete mode 100644 messages/lv/widgets_views_newMessageButton.php
 delete mode 100644 messages/nb-NO/forms_CreateMessageForm.php
 delete mode 100644 messages/nb-NO/forms_InviteRecipientForm.php
 delete mode 100644 messages/nb-NO/forms_ReplyMessageForm.php
 delete mode 100644 messages/nb-NO/models_Message.php
 delete mode 100644 messages/nb-NO/models_MessageEntry.php
 delete mode 100644 messages/nb-NO/views_emails_NewMessage.php
 delete mode 100644 messages/nb-NO/views_emails_NewMessageEntry.php
 delete mode 100644 messages/nb-NO/views_mail_adduser.php
 delete mode 100644 messages/nb-NO/views_mail_create.php
 delete mode 100644 messages/nb-NO/views_mail_edit.php
 delete mode 100644 messages/nb-NO/views_mail_index.php
 delete mode 100644 messages/nb-NO/views_mail_list.php
 delete mode 100644 messages/nb-NO/views_mail_show.php
 delete mode 100644 messages/nb-NO/views_mail_sidebar.php
 delete mode 100644 messages/nb-NO/views_mails_UserInviteSpace.php
 delete mode 100644 messages/nb-NO/widgets_views_mailNotification.php
 delete mode 100644 messages/nb-NO/widgets_views_newMessageButton.php
 delete mode 100644 messages/nl/forms_CreateMessageForm.php
 delete mode 100644 messages/nl/forms_InviteRecipientForm.php
 delete mode 100644 messages/nl/forms_ReplyMessageForm.php
 delete mode 100644 messages/nl/models_Message.php
 delete mode 100644 messages/nl/models_MessageEntry.php
 delete mode 100644 messages/nl/views_emails_NewMessage.php
 delete mode 100644 messages/nl/views_emails_NewMessageEntry.php
 delete mode 100644 messages/nl/views_mail_adduser.php
 delete mode 100644 messages/nl/views_mail_create.php
 delete mode 100644 messages/nl/views_mail_edit.php
 delete mode 100644 messages/nl/views_mail_index.php
 delete mode 100644 messages/nl/views_mail_list.php
 delete mode 100644 messages/nl/views_mail_show.php
 delete mode 100644 messages/nl/views_mail_sidebar.php
 delete mode 100644 messages/nl/views_mails_UserInviteSpace.php
 delete mode 100644 messages/nl/widgets_views_mailNotification.php
 delete mode 100644 messages/nl/widgets_views_newMessageButton.php
 delete mode 100644 messages/nn-NO/forms_CreateMessageForm.php
 delete mode 100644 messages/nn-NO/forms_InviteRecipientForm.php
 delete mode 100644 messages/nn-NO/forms_ReplyMessageForm.php
 delete mode 100644 messages/nn-NO/models_Message.php
 delete mode 100644 messages/nn-NO/models_MessageEntry.php
 delete mode 100644 messages/nn-NO/views_emails_NewMessage.php
 delete mode 100644 messages/nn-NO/views_emails_NewMessageEntry.php
 delete mode 100644 messages/nn-NO/views_mail_adduser.php
 delete mode 100644 messages/nn-NO/views_mail_create.php
 delete mode 100644 messages/nn-NO/views_mail_edit.php
 delete mode 100644 messages/nn-NO/views_mail_index.php
 delete mode 100644 messages/nn-NO/views_mail_list.php
 delete mode 100644 messages/nn-NO/views_mail_show.php
 delete mode 100644 messages/nn-NO/widgets_views_mailNotification.php
 delete mode 100644 messages/nn-NO/widgets_views_newMessageButton.php
 delete mode 100644 messages/pl/forms_CreateMessageForm.php
 delete mode 100644 messages/pl/forms_InviteRecipientForm.php
 delete mode 100644 messages/pl/forms_ReplyMessageForm.php
 delete mode 100644 messages/pl/models_Message.php
 delete mode 100644 messages/pl/models_MessageEntry.php
 delete mode 100644 messages/pl/views_emails_NewMessage.php
 delete mode 100644 messages/pl/views_emails_NewMessageEntry.php
 delete mode 100644 messages/pl/views_mail_adduser.php
 delete mode 100644 messages/pl/views_mail_create.php
 delete mode 100644 messages/pl/views_mail_edit.php
 delete mode 100644 messages/pl/views_mail_index.php
 delete mode 100644 messages/pl/views_mail_list.php
 delete mode 100644 messages/pl/views_mail_show.php
 delete mode 100644 messages/pl/views_mail_sidebar.php
 delete mode 100644 messages/pl/views_mails_UserInviteSpace.php
 delete mode 100644 messages/pl/widgets_views_mailNotification.php
 delete mode 100644 messages/pl/widgets_views_newMessageButton.php
 delete mode 100644 messages/pt-BR/forms_CreateMessageForm.php
 delete mode 100644 messages/pt-BR/forms_InviteRecipientForm.php
 delete mode 100644 messages/pt-BR/forms_ReplyMessageForm.php
 delete mode 100644 messages/pt-BR/models_Message.php
 delete mode 100644 messages/pt-BR/models_MessageEntry.php
 delete mode 100644 messages/pt-BR/views_emails_NewMessage.php
 delete mode 100644 messages/pt-BR/views_emails_NewMessageEntry.php
 delete mode 100644 messages/pt-BR/views_mail_adduser.php
 delete mode 100644 messages/pt-BR/views_mail_create.php
 delete mode 100644 messages/pt-BR/views_mail_edit.php
 delete mode 100644 messages/pt-BR/views_mail_index.php
 delete mode 100644 messages/pt-BR/views_mail_list.php
 delete mode 100644 messages/pt-BR/views_mail_show.php
 delete mode 100644 messages/pt-BR/views_mail_sidebar.php
 delete mode 100644 messages/pt-BR/views_mails_UserInviteSpace.php
 delete mode 100644 messages/pt-BR/widgets_views_mailNotification.php
 delete mode 100644 messages/pt-BR/widgets_views_newMessageButton.php
 delete mode 100644 messages/pt/forms_CreateMessageForm.php
 delete mode 100644 messages/pt/forms_InviteRecipientForm.php
 delete mode 100644 messages/pt/forms_ReplyMessageForm.php
 delete mode 100644 messages/pt/models_Message.php
 delete mode 100644 messages/pt/models_MessageEntry.php
 delete mode 100644 messages/pt/views_emails_NewMessage.php
 delete mode 100644 messages/pt/views_emails_NewMessageEntry.php
 delete mode 100644 messages/pt/views_mail_adduser.php
 delete mode 100644 messages/pt/views_mail_create.php
 delete mode 100644 messages/pt/views_mail_edit.php
 delete mode 100644 messages/pt/views_mail_index.php
 delete mode 100644 messages/pt/views_mail_list.php
 delete mode 100644 messages/pt/views_mail_show.php
 delete mode 100644 messages/pt/views_mail_sidebar.php
 delete mode 100644 messages/pt/views_mails_UserInviteSpace.php
 delete mode 100644 messages/pt/widgets_views_mailNotification.php
 delete mode 100644 messages/pt/widgets_views_newMessageButton.php
 delete mode 100644 messages/ro/forms_CreateMessageForm.php
 delete mode 100644 messages/ro/forms_InviteRecipientForm.php
 delete mode 100644 messages/ro/forms_ReplyMessageForm.php
 delete mode 100644 messages/ro/models_Message.php
 delete mode 100644 messages/ro/models_MessageEntry.php
 delete mode 100644 messages/ro/views_emails_NewMessage.php
 delete mode 100644 messages/ro/views_emails_NewMessageEntry.php
 delete mode 100644 messages/ro/views_mail_adduser.php
 delete mode 100644 messages/ro/views_mail_create.php
 delete mode 100644 messages/ro/views_mail_edit.php
 delete mode 100644 messages/ro/views_mail_index.php
 delete mode 100644 messages/ro/views_mail_list.php
 delete mode 100644 messages/ro/views_mail_show.php
 delete mode 100644 messages/ro/views_mail_sidebar.php
 delete mode 100644 messages/ro/views_mails_UserInviteSpace.php
 delete mode 100644 messages/ro/widgets_views_mailNotification.php
 delete mode 100644 messages/ro/widgets_views_newMessageButton.php
 delete mode 100644 messages/ru/forms_CreateMessageForm.php
 delete mode 100644 messages/ru/forms_InviteRecipientForm.php
 delete mode 100644 messages/ru/forms_ReplyMessageForm.php
 delete mode 100644 messages/ru/models_Message.php
 delete mode 100644 messages/ru/models_MessageEntry.php
 delete mode 100644 messages/ru/views_emails_NewMessage.php
 delete mode 100644 messages/ru/views_emails_NewMessageEntry.php
 delete mode 100644 messages/ru/views_mail_adduser.php
 delete mode 100644 messages/ru/views_mail_create.php
 delete mode 100644 messages/ru/views_mail_edit.php
 delete mode 100644 messages/ru/views_mail_index.php
 delete mode 100644 messages/ru/views_mail_list.php
 delete mode 100644 messages/ru/views_mail_show.php
 delete mode 100644 messages/ru/views_mail_sidebar.php
 delete mode 100644 messages/ru/views_mails_UserInviteSpace.php
 delete mode 100644 messages/ru/widgets_views_mailNotification.php
 delete mode 100644 messages/ru/widgets_views_newMessageButton.php
 delete mode 100644 messages/sk/forms_CreateMessageForm.php
 delete mode 100644 messages/sk/forms_InviteRecipientForm.php
 delete mode 100644 messages/sk/forms_ReplyMessageForm.php
 delete mode 100644 messages/sk/models_Message.php
 delete mode 100644 messages/sk/models_MessageEntry.php
 delete mode 100644 messages/sk/views_emails_NewMessage.php
 delete mode 100644 messages/sk/views_emails_NewMessageEntry.php
 delete mode 100644 messages/sk/views_mail_adduser.php
 delete mode 100644 messages/sk/views_mail_create.php
 delete mode 100644 messages/sk/views_mail_edit.php
 delete mode 100644 messages/sk/views_mail_index.php
 delete mode 100644 messages/sk/views_mail_list.php
 delete mode 100644 messages/sk/views_mail_show.php
 delete mode 100644 messages/sk/views_mail_sidebar.php
 delete mode 100644 messages/sk/views_mails_UserInviteSpace.php
 delete mode 100644 messages/sk/widgets_views_mailNotification.php
 delete mode 100644 messages/sk/widgets_views_newMessageButton.php
 delete mode 100644 messages/sl/forms_CreateMessageForm.php
 delete mode 100644 messages/sl/forms_InviteRecipientForm.php
 delete mode 100644 messages/sl/forms_ReplyMessageForm.php
 delete mode 100644 messages/sl/models_Message.php
 delete mode 100644 messages/sl/models_MessageEntry.php
 delete mode 100644 messages/sl/views_emails_NewMessage.php
 delete mode 100644 messages/sl/views_emails_NewMessageEntry.php
 delete mode 100644 messages/sl/views_mail_adduser.php
 delete mode 100644 messages/sl/views_mail_create.php
 delete mode 100644 messages/sl/views_mail_edit.php
 delete mode 100644 messages/sl/views_mail_index.php
 delete mode 100644 messages/sl/views_mail_list.php
 delete mode 100644 messages/sl/views_mail_show.php
 delete mode 100644 messages/sl/widgets_views_mailNotification.php
 delete mode 100644 messages/sl/widgets_views_newMessageButton.php
 delete mode 100644 messages/sq/forms_CreateMessageForm.php
 delete mode 100644 messages/sq/forms_InviteRecipientForm.php
 delete mode 100644 messages/sq/forms_ReplyMessageForm.php
 delete mode 100644 messages/sq/models_Message.php
 delete mode 100644 messages/sq/views_emails_NewMessage.php
 delete mode 100644 messages/sq/views_emails_NewMessageEntry.php
 delete mode 100644 messages/sq/views_mail_adduser.php
 delete mode 100644 messages/sq/views_mail_create.php
 delete mode 100644 messages/sq/views_mail_edit.php
 delete mode 100644 messages/sq/views_mail_index.php
 delete mode 100644 messages/sq/views_mail_list.php
 delete mode 100644 messages/sq/views_mail_show.php
 delete mode 100644 messages/sq/widgets_views_mailNotification.php
 delete mode 100644 messages/sq/widgets_views_newMessageButton.php
 delete mode 100644 messages/sr/forms_CreateMessageForm.php
 delete mode 100644 messages/sr/forms_InviteRecipientForm.php
 delete mode 100644 messages/sr/forms_ReplyMessageForm.php
 delete mode 100644 messages/sr/models_Message.php
 delete mode 100644 messages/sr/views_emails_NewMessage.php
 delete mode 100644 messages/sr/views_emails_NewMessageEntry.php
 delete mode 100644 messages/sr/views_mail_create.php
 delete mode 100644 messages/sr/views_mail_edit.php
 delete mode 100644 messages/sr/views_mail_index.php
 delete mode 100644 messages/sr/views_mail_list.php
 delete mode 100644 messages/sr/views_mail_show.php
 delete mode 100644 messages/sr/widgets_views_mailNotification.php
 delete mode 100644 messages/sr/widgets_views_newMessageButton.php
 delete mode 100644 messages/sv/forms_CreateMessageForm.php
 delete mode 100644 messages/sv/forms_InviteRecipientForm.php
 delete mode 100644 messages/sv/forms_ReplyMessageForm.php
 delete mode 100644 messages/sv/models_Message.php
 delete mode 100644 messages/sv/models_MessageEntry.php
 delete mode 100644 messages/sv/views_emails_NewMessage.php
 delete mode 100644 messages/sv/views_emails_NewMessageEntry.php
 delete mode 100644 messages/sv/views_mail_adduser.php
 delete mode 100644 messages/sv/views_mail_create.php
 delete mode 100644 messages/sv/views_mail_edit.php
 delete mode 100644 messages/sv/views_mail_index.php
 delete mode 100644 messages/sv/views_mail_list.php
 delete mode 100644 messages/sv/views_mail_show.php
 delete mode 100644 messages/sv/views_mail_sidebar.php
 delete mode 100644 messages/sv/views_mails_UserInviteSpace.php
 delete mode 100644 messages/sv/widgets_views_mailNotification.php
 delete mode 100644 messages/sv/widgets_views_newMessageButton.php
 delete mode 100644 messages/sw/forms_CreateMessageForm.php
 delete mode 100644 messages/sw/forms_InviteRecipientForm.php
 delete mode 100644 messages/sw/forms_ReplyMessageForm.php
 delete mode 100644 messages/sw/models_Message.php
 delete mode 100644 messages/sw/views_emails_NewMessage.php
 delete mode 100644 messages/sw/views_emails_NewMessageEntry.php
 delete mode 100644 messages/sw/views_mail_adduser.php
 delete mode 100644 messages/sw/views_mail_create.php
 delete mode 100644 messages/sw/views_mail_edit.php
 delete mode 100644 messages/sw/views_mail_index.php
 delete mode 100644 messages/sw/views_mail_list.php
 delete mode 100644 messages/sw/views_mail_show.php
 delete mode 100644 messages/sw/widgets_views_mailNotification.php
 delete mode 100644 messages/sw/widgets_views_newMessageButton.php
 delete mode 100644 messages/th/forms_CreateMessageForm.php
 delete mode 100644 messages/th/forms_InviteRecipientForm.php
 delete mode 100644 messages/th/forms_ReplyMessageForm.php
 delete mode 100644 messages/th/models_Message.php
 delete mode 100644 messages/th/models_MessageEntry.php
 delete mode 100644 messages/th/views_emails_NewMessage.php
 delete mode 100644 messages/th/views_emails_NewMessageEntry.php
 delete mode 100644 messages/th/views_mail_adduser.php
 delete mode 100644 messages/th/views_mail_create.php
 delete mode 100644 messages/th/views_mail_edit.php
 delete mode 100644 messages/th/views_mail_index.php
 delete mode 100644 messages/th/views_mail_list.php
 delete mode 100644 messages/th/views_mail_show.php
 delete mode 100644 messages/th/views_mail_sidebar.php
 delete mode 100644 messages/th/views_mails_UserInviteSpace.php
 delete mode 100644 messages/th/widgets_views_mailNotification.php
 delete mode 100644 messages/th/widgets_views_newMessageButton.php
 delete mode 100644 messages/tr/forms_CreateMessageForm.php
 delete mode 100644 messages/tr/forms_InviteRecipientForm.php
 delete mode 100644 messages/tr/forms_ReplyMessageForm.php
 delete mode 100644 messages/tr/models_Message.php
 delete mode 100644 messages/tr/models_MessageEntry.php
 delete mode 100644 messages/tr/views_emails_NewMessage.php
 delete mode 100644 messages/tr/views_emails_NewMessageEntry.php
 delete mode 100644 messages/tr/views_mail_adduser.php
 delete mode 100644 messages/tr/views_mail_create.php
 delete mode 100644 messages/tr/views_mail_edit.php
 delete mode 100644 messages/tr/views_mail_index.php
 delete mode 100644 messages/tr/views_mail_list.php
 delete mode 100644 messages/tr/views_mail_show.php
 delete mode 100644 messages/tr/views_mail_sidebar.php
 delete mode 100644 messages/tr/views_mails_UserInviteSpace.php
 delete mode 100644 messages/tr/widgets_views_mailNotification.php
 delete mode 100644 messages/tr/widgets_views_newMessageButton.php
 delete mode 100644 messages/uk/forms_CreateMessageForm.php
 delete mode 100644 messages/uk/forms_InviteRecipientForm.php
 delete mode 100644 messages/uk/forms_ReplyMessageForm.php
 delete mode 100644 messages/uk/models_Message.php
 delete mode 100644 messages/uk/models_MessageEntry.php
 delete mode 100644 messages/uk/views_emails_NewMessage.php
 delete mode 100644 messages/uk/views_emails_NewMessageEntry.php
 delete mode 100644 messages/uk/views_mail_adduser.php
 delete mode 100644 messages/uk/views_mail_create.php
 delete mode 100644 messages/uk/views_mail_edit.php
 delete mode 100644 messages/uk/views_mail_index.php
 delete mode 100644 messages/uk/views_mail_list.php
 delete mode 100644 messages/uk/views_mail_show.php
 delete mode 100644 messages/uk/views_mail_sidebar.php
 delete mode 100644 messages/uk/views_mails_UserInviteSpace.php
 delete mode 100644 messages/uk/widgets_views_mailNotification.php
 delete mode 100644 messages/uk/widgets_views_newMessageButton.php
 delete mode 100644 messages/uz/forms_CreateMessageForm.php
 delete mode 100644 messages/uz/forms_InviteRecipientForm.php
 delete mode 100644 messages/uz/forms_ReplyMessageForm.php
 delete mode 100644 messages/uz/models_Message.php
 delete mode 100644 messages/uz/models_MessageEntry.php
 delete mode 100644 messages/uz/views_emails_NewMessage.php
 delete mode 100644 messages/uz/views_emails_NewMessageEntry.php
 delete mode 100644 messages/uz/views_mail_adduser.php
 delete mode 100644 messages/uz/views_mail_create.php
 delete mode 100644 messages/uz/views_mail_edit.php
 delete mode 100644 messages/uz/views_mail_index.php
 delete mode 100644 messages/uz/views_mail_list.php
 delete mode 100644 messages/uz/views_mail_show.php
 delete mode 100644 messages/uz/views_mail_sidebar.php
 delete mode 100644 messages/uz/views_mails_UserInviteSpace.php
 delete mode 100644 messages/uz/widgets_views_mailNotification.php
 delete mode 100644 messages/uz/widgets_views_newMessageButton.php
 delete mode 100644 messages/vi/forms_CreateMessageForm.php
 delete mode 100644 messages/vi/forms_InviteRecipientForm.php
 delete mode 100644 messages/vi/forms_ReplyMessageForm.php
 delete mode 100644 messages/vi/models_Message.php
 delete mode 100644 messages/vi/models_MessageEntry.php
 delete mode 100644 messages/vi/views_emails_NewMessage.php
 delete mode 100644 messages/vi/views_emails_NewMessageEntry.php
 delete mode 100644 messages/vi/views_mail_adduser.php
 delete mode 100644 messages/vi/views_mail_create.php
 delete mode 100644 messages/vi/views_mail_edit.php
 delete mode 100644 messages/vi/views_mail_index.php
 delete mode 100644 messages/vi/views_mail_list.php
 delete mode 100644 messages/vi/views_mail_show.php
 delete mode 100644 messages/vi/views_mail_sidebar.php
 delete mode 100644 messages/vi/views_mails_UserInviteSpace.php
 delete mode 100644 messages/vi/widgets_views_mailNotification.php
 delete mode 100644 messages/vi/widgets_views_newMessageButton.php
 delete mode 100644 messages/zh-CN/forms_CreateMessageForm.php
 delete mode 100644 messages/zh-CN/forms_InviteRecipientForm.php
 delete mode 100644 messages/zh-CN/forms_ReplyMessageForm.php
 delete mode 100644 messages/zh-CN/models_Message.php
 delete mode 100644 messages/zh-CN/models_MessageEntry.php
 delete mode 100644 messages/zh-CN/views_emails_NewMessage.php
 delete mode 100644 messages/zh-CN/views_emails_NewMessageEntry.php
 delete mode 100644 messages/zh-CN/views_mail_adduser.php
 delete mode 100644 messages/zh-CN/views_mail_create.php
 delete mode 100644 messages/zh-CN/views_mail_edit.php
 delete mode 100644 messages/zh-CN/views_mail_index.php
 delete mode 100644 messages/zh-CN/views_mail_list.php
 delete mode 100644 messages/zh-CN/views_mail_show.php
 delete mode 100644 messages/zh-CN/views_mail_sidebar.php
 delete mode 100644 messages/zh-CN/views_mails_UserInviteSpace.php
 delete mode 100644 messages/zh-CN/widgets_views_mailNotification.php
 delete mode 100644 messages/zh-CN/widgets_views_newMessageButton.php
 delete mode 100644 messages/zh-TW/forms_CreateMessageForm.php
 delete mode 100644 messages/zh-TW/forms_InviteRecipientForm.php
 delete mode 100644 messages/zh-TW/forms_ReplyMessageForm.php
 delete mode 100644 messages/zh-TW/models_Message.php
 delete mode 100644 messages/zh-TW/models_MessageEntry.php
 delete mode 100644 messages/zh-TW/views_emails_NewMessage.php
 delete mode 100644 messages/zh-TW/views_emails_NewMessageEntry.php
 delete mode 100644 messages/zh-TW/views_mail_adduser.php
 delete mode 100644 messages/zh-TW/views_mail_create.php
 delete mode 100644 messages/zh-TW/views_mail_edit.php
 delete mode 100644 messages/zh-TW/views_mail_index.php
 delete mode 100644 messages/zh-TW/views_mail_list.php
 delete mode 100644 messages/zh-TW/views_mail_show.php
 delete mode 100644 messages/zh-TW/views_mail_sidebar.php
 delete mode 100644 messages/zh-TW/views_mails_UserInviteSpace.php
 delete mode 100644 messages/zh-TW/widgets_views_mailNotification.php
 delete mode 100644 messages/zh-TW/widgets_views_newMessageButton.php

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index cbeab5f0..7c2863d4 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -12,6 +12,7 @@ Changelog
 - Enh #422: Changed deprecated `DOMSubtreeModified` to `MutationObserver`
 - Fix #423: Fix rendering of attached files on new reply by PushService
 - Enh #424: Allow sending a message with attached files only, such as an image
+- Enh #426: Reduce translation message categories
 
 3.2.2 (July 9, 2024)
 --------------------
diff --git a/messages/am/base.php b/messages/am/base.php
index 9ab110e7..0eee977c 100644
--- a/messages/am/base.php
+++ b/messages/am/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    'Confirm' => 'አረጋግጥ',
-    'Edit' => 'ማስተካከያ',
-    'Message' => 'መልዕክት',
-    'Pinned' => 'የተሰካ',
-    'Search' => 'ፈልግ',
-    'Subject' => 'ርዕስ',
-    'Title' => 'ርዕስ',
-    'Unpin' => 'ንቀል',
-    'User' => 'ተጠቃሚ',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'ይቅር',
+  'Confirm' => 'አረጋግጥ',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => 'አስወግድ',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'ማስተካከያ',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => 'መልዕክት',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => 'የተሰካ',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'ፈልግ',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => 'ርዕስ',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'ርዕስ',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => 'ንቀል',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'ተጠቃሚ',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/am/forms_CreateMessageForm.php b/messages/am/forms_CreateMessageForm.php
deleted file mode 100644
index fb2a9911..00000000
--- a/messages/am/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => 'መልዕክት',
-    'Subject' => 'ርዕስ',
-    'Recipient' => '',
-    'Tags' => '',
-];
diff --git a/messages/am/forms_InviteRecipientForm.php b/messages/am/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/am/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/am/forms_ReplyMessageForm.php b/messages/am/forms_ReplyMessageForm.php
deleted file mode 100644
index 80473e79..00000000
--- a/messages/am/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'መልዕክት',
-);
diff --git a/messages/am/models_Message.php b/messages/am/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/am/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/am/models_MessageEntry.php b/messages/am/models_MessageEntry.php
deleted file mode 100644
index cd01e64a..00000000
--- a/messages/am/models_MessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'New message in discussion from %displayName%' => '',
-];
diff --git a/messages/am/views_emails_NewMessage.php b/messages/am/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/am/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/am/views_emails_NewMessageEntry.php b/messages/am/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/am/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/am/views_mail_adduser.php b/messages/am/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/am/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/am/views_mail_create.php b/messages/am/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/am/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/am/views_mail_edit.php b/messages/am/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/am/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/am/views_mail_index.php b/messages/am/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/am/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/am/views_mail_list.php b/messages/am/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/am/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/am/views_mail_show.php b/messages/am/views_mail_show.php
deleted file mode 100644
index 4e24e87e..00000000
--- a/messages/am/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'ይቅር',
-    'Delete' => 'አስወግድ',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/am/widgets_views_mailNotification.php b/messages/am/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/am/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/am/widgets_views_newMessageButton.php b/messages/am/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/am/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/an/base.php b/messages/an/base.php
index 0190d22d..8ee56c49 100644
--- a/messages/an/base.php
+++ b/messages/an/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => 'Confirmar',
-    'Conversations' => 'Conversacions',
-    'Created At' => 'Creyau o',
-    'Created By' => 'Creyau per',
-    'Edit' => 'Editar',
-    'Message' => 'Mensache',
-    'Messages' => 'Mensaches',
-    'Pinned' => 'Fixau',
-    'Search' => 'Buscar',
-    'Subject' => 'Asunto',
-    'Tags' => 'Etiquetas',
-    'Title' => 'Títol',
-    'Unpin' => 'Des-fixar',
-    'Updated At' => 'Actualizau o',
-    'Updated By' => 'Actualizau per',
-    'User' => 'Usuario',
-    'You' => 'Tu',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Nuevo</strong> mensache',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Cancelar',
+  'Confirm' => 'Confirmar',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => 'Conversacions',
+  'Created At' => 'Creyau o',
+  'Created By' => 'Creyau per',
+  'Delete' => 'Eliminar',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'Editar',
+  'Edit message entry' => 'Editar o mensache',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => 'Grupos',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Miembros',
+  'Message' => 'Mensache',
+  'Messages' => 'Mensaches',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => 'Fixau',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => 'Destinatario',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'Buscar',
+  'Send' => 'Ninviar',
+  'Send message' => 'Ninviar mensache',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'Veyer totz os mensaches',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => 'Rechistrar-se',
+  'Spaces' => 'Espacios',
+  'Start new conversations' => '',
+  'Subject' => 'Asunto',
+  'Sunday' => '',
+  'Tags' => 'Etiquetas',
+  'There are no messages yet.' => 'Encara no i hai mensaches',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Títol',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => 'Des-fixar',
+  'Until a user is member since (days)' => '',
+  'Updated At' => 'Actualizau o',
+  'Updated By' => 'Actualizau per',
+  'User' => 'Usuario',
+  'User Posts' => 'Publicacions d\'usuario',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Tu',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/an/forms_CreateMessageForm.php b/messages/an/forms_CreateMessageForm.php
deleted file mode 100644
index 24a50a2c..00000000
--- a/messages/an/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensache',
-  'Recipient' => 'Destinatario',
-  'Subject' => 'Asunto',
-  'Tags' => 'Etiquetas',
-);
diff --git a/messages/an/forms_InviteRecipientForm.php b/messages/an/forms_InviteRecipientForm.php
deleted file mode 100644
index 40e37a79..00000000
--- a/messages/an/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-    'Recipient' => 'Destinatario',
-];
diff --git a/messages/an/forms_ReplyMessageForm.php b/messages/an/forms_ReplyMessageForm.php
deleted file mode 100644
index 86207142..00000000
--- a/messages/an/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensache',
-);
diff --git a/messages/an/models_Message.php b/messages/an/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/an/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/an/models_MessageEntry.php b/messages/an/models_MessageEntry.php
deleted file mode 100644
index c6cd1f38..00000000
--- a/messages/an/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'New message in discussion from %displayName%' => '',
-);
diff --git a/messages/an/views_emails_NewMessage.php b/messages/an/views_emails_NewMessage.php
deleted file mode 100644
index 279655eb..00000000
--- a/messages/an/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Nuevo</strong> mensache',
-    '<strong>New</strong> conversation' => '',
-    'Reply now' => '',
-];
diff --git a/messages/an/views_emails_NewMessageEntry.php b/messages/an/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/an/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/an/views_mail_adduser.php b/messages/an/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/an/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/an/views_mail_create.php b/messages/an/views_mail_create.php
deleted file mode 100644
index da2843ba..00000000
--- a/messages/an/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nuevo</strong> mensache',
-  'Add recipients' => '',
-  'Send' => 'Ninviar',
-);
diff --git a/messages/an/views_mail_edit.php b/messages/an/views_mail_edit.php
deleted file mode 100644
index 192476bd..00000000
--- a/messages/an/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Editar o mensache',
-];
diff --git a/messages/an/views_mail_index.php b/messages/an/views_mail_index.php
deleted file mode 100644
index 9728bb48..00000000
--- a/messages/an/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Conversacions',
-    'There are no messages yet.' => 'Encara no i hai mensaches',
-];
diff --git a/messages/an/views_mail_list.php b/messages/an/views_mail_list.php
deleted file mode 100644
index f5d46381..00000000
--- a/messages/an/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Encara no i hai mensaches.',
-);
diff --git a/messages/an/views_mail_show.php b/messages/an/views_mail_show.php
deleted file mode 100644
index 7147cf78..00000000
--- a/messages/an/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'Cancelar',
-    'Delete' => 'Eliminar',
-    'There are no messages yet.' => 'Encara no i hai mensaches',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/an/views_mail_sidebar.php b/messages/an/views_mail_sidebar.php
deleted file mode 100644
index 00e79cdf..00000000
--- a/messages/an/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupos',
-  'Members' => 'Miembros',
-  'Spaces' => 'Espacios',
-  'User Posts' => 'Publicacions d\'usuario',
-);
diff --git a/messages/an/views_mails_UserInviteSpace.php b/messages/an/views_mails_UserInviteSpace.php
deleted file mode 100644
index 2e0ca9d1..00000000
--- a/messages/an/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Rechistrar-se',
-);
diff --git a/messages/an/widgets_views_mailNotification.php b/messages/an/widgets_views_mailNotification.php
deleted file mode 100644
index 13434a9f..00000000
--- a/messages/an/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Veyer totz os mensaches',
-];
diff --git a/messages/an/widgets_views_newMessageButton.php b/messages/an/widgets_views_newMessageButton.php
deleted file mode 100644
index 31ea67ae..00000000
--- a/messages/an/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Ninviar mensache',
-];
diff --git a/messages/ar/base.php b/messages/ar/base.php
index 52018d55..5a0d8f6c 100644
--- a/messages/ar/base.php
+++ b/messages/ar/base.php
@@ -1,30 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '<strong>تأكيد</strong> حذف المحادثة',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>تأكيد</strong> مغادرة المحادثة',
+  '<strong>Confirm</strong> message deletion' => '<strong>تأكيد</strong> حذف الرسالة',
   '<strong>Confirm</strong> tag deletion' => '',
   '<strong>Edit</strong> conversation tags' => '',
   '<strong>Edit</strong> tag' => '',
   '<strong>Manage</strong> conversation tags' => '',
   '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => 'رسالة <strong>جديدة</strong>',
   'A tag with the same name already exists.' => '',
   'Add Tag' => '',
+  'Add more participants to your conversation...' => 'اضف مستخدين اخرين الي المحادثة',
   'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => 'اضافة مستخدم',
   'Advanced Messages Search' => '',
   'Allow others to send you private messages' => '',
   'Allow users to start new conversations' => '',
+  'Cancel' => 'الغاء',
   'Confirm' => 'أكد',
   'Conversation' => '',
   'Conversation tags can be used to filter conversations and are only visible to you.' => '',
   'Conversations' => '',
   'Created At' => 'أنشئت في',
   'Created By' => 'تم وضعه بواسطة',
+  'Delete' => 'حذف',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => 'هل تريد حذف هذه المحادثة؟',
+  'Do you really want to delete this message?' => 'هل تريد حذف هذه الرسالة؟',
   'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'هل تريد مغادرة هذه المحادثة؟',
   'Edit' => 'تحرير',
+  'Edit message entry' => 'تعديل محتوي الرسالة',
   'Edit message...' => '',
   'Filters' => '',
   'Friday' => 'الجمعة',
   'Here you can manage your private conversation tags.' => '',
   'Is Originator' => '',
   'Last Viewed' => '',
+  'Leave' => 'مغادرة',
+  'Leave conversation' => '',
   'Leave fields blank in order to disable a restriction.' => '',
   'Manage Tags' => '',
   'Mark Unread' => '',
@@ -36,20 +53,30 @@
   'Messages' => 'الرسائل',
   'Monday' => 'الاثنين',
   'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'رسالة جديدة من {senderName}',
+  'New message in discussion from %displayName%' => 'رسالة جديدة في المناقشة بواسطة %displayName%',
   'Participants' => 'المشاركون',
   'Pin' => '',
   'Pinned' => 'تثبيت',
   'Receive Notifications when someone opens a new conversation.' => '',
   'Receive Notifications when someone sends you a message.' => '',
   'Receive private messages' => '',
+  'Recipient' => 'المستلم',
+  'Reply now' => 'اضف رد',
   'Saturday' => 'السبت',
   'Search' => 'بحث',
+  'Send' => 'ارسال',
+  'Send message' => 'ارسال رسالة',
   'Seperate restrictions for new users' => '',
+  'Show all messages' => 'عرض كل الرسائل',
   'Show menu item in top Navigation' => '',
+  'Sign up now' => 'اشترك الان',
   'Start new conversations' => '',
   'Subject' => 'عنوان الرسالة',
   'Sunday' => 'الأحد',
   'Tags' => 'الأوسمة',
+  'There are no messages yet.' => 'لا توجد رسائل',
   'This user is already participating in this conversation.' => '',
   'Thursday' => 'الخميس',
   'Title' => 'العنوان',
@@ -60,13 +87,17 @@
   'Updated At' => 'تم التحديث في',
   'Updated By' => 'تم التحديث بواسطة',
   'User' => 'المستخدم',
+  'User {name} is already participating!' => '',
   'Wednesday' => 'الأربعاء',
   'Write a message...' => '',
   'Yesterday' => '',
   'You' => 'أنت',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
   'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
   'You are not allowed to start a conversation with this user.' => '',
   'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
   'You cannot send a message to yourself!' => '',
   'You cannot send a message without recipients!' => '',
   'You joined the conversation.' => '',
@@ -74,6 +105,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => '',
   'edited' => '',
   '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
   '{username} joined the conversation.' => '',
   '{username} left the conversation.' => '',
-);
+];
diff --git a/messages/ar/forms_CreateMessageForm.php b/messages/ar/forms_CreateMessageForm.php
deleted file mode 100644
index c88976a2..00000000
--- a/messages/ar/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'الرسالة',
-  'Recipient' => 'المستلم',
-  'Subject' => 'عنوان الرسالة',
-  'Tags' => 'الأوسمة',
-);
diff --git a/messages/ar/forms_InviteRecipientForm.php b/messages/ar/forms_InviteRecipientForm.php
deleted file mode 100644
index dcc80c0e..00000000
--- a/messages/ar/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-    'Recipient' => 'المستلم',
-];
diff --git a/messages/ar/forms_ReplyMessageForm.php b/messages/ar/forms_ReplyMessageForm.php
deleted file mode 100644
index b698dc56..00000000
--- a/messages/ar/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'الرسالة',
-);
diff --git a/messages/ar/models_Message.php b/messages/ar/models_Message.php
deleted file mode 100644
index f35379a9..00000000
--- a/messages/ar/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'رسالة جديدة من {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/ar/models_MessageEntry.php b/messages/ar/models_MessageEntry.php
deleted file mode 100644
index c45e5f56..00000000
--- a/messages/ar/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'رسالة جديدة في المناقشة بواسطة %displayName%',
-);
diff --git a/messages/ar/views_emails_NewMessage.php b/messages/ar/views_emails_NewMessage.php
deleted file mode 100644
index ae9de33f..00000000
--- a/messages/ar/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => 'رسالة <strong>جديدة</strong>',
-    'Reply now' => 'اضف رد',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/ar/views_emails_NewMessageEntry.php b/messages/ar/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/ar/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/ar/views_mail_adduser.php b/messages/ar/views_mail_adduser.php
deleted file mode 100644
index 8b916738..00000000
--- a/messages/ar/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'اضف مستخدين اخرين الي المحادثة',
-];
diff --git a/messages/ar/views_mail_create.php b/messages/ar/views_mail_create.php
deleted file mode 100644
index 7d0d90ae..00000000
--- a/messages/ar/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => 'رسالة <strong>جديدة</strong>',
-  'Add recipients' => '',
-  'Send' => 'ارسال',
-);
diff --git a/messages/ar/views_mail_edit.php b/messages/ar/views_mail_edit.php
deleted file mode 100644
index fc3828fb..00000000
--- a/messages/ar/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'تعديل محتوي الرسالة',
-];
diff --git a/messages/ar/views_mail_index.php b/messages/ar/views_mail_index.php
deleted file mode 100644
index 693f823a..00000000
--- a/messages/ar/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => 'لا توجد رسائل',
-    'Conversations' => '',
-];
diff --git a/messages/ar/views_mail_list.php b/messages/ar/views_mail_list.php
deleted file mode 100644
index d4c3c033..00000000
--- a/messages/ar/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'لا توجد رسائل',
-);
diff --git a/messages/ar/views_mail_show.php b/messages/ar/views_mail_show.php
deleted file mode 100644
index e5458ea4..00000000
--- a/messages/ar/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>تأكيد</strong> حذف المحادثة',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>تأكيد</strong> مغادرة المحادثة',
-    '<strong>Confirm</strong> message deletion' => '<strong>تأكيد</strong> حذف الرسالة',
-    'Add user' => 'اضافة مستخدم',
-    'Cancel' => 'الغاء',
-    'Delete' => 'حذف',
-    'Do you really want to delete this conversation?' => 'هل تريد حذف هذه المحادثة؟',
-    'Do you really want to delete this message?' => 'هل تريد حذف هذه الرسالة؟',
-    'Do you really want to leave this conversation?' => 'هل تريد مغادرة هذه المحادثة؟',
-    'Leave' => 'مغادرة',
-    'There are no messages yet.' => 'لا توجد رسائل',
-    'Delete conversation' => '',
-    'Leave conversation' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/ar/views_mails_UserInviteSpace.php b/messages/ar/views_mails_UserInviteSpace.php
deleted file mode 100644
index b13bcf34..00000000
--- a/messages/ar/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'اشترك الان',
-);
diff --git a/messages/ar/widgets_views_mailNotification.php b/messages/ar/widgets_views_mailNotification.php
deleted file mode 100644
index 4080e1a1..00000000
--- a/messages/ar/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'عرض كل الرسائل',
-];
diff --git a/messages/ar/widgets_views_newMessageButton.php b/messages/ar/widgets_views_newMessageButton.php
deleted file mode 100644
index 84b611b2..00000000
--- a/messages/ar/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'ارسال رسالة',
-];
diff --git a/messages/bg/base.php b/messages/bg/base.php
index 3b967695..ec31bc2c 100644
--- a/messages/bg/base.php
+++ b/messages/bg/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Потвърди</strong> изтриването на етикета',
-    '<strong>Edit</strong> conversation tags' => '<strong>Редактирай</strong> етикетите за разговори',
-    '<strong>Edit</strong> tag' => '<strong>Редактирай</strong> етикет',
-    '<strong>Manage</strong> conversation tags' => '<strong>Управлявай</strong> етикетите за обсъждане',
-    'A tag with the same name already exists.' => 'Етикет с такова име, вече съществува.',
-    'Add Tag' => 'Добави етикет',
-    'Add participants' => 'Добави участници',
-    'Allow others to send you private messages' => 'Позволи на другите да ти изпратят лично съобщение',
-    'Allow users to start new conversations' => 'Позволи на другите да започнат ново обсъждане',
-    'Confirm' => 'Потвърждение',
-    'Conversation' => 'Обсъждане',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Етикетите за обсъждания могат да бъдат използвани за филтриране и са видими само за теб',
-    'Conversations' => 'Обсъждания',
-    'Created At' => 'Създадено на',
-    'Created By' => 'Създадено от',
-    'Do you really want to delete this tag?' => 'Наистина ли искаш да изтриеш този етикет?',
-    'Edit' => 'Редактирай',
-    'Edit message...' => 'Редактирай съобщение...',
-    'Filters' => 'Филтри',
-    'Friday' => 'Петък',
-    'Here you can manage your private conversation tags.' => 'Тук можеш да управляваш твоите етикети за обсъжданията.',
-    'Is Originator' => 'Оригинатор',
-    'Last Viewed' => 'Последно видяно',
-    'Leave fields blank in order to disable a restriction.' => 'Остави полетата празни, за да премахнеш ограничение.',
-    'Manage Tags' => 'Управлявай етикетите',
-    'Max messages allowed per day' => 'Макс брой съобщения разрешени на ден',
-    'Max number of messages allowed for a new user per day' => 'Мак брой съобщения позволени за нов потребител на ден',
-    'Max number of new conversations allowed for a new user per day' => 'Макс брой нови обсъждания позволени за нов потребител на ден',
-    'Max number of new conversations allowed for a user per day' => 'Макс брой нови обсъждания позволени за потребител на ден',
-    'Message' => 'Съобщение',
-    'Messages' => 'Съобщения',
-    'Monday' => 'Понеделник',
-    'My Tags' => 'Моите етикети',
-    'Participants' => 'Участници',
-    'Pinned' => 'Фиксирано',
-    'Receive Notifications when someone opens a new conversation.' => 'Получи съобщение, когато някой отвори ново обсъждане.',
-    'Receive Notifications when someone sends you a message.' => 'Получи съобщение, когато някой ти изпрати съобщение.',
-    'Receive private messages' => 'Получавай лични съобщения',
-    'Saturday' => 'Събота',
-    'Search' => 'Търси',
-    'Seperate restrictions for new users' => 'Раздели ограниченията за нови потребители',
-    'Show menu item in top Navigation' => 'Покажи го в менюто на топ навигацията',
-    'Start new conversations' => 'Започнете нови обсъждания',
-    'Subject' => 'Тема',
-    'Sunday' => 'Неделя',
-    'Tags' => 'Етикети',
-    'This user is already participating in this conversation.' => 'Този потребител вече присъства в обсъждането.',
-    'Thursday' => 'Четвъртък',
-    'Title' => 'Заглавие',
-    'Today' => 'Днес',
-    'Tuesday' => 'Вторник',
-    'Unpin' => 'Освободи',
-    'Until a user is member since (days)' => 'Докато потребителят е член от (дни)',
-    'Updated At' => 'Обновено в',
-    'Updated By' => 'Обновено от',
-    'User' => 'Потребител',
-    'Wednesday' => 'Сряда',
-    'Write a message...' => 'Напиши съобщение',
-    'You' => 'Ти',
-    'You are not allowed to start a conversation with this user.' => 'Не Ви е позволено да започнете ново обсъждане с този потребител.',
-    'You are not allowed to start a conversation with {userName}!' => 'Нямате право да започнете разговор с {userName}!',
-    'You cannot send a message to yourself!' => 'Не можете да изпратите съобщение до себе си!',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Вие надвишихте дневният си лимит за нови обсъждания.',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# друг} other{# други}}',
-    '<strong>Messenger</strong> module configuration' => '',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Потвърди</strong> изтриването на обсъждането',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Потвърди</strong> напускането на обсъждането',
+  '<strong>Confirm</strong> message deletion' => '<strong>Потвърди</strong> изтриването на съобщението',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Потвърди</strong> изтриването на етикета',
+  '<strong>Edit</strong> conversation tags' => '<strong>Редактирай</strong> етикетите за разговори',
+  '<strong>Edit</strong> tag' => '<strong>Редактирай</strong> етикет',
+  '<strong>Manage</strong> conversation tags' => '<strong>Управлявай</strong> етикетите за обсъждане',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Ново</strong> съобщение',
+  'A tag with the same name already exists.' => 'Етикет с такова име, вече съществува.',
+  'Add Tag' => 'Добави етикет',
+  'Add more participants to your conversation...' => 'Добави още участници към твоето обсъждане...',
+  'Add participants' => 'Добави участници',
+  'Add recipients' => 'Добави получатели',
+  'Add user' => 'Добави потребител',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Позволи на другите да ти изпратят лично съобщение',
+  'Allow users to start new conversations' => 'Позволи на другите да започнат ново обсъждане',
+  'Cancel' => 'Отказ',
+  'Confirm' => 'Потвърждение',
+  'Conversation' => 'Обсъждане',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Етикетите за обсъждания могат да бъдат използвани за филтриране и са видими само за теб',
+  'Conversations' => 'Обсъждания',
+  'Created At' => 'Създадено на',
+  'Created By' => 'Създадено от',
+  'Delete' => 'Изтрий',
+  'Delete conversation' => 'Изтрий обсъждането',
+  'Do you really want to delete this conversation?' => 'Наистина ли искаш да изтриеш обсъждането?',
+  'Do you really want to delete this message?' => 'Наистина ли искаш да изтриеш съобщението?',
+  'Do you really want to delete this tag?' => 'Наистина ли искаш да изтриеш този етикет?',
+  'Do you really want to leave this conversation?' => 'Наистина ли искаш да напуснеш обсъждането?',
+  'Edit' => 'Редактирай',
+  'Edit message entry' => 'Редактирай съобщението',
+  'Edit message...' => 'Редактирай съобщение...',
+  'Filters' => 'Филтри',
+  'Friday' => 'Петък',
+  'Groups' => 'Групи',
+  'Here you can manage your private conversation tags.' => 'Тук можеш да управляваш твоите етикети за обсъжданията.',
+  'Is Originator' => 'Оригинатор',
+  'Last Viewed' => 'Последно видяно',
+  'Leave' => 'Напусни',
+  'Leave conversation' => 'Напусни обсъждането',
+  'Leave fields blank in order to disable a restriction.' => 'Остави полетата празни, за да премахнеш ограничение.',
+  'Manage Tags' => 'Управлявай етикетите',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Макс брой съобщения разрешени на ден',
+  'Max number of messages allowed for a new user per day' => 'Мак брой съобщения позволени за нов потребител на ден',
+  'Max number of new conversations allowed for a new user per day' => 'Макс брой нови обсъждания позволени за нов потребител на ден',
+  'Max number of new conversations allowed for a user per day' => 'Макс брой нови обсъждания позволени за потребител на ден',
+  'Members' => 'Членове',
+  'Message' => 'Съобщение',
+  'Messages' => 'Съобщения',
+  'Monday' => 'Понеделник',
+  'My Tags' => 'Моите етикети',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Ново съобщение от {senderName}',
+  'New message in discussion from %displayName%' => 'Ново съобщение в дискусия от %displayName%',
+  'Participants' => 'Участници',
+  'Pin' => '',
+  'Pinned' => 'Фиксирано',
+  'Receive Notifications when someone opens a new conversation.' => 'Получи съобщение, когато някой отвори ново обсъждане.',
+  'Receive Notifications when someone sends you a message.' => 'Получи съобщение, когато някой ти изпрати съобщение.',
+  'Receive private messages' => 'Получавай лични съобщения',
+  'Recipient' => 'Получател',
+  'Reply now' => 'Отговори сега',
+  'Saturday' => 'Събота',
+  'Search' => 'Търси',
+  'Send' => 'Изпрати',
+  'Send message' => 'Изпрати съобщение',
+  'Seperate restrictions for new users' => 'Раздели ограниченията за нови потребители',
+  'Show all messages' => 'Покажи всички съобщения',
+  'Show menu item in top Navigation' => 'Покажи го в менюто на топ навигацията',
+  'Sign up now' => 'Запиши се сега',
+  'Spaces' => 'Раздели',
+  'Start new conversations' => 'Започнете нови обсъждания',
+  'Subject' => 'Тема',
+  'Sunday' => 'Неделя',
+  'Tags' => 'Етикети',
+  'There are no messages yet.' => 'Все още нямате съобщения.',
+  'This user is already participating in this conversation.' => 'Този потребител вече присъства в обсъждането.',
+  'Thursday' => 'Четвъртък',
+  'Title' => 'Заглавие',
+  'Today' => 'Днес',
+  'Tuesday' => 'Вторник',
+  'Unpin' => 'Освободи',
+  'Until a user is member since (days)' => 'Докато потребителят е член от (дни)',
+  'Updated At' => 'Обновено в',
+  'Updated By' => 'Обновено от',
+  'User' => 'Потребител',
+  'User Posts' => 'Потребителски публикации',
+  'User {name} is already participating!' => 'Потребител {name} вече учавства!',
+  'Wednesday' => 'Сряда',
+  'Write a message...' => 'Напиши съобщение',
+  'Yesterday' => '',
+  'You' => 'Ти',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => 'Не ти е позволено да изпратиш потребител {name} вече!',
+  'You are not allowed to start a conversation with this user.' => 'Не Ви е позволено да започнете ново обсъждане с този потребител.',
+  'You are not allowed to start a conversation with {userName}!' => 'Нямате право да започнете разговор с {userName}!',
+  'You cannot send a email to yourself!' => 'Не можеш да изпратиш имейл до себе си!',
+  'You cannot send a message to yourself!' => 'Не можете да изпратите съобщение до себе си!',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Вие надвишихте дневният си лимит за нови обсъждания.',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# друг} other{# други}}',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/bg/forms_CreateMessageForm.php b/messages/bg/forms_CreateMessageForm.php
deleted file mode 100644
index 61b3d1cd..00000000
--- a/messages/bg/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Съобщение',
-  'Recipient' => 'Получател',
-  'Subject' => 'Тема',
-  'Tags' => 'Етикети',
-);
diff --git a/messages/bg/forms_InviteRecipientForm.php b/messages/bg/forms_InviteRecipientForm.php
deleted file mode 100644
index 6fbe7ae6..00000000
--- a/messages/bg/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Получател',
-  'User {name} is already participating!' => 'Потребител {name} вече учавства!',
-  'You are not allowed to send user {name} is already!' => 'Не ти е позволено да изпратиш потребител {name} вече!',
-  'You cannot send a email to yourself!' => 'Не можеш да изпратиш имейл до себе си!',
-);
diff --git a/messages/bg/forms_ReplyMessageForm.php b/messages/bg/forms_ReplyMessageForm.php
deleted file mode 100644
index fa70bce3..00000000
--- a/messages/bg/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Съобщение',
-);
diff --git a/messages/bg/models_Message.php b/messages/bg/models_Message.php
deleted file mode 100644
index 99e2d213..00000000
--- a/messages/bg/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Ново съобщение от {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/bg/models_MessageEntry.php b/messages/bg/models_MessageEntry.php
deleted file mode 100644
index 069515a6..00000000
--- a/messages/bg/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Ново съобщение в дискусия от %displayName%',
-);
diff --git a/messages/bg/views_emails_NewMessage.php b/messages/bg/views_emails_NewMessage.php
deleted file mode 100644
index 6dde8ccf..00000000
--- a/messages/bg/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Ново</strong> съобщение',
-    'Reply now' => 'Отговори сега',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/bg/views_emails_NewMessageEntry.php b/messages/bg/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/bg/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/bg/views_mail_adduser.php b/messages/bg/views_mail_adduser.php
deleted file mode 100644
index d1f12ac3..00000000
--- a/messages/bg/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => 'Добави още участници към твоето обсъждане...',
-);
diff --git a/messages/bg/views_mail_create.php b/messages/bg/views_mail_create.php
deleted file mode 100644
index 8e0fb281..00000000
--- a/messages/bg/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Ново</strong> съобщение',
-  'Add recipients' => 'Добави получатели',
-  'Send' => 'Изпрати',
-);
diff --git a/messages/bg/views_mail_edit.php b/messages/bg/views_mail_edit.php
deleted file mode 100644
index fe5afee9..00000000
--- a/messages/bg/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => 'Редактирай съобщението',
-);
diff --git a/messages/bg/views_mail_index.php b/messages/bg/views_mail_index.php
deleted file mode 100644
index 8c4f4ec8..00000000
--- a/messages/bg/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Обсъждания',
-    'There are no messages yet.' => 'Все още нямате съобщения.',
-];
diff --git a/messages/bg/views_mail_list.php b/messages/bg/views_mail_list.php
deleted file mode 100644
index 375292a3..00000000
--- a/messages/bg/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Все още нямате съобщения.',
-);
diff --git a/messages/bg/views_mail_show.php b/messages/bg/views_mail_show.php
deleted file mode 100644
index b5597654..00000000
--- a/messages/bg/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Потвърди</strong> изтриването на обсъждането',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Потвърди</strong> напускането на обсъждането',
-    '<strong>Confirm</strong> message deletion' => '<strong>Потвърди</strong> изтриването на съобщението',
-    'Add user' => 'Добави потребител',
-    'Cancel' => 'Отказ',
-    'Delete' => 'Изтрий',
-    'Delete conversation' => 'Изтрий обсъждането',
-    'Do you really want to delete this conversation?' => 'Наистина ли искаш да изтриеш обсъждането?',
-    'Do you really want to delete this message?' => 'Наистина ли искаш да изтриеш съобщението?',
-    'Do you really want to leave this conversation?' => 'Наистина ли искаш да напуснеш обсъждането?',
-    'Leave' => 'Напусни',
-    'Leave conversation' => 'Напусни обсъждането',
-    'There are no messages yet.' => 'Все още нямате съобщения',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/bg/views_mail_sidebar.php b/messages/bg/views_mail_sidebar.php
deleted file mode 100644
index 776e7c3e..00000000
--- a/messages/bg/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Групи',
-  'Members' => 'Членове',
-  'Spaces' => 'Раздели',
-  'User Posts' => 'Потребителски публикации',
-);
diff --git a/messages/bg/views_mails_UserInviteSpace.php b/messages/bg/views_mails_UserInviteSpace.php
deleted file mode 100644
index a5bc67b1..00000000
--- a/messages/bg/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Запиши се сега',
-);
diff --git a/messages/bg/widgets_views_mailNotification.php b/messages/bg/widgets_views_mailNotification.php
deleted file mode 100644
index 8094278a..00000000
--- a/messages/bg/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'Покажи всички съобщения',
-);
diff --git a/messages/bg/widgets_views_newMessageButton.php b/messages/bg/widgets_views_newMessageButton.php
deleted file mode 100644
index d3ea1d66..00000000
--- a/messages/bg/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'Изпрати съобщение',
-);
diff --git a/messages/br/base.php b/messages/br/base.php
index ac4b75fb..0a96c808 100644
--- a/messages/br/base.php
+++ b/messages/br/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Search' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Title' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'User' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => 'Dilemel',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => '',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/br/forms_CreateMessageForm.php b/messages/br/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/br/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/br/forms_InviteRecipientForm.php b/messages/br/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/br/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/br/forms_ReplyMessageForm.php b/messages/br/forms_ReplyMessageForm.php
deleted file mode 100644
index 81f52098..00000000
--- a/messages/br/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-];
diff --git a/messages/br/models_Message.php b/messages/br/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/br/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/br/models_MessageEntry.php b/messages/br/models_MessageEntry.php
deleted file mode 100644
index cd01e64a..00000000
--- a/messages/br/models_MessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'New message in discussion from %displayName%' => '',
-];
diff --git a/messages/br/views_emails_NewMessage.php b/messages/br/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/br/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/br/views_emails_NewMessageEntry.php b/messages/br/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/br/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/br/views_mail_adduser.php b/messages/br/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/br/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/br/views_mail_create.php b/messages/br/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/br/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/br/views_mail_edit.php b/messages/br/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/br/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/br/views_mail_index.php b/messages/br/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/br/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/br/views_mail_list.php b/messages/br/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/br/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/br/views_mail_show.php b/messages/br/views_mail_show.php
deleted file mode 100644
index 58e5ee74..00000000
--- a/messages/br/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Delete' => 'Dilemel',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/br/widgets_views_mailNotification.php b/messages/br/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/br/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/br/widgets_views_newMessageButton.php b/messages/br/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/br/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/ca/base.php b/messages/ca/base.php
index fa7509ae..70a4812c 100644
--- a/messages/ca/base.php
+++ b/messages/ca/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Confirmar</strong> la supresió de l\'etiqueta',
-    '<strong>Edit</strong> conversation tags' => '<strong>Editar</strong> etiquetes de la conversa',
-    '<strong>Edit</strong> tag' => '<strong>Editar</strong> etiqueta',
-    '<strong>Manage</strong> conversation tags' => '<strong>Gestionar</strong> etiquetes de les converses',
-    'A tag with the same name already exists.' => 'Ja existeix una etiqueta amb el mateix nom.',
-    'Add Tag' => 'Afegir etiqueta',
-    'Allow others to send you private messages' => 'Permet als altres a enviar-te missatges privats.',
-    'Allow users to start new conversations' => 'Permet als usuaris iniciat noves converses.',
-    'Confirm' => 'Confirma',
-    'Conversation' => 'Conversa',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Les etiquetes de les converses poden utilitzar-se per filtrar converses i només són visibles per a tu.',
-    'Conversations' => 'Converses',
-    'Created At' => 'Creat el',
-    'Created By' => 'Creat per',
-    'Do you really want to delete this tag?' => 'Segur que vols eliminar aquesta etiqueta?',
-    'Edit' => 'Editar',
-    'Edit message...' => 'Editar missatge...',
-    'Filters' => 'Filtres',
-    'Friday' => 'Divendres',
-    'Here you can manage your private conversation tags.' => 'Aquí pots gestionar les etiquetes de les teves converses privades.',
-    'Is Originator' => 'És l\'autor',
-    'Last Viewed' => 'Darrera visualització',
-    'Leave fields blank in order to disable a restriction.' => 'Deixeu els camps en blanc per desactivar una restricció.',
-    'Manage Tags' => 'Gestionar etiquetas',
-    'Max messages allowed per day' => 'Màx missatges permesos per dia',
-    'Max number of messages allowed for a new user per day' => 'Màx número de missatges permesos per dia per a un nou usuari.',
-    'Max number of new conversations allowed for a new user per day' => 'Màx número de noves converses permeses per dia per a un nou usuari.',
-    'Max number of new conversations allowed for a user per day' => 'Màx número de noves converses permeses per dia per usuari.',
-    'Message' => 'Missatge',
-    'Messages' => 'Missatges',
-    'Monday' => 'Dilluns',
-    'My Tags' => 'Les meves etiquetes',
-    'Participants' => 'Participants',
-    'Pinned' => 'Fixa a dalt',
-    'Receive Notifications when someone opens a new conversation.' => 'Rebre notificacions quan algú obre una nova conversa.',
-    'Receive Notifications when someone sends you a message.' => 'Rebre notificacions quan algú t\'envia un missatge.',
-    'Receive private messages' => 'Rebre missatges privats',
-    'Saturday' => 'Dissabte',
-    'Search' => 'Cerca',
-    'Seperate restrictions for new users' => 'Restriccions separades per a usuaris nous',
-    'Show menu item in top Navigation' => 'Mostrar el menú a la navegació superior',
-    'Start new conversations' => 'Iniciar noves converses',
-    'Subject' => 'Assumpte',
-    'Sunday' => 'Diumenge',
-    'Tags' => 'Etiquetes',
-    'This user is already participating in this conversation.' => 'Aquest usuari ja està participant en aquesta conversa.',
-    'Thursday' => 'Dijous',
-    'Title' => 'Títol',
-    'Today' => 'Avui',
-    'Tuesday' => 'Dimarts',
-    'Unpin' => 'Desancorar',
-    'Until a user is member since (days)' => 'Fins que un usuari sigui membre des de (dies)',
-    'Updated At' => 'Actualitzat el',
-    'Updated By' => 'Actualitzat per',
-    'User' => 'Usuari',
-    'Wednesday' => 'Dimecres',
-    'Write a message...' => 'Escriure un missatge...',
-    'You' => 'Tu',
-    'You are not allowed to reply to users {userNames}!' => 'No tens permisos per respondre als usuaris {userNames}!',
-    'You are not allowed to start a conversation with this user.' => 'No tens permisos per iniciar una conversa amb aquest usuari.',
-    'You are not allowed to start a conversation with {userName}!' => 'No tens permisos per iniciar una conversa amb {userName}!',
-    'You cannot send a message to yourself!' => 'No pots enviar-te un missatge a tu mateix!',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Has excedit la quantitat de noves converses que pots fer diàriament.',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
-    '<strong>Messenger</strong> module configuration' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
-    'Yesterday' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> supressió de la conversa',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> sortir de la conversa',
+  '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> supressió del missatge',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Confirmar</strong> la supresió de l\'etiqueta',
+  '<strong>Edit</strong> conversation tags' => '<strong>Editar</strong> etiquetes de la conversa',
+  '<strong>Edit</strong> tag' => '<strong>Editar</strong> etiqueta',
+  '<strong>Manage</strong> conversation tags' => '<strong>Gestionar</strong> etiquetes de les converses',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '<strong>Nova</strong> conversa',
+  '<strong>New</strong> message' => '<strong>Nou</strong> missatge',
+  'A tag with the same name already exists.' => 'Ja existeix una etiqueta amb el mateix nom.',
+  'Add Tag' => 'Afegir etiqueta',
+  'Add more participants to your conversation...' => 'Afegeix més participants a la conversa...',
+  'Add participants' => '',
+  'Add recipients' => 'Afegeix destinataris',
+  'Add user' => 'Afegeix membres',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Permet als altres a enviar-te missatges privats.',
+  'Allow users to start new conversations' => 'Permet als usuaris iniciat noves converses.',
+  'Cancel' => 'Cancel·la',
+  'Confirm' => 'Confirma',
+  'Conversation' => 'Conversa',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Les etiquetes de les converses poden utilitzar-se per filtrar converses i només són visibles per a tu.',
+  'Conversations' => 'Converses',
+  'Created At' => 'Creat el',
+  'Created By' => 'Creat per',
+  'Delete' => 'Suprimeix',
+  'Delete conversation' => 'Suprimir conversa',
+  'Do you really want to delete this conversation?' => 'Segur que vols eliminar aquesta conversa?',
+  'Do you really want to delete this message?' => 'Segur que vols eliminar aquest missatge?',
+  'Do you really want to delete this tag?' => 'Segur que vols eliminar aquesta etiqueta?',
+  'Do you really want to leave this conversation?' => 'Segur que vols sortir d\'aquesta conversa?',
+  'Edit' => 'Editar',
+  'Edit message entry' => 'Editar missatge',
+  'Edit message...' => 'Editar missatge...',
+  'Filters' => 'Filtres',
+  'Friday' => 'Divendres',
+  'Groups' => 'Grups',
+  'Here you can manage your private conversation tags.' => 'Aquí pots gestionar les etiquetes de les teves converses privades.',
+  'Is Originator' => 'És l\'autor',
+  'Last Viewed' => 'Darrera visualització',
+  'Leave' => 'Sortir',
+  'Leave conversation' => 'Sortir de la conversa',
+  'Leave fields blank in order to disable a restriction.' => 'Deixeu els camps en blanc per desactivar una restricció.',
+  'Manage Tags' => 'Gestionar etiquetas',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Màx missatges permesos per dia',
+  'Max number of messages allowed for a new user per day' => 'Màx número de missatges permesos per dia per a un nou usuari.',
+  'Max number of new conversations allowed for a new user per day' => 'Màx número de noves converses permeses per dia per a un nou usuari.',
+  'Max number of new conversations allowed for a user per day' => 'Màx número de noves converses permeses per dia per usuari.',
+  'Members' => 'Membres',
+  'Message' => 'Missatge',
+  'Messages' => 'Missatges',
+  'Monday' => 'Dilluns',
+  'My Tags' => 'Les meves etiquetes',
+  'New conversation from {senderName}' => 'Nova conversa de {senderName}',
+  'New message from {senderName}' => 'Nou missatge de {senderName}',
+  'New message in discussion from %displayName%' => 'Nou missatge en el debat de %displayName%',
+  'Participants' => 'Participants',
+  'Pin' => '',
+  'Pinned' => 'Fixa a dalt',
+  'Receive Notifications when someone opens a new conversation.' => 'Rebre notificacions quan algú obre una nova conversa.',
+  'Receive Notifications when someone sends you a message.' => 'Rebre notificacions quan algú t\'envia un missatge.',
+  'Receive private messages' => 'Rebre missatges privats',
+  'Recipient' => 'Destinatari',
+  'Reply now' => 'Respon ara',
+  'Saturday' => 'Dissabte',
+  'Search' => 'Cerca',
+  'Send' => 'Envia',
+  'Send message' => 'Enviar missatge',
+  'Seperate restrictions for new users' => 'Restriccions separades per a usuaris nous',
+  'Show all messages' => 'Mostra tots els missatges',
+  'Show menu item in top Navigation' => 'Mostrar el menú a la navegació superior',
+  'Sign up now' => 'Dona\'t d\'alta ara',
+  'Spaces' => 'Espais',
+  'Start new conversations' => 'Iniciar noves converses',
+  'Subject' => 'Assumpte',
+  'Sunday' => 'Diumenge',
+  'Tags' => 'Etiquetes',
+  'There are no messages yet.' => 'No tens cap missatge.',
+  'This user is already participating in this conversation.' => 'Aquest usuari ja està participant en aquesta conversa.',
+  'Thursday' => 'Dijous',
+  'Title' => 'Títol',
+  'Today' => 'Avui',
+  'Tuesday' => 'Dimarts',
+  'Unpin' => 'Desancorar',
+  'Until a user is member since (days)' => 'Fins que un usuari sigui membre des de (dies)',
+  'Updated At' => 'Actualitzat el',
+  'Updated By' => 'Actualitzat per',
+  'User' => 'Usuari',
+  'User Posts' => 'Publicacions de membres',
+  'User {name} is already participating!' => 'L\'usuari {name} ja està participant!',
+  'Wednesday' => 'Dimecres',
+  'Write a message...' => 'Escriure un missatge...',
+  'Yesterday' => '',
+  'You' => 'Tu',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'No tens permisos per participar en aquesta conversa. Has estat blocat per: {userNames}.',
+  'You are not allowed to reply to users {userNames}!' => 'No tens permisos per respondre als usuaris {userNames}!',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => 'No tens permisos per iniciar una conversa amb aquest usuari.',
+  'You are not allowed to start a conversation with {userName}!' => 'No tens permisos per iniciar una conversa amb {userName}!',
+  'You cannot send a email to yourself!' => 'No et pots enviar un e-mail a tu mateix!',
+  'You cannot send a message to yourself!' => 'No pots enviar-te un missatge a tu mateix!',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Has excedit la quantitat de noves converses que pots fer diàriament.',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} ha creat una nova conversa {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} t\'ha enviat un nou misssatge  {conversationTitle}',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/ca/forms_CreateMessageForm.php b/messages/ca/forms_CreateMessageForm.php
deleted file mode 100644
index bb59b73d..00000000
--- a/messages/ca/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Missatge',
-  'Recipient' => 'Destinatari',
-  'Subject' => 'Assumpte',
-  'Tags' => 'Etiquetes',
-);
diff --git a/messages/ca/forms_InviteRecipientForm.php b/messages/ca/forms_InviteRecipientForm.php
deleted file mode 100644
index ae19ba35..00000000
--- a/messages/ca/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Destinatari',
-  'User {name} is already participating!' => 'L\'usuari {name} ja està participant!',
-  'You are not allowed to send user {name} is already!' => '',
-  'You cannot send a email to yourself!' => 'No et pots enviar un e-mail a tu mateix!',
-);
diff --git a/messages/ca/forms_ReplyMessageForm.php b/messages/ca/forms_ReplyMessageForm.php
deleted file mode 100644
index d8eb1cd5..00000000
--- a/messages/ca/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Missatge',
-);
diff --git a/messages/ca/models_Message.php b/messages/ca/models_Message.php
deleted file mode 100644
index 03d5a4f6..00000000
--- a/messages/ca/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Nova conversa de {senderName}',
-  'New message from {senderName}' => 'Nou missatge de {senderName}',
-);
diff --git a/messages/ca/models_MessageEntry.php b/messages/ca/models_MessageEntry.php
deleted file mode 100644
index b10ff8ed..00000000
--- a/messages/ca/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nou missatge en el debat de %displayName%',
-);
diff --git a/messages/ca/views_emails_NewMessage.php b/messages/ca/views_emails_NewMessage.php
deleted file mode 100644
index 4525d333..00000000
--- a/messages/ca/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Nova</strong> conversa',
-  '<strong>New</strong> message' => '<strong>Nou</strong> missatge',
-  'Reply now' => 'Respon ara',
-);
diff --git a/messages/ca/views_emails_NewMessageEntry.php b/messages/ca/views_emails_NewMessageEntry.php
deleted file mode 100644
index f1135d27..00000000
--- a/messages/ca/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} ha creat una nova conversa {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} t\'ha enviat un nou misssatge  {conversationTitle}',
-);
diff --git a/messages/ca/views_mail_adduser.php b/messages/ca/views_mail_adduser.php
deleted file mode 100644
index 476d86fb..00000000
--- a/messages/ca/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Afegeix més participants a la conversa...',
-];
diff --git a/messages/ca/views_mail_create.php b/messages/ca/views_mail_create.php
deleted file mode 100644
index 7d644f85..00000000
--- a/messages/ca/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nou</strong> missatge',
-  'Add recipients' => 'Afegeix destinataris',
-  'Send' => 'Envia',
-);
diff --git a/messages/ca/views_mail_edit.php b/messages/ca/views_mail_edit.php
deleted file mode 100644
index 8df0f6be..00000000
--- a/messages/ca/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => 'Editar missatge',
-);
diff --git a/messages/ca/views_mail_index.php b/messages/ca/views_mail_index.php
deleted file mode 100644
index 8d7b5b78..00000000
--- a/messages/ca/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Converses',
-    'There are no messages yet.' => 'No tens cap missatge.',
-];
diff --git a/messages/ca/views_mail_list.php b/messages/ca/views_mail_list.php
deleted file mode 100644
index 68eae460..00000000
--- a/messages/ca/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'No tens cap missatge.',
-);
diff --git a/messages/ca/views_mail_show.php b/messages/ca/views_mail_show.php
deleted file mode 100644
index 5f79a7c5..00000000
--- a/messages/ca/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> supressió de la conversa',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> sortir de la conversa',
-  '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> supressió del missatge',
-  'Add user' => 'Afegeix membres',
-  'Cancel' => 'Cancel·la',
-  'Delete' => 'Suprimeix',
-  'Delete conversation' => 'Suprimir conversa',
-  'Do you really want to delete this conversation?' => 'Segur que vols eliminar aquesta conversa?',
-  'Do you really want to delete this message?' => 'Segur que vols eliminar aquest missatge?',
-  'Do you really want to leave this conversation?' => 'Segur que vols sortir d\'aquesta conversa?',
-  'Leave' => 'Sortir',
-  'Leave conversation' => 'Sortir de la conversa',
-  'There are no messages yet.' => 'No tens cap missatge.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'No tens permisos per participar en aquesta conversa. Has estat blocat per: {userNames}.',
-);
diff --git a/messages/ca/views_mail_sidebar.php b/messages/ca/views_mail_sidebar.php
deleted file mode 100644
index 9b36abf0..00000000
--- a/messages/ca/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grups',
-  'Members' => 'Membres',
-  'Spaces' => 'Espais',
-  'User Posts' => 'Publicacions de membres',
-);
diff --git a/messages/ca/views_mails_UserInviteSpace.php b/messages/ca/views_mails_UserInviteSpace.php
deleted file mode 100644
index 6b0de4fd..00000000
--- a/messages/ca/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Dona\'t d\'alta ara',
-);
diff --git a/messages/ca/widgets_views_mailNotification.php b/messages/ca/widgets_views_mailNotification.php
deleted file mode 100644
index 59525cee..00000000
--- a/messages/ca/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Mostra tots els missatges',
-];
diff --git a/messages/ca/widgets_views_newMessageButton.php b/messages/ca/widgets_views_newMessageButton.php
deleted file mode 100644
index b4be7275..00000000
--- a/messages/ca/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'Enviar missatge',
-);
diff --git a/messages/cs/base.php b/messages/cs/base.php
index 2077b0a7..ad2d7a13 100644
--- a/messages/cs/base.php
+++ b/messages/cs/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Add participants' => 'Přidat účastníky',
-    'Confirm' => 'Potvrdit',
-    'Conversations' => 'Konverzace',
-    'Created At' => 'Vytvořeno',
-    'Created By' => 'Vytvořil(a)',
-    'Edit' => 'Upravit',
-    'Is Originator' => 'Je originátorem',
-    'Last Viewed' => 'Poslední zobrazení',
-    'Message' => 'Zpráva',
-    'Messages' => 'Zprávy',
-    'Participants' => 'Účastníci',
-    'Pinned' => 'Připnout',
-    'Search' => 'Hledat',
-    'Subject' => 'Předmět',
-    'Tags' => 'Štítky',
-    'Title' => 'Název',
-    'Today' => 'Dnes',
-    'Unpin' => 'Odepnout',
-    'Updated At' => 'Aktualizováno',
-    'Updated By' => 'Aktualizoval/a',
-    'User' => 'Uživatel',
-    'You' => 'Vy',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Smazání</strong> konverzace',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Opuštění</strong> konverzace',
+  '<strong>Confirm</strong> message deletion' => '<strong>Smazání</strong> zprávy',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Nová</strong> zpráva',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'Přidejte do této konverzace více lidí...',
+  'Add participants' => 'Přidat účastníky',
+  'Add recipients' => 'Přidat příjemce',
+  'Add user' => 'Přidat uživatele',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Zrušit',
+  'Confirm' => 'Potvrdit',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => 'Konverzace',
+  'Created At' => 'Vytvořeno',
+  'Created By' => 'Vytvořil(a)',
+  'Delete' => 'Smazat',
+  'Delete conversation' => 'Smazat konverzaci',
+  'Do you really want to delete this conversation?' => 'Opravdu chcete smazat tuto konverzaci?',
+  'Do you really want to delete this message?' => 'Opravdu chcete smazat tuto zprávu?',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'Opravdu chcete opustit tuto konverzaci?',
+  'Edit' => 'Upravit',
+  'Edit message entry' => 'Změnit obsah zprávy',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => 'Skupiny',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => 'Je originátorem',
+  'Last Viewed' => 'Poslední zobrazení',
+  'Leave' => 'Opustit',
+  'Leave conversation' => 'Opustit konverzaci',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Členové',
+  'Message' => 'Zpráva',
+  'Messages' => 'Zprávy',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Nová zpráva od uživatele {senderName}',
+  'New message in discussion from %displayName%' => 'Nová zpráva v konverzaci od uživatele %displayName%',
+  'Participants' => 'Účastníci',
+  'Pin' => '',
+  'Pinned' => 'Připnout',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => 'Příjemce',
+  'Reply now' => 'Odpovědět',
+  'Saturday' => '',
+  'Search' => 'Hledat',
+  'Send' => 'Poslat',
+  'Send message' => 'Poslat zprávu',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'Zobrazit všechny zprávy',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => 'Zaregistrovat se',
+  'Spaces' => 'Prostory',
+  'Start new conversations' => '',
+  'Subject' => 'Předmět',
+  'Sunday' => '',
+  'Tags' => 'Štítky',
+  'There are no messages yet.' => 'Zatím zde nejsou žádné zprávy.',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Název',
+  'Today' => 'Dnes',
+  'Tuesday' => '',
+  'Unpin' => 'Odepnout',
+  'Until a user is member since (days)' => '',
+  'Updated At' => 'Aktualizováno',
+  'Updated By' => 'Aktualizoval/a',
+  'User' => 'Uživatel',
+  'User Posts' => 'Příspěvky uživatelů',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Vy',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Nemůžete poslat zprávu sami sobě.',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/cs/forms_CreateMessageForm.php b/messages/cs/forms_CreateMessageForm.php
deleted file mode 100644
index aab59d33..00000000
--- a/messages/cs/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Zpráva',
-  'Recipient' => 'Příjemce',
-  'Subject' => 'Předmět',
-  'Tags' => 'Štítky',
-);
diff --git a/messages/cs/forms_InviteRecipientForm.php b/messages/cs/forms_InviteRecipientForm.php
deleted file mode 100644
index 139c3a50..00000000
--- a/messages/cs/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'Recipient' => 'Příjemce',
-    'You cannot send a email to yourself!' => 'Nemůžete poslat zprávu sami sobě.',
-];
diff --git a/messages/cs/forms_ReplyMessageForm.php b/messages/cs/forms_ReplyMessageForm.php
deleted file mode 100644
index 53e37bd0..00000000
--- a/messages/cs/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Zpráva',
-);
diff --git a/messages/cs/models_Message.php b/messages/cs/models_Message.php
deleted file mode 100644
index eea2cef6..00000000
--- a/messages/cs/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Nová zpráva od uživatele {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/cs/models_MessageEntry.php b/messages/cs/models_MessageEntry.php
deleted file mode 100644
index c51b2fe8..00000000
--- a/messages/cs/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nová zpráva v konverzaci od uživatele %displayName%',
-);
diff --git a/messages/cs/views_emails_NewMessage.php b/messages/cs/views_emails_NewMessage.php
deleted file mode 100644
index 7c1d90ee..00000000
--- a/messages/cs/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Nová</strong> zpráva',
-    'Reply now' => 'Odpovědět',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/cs/views_emails_NewMessageEntry.php b/messages/cs/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/cs/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/cs/views_mail_adduser.php b/messages/cs/views_mail_adduser.php
deleted file mode 100644
index 7fe22079..00000000
--- a/messages/cs/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Přidejte do této konverzace více lidí...',
-];
diff --git a/messages/cs/views_mail_create.php b/messages/cs/views_mail_create.php
deleted file mode 100644
index d84e0e18..00000000
--- a/messages/cs/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nová</strong> zpráva',
-  'Add recipients' => 'Přidat příjemce',
-  'Send' => 'Poslat',
-);
diff --git a/messages/cs/views_mail_edit.php b/messages/cs/views_mail_edit.php
deleted file mode 100644
index 50566f63..00000000
--- a/messages/cs/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Změnit obsah zprávy',
-];
diff --git a/messages/cs/views_mail_index.php b/messages/cs/views_mail_index.php
deleted file mode 100644
index f739c177..00000000
--- a/messages/cs/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Konverzace',
-    'There are no messages yet.' => 'Zatím zde nejsou žádné zprávy.',
-];
diff --git a/messages/cs/views_mail_list.php b/messages/cs/views_mail_list.php
deleted file mode 100644
index d607807c..00000000
--- a/messages/cs/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Zatím zde nejsou žádné zprávy.',
-);
diff --git a/messages/cs/views_mail_show.php b/messages/cs/views_mail_show.php
deleted file mode 100644
index ff645284..00000000
--- a/messages/cs/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Smazání</strong> konverzace',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Opuštění</strong> konverzace',
-    '<strong>Confirm</strong> message deletion' => '<strong>Smazání</strong> zprávy',
-    'Add user' => 'Přidat uživatele',
-    'Cancel' => 'Zrušit',
-    'Delete' => 'Smazat',
-    'Delete conversation' => 'Smazat konverzaci',
-    'Do you really want to delete this conversation?' => 'Opravdu chcete smazat tuto konverzaci?',
-    'Do you really want to delete this message?' => 'Opravdu chcete smazat tuto zprávu?',
-    'Do you really want to leave this conversation?' => 'Opravdu chcete opustit tuto konverzaci?',
-    'Leave' => 'Opustit',
-    'Leave conversation' => 'Opustit konverzaci',
-    'There are no messages yet.' => 'Zatím zde nejsou žádné zprávy.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/cs/views_mail_sidebar.php b/messages/cs/views_mail_sidebar.php
deleted file mode 100644
index a1436cf0..00000000
--- a/messages/cs/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Skupiny',
-  'Members' => 'Členové',
-  'Spaces' => 'Prostory',
-  'User Posts' => 'Příspěvky uživatelů',
-);
diff --git a/messages/cs/views_mails_UserInviteSpace.php b/messages/cs/views_mails_UserInviteSpace.php
deleted file mode 100644
index a5b73478..00000000
--- a/messages/cs/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Zaregistrovat se',
-);
diff --git a/messages/cs/widgets_views_mailNotification.php b/messages/cs/widgets_views_mailNotification.php
deleted file mode 100644
index 01dea9fd..00000000
--- a/messages/cs/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Zobrazit všechny zprávy',
-];
diff --git a/messages/cs/widgets_views_newMessageButton.php b/messages/cs/widgets_views_newMessageButton.php
deleted file mode 100644
index 2be8058f..00000000
--- a/messages/cs/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Poslat zprávu',
-];
diff --git a/messages/cy/base.php b/messages/cy/base.php
index ac4b75fb..b6fb7049 100644
--- a/messages/cy/base.php
+++ b/messages/cy/base.php
@@ -1,80 +1,110 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Search' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Title' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'User' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => '',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/cy/forms_CreateMessageForm.php b/messages/cy/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/cy/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/cy/forms_InviteRecipientForm.php b/messages/cy/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/cy/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/cy/forms_ReplyMessageForm.php b/messages/cy/forms_ReplyMessageForm.php
deleted file mode 100644
index 81f52098..00000000
--- a/messages/cy/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-];
diff --git a/messages/cy/models_Message.php b/messages/cy/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/cy/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/cy/views_emails_NewMessage.php b/messages/cy/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/cy/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/cy/views_emails_NewMessageEntry.php b/messages/cy/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/cy/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/cy/views_mail_adduser.php b/messages/cy/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/cy/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/cy/views_mail_create.php b/messages/cy/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/cy/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/cy/views_mail_edit.php b/messages/cy/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/cy/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/cy/views_mail_index.php b/messages/cy/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/cy/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/cy/views_mail_list.php b/messages/cy/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/cy/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/cy/views_mail_show.php b/messages/cy/views_mail_show.php
deleted file mode 100644
index 1b3f7308..00000000
--- a/messages/cy/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/cy/widgets_views_mailNotification.php b/messages/cy/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/cy/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/cy/widgets_views_newMessageButton.php b/messages/cy/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/cy/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/da/base.php b/messages/da/base.php
index 721ec8cd..9bc5e4b9 100644
--- a/messages/da/base.php
+++ b/messages/da/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => 'Bekræft',
-    'Created At' => 'Oprettet den',
-    'Created By' => 'Oprettet af',
-    'Edit' => 'Rediger',
-    'Message' => 'Besked',
-    'Messages' => 'Beskeder',
-    'Participants' => 'Deltagere',
-    'Pinned' => 'Pinned',
-    'Search' => 'Søg',
-    'Subject' => 'Emne',
-    'Tags' => 'Tags',
-    'Title' => 'Titel',
-    'Updated At' => 'Opdateret den',
-    'User' => 'Bruger',
-    'Write a message...' => 'Skriv en besked...',
-    'You' => 'Du',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Bekræft</strong> sletning af samtale',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Bekræft</strong> afslutning af samtale',
+  '<strong>Confirm</strong> message deletion' => '<strong>Bekræft</strong> sletning af besked',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Ny</strong> besked',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'Tilføj flere deltagere til din samtale...',
+  'Add participants' => '',
+  'Add recipients' => 'Tilføjet modtagere',
+  'Add user' => 'Tilføj bruger',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Afbryd',
+  'Confirm' => 'Bekræft',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => 'Oprettet den',
+  'Created By' => 'Oprettet af',
+  'Delete' => 'Slet',
+  'Delete conversation' => 'Slet samtale',
+  'Do you really want to delete this conversation?' => 'Vil du virkelig gerne slette denne samtale?',
+  'Do you really want to delete this message?' => 'Vil du virkelig gerne slette denne besked?',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'Vil du virkelig gerne forlade denne samtale',
+  'Edit' => 'Rediger',
+  'Edit message entry' => 'Rediger besked',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => 'Grupper',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => 'Forlad',
+  'Leave conversation' => 'Forlad samtale',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Medlemmer',
+  'Message' => 'Besked',
+  'Messages' => 'Beskeder',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Ny besked fra {senderName}',
+  'New message in discussion from %displayName%' => 'Ny besked i samtalen med %displayName%',
+  'Participants' => 'Deltagere',
+  'Pin' => '',
+  'Pinned' => 'Pinned',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => 'Modtager',
+  'Reply now' => 'Svar nu',
+  'Saturday' => '',
+  'Search' => 'Søg',
+  'Send' => 'Send',
+  'Send message' => 'Send besked',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'Vis alle beskeder',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => 'Opret nu',
+  'Spaces' => 'Sider',
+  'Start new conversations' => '',
+  'Subject' => 'Emne',
+  'Sunday' => '',
+  'Tags' => 'Tags',
+  'There are no messages yet.' => 'Der er ingen beskeder endnu.',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Titel',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => 'Opdateret den',
+  'Updated By' => '',
+  'User' => 'Bruger',
+  'User Posts' => 'Bruger Opslag',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => 'Skriv en besked...',
+  'Yesterday' => '',
+  'You' => 'Du',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Du kan ikke sende en besked til dig selv!',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/da/forms_CreateMessageForm.php b/messages/da/forms_CreateMessageForm.php
deleted file mode 100644
index d800d6a2..00000000
--- a/messages/da/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Besked',
-  'Recipient' => 'Modtager',
-  'Subject' => 'Emne',
-  'Tags' => 'Tags',
-);
diff --git a/messages/da/forms_InviteRecipientForm.php b/messages/da/forms_InviteRecipientForm.php
deleted file mode 100644
index 1e0904e5..00000000
--- a/messages/da/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'Recipient' => 'Modtager',
-    'You cannot send a email to yourself!' => 'Du kan ikke sende en besked til dig selv!',
-];
diff --git a/messages/da/forms_ReplyMessageForm.php b/messages/da/forms_ReplyMessageForm.php
deleted file mode 100644
index 775689b8..00000000
--- a/messages/da/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Besked',
-);
diff --git a/messages/da/models_Message.php b/messages/da/models_Message.php
deleted file mode 100644
index 6c185136..00000000
--- a/messages/da/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Ny besked fra {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/da/models_MessageEntry.php b/messages/da/models_MessageEntry.php
deleted file mode 100644
index faea7c0d..00000000
--- a/messages/da/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Ny besked i samtalen med %displayName%',
-);
diff --git a/messages/da/views_emails_NewMessage.php b/messages/da/views_emails_NewMessage.php
deleted file mode 100644
index 5544d371..00000000
--- a/messages/da/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Ny</strong> besked',
-    'Reply now' => 'Svar nu',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/da/views_emails_NewMessageEntry.php b/messages/da/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/da/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/da/views_mail_adduser.php b/messages/da/views_mail_adduser.php
deleted file mode 100644
index 18de4baf..00000000
--- a/messages/da/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Tilføj flere deltagere til din samtale...',
-];
diff --git a/messages/da/views_mail_create.php b/messages/da/views_mail_create.php
deleted file mode 100644
index 1b4623f3..00000000
--- a/messages/da/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Ny</strong> besked',
-  'Add recipients' => 'Tilføjet modtagere',
-  'Send' => 'Send',
-);
diff --git a/messages/da/views_mail_edit.php b/messages/da/views_mail_edit.php
deleted file mode 100644
index 171174ce..00000000
--- a/messages/da/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Rediger besked',
-];
diff --git a/messages/da/views_mail_index.php b/messages/da/views_mail_index.php
deleted file mode 100644
index 2f937e50..00000000
--- a/messages/da/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => 'Der er ingen beskeder endnu.',
-    'Conversations' => '',
-];
diff --git a/messages/da/views_mail_list.php b/messages/da/views_mail_list.php
deleted file mode 100644
index 68dffe57..00000000
--- a/messages/da/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Der er ingen beskeder endnu.',
-);
diff --git a/messages/da/views_mail_show.php b/messages/da/views_mail_show.php
deleted file mode 100644
index 4c6a7c68..00000000
--- a/messages/da/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Bekræft</strong> sletning af samtale',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Bekræft</strong> afslutning af samtale',
-    '<strong>Confirm</strong> message deletion' => '<strong>Bekræft</strong> sletning af besked',
-    'Add user' => 'Tilføj bruger',
-    'Cancel' => 'Afbryd',
-    'Delete' => 'Slet',
-    'Delete conversation' => 'Slet samtale',
-    'Do you really want to delete this conversation?' => 'Vil du virkelig gerne slette denne samtale?',
-    'Do you really want to delete this message?' => 'Vil du virkelig gerne slette denne besked?',
-    'Do you really want to leave this conversation?' => 'Vil du virkelig gerne forlade denne samtale',
-    'Leave' => 'Forlad',
-    'Leave conversation' => 'Forlad samtale',
-    'There are no messages yet.' => 'Der er ingen beskeder endnu.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/da/views_mail_sidebar.php b/messages/da/views_mail_sidebar.php
deleted file mode 100644
index 3eeefcfc..00000000
--- a/messages/da/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupper',
-  'Members' => 'Medlemmer',
-  'Spaces' => 'Sider',
-  'User Posts' => 'Bruger Opslag',
-);
diff --git a/messages/da/views_mails_UserInviteSpace.php b/messages/da/views_mails_UserInviteSpace.php
deleted file mode 100644
index 99f390aa..00000000
--- a/messages/da/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Opret nu',
-);
diff --git a/messages/da/widgets_views_mailNotification.php b/messages/da/widgets_views_mailNotification.php
deleted file mode 100644
index 8a4bcba4..00000000
--- a/messages/da/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Vis alle beskeder',
-];
diff --git a/messages/da/widgets_views_newMessageButton.php b/messages/da/widgets_views_newMessageButton.php
deleted file mode 100644
index 8ae330a8..00000000
--- a/messages/da/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Send besked',
-];
diff --git a/messages/de/base.php b/messages/de/base.php
index f2969406..19860122 100644
--- a/messages/de/base.php
+++ b/messages/de/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => 'Löschen des Tags <strong>bestätigen</strong>',
-    '<strong>Edit</strong> conversation tags' => 'Konversations-Tags <strong>bearbeiten</strong>',
-    '<strong>Edit</strong> tag' => 'Tag <strong>bearbeiten</strong>',
-    '<strong>Manage</strong> conversation tags' => 'Konversations-Tags <strong>verwalten</strong>',
-    '<strong>Messenger</strong> module configuration' => '<strong>Messenger</strong> Modul Konfiguration',
-    'A tag with the same name already exists.' => 'Ein Tag mit diesem Namen existiert bereits.',
-    'Add Tag' => 'Tag hinzufügen',
-    'Add participants' => 'Teilnehmer hinzufügen',
-    'Allow others to send you private messages' => 'Erlaube anderen Nutzern, dir private Nachrichten zu senden',
-    'Allow users to start new conversations' => 'Erlaube Nutzern, neue Konversationen zu beginnen',
-    'Confirm' => 'Bestätigen',
-    'Conversation' => 'Unterhaltung',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Konversations-Tags können benutzt werden um Konversationen zu filtern, und sind nur für dich sichtbar.',
-    'Conversations' => 'Unterhaltungen',
-    'Created At' => 'Erstellt am',
-    'Created By' => 'Erstellt durch',
-    'Do you really want to delete this tag?' => 'Willst du diesen Tag wirklich löschen?',
-    'Edit' => 'Bearbeiten',
-    'Edit message...' => 'Nachricht bearbeiten ...',
-    'Filters' => 'Filter',
-    'Friday' => 'Freitag',
-    'Here you can manage your private conversation tags.' => 'Hier kannst du private Konversations-Tags verwalten.',
-    'Is Originator' => 'Ist Ersteller',
-    'Last Viewed' => 'Zuletzt angesehen',
-    'Leave fields blank in order to disable a restriction.' => 'Lassen Sie die Felder leer, um eine Einschränkung zu deaktivieren.',
-    'Manage Tags' => 'Tags verwalten',
-    'Mark Unread' => 'Als ungelesen markieren',
-    'Max messages allowed per day' => 'Max. erlaubte Nachrichten pro Tag',
-    'Max number of messages allowed for a new user per day' => 'Max. zulässige Anzahl von Nachrichten für einen neuen Benutzer pro Tag',
-    'Max number of new conversations allowed for a new user per day' => 'Maximal zulässige Anzahl an täglich neu begonnenen Konversationen je "Neuer Benutzer" (Spamschutz)',
-    'Max number of new conversations allowed for a user per day' => 'Maximal zulässige Anzahl an täglich neu begonnenen Konversationen je Benutzer (Spamschutz)',
-    'Message' => 'Nachricht',
-    'Messages' => 'Nachrichten',
-    'Monday' => 'Montag',
-    'My Tags' => 'Meine Tags',
-    'Participants' => 'Teilnehmer',
-    'Pin' => 'Anpinnen',
-    'Pinned' => 'Angeheftet',
-    'Receive Notifications when someone opens a new conversation.' => 'Benachrichtigungen erhalten, wenn jemand eine neue Unterhaltung eröffnet.',
-    'Receive Notifications when someone sends you a message.' => 'Benachrichtigungen erhalten, wenn dir jemand eine Nachricht schickt.',
-    'Receive private messages' => 'Private Nachrichten erhalten',
-    'Saturday' => 'Samstag',
-    'Search' => 'Suche',
-    'Seperate restrictions for new users' => 'Limitierung nur auf neue Benutzer anwenden',
-    'Show menu item in top Navigation' => 'Link zu Modul in Hauptnavigation anzeigen',
-    'Start new conversations' => 'Neue Konversation beginnen',
-    'Subject' => 'Beschreibung',
-    'Sunday' => 'Sonntag',
-    'Tags' => 'Tags',
-    'This user is already participating in this conversation.' => 'Dieser Benutzer nimmt bereits an diesem Gespräch teil.',
-    'Thursday' => 'Donnerstag',
-    'Title' => 'Betreff',
-    'Today' => 'Heute',
-    'Tuesday' => 'Dienstag',
-    'Unpin' => 'Lösen',
-    'Until a user is member since (days)' => 'Zeitraum in Tagen seit Registrierung für Status "Neuer Benutzer"',
-    'Updated At' => 'Aktualisiert am',
-    'Updated By' => 'Aktualisiert durch',
-    'User' => 'Benutzer',
-    'Wednesday' => 'Mittwoch',
-    'Write a message...' => 'Schreibe eine Nachricht ...',
-    'Yesterday' => 'Gestern',
-    'You' => 'Du',
-    'You are not allowed to reply to users {userNames}!' => 'Du darfst den Benutzern {userNames} nicht antworten!',
-    'You are not allowed to start a conversation with this user.' => 'Du darfst mit diesem Benutzer keine Unterhaltung beginnen.',
-    'You are not allowed to start a conversation with {userName}!' => 'Du kannst keine Unterhaltung mit {userName} beginnen!',
-    'You cannot send a message to yourself!' => 'Du kannst keine Nachricht an dich selbst schreiben!',
-    'You cannot send a message without recipients!' => 'Du kannst keine Nachricht ohne Empfänger senden!',
-    'You joined the conversation.' => 'Du bist der Unterhaltung beigetreten.',
-    'You left the conversation.' => 'Du hast die Unterhaltung verlassen.',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Du hast deine täglich max. Anzahl an neuen Gesprächen überschritten.',
-    'edited' => 'bearbeitet',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# anderen} other{# anderen}}',
-    '{username} joined the conversation.' => '{username} ist der Unterhaltung beigetreten.',
-    '{username} left the conversation.' => '{username} hat die Unterhaltung verlassen.',
-    'Advanced Messages Search' => '',
+  '<strong>Confirm</strong> deleting conversation' => 'Löschen der Unterhaltung <strong>bestätigen</strong>',
+  '<strong>Confirm</strong> leaving conversation' => 'Verlassen der Unterhaltung <strong>bestätigen</strong>',
+  '<strong>Confirm</strong> message deletion' => 'Löschen der Nachricht <strong>bestätigen</strong>',
+  '<strong>Confirm</strong> tag deletion' => 'Löschen des Tags <strong>bestätigen</strong>',
+  '<strong>Edit</strong> conversation tags' => 'Konversations-Tags <strong>bearbeiten</strong>',
+  '<strong>Edit</strong> tag' => 'Tag <strong>bearbeiten</strong>',
+  '<strong>Manage</strong> conversation tags' => 'Konversations-Tags <strong>verwalten</strong>',
+  '<strong>Messenger</strong> module configuration' => '<strong>Messenger</strong> Modul Konfiguration',
+  '<strong>New</strong> conversation' => '<strong>Neue</strong> Unterhaltung',
+  '<strong>New</strong> message' => '<strong>Neue</strong> Nachricht',
+  'A tag with the same name already exists.' => 'Ein Tag mit diesem Namen existiert bereits.',
+  'Add Tag' => 'Tag hinzufügen',
+  'Add more participants to your conversation...' => 'Füge der Unterhaltung weitere Empfänger hinzu ...',
+  'Add participants' => 'Teilnehmer hinzufügen',
+  'Add recipients' => 'Empfänger hinzufügen',
+  'Add user' => 'Benutzer hinzufügen',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Erlaube anderen Nutzern, dir private Nachrichten zu senden',
+  'Allow users to start new conversations' => 'Erlaube Nutzern, neue Konversationen zu beginnen',
+  'Cancel' => 'Abbrechen',
+  'Confirm' => 'Bestätigen',
+  'Conversation' => 'Unterhaltung',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Konversations-Tags können benutzt werden um Konversationen zu filtern, und sind nur für dich sichtbar.',
+  'Conversations' => 'Unterhaltungen',
+  'Created At' => 'Erstellt am',
+  'Created By' => 'Erstellt durch',
+  'Delete' => 'Löschen',
+  'Delete conversation' => 'Unterhaltung löschen',
+  'Do you really want to delete this conversation?' => 'Willst du diese Unterhaltung wirklich löschen?',
+  'Do you really want to delete this message?' => 'Willst du diese Nachricht wirklich löschen?',
+  'Do you really want to delete this tag?' => 'Willst du diesen Tag wirklich löschen?',
+  'Do you really want to leave this conversation?' => 'Willst du diese Unterhaltung wirklich verlassen?',
+  'Edit' => 'Bearbeiten',
+  'Edit message entry' => 'Nachricht bearbeiten',
+  'Edit message...' => 'Nachricht bearbeiten ...',
+  'Filters' => 'Filter',
+  'Friday' => 'Freitag',
+  'Groups' => 'Gruppen',
+  'Here you can manage your private conversation tags.' => 'Hier kannst du private Konversations-Tags verwalten.',
+  'Is Originator' => 'Ist Ersteller',
+  'Last Viewed' => 'Zuletzt angesehen',
+  'Leave' => 'Verlassen',
+  'Leave conversation' => 'Unterhaltung verlassen',
+  'Leave fields blank in order to disable a restriction.' => 'Lassen Sie die Felder leer, um eine Einschränkung zu deaktivieren.',
+  'Manage Tags' => 'Tags verwalten',
+  'Mark Unread' => 'Als ungelesen markieren',
+  'Max messages allowed per day' => 'Max. erlaubte Nachrichten pro Tag',
+  'Max number of messages allowed for a new user per day' => 'Max. zulässige Anzahl von Nachrichten für einen neuen Benutzer pro Tag',
+  'Max number of new conversations allowed for a new user per day' => 'Maximal zulässige Anzahl an täglich neu begonnenen Konversationen je "Neuer Benutzer" (Spamschutz)',
+  'Max number of new conversations allowed for a user per day' => 'Maximal zulässige Anzahl an täglich neu begonnenen Konversationen je Benutzer (Spamschutz)',
+  'Members' => 'Mitglieder',
+  'Message' => 'Nachricht',
+  'Messages' => 'Nachrichten',
+  'Monday' => 'Montag',
+  'My Tags' => 'Meine Tags',
+  'New conversation from {senderName}' => 'Neue Unterhaltung gestartet von {senderName}',
+  'New message from {senderName}' => 'Neue Nachricht von {senderName}',
+  'New message in discussion from %displayName%' => 'Neue Nachricht in der Diskussion von %displayName%',
+  'Participants' => 'Teilnehmer',
+  'Pin' => 'Anpinnen',
+  'Pinned' => 'Angeheftet',
+  'Receive Notifications when someone opens a new conversation.' => 'Benachrichtigungen erhalten, wenn jemand eine neue Unterhaltung eröffnet.',
+  'Receive Notifications when someone sends you a message.' => 'Benachrichtigungen erhalten, wenn dir jemand eine Nachricht schickt.',
+  'Receive private messages' => 'Private Nachrichten erhalten',
+  'Recipient' => 'Empfänger',
+  'Reply now' => 'Antworte jetzt',
+  'Saturday' => 'Samstag',
+  'Search' => 'Suche',
+  'Send' => 'Senden',
+  'Send message' => 'Nachricht senden',
+  'Seperate restrictions for new users' => 'Limitierung nur auf neue Benutzer anwenden',
+  'Show all messages' => 'Zeige alle Nachrichten',
+  'Show menu item in top Navigation' => 'Link zu Modul in Hauptnavigation anzeigen',
+  'Sign up now' => 'Registriere dich jetzt',
+  'Spaces' => 'Spaces',
+  'Start new conversations' => 'Neue Konversation beginnen',
+  'Subject' => 'Beschreibung',
+  'Sunday' => 'Sonntag',
+  'Tags' => 'Tags',
+  'There are no messages yet.' => 'Es sind noch keine Nachrichten vorhanden.',
+  'This user is already participating in this conversation.' => 'Dieser Benutzer nimmt bereits an diesem Gespräch teil.',
+  'Thursday' => 'Donnerstag',
+  'Title' => 'Betreff',
+  'Today' => 'Heute',
+  'Tuesday' => 'Dienstag',
+  'Unpin' => 'Lösen',
+  'Until a user is member since (days)' => 'Zeitraum in Tagen seit Registrierung für Status "Neuer Benutzer"',
+  'Updated At' => 'Aktualisiert am',
+  'Updated By' => 'Aktualisiert durch',
+  'User' => 'Benutzer',
+  'User Posts' => 'Benutzerbeiträge',
+  'User {name} is already participating!' => 'Benutzer {name} ist bereits dabei!',
+  'Wednesday' => 'Mittwoch',
+  'Write a message...' => 'Schreibe eine Nachricht ...',
+  'Yesterday' => 'Gestern',
+  'You' => 'Du',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Du darfst nicht an dieser Unterhaltung teilnehmen. Du wurdest geblockt von: {userNames}.',
+  'You are not allowed to reply to users {userNames}!' => 'Du darfst den Benutzern {userNames} nicht antworten!',
+  'You are not allowed to send user {name} is already!' => 'You are not allowed to send user {name} is already!',
+  'You are not allowed to start a conversation with this user.' => 'Du darfst mit diesem Benutzer keine Unterhaltung beginnen.',
+  'You are not allowed to start a conversation with {userName}!' => 'Du kannst keine Unterhaltung mit {userName} beginnen!',
+  'You cannot send a email to yourself!' => 'Du kannst dir selber keine Mail senden!',
+  'You cannot send a message to yourself!' => 'Du kannst keine Nachricht an dich selbst schreiben!',
+  'You cannot send a message without recipients!' => 'Du kannst keine Nachricht ohne Empfänger senden!',
+  'You joined the conversation.' => 'Du bist der Unterhaltung beigetreten.',
+  'You left the conversation.' => 'Du hast die Unterhaltung verlassen.',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Du hast deine täglich max. Anzahl an neuen Gesprächen überschritten.',
+  'edited' => 'bearbeitet',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# anderen} other{# anderen}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} hat eine neue Unterhaltung erstellt {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} hat dir eine neue Nachricht gesendet in {conversationTitle}',
+  '{username} joined the conversation.' => '{username} ist der Unterhaltung beigetreten.',
+  '{username} left the conversation.' => '{username} hat die Unterhaltung verlassen.',
 ];
diff --git a/messages/de/forms_CreateMessageForm.php b/messages/de/forms_CreateMessageForm.php
deleted file mode 100644
index dd0d37c0..00000000
--- a/messages/de/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Nachricht',
-  'Recipient' => 'Empfänger',
-  'Subject' => 'Betreff',
-  'Tags' => 'Tags',
-);
diff --git a/messages/de/forms_InviteRecipientForm.php b/messages/de/forms_InviteRecipientForm.php
deleted file mode 100644
index 79dd7489..00000000
--- a/messages/de/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Empfänger',
-  'User {name} is already participating!' => 'Benutzer {name} ist bereits dabei!',
-  'You are not allowed to send user {name} is already!' => 'You are not allowed to send user {name} is already!',
-  'You cannot send a email to yourself!' => 'Du kannst dir selber keine Mail senden!',
-);
diff --git a/messages/de/forms_ReplyMessageForm.php b/messages/de/forms_ReplyMessageForm.php
deleted file mode 100644
index 7f0062ba..00000000
--- a/messages/de/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Nachricht',
-);
diff --git a/messages/de/models_Message.php b/messages/de/models_Message.php
deleted file mode 100644
index 48054e55..00000000
--- a/messages/de/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Neue Unterhaltung gestartet von {senderName}',
-  'New message from {senderName}' => 'Neue Nachricht von {senderName}',
-);
diff --git a/messages/de/models_MessageEntry.php b/messages/de/models_MessageEntry.php
deleted file mode 100644
index 87d51abe..00000000
--- a/messages/de/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Neue Nachricht in der Diskussion von %displayName%',
-);
diff --git a/messages/de/views_emails_NewMessage.php b/messages/de/views_emails_NewMessage.php
deleted file mode 100644
index dbe62f04..00000000
--- a/messages/de/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Neue</strong> Unterhaltung',
-  '<strong>New</strong> message' => '<strong>Neue</strong> Nachricht',
-  'Reply now' => 'Antworte jetzt',
-);
diff --git a/messages/de/views_emails_NewMessageEntry.php b/messages/de/views_emails_NewMessageEntry.php
deleted file mode 100644
index 14a0f109..00000000
--- a/messages/de/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} hat eine neue Unterhaltung erstellt {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} hat dir eine neue Nachricht gesendet in {conversationTitle}',
-);
diff --git a/messages/de/views_mail_adduser.php b/messages/de/views_mail_adduser.php
deleted file mode 100644
index 2ac20c68..00000000
--- a/messages/de/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => 'Füge der Unterhaltung weitere Empfänger hinzu ...',
-);
diff --git a/messages/de/views_mail_create.php b/messages/de/views_mail_create.php
deleted file mode 100644
index 14d6dc51..00000000
--- a/messages/de/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Neue</strong> Nachricht',
-  'Add recipients' => 'Empfänger hinzufügen',
-  'Send' => 'Senden',
-);
diff --git a/messages/de/views_mail_edit.php b/messages/de/views_mail_edit.php
deleted file mode 100644
index c4fc2c57..00000000
--- a/messages/de/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Nachricht bearbeiten',
-];
diff --git a/messages/de/views_mail_index.php b/messages/de/views_mail_index.php
deleted file mode 100644
index d30ac4cf..00000000
--- a/messages/de/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Unterhaltungen',
-    'There are no messages yet.' => 'Es sind noch keine Nachrichten vorhanden.',
-];
diff --git a/messages/de/views_mail_list.php b/messages/de/views_mail_list.php
deleted file mode 100644
index 6711f20d..00000000
--- a/messages/de/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Es sind noch keine Nachrichten vorhanden.',
-);
diff --git a/messages/de/views_mail_show.php b/messages/de/views_mail_show.php
deleted file mode 100644
index 78781ed4..00000000
--- a/messages/de/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => 'Löschen der Unterhaltung <strong>bestätigen</strong>',
-  '<strong>Confirm</strong> leaving conversation' => 'Verlassen der Unterhaltung <strong>bestätigen</strong>',
-  '<strong>Confirm</strong> message deletion' => 'Löschen der Nachricht <strong>bestätigen</strong>',
-  'Add user' => 'Benutzer hinzufügen',
-  'Cancel' => 'Abbrechen',
-  'Delete' => 'Löschen',
-  'Delete conversation' => 'Unterhaltung löschen',
-  'Do you really want to delete this conversation?' => 'Willst du diese Unterhaltung wirklich löschen?',
-  'Do you really want to delete this message?' => 'Willst du diese Nachricht wirklich löschen?',
-  'Do you really want to leave this conversation?' => 'Willst du diese Unterhaltung wirklich verlassen?',
-  'Leave' => 'Verlassen',
-  'Leave conversation' => 'Unterhaltung verlassen',
-  'There are no messages yet.' => 'Derzeit keine Nachrichten vorhanden.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Du darfst nicht an dieser Unterhaltung teilnehmen. Du wurdest geblockt von: {userNames}.',
-);
diff --git a/messages/de/views_mail_sidebar.php b/messages/de/views_mail_sidebar.php
deleted file mode 100644
index 2047b0fe..00000000
--- a/messages/de/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Gruppen',
-  'Members' => 'Mitglieder',
-  'Spaces' => 'Spaces',
-  'User Posts' => 'Benutzerbeiträge',
-);
diff --git a/messages/de/views_mails_UserInviteSpace.php b/messages/de/views_mails_UserInviteSpace.php
deleted file mode 100644
index 91f1c569..00000000
--- a/messages/de/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Registriere dich jetzt',
-);
diff --git a/messages/de/widgets_views_mailNotification.php b/messages/de/widgets_views_mailNotification.php
deleted file mode 100644
index a0e182d5..00000000
--- a/messages/de/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Zeige alle Nachrichten',
-];
diff --git a/messages/de/widgets_views_newMessageButton.php b/messages/de/widgets_views_newMessageButton.php
deleted file mode 100644
index adffaa0d..00000000
--- a/messages/de/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Nachricht senden',
-];
diff --git a/messages/el/base.php b/messages/el/base.php
index b310887c..a942b736 100644
--- a/messages/el/base.php
+++ b/messages/el/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => 'Επιβεβαίωση',
-    'Edit' => 'Επεξεργασία',
-    'Friday' => 'Παρασκευή',
-    'Message' => 'Μήνυμα',
-    'Monday' => 'Δευτέρα',
-    'Participants' => 'Συμμετέχοντες',
-    'Pinned' => 'Καρφιτσωμένo',
-    'Saturday' => 'Σάββατο',
-    'Search' => 'Αναζήτηση',
-    'Subject' => 'Θέμα',
-    'Sunday' => 'Κυριακή',
-    'Tags' => 'Λέξεις κλειδιά',
-    'Thursday' => 'Πέμπτη',
-    'Title' => 'Τίτλος',
-    'Tuesday' => 'Τρίτη',
-    'Unpin' => 'Ξεκαρφίτσωμα',
-    'User' => 'Χρήστης',
-    'Wednesday' => 'Τετάρτη',
-    'You' => 'Εσείς',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Messages' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'This user is already participating in this conversation.' => '',
-    'Today' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Ακύρωση',
+  'Confirm' => 'Επιβεβαίωση',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => 'Διαγραφή',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'Επεξεργασία',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => 'Παρασκευή',
+  'Groups' => 'Ομάδες',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Μέλη',
+  'Message' => 'Μήνυμα',
+  'Messages' => '',
+  'Monday' => 'Δευτέρα',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => 'Συμμετέχοντες',
+  'Pin' => '',
+  'Pinned' => 'Καρφιτσωμένo',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => 'Σάββατο',
+  'Search' => 'Αναζήτηση',
+  'Send' => 'Στείλε',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => '',
+  'Spaces' => 'Χώροι',
+  'Start new conversations' => '',
+  'Subject' => 'Θέμα',
+  'Sunday' => 'Κυριακή',
+  'Tags' => 'Λέξεις κλειδιά',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => 'Πέμπτη',
+  'Title' => 'Τίτλος',
+  'Today' => '',
+  'Tuesday' => 'Τρίτη',
+  'Unpin' => 'Ξεκαρφίτσωμα',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Χρήστης',
+  'User Posts' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => 'Τετάρτη',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Εσείς',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/el/forms_CreateMessageForm.php b/messages/el/forms_CreateMessageForm.php
deleted file mode 100644
index a84f0af0..00000000
--- a/messages/el/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Μήνυμα',
-  'Recipient' => '',
-  'Subject' => 'Θέμα',
-  'Tags' => 'Λέξεις κλειδιά',
-);
diff --git a/messages/el/forms_InviteRecipientForm.php b/messages/el/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/el/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/el/forms_ReplyMessageForm.php b/messages/el/forms_ReplyMessageForm.php
deleted file mode 100644
index 441526bc..00000000
--- a/messages/el/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Μήνυμα',
-);
diff --git a/messages/el/models_Message.php b/messages/el/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/el/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/el/models_MessageEntry.php b/messages/el/models_MessageEntry.php
deleted file mode 100644
index c6cd1f38..00000000
--- a/messages/el/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'New message in discussion from %displayName%' => '',
-);
diff --git a/messages/el/views_emails_NewMessage.php b/messages/el/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/el/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/el/views_emails_NewMessageEntry.php b/messages/el/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/el/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/el/views_mail_adduser.php b/messages/el/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/el/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/el/views_mail_create.php b/messages/el/views_mail_create.php
deleted file mode 100644
index ac8e8084..00000000
--- a/messages/el/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    'Send' => 'Στείλε',
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-];
diff --git a/messages/el/views_mail_edit.php b/messages/el/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/el/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/el/views_mail_index.php b/messages/el/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/el/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/el/views_mail_list.php b/messages/el/views_mail_list.php
deleted file mode 100644
index e5ebcb0b..00000000
--- a/messages/el/views_mail_list.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'There are no messages yet.' => '',
-);
diff --git a/messages/el/views_mail_show.php b/messages/el/views_mail_show.php
deleted file mode 100644
index 903082e2..00000000
--- a/messages/el/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'Ακύρωση',
-    'Delete' => 'Διαγραφή',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/el/views_mail_sidebar.php b/messages/el/views_mail_sidebar.php
deleted file mode 100644
index 7389e778..00000000
--- a/messages/el/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Ομάδες',
-  'Members' => 'Μέλη',
-  'Spaces' => 'Χώροι',
-  'User Posts' => '',
-);
diff --git a/messages/el/views_mails_UserInviteSpace.php b/messages/el/views_mails_UserInviteSpace.php
deleted file mode 100644
index 8c8a6c05..00000000
--- a/messages/el/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'Sign up now' => '',
-);
diff --git a/messages/el/widgets_views_mailNotification.php b/messages/el/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/el/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/el/widgets_views_newMessageButton.php b/messages/el/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/el/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/es/base.php b/messages/es/base.php
index dc76e9e8..c7f6511f 100644
--- a/messages/es/base.php
+++ b/messages/es/base.php
@@ -1,30 +1,48 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> eliminación de la conversación',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> salida de la conversación',
+  '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> eliminación del mensaje',
   '<strong>Confirm</strong> tag deletion' => '<strong>Confirmar</strong> la eliminación de la etiqueta',
   '<strong>Edit</strong> conversation tags' => '<strong>Editar</strong> etiquetas de conversación',
   '<strong>Edit</strong> tag' => '<strong>Editar</strong> etiqueta',
   '<strong>Manage</strong> conversation tags' => '<strong>Administrar</strong> etiquetas de conversación',
   '<strong>Messenger</strong> module configuration' => 'Módulo de configuración de <strong>Messenger</strong>',
+  '<strong>New</strong> conversation' => '<strong>Nueva</strong> conversación',
+  '<strong>New</strong> message' => '<strong>Nuevo</strong> mensaje',
   'A tag with the same name already exists.' => 'Ya existe una etiqueta con el mismo nombre.',
   'Add Tag' => 'Añadir etiqueta',
+  'Add more participants to your conversation...' => 'Añadir mas participantes a tu conversación...',
   'Add participants' => 'Agregar participantes',
+  'Add recipients' => 'Agregar destinatarios',
+  'Add user' => 'Añadir usuario',
   'Advanced Messages Search' => 'Búsqueda avanzada de mensajes',
   'Allow others to send you private messages' => 'Permitir que otros le envíen mensajes privados',
   'Allow users to start new conversations' => 'Permitir a los usuarios iniciar nuevas conversaciones',
+  'Cancel' => 'Cancelar',
   'Confirm' => 'Confirmar',
   'Conversation' => 'Conversación',
   'Conversation tags can be used to filter conversations and are only visible to you.' => 'Las etiquetas de conversación se pueden utilizar para filtrar conversaciones y solo usted las puede ver.',
   'Conversations' => 'Conversaciones',
   'Created At' => 'Creado en',
   'Created By' => 'Creado por',
+  'Delete' => 'Eliminar',
+  'Delete conversation' => 'Borrar conversación',
+  'Do you really want to delete this conversation?' => '¿Seguro que quieres eliminar esta conversación?',
+  'Do you really want to delete this message?' => '¿Seguro que quieres eliminar este mensaje?',
   'Do you really want to delete this tag?' => '¿Realmente quieres eliminar esta etiqueta?',
+  'Do you really want to leave this conversation?' => '¿Seguro que quieres abandonar esta conversación?',
   'Edit' => 'Editar',
+  'Edit message entry' => 'Editar mensaje',
   'Edit message...' => 'Editar mensaje...',
   'Filters' => 'Filtros',
   'Friday' => 'Viernes',
+  'Groups' => 'Grupos',
   'Here you can manage your private conversation tags.' => 'Aquí puedes administrar tus etiquetas de conversación privada.',
   'Is Originator' => 'Es Originario',
   'Last Viewed' => 'Visto por última vez',
+  'Leave' => 'Abandonar',
+  'Leave conversation' => 'Abandonar conversación',
   'Leave fields blank in order to disable a restriction.' => 'Dejar los campos en blanco para deshabilitar una restricción.',
   'Manage Tags' => 'Administrar etiquetas',
   'Mark Unread' => 'Marcar como no leído',
@@ -32,24 +50,36 @@
   'Max number of messages allowed for a new user per day' => 'Máximo número de mensajes por día permitidos a un nuevo usuario',
   'Max number of new conversations allowed for a new user per day' => 'Máximo número de nuevas conversaciones por día permitidas a un nuevo usuario',
   'Max number of new conversations allowed for a user per day' => 'Máximo número de nuevas conversaciones por día permitidas a un usuario',
+  'Members' => 'Miembros',
   'Message' => 'Mensaje',
   'Messages' => 'Mensajes',
   'Monday' => 'Lunes',
   'My Tags' => 'Mis etiquetas',
+  'New conversation from {senderName}' => 'Nueva conversación de {senderName}',
+  'New message from {senderName}' => 'Nuevo mensaje de {senderName}',
+  'New message in discussion from %displayName%' => 'Nueva respuesta en la conversación de %displayName%',
   'Participants' => 'Participantes',
   'Pin' => 'Fijar',
   'Pinned' => 'Fijado',
   'Receive Notifications when someone opens a new conversation.' => 'Recibir notificaciones cuando alguien abre una nueva conversación.',
   'Receive Notifications when someone sends you a message.' => 'Recibir notificaciones cuando alguien te envía un mensaje.',
   'Receive private messages' => 'Recibir mensajes privados',
+  'Recipient' => 'Destinatario',
+  'Reply now' => 'Responder ahora',
   'Saturday' => 'Sábado',
   'Search' => 'Buscar',
+  'Send' => 'Enviar',
+  'Send message' => 'Enviar mensaje',
   'Seperate restrictions for new users' => 'Separar restricciones para los nuevos usuarios',
+  'Show all messages' => 'Mostrar todos los mensajes',
   'Show menu item in top Navigation' => 'Mostrar este elemento del menú en la navegación superior',
+  'Sign up now' => 'Registrarse ahora',
+  'Spaces' => 'Espacios',
   'Start new conversations' => 'Iniciar nuevas conversaciones',
   'Subject' => 'Asunto',
   'Sunday' => 'Domingo',
   'Tags' => 'Etiquetas',
+  'There are no messages yet.' => 'No hay mensajes aún.',
   'This user is already participating in this conversation.' => 'Este usuario está ya participando en esta conversación.',
   'Thursday' => 'Jueves',
   'Title' => 'Titulo',
@@ -60,13 +90,18 @@
   'Updated At' => 'Actualizado en',
   'Updated By' => 'Actualizado por',
   'User' => 'Usuario',
+  'User Posts' => 'Entradas de usuario',
+  'User {name} is already participating!' => '¡El usuario {name} está participando ya!',
   'Wednesday' => 'Miércoles',
   'Write a message...' => 'Escribir un mensaje...',
   'Yesterday' => 'Ayer',
   'You' => 'Tú',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'No estás autorizado a participar en esta conversación. Has sido bloqueado por: {userNames}.',
   'You are not allowed to reply to users {userNames}!' => '¡No está permitido que respondas a los usuarios {userNames}!',
+  'You are not allowed to send user {name} is already!' => '¡No está permitido que le envíes una invitación a {name}!',
   'You are not allowed to start a conversation with this user.' => 'No está permitido que inicies una conversación con este usuario.',
   'You are not allowed to start a conversation with {userName}!' => '¡No estás autorizado para iniciar una conversación con {userName}!',
+  'You cannot send a email to yourself!' => 'No te puedes enviar mensajes tu mismo!',
   'You cannot send a message to yourself!' => '¡No puedes enviarte un mensaje a tu propio perfil!',
   'You cannot send a message without recipients!' => '¡No puedes enviar un mensaje sin un destinatario!',
   'You joined the conversation.' => 'Te has unido a la conversación.',
@@ -74,6 +109,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => 'Has sobrepasado tu cantidad diaria de nuevas conversaciones.',
   'edited' => 'editado',
   '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# otro} other{# otros}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} ha creado una nueva conversación {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} te ha enviado un nuevo mensaje en {conversationTitle}',
   '{username} joined the conversation.' => '{username} se ha unido a la conversación.',
   '{username} left the conversation.' => '{username} ha abandonado la conversación.',
-);
+];
diff --git a/messages/es/forms_CreateMessageForm.php b/messages/es/forms_CreateMessageForm.php
deleted file mode 100644
index 862f9330..00000000
--- a/messages/es/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensaje',
-  'Recipient' => 'Destinatario',
-  'Subject' => 'Asunto',
-  'Tags' => 'Etiquetas',
-);
diff --git a/messages/es/forms_InviteRecipientForm.php b/messages/es/forms_InviteRecipientForm.php
deleted file mode 100644
index ca663b2b..00000000
--- a/messages/es/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Destinatario',
-  'User {name} is already participating!' => '¡El usuario {name} está participando ya!',
-  'You are not allowed to send user {name} is already!' => '¡No está permitido que le envíes una invitación a {name}!',
-  'You cannot send a email to yourself!' => 'No te puedes enviar mensajes tu mismo!',
-);
diff --git a/messages/es/forms_ReplyMessageForm.php b/messages/es/forms_ReplyMessageForm.php
deleted file mode 100644
index 8f411c71..00000000
--- a/messages/es/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensaje',
-);
diff --git a/messages/es/models_Message.php b/messages/es/models_Message.php
deleted file mode 100644
index c0ea20b9..00000000
--- a/messages/es/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Nueva conversación de {senderName}',
-  'New message from {senderName}' => 'Nuevo mensaje de {senderName}',
-);
diff --git a/messages/es/models_MessageEntry.php b/messages/es/models_MessageEntry.php
deleted file mode 100644
index 30cbd5ad..00000000
--- a/messages/es/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nueva respuesta en la conversación de %displayName%',
-);
diff --git a/messages/es/views_emails_NewMessage.php b/messages/es/views_emails_NewMessage.php
deleted file mode 100644
index b2529fc7..00000000
--- a/messages/es/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Nueva</strong> conversación',
-  '<strong>New</strong> message' => '<strong>Nuevo</strong> mensaje',
-  'Reply now' => 'Responder ahora',
-);
diff --git a/messages/es/views_emails_NewMessageEntry.php b/messages/es/views_emails_NewMessageEntry.php
deleted file mode 100644
index 41285bc7..00000000
--- a/messages/es/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} ha creado una nueva conversación {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} te ha enviado un nuevo mensaje en {conversationTitle}',
-);
diff --git a/messages/es/views_mail_adduser.php b/messages/es/views_mail_adduser.php
deleted file mode 100644
index 405260cb..00000000
--- a/messages/es/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Añadir mas participantes a tu conversación...',
-];
diff --git a/messages/es/views_mail_create.php b/messages/es/views_mail_create.php
deleted file mode 100644
index 2a0effce..00000000
--- a/messages/es/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nuevo</strong> mensaje',
-  'Add recipients' => 'Agregar destinatarios',
-  'Send' => 'Enviar',
-);
diff --git a/messages/es/views_mail_edit.php b/messages/es/views_mail_edit.php
deleted file mode 100644
index 13eddae1..00000000
--- a/messages/es/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Editar mensaje',
-];
diff --git a/messages/es/views_mail_index.php b/messages/es/views_mail_index.php
deleted file mode 100644
index 1f6619b8..00000000
--- a/messages/es/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Conversaciones',
-    'There are no messages yet.' => 'No hay mensajes aún.',
-];
diff --git a/messages/es/views_mail_list.php b/messages/es/views_mail_list.php
deleted file mode 100644
index fc7e4531..00000000
--- a/messages/es/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'No hay mensajes aún.',
-);
diff --git a/messages/es/views_mail_show.php b/messages/es/views_mail_show.php
deleted file mode 100644
index 3d020039..00000000
--- a/messages/es/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> eliminación de la conversación',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> salida de la conversación',
-  '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> eliminación del mensaje',
-  'Add user' => 'Añadir usuario',
-  'Cancel' => 'Cancelar',
-  'Delete' => 'Eliminar',
-  'Delete conversation' => 'Borrar conversación',
-  'Do you really want to delete this conversation?' => '¿Seguro que quieres eliminar esta conversación?',
-  'Do you really want to delete this message?' => '¿Seguro que quieres eliminar este mensaje?',
-  'Do you really want to leave this conversation?' => '¿Seguro que quieres abandonar esta conversación?',
-  'Leave' => 'Abandonar',
-  'Leave conversation' => 'Abandonar conversación',
-  'There are no messages yet.' => 'No hay mensajes aún.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'No estás autorizado a participar en esta conversación. Has sido bloqueado por: {userNames}.',
-);
diff --git a/messages/es/views_mail_sidebar.php b/messages/es/views_mail_sidebar.php
deleted file mode 100644
index c2096277..00000000
--- a/messages/es/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupos',
-  'Members' => 'Miembros',
-  'Spaces' => 'Espacios',
-  'User Posts' => 'Entradas de usuario',
-);
diff --git a/messages/es/views_mails_UserInviteSpace.php b/messages/es/views_mails_UserInviteSpace.php
deleted file mode 100644
index 40f7d758..00000000
--- a/messages/es/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Registrarse ahora',
-);
diff --git a/messages/es/widgets_views_mailNotification.php b/messages/es/widgets_views_mailNotification.php
deleted file mode 100644
index 847cf0b5..00000000
--- a/messages/es/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Mostrar todos los mensajes',
-];
diff --git a/messages/es/widgets_views_newMessageButton.php b/messages/es/widgets_views_newMessageButton.php
deleted file mode 100644
index 0bd07beb..00000000
--- a/messages/es/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Enviar mensaje',
-];
diff --git a/messages/et/base.php b/messages/et/base.php
index ac4b75fb..b6fb7049 100644
--- a/messages/et/base.php
+++ b/messages/et/base.php
@@ -1,80 +1,110 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Search' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Title' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'User' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => '',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/et/forms_CreateMessageForm.php b/messages/et/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/et/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/et/forms_InviteRecipientForm.php b/messages/et/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/et/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/et/forms_ReplyMessageForm.php b/messages/et/forms_ReplyMessageForm.php
deleted file mode 100644
index 81f52098..00000000
--- a/messages/et/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-];
diff --git a/messages/et/models_Message.php b/messages/et/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/et/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/et/views_emails_NewMessage.php b/messages/et/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/et/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/et/views_emails_NewMessageEntry.php b/messages/et/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/et/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/et/views_mail_adduser.php b/messages/et/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/et/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/et/views_mail_create.php b/messages/et/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/et/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/et/views_mail_edit.php b/messages/et/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/et/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/et/views_mail_index.php b/messages/et/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/et/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/et/views_mail_list.php b/messages/et/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/et/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/et/views_mail_show.php b/messages/et/views_mail_show.php
deleted file mode 100644
index 1b3f7308..00000000
--- a/messages/et/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/et/widgets_views_mailNotification.php b/messages/et/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/et/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/et/widgets_views_newMessageButton.php b/messages/et/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/et/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/eu/base.php b/messages/eu/base.php
index e2b98c4c..cd910797 100644
--- a/messages/eu/base.php
+++ b/messages/eu/base.php
@@ -1,30 +1,46 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
   '<strong>Confirm</strong> tag deletion' => '',
   '<strong>Edit</strong> conversation tags' => '',
   '<strong>Edit</strong> tag' => '',
   '<strong>Manage</strong> conversation tags' => '',
   '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
   'A tag with the same name already exists.' => '',
   'Add Tag' => '',
   'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
   'Advanced Messages Search' => '',
   'Allow others to send you private messages' => '',
   'Allow users to start new conversations' => '',
+  'Cancel' => 'Deuseztatu',
   'Confirm' => 'Berretsi',
   'Conversation' => '',
   'Conversation tags can be used to filter conversations and are only visible to you.' => '',
   'Conversations' => '',
   'Created At' => 'Non sortua',
   'Created By' => 'Sortzailea',
+  'Delete' => 'Ezabatu',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
   'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
   'Edit' => 'Editatu',
+  'Edit message entry' => '',
   'Edit message...' => '',
   'Filters' => '',
   'Friday' => '',
   'Here you can manage your private conversation tags.' => '',
   'Is Originator' => '',
   'Last Viewed' => '',
+  'Leave' => 'Zoaz',
+  'Leave conversation' => '',
   'Leave fields blank in order to disable a restriction.' => '',
   'Manage Tags' => '',
   'Mark Unread' => '',
@@ -36,20 +52,28 @@
   'Messages' => '',
   'Monday' => '',
   'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
   'Participants' => '',
   'Pin' => '',
   'Pinned' => 'Ainguratua',
   'Receive Notifications when someone opens a new conversation.' => '',
   'Receive Notifications when someone sends you a message.' => '',
   'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
   'Saturday' => '',
   'Search' => 'Bilatu',
+  'Send' => 'Bidali',
+  'Send message' => '',
   'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
   'Show menu item in top Navigation' => '',
   'Start new conversations' => '',
   'Subject' => 'Gaia',
   'Sunday' => '',
   'Tags' => 'Etiketak',
+  'There are no messages yet.' => '',
   'This user is already participating in this conversation.' => '',
   'Thursday' => '',
   'Title' => 'Izenburua',
@@ -60,13 +84,17 @@
   'Updated At' => 'Hemen eguneratua',
   'Updated By' => 'Honek eguneratua',
   'User' => 'Erabiltzailea',
+  'User {name} is already participating!' => '',
   'Wednesday' => '',
   'Write a message...' => '',
   'Yesterday' => '',
   'You' => 'Zuk',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
   'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
   'You are not allowed to start a conversation with this user.' => '',
   'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
   'You cannot send a message to yourself!' => '',
   'You cannot send a message without recipients!' => '',
   'You joined the conversation.' => '',
@@ -74,6 +102,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => '',
   'edited' => '',
   '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
   '{username} joined the conversation.' => '',
   '{username} left the conversation.' => '',
-);
+];
diff --git a/messages/eu/forms_CreateMessageForm.php b/messages/eu/forms_CreateMessageForm.php
deleted file mode 100644
index 7053c04f..00000000
--- a/messages/eu/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mezua',
-  'Recipient' => '',
-  'Subject' => 'Gaia',
-  'Tags' => 'Etiketak',
-);
diff --git a/messages/eu/forms_InviteRecipientForm.php b/messages/eu/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/eu/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/eu/forms_ReplyMessageForm.php b/messages/eu/forms_ReplyMessageForm.php
deleted file mode 100644
index b29edee7..00000000
--- a/messages/eu/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mezua',
-);
diff --git a/messages/eu/models_Message.php b/messages/eu/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/eu/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/eu/views_emails_NewMessage.php b/messages/eu/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/eu/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/eu/views_emails_NewMessageEntry.php b/messages/eu/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/eu/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/eu/views_mail_create.php b/messages/eu/views_mail_create.php
deleted file mode 100644
index f2817197..00000000
--- a/messages/eu/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '',
-  'Add recipients' => '',
-  'Send' => 'Bidali',
-);
diff --git a/messages/eu/views_mail_edit.php b/messages/eu/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/eu/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/eu/views_mail_index.php b/messages/eu/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/eu/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/eu/views_mail_list.php b/messages/eu/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/eu/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/eu/views_mail_show.php b/messages/eu/views_mail_show.php
deleted file mode 100644
index 82009af0..00000000
--- a/messages/eu/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '',
-  '<strong>Confirm</strong> leaving conversation' => '',
-  '<strong>Confirm</strong> message deletion' => '',
-  'Add user' => '',
-  'Cancel' => 'Deuseztatu',
-  'Delete' => 'Ezabatu',
-  'Delete conversation' => '',
-  'Do you really want to delete this conversation?' => '',
-  'Do you really want to delete this message?' => '',
-  'Do you really want to leave this conversation?' => '',
-  'Leave' => 'Zoaz',
-  'Leave conversation' => '',
-  'There are no messages yet.' => '',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-);
diff --git a/messages/eu/widgets_views_mailNotification.php b/messages/eu/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/eu/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/eu/widgets_views_newMessageButton.php b/messages/eu/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/eu/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/fa-IR/base.php b/messages/fa-IR/base.php
index 068ca60e..6b17d768 100644
--- a/messages/fa-IR/base.php
+++ b/messages/fa-IR/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => 'تایید',
-    'Created At' => 'ایجادشده در',
-    'Created By' => 'ایجادشده توسط',
-    'Edit' => 'ویرایش',
-    'Message' => 'پیغام',
-    'Messages' => 'پیام‌ها',
-    'Participants' => 'مشارکت‌کننده‌ها',
-    'Pinned' => 'چسباندن',
-    'Search' => 'جستجو',
-    'Subject' => 'موضوع',
-    'Tags' => 'تگ‌ها',
-    'Title' => 'عنوان',
-    'Unpin' => 'برداشتن سنجاق',
-    'Updated At' => 'به‌روزرسانی‌شده در',
-    'Updated By' => 'بروزرساني توسط',
-    'User' => 'کاربر',
-    'You' => 'شما',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>تایید</strong> حذف مکالمه',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>تایید</strong>  ترک مکالمه',
+  '<strong>Confirm</strong> message deletion' => '<strong>تایید</strong>  حذف پیغام',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => 'پیغام <strong>جدید</strong>',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'شرکت‌کننده‌های دیگری به مکالمه‌ی خود اضافه کنید. . .',
+  'Add participants' => '',
+  'Add recipients' => 'اضافه كردن گيرنده',
+  'Add user' => 'اضافه کردن کاربر',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'انصراف',
+  'Confirm' => 'تایید',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => 'ایجادشده در',
+  'Created By' => 'ایجادشده توسط',
+  'Delete' => 'حذف',
+  'Delete conversation' => 'حذف گفتگو',
+  'Do you really want to delete this conversation?' => 'آیا واقعا می‌خواهید این مکالمه را حذف کنید؟',
+  'Do you really want to delete this message?' => 'آیا واقعا می‌خواهید این پیغام را حذف کنید؟',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'آیا واقعا می‌خواهید این مکالمه را ترک کنید؟',
+  'Edit' => 'ویرایش',
+  'Edit message entry' => 'ویرایش ورودی پیغام',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => 'گروه‌ها',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => 'ترک',
+  'Leave conversation' => 'ترك گفتگو',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'اعضا',
+  'Message' => 'پیغام',
+  'Messages' => 'پیام‌ها',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'پیغام جدید از {senderName}',
+  'New message in discussion from %displayName%' => 'پیغام جدید در بحث از %displayName%',
+  'Participants' => 'مشارکت‌کننده‌ها',
+  'Pin' => '',
+  'Pinned' => 'چسباندن',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => 'گیرنده',
+  'Reply now' => 'الان پاسخ دهید',
+  'Saturday' => '',
+  'Search' => 'جستجو',
+  'Send' => 'ارسال',
+  'Send message' => 'ارسال پیغام',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'نمایش همه‌ی پیغام‌ها',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => 'الان ثبت نام کنید',
+  'Spaces' => 'انجمن‌ها',
+  'Start new conversations' => '',
+  'Subject' => 'موضوع',
+  'Sunday' => '',
+  'Tags' => 'تگ‌ها',
+  'There are no messages yet.' => 'هنوز پیغامی وجود ندارد.',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'عنوان',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => 'برداشتن سنجاق',
+  'Until a user is member since (days)' => '',
+  'Updated At' => 'به‌روزرسانی‌شده در',
+  'Updated By' => 'بروزرساني توسط',
+  'User' => 'کاربر',
+  'User Posts' => 'پست‌های کاربران',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'شما',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'شما نمي توانيد به خودتان پيام بفرستيد',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/fa-IR/forms_CreateMessageForm.php b/messages/fa-IR/forms_CreateMessageForm.php
deleted file mode 100644
index eeb74042..00000000
--- a/messages/fa-IR/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'پیغام',
-  'Recipient' => 'گیرنده',
-  'Subject' => 'موضوع',
-  'Tags' => 'تگ‌ها',
-);
diff --git a/messages/fa-IR/forms_InviteRecipientForm.php b/messages/fa-IR/forms_InviteRecipientForm.php
deleted file mode 100644
index 7bb1f67b..00000000
--- a/messages/fa-IR/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'Recipient' => 'گيرنده',
-    'You cannot send a email to yourself!' => 'شما نمي توانيد به خودتان پيام بفرستيد',
-];
diff --git a/messages/fa-IR/forms_ReplyMessageForm.php b/messages/fa-IR/forms_ReplyMessageForm.php
deleted file mode 100644
index c7b49af7..00000000
--- a/messages/fa-IR/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'پیغام',
-);
diff --git a/messages/fa-IR/models_Message.php b/messages/fa-IR/models_Message.php
deleted file mode 100644
index 217fe92a..00000000
--- a/messages/fa-IR/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'پیغام جدید از {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/fa-IR/models_MessageEntry.php b/messages/fa-IR/models_MessageEntry.php
deleted file mode 100644
index 30c8f2af..00000000
--- a/messages/fa-IR/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'پیغام جدید در بحث از %displayName%',
-);
diff --git a/messages/fa-IR/views_emails_NewMessage.php b/messages/fa-IR/views_emails_NewMessage.php
deleted file mode 100644
index df5aacd5..00000000
--- a/messages/fa-IR/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => 'پیغام <strong>جدید</strong>',
-    'Reply now' => 'الان پاسخ دهید',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/fa-IR/views_emails_NewMessageEntry.php b/messages/fa-IR/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/fa-IR/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/fa-IR/views_mail_adduser.php b/messages/fa-IR/views_mail_adduser.php
deleted file mode 100644
index d5d16d3a..00000000
--- a/messages/fa-IR/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'شرکت‌کننده‌های دیگری به مکالمه‌ی خود اضافه کنید. . .',
-];
diff --git a/messages/fa-IR/views_mail_create.php b/messages/fa-IR/views_mail_create.php
deleted file mode 100644
index 708ca9da..00000000
--- a/messages/fa-IR/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => 'پیغام <strong>جدید</strong>',
-  'Add recipients' => 'اضافه كردن گيرنده',
-  'Send' => 'ارسال',
-);
diff --git a/messages/fa-IR/views_mail_edit.php b/messages/fa-IR/views_mail_edit.php
deleted file mode 100644
index fc78a020..00000000
--- a/messages/fa-IR/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'ویرایش ورودی پیغام',
-];
diff --git a/messages/fa-IR/views_mail_index.php b/messages/fa-IR/views_mail_index.php
deleted file mode 100644
index e99e52cd..00000000
--- a/messages/fa-IR/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => 'هنوز پیغامی وجود ندارد.',
-    'Conversations' => '',
-];
diff --git a/messages/fa-IR/views_mail_list.php b/messages/fa-IR/views_mail_list.php
deleted file mode 100644
index ebcabe9f..00000000
--- a/messages/fa-IR/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'هنوز پیغامی وجود ندارد.',
-);
diff --git a/messages/fa-IR/views_mail_show.php b/messages/fa-IR/views_mail_show.php
deleted file mode 100644
index 5ebcb64d..00000000
--- a/messages/fa-IR/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>تایید</strong> حذف مکالمه',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>تایید</strong>  ترک مکالمه',
-    '<strong>Confirm</strong> message deletion' => '<strong>تایید</strong>  حذف پیغام',
-    'Add user' => 'اضافه کردن کاربر',
-    'Cancel' => 'انصراف',
-    'Delete' => 'حذف',
-    'Delete conversation' => 'حذف گفتگو',
-    'Do you really want to delete this conversation?' => 'آیا واقعا می‌خواهید این مکالمه را حذف کنید؟',
-    'Do you really want to delete this message?' => 'آیا واقعا می‌خواهید این پیغام را حذف کنید؟',
-    'Do you really want to leave this conversation?' => 'آیا واقعا می‌خواهید این مکالمه را ترک کنید؟',
-    'Leave' => 'ترک',
-    'Leave conversation' => 'ترك گفتگو',
-    'There are no messages yet.' => 'هنوز هیچ پیغامی وجود ندارد.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/fa-IR/views_mail_sidebar.php b/messages/fa-IR/views_mail_sidebar.php
deleted file mode 100644
index 5c7ae684..00000000
--- a/messages/fa-IR/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'گروه‌ها',
-  'Members' => 'اعضا',
-  'Spaces' => 'انجمن‌ها',
-  'User Posts' => 'پست‌های کاربران',
-);
diff --git a/messages/fa-IR/views_mails_UserInviteSpace.php b/messages/fa-IR/views_mails_UserInviteSpace.php
deleted file mode 100644
index a86404ed..00000000
--- a/messages/fa-IR/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'الان ثبت نام کنید',
-);
diff --git a/messages/fa-IR/widgets_views_mailNotification.php b/messages/fa-IR/widgets_views_mailNotification.php
deleted file mode 100644
index c2dfb5f4..00000000
--- a/messages/fa-IR/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'نمایش همه‌ی پیغام‌ها',
-];
diff --git a/messages/fa-IR/widgets_views_newMessageButton.php b/messages/fa-IR/widgets_views_newMessageButton.php
deleted file mode 100644
index efb1ff52..00000000
--- a/messages/fa-IR/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'ارسال پیغام',
-];
diff --git a/messages/fi/base.php b/messages/fi/base.php
index a0c156c5..514d4478 100644
--- a/messages/fi/base.php
+++ b/messages/fi/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Add participants' => 'Lisää osallistujia',
-    'Allow others to send you private messages' => 'Salli muiden lähdettää minulle yksityis viestejä',
-    'Allow users to start new conversations' => 'Sallii käyttäjien aloittaa uusia keskusteluja',
-    'Confirm' => 'Vahvista',
-    'Conversation' => 'Keskustelu',
-    'Conversations' => 'Keskustelut',
-    'Created At' => 'Luotu',
-    'Created By' => 'Luonut',
-    'Edit' => 'Muokkaa',
-    'Edit message...' => 'Muokkaa viestiä...',
-    'Friday' => 'Perjantai',
-    'Is Originator' => 'Aloittanut',
-    'Last Viewed' => 'Viimeksi katsottu',
-    'Leave fields blank in order to disable a restriction.' => 'Jätä laatikko tyhjäksi jos et halua rajoittaa viestejä',
-    'Max messages allowed per day' => 'Maksimi määrä viestejä päivässä joita käyttäjät voi lähettää',
-    'Max number of messages allowed for a new user per day' => 'Maksimi määrä viestejä päivässä joita uudet käyttäjät voi lähettää',
-    'Max number of new conversations allowed for a new user per day' => 'Maksimi määrä keskusteluja päivässä joita uudet käyttäjät voi aloittaa',
-    'Max number of new conversations allowed for a user per day' => 'Maksimi määrä keskusteluja päivässä joita käyttäjät voi aloittaa',
-    'Message' => 'Viesti',
-    'Messages' => 'Viestit',
-    'Monday' => 'Maanantai',
-    'Participants' => 'Osallistujat',
-    'Pinned' => 'Kiinnitetty',
-    'Receive Notifications when someone opens a new conversation.' => 'Saa ilmoitus aina kun joku aloittaa uuden keskustelun.',
-    'Receive Notifications when someone sends you a message.' => 'Saa ilmoitus aina kun joku lähettää viestin sinulle.',
-    'Receive private messages' => 'Vastaanota yksityisiä viestejä',
-    'Saturday' => 'Lauantai',
-    'Search' => 'Hae',
-    'Seperate restrictions for new users' => 'Erilliset rajoitukset uusille käyttäjille',
-    'Show menu item in top Navigation' => 'Näytä viestinappula ylä paneelissa.',
-    'Start new conversations' => 'Aloita uusi keskustelu',
-    'Subject' => 'Aihe',
-    'Sunday' => 'Sunnuntai',
-    'Tags' => 'Tägit',
-    'This user is already participating in this conversation.' => 'Tämä käyttäjä osallistuu jo tähän keskusteluun.',
-    'Thursday' => 'Torstai',
-    'Title' => 'Otsikko',
-    'Today' => 'Tänään',
-    'Tuesday' => 'Tiistai',
-    'Unpin' => 'Poista kiinnitys',
-    'Until a user is member since (days)' => 'Kunnes käyttäjä on jäsenenä (päivät)',
-    'Updated At' => 'Päivitetty',
-    'Updated By' => 'Päivittänyt',
-    'User' => 'Käyttäjä',
-    'Wednesday' => 'Keskiviikko',
-    'Write a message...' => 'Kirjoittaa viestiä...',
-    'You' => 'Sinä',
-    'You are not allowed to start a conversation with this user.' => 'Et voi aloittaa keskustelua tämän käyttäjän kanssa.',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Et voi aloittaa uutta keskustelua koska olet ylittänyt järjestelmän valvojan asettaman rajoituksen.',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Advanced Messages Search' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Filters' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Poista</strong> keskustelu',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Poistu</strong> keskustelusta',
+  '<strong>Confirm</strong> message deletion' => '<strong>Vahvista</strong> viestin poistaminen',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Uusi</strong> viesti',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'Lisää osallistujia keskusteluun...',
+  'Add participants' => 'Lisää osallistujia',
+  'Add recipients' => 'Lisää vastaanottajia',
+  'Add user' => 'Lisää käyttäjä',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Salli muiden lähdettää minulle yksityis viestejä',
+  'Allow users to start new conversations' => 'Sallii käyttäjien aloittaa uusia keskusteluja',
+  'Cancel' => 'Poistu',
+  'Confirm' => 'Vahvista',
+  'Conversation' => 'Keskustelu',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => 'Keskustelut',
+  'Created At' => 'Luotu',
+  'Created By' => 'Luonut',
+  'Delete' => 'Poista',
+  'Delete conversation' => 'Poista keskustelu',
+  'Do you really want to delete this conversation?' => 'Haluatko varmasti poistaa tämän keskustelun?',
+  'Do you really want to delete this message?' => 'Haluatko varmasti poistaa tämän viestin?',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'Haluatko varmasti poistua tästä keskustelusta?',
+  'Edit' => 'Muokkaa',
+  'Edit message entry' => 'Muokkaa viestiä',
+  'Edit message...' => 'Muokkaa viestiä...',
+  'Filters' => '',
+  'Friday' => 'Perjantai',
+  'Groups' => 'Ryhmät',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => 'Aloittanut',
+  'Last Viewed' => 'Viimeksi katsottu',
+  'Leave' => 'Poistu',
+  'Leave conversation' => 'Poistu keskustelusta',
+  'Leave fields blank in order to disable a restriction.' => 'Jätä laatikko tyhjäksi jos et halua rajoittaa viestejä',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Maksimi määrä viestejä päivässä joita käyttäjät voi lähettää',
+  'Max number of messages allowed for a new user per day' => 'Maksimi määrä viestejä päivässä joita uudet käyttäjät voi lähettää',
+  'Max number of new conversations allowed for a new user per day' => 'Maksimi määrä keskusteluja päivässä joita uudet käyttäjät voi aloittaa',
+  'Max number of new conversations allowed for a user per day' => 'Maksimi määrä keskusteluja päivässä joita käyttäjät voi aloittaa',
+  'Members' => 'Jäsenet',
+  'Message' => 'Viesti',
+  'Messages' => 'Viestit',
+  'Monday' => 'Maanantai',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Uusi viesti lähetäjältä {senderName}',
+  'New message in discussion from %displayName%' => 'Uusi viesti keskustelussa %displayName%',
+  'Participants' => 'Osallistujat',
+  'Pin' => '',
+  'Pinned' => 'Kiinnitetty',
+  'Receive Notifications when someone opens a new conversation.' => 'Saa ilmoitus aina kun joku aloittaa uuden keskustelun.',
+  'Receive Notifications when someone sends you a message.' => 'Saa ilmoitus aina kun joku lähettää viestin sinulle.',
+  'Receive private messages' => 'Vastaanota yksityisiä viestejä',
+  'Recipient' => 'Vastaanottaja',
+  'Reply now' => 'Vastaa nyt',
+  'Saturday' => 'Lauantai',
+  'Search' => 'Hae',
+  'Send' => 'Lähetä',
+  'Send message' => 'Viesti',
+  'Seperate restrictions for new users' => 'Erilliset rajoitukset uusille käyttäjille',
+  'Show all messages' => 'Näytä kaikki viestit',
+  'Show menu item in top Navigation' => 'Näytä viestinappula ylä paneelissa.',
+  'Sign up now' => 'Rekisteröidy nyt',
+  'Spaces' => 'Sivut',
+  'Start new conversations' => 'Aloita uusi keskustelu',
+  'Subject' => 'Aihe',
+  'Sunday' => 'Sunnuntai',
+  'Tags' => 'Tägit',
+  'There are no messages yet.' => 'Viestejä ei ole vielä.',
+  'This user is already participating in this conversation.' => 'Tämä käyttäjä osallistuu jo tähän keskusteluun.',
+  'Thursday' => 'Torstai',
+  'Title' => 'Otsikko',
+  'Today' => 'Tänään',
+  'Tuesday' => 'Tiistai',
+  'Unpin' => 'Poista kiinnitys',
+  'Until a user is member since (days)' => 'Kunnes käyttäjä on jäsenenä (päivät)',
+  'Updated At' => 'Päivitetty',
+  'Updated By' => 'Päivittänyt',
+  'User' => 'Käyttäjä',
+  'User Posts' => 'Käyttäjän Julkaisut',
+  'User {name} is already participating!' => 'Käyttäjä {name} osalistuu jo tähän!',
+  'Wednesday' => 'Keskiviikko',
+  'Write a message...' => 'Kirjoittaa viestiä...',
+  'Yesterday' => '',
+  'You' => 'Sinä',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => 'Sinä et voi lähettää {name} :le viestejä',
+  'You are not allowed to start a conversation with this user.' => 'Et voi aloittaa keskustelua tämän käyttäjän kanssa.',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Et voi lähettää viestiä itsellesi!',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Et voi aloittaa uutta keskustelua koska olet ylittänyt järjestelmän valvojan asettaman rajoituksen.',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/fi/forms_CreateMessageForm.php b/messages/fi/forms_CreateMessageForm.php
deleted file mode 100644
index 68a801eb..00000000
--- a/messages/fi/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Viesti',
-  'Recipient' => 'Vastaanottaja',
-  'Subject' => 'Aihe',
-  'Tags' => 'Tägit',
-);
diff --git a/messages/fi/forms_InviteRecipientForm.php b/messages/fi/forms_InviteRecipientForm.php
deleted file mode 100644
index 15415610..00000000
--- a/messages/fi/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Vastaanottaja',
-  'User {name} is already participating!' => 'Käyttäjä {name} osalistuu jo tähän!',
-  'You are not allowed to send user {name} is already!' => 'Sinä et voi lähettää {name} :le viestejä',
-  'You cannot send a email to yourself!' => 'Et voi lähettää viestiä itsellesi!',
-);
diff --git a/messages/fi/forms_ReplyMessageForm.php b/messages/fi/forms_ReplyMessageForm.php
deleted file mode 100644
index 1e0382ca..00000000
--- a/messages/fi/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Viesti',
-);
diff --git a/messages/fi/models_Message.php b/messages/fi/models_Message.php
deleted file mode 100644
index 82bbab1b..00000000
--- a/messages/fi/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Uusi viesti lähetäjältä {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/fi/models_MessageEntry.php b/messages/fi/models_MessageEntry.php
deleted file mode 100644
index 009f5cd4..00000000
--- a/messages/fi/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'New message in discussion from %displayName%' => 'Uusi viesti keskustelussa %displayName%',
-);
diff --git a/messages/fi/views_emails_NewMessage.php b/messages/fi/views_emails_NewMessage.php
deleted file mode 100644
index fc878cfc..00000000
--- a/messages/fi/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Uusi</strong> viesti',
-    'Reply now' => 'Vastaa nyt',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/fi/views_emails_NewMessageEntry.php b/messages/fi/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/fi/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/fi/views_mail_adduser.php b/messages/fi/views_mail_adduser.php
deleted file mode 100644
index 51441070..00000000
--- a/messages/fi/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Lisää osallistujia keskusteluun...',
-];
diff --git a/messages/fi/views_mail_create.php b/messages/fi/views_mail_create.php
deleted file mode 100644
index 20c4a0d3..00000000
--- a/messages/fi/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Uusi</strong> viesti',
-  'Add recipients' => 'Lisää vastaanottajia',
-  'Send' => 'Lähetä',
-);
diff --git a/messages/fi/views_mail_edit.php b/messages/fi/views_mail_edit.php
deleted file mode 100644
index 115d4501..00000000
--- a/messages/fi/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Muokkaa viestiä',
-];
diff --git a/messages/fi/views_mail_index.php b/messages/fi/views_mail_index.php
deleted file mode 100644
index aff6a282..00000000
--- a/messages/fi/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Keskustelut',
-    'There are no messages yet.' => 'Viestejä ei ole vielä.',
-];
diff --git a/messages/fi/views_mail_list.php b/messages/fi/views_mail_list.php
deleted file mode 100644
index 4464f89d..00000000
--- a/messages/fi/views_mail_list.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'There are no messages yet.' => 'Viestejä ei ole vielä.',
-);
diff --git a/messages/fi/views_mail_show.php b/messages/fi/views_mail_show.php
deleted file mode 100644
index fc58be89..00000000
--- a/messages/fi/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Poista</strong> keskustelu',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Poistu</strong> keskustelusta',
-    '<strong>Confirm</strong> message deletion' => '<strong>Vahvista</strong> viestin poistaminen',
-    'Add user' => 'Lisää käyttäjä',
-    'Cancel' => 'Poistu',
-    'Delete' => 'Poista',
-    'Delete conversation' => 'Poista keskustelu',
-    'Do you really want to delete this conversation?' => 'Haluatko varmasti poistaa tämän keskustelun?',
-    'Do you really want to delete this message?' => 'Haluatko varmasti poistaa tämän viestin?',
-    'Do you really want to leave this conversation?' => 'Haluatko varmasti poistua tästä keskustelusta?',
-    'Leave' => 'Poistu',
-    'Leave conversation' => 'Poistu keskustelusta',
-    'There are no messages yet.' => 'Täällä ei ole viestejä vielä.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/fi/views_mail_sidebar.php b/messages/fi/views_mail_sidebar.php
deleted file mode 100644
index f0f81b48..00000000
--- a/messages/fi/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Ryhmät',
-  'Members' => 'Jäsenet',
-  'Spaces' => 'Sivut',
-  'User Posts' => 'Käyttäjän Julkaisut',
-);
diff --git a/messages/fi/views_mails_UserInviteSpace.php b/messages/fi/views_mails_UserInviteSpace.php
deleted file mode 100644
index 79518046..00000000
--- a/messages/fi/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'Sign up now' => 'Rekisteröidy nyt',
-);
diff --git a/messages/fi/widgets_views_mailNotification.php b/messages/fi/widgets_views_mailNotification.php
deleted file mode 100644
index 1cdfd151..00000000
--- a/messages/fi/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Näytä kaikki viestit',
-];
diff --git a/messages/fi/widgets_views_newMessageButton.php b/messages/fi/widgets_views_newMessageButton.php
deleted file mode 100644
index 699a9f14..00000000
--- a/messages/fi/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Viesti',
-];
diff --git a/messages/fr/base.php b/messages/fr/base.php
index d239ae12..b693c0e9 100644
--- a/messages/fr/base.php
+++ b/messages/fr/base.php
@@ -1,30 +1,48 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmer</strong> la suppression de la conversation',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmer</strong> le départ de la conversation',
+  '<strong>Confirm</strong> message deletion' => '<strong>Confirmer</strong> la suppression du message',
   '<strong>Confirm</strong> tag deletion' => '<strong>Confirmer</strong> la suppression du tag',
   '<strong>Edit</strong> conversation tags' => '<strong>Modifier</strong> les tags de la conversation',
   '<strong>Edit</strong> tag' => '<strong>Modifier</strong> tag',
   '<strong>Manage</strong> conversation tags' => '<strong>Administrer</strong> les tags de conversation',
   '<strong>Messenger</strong> module configuration' => 'Configuration du module de <strong>messagerie</strong>',
+  '<strong>New</strong> conversation' => '<strong>Nouvelle</strong> conversation',
+  '<strong>New</strong> message' => '<strong>Nouveau</strong> message',
   'A tag with the same name already exists.' => 'Il existe déjà un tag avec ce nom',
   'Add Tag' => 'Ajouter tag',
+  'Add more participants to your conversation...' => 'Ajouter plus de participants à votre conversation...',
   'Add participants' => 'Ajouter des participants',
+  'Add recipients' => 'Ajouter des destinataires',
+  'Add user' => 'Ajouter un utilisateur',
   'Advanced Messages Search' => 'Recherche avancée de messages',
   'Allow others to send you private messages' => 'Autoriser les autres utilisateurs à vous envoyer des messages privés',
   'Allow users to start new conversations' => 'Autoriser les utilisateurs à lancer des nouvelles conversations',
+  'Cancel' => 'Annuler',
   'Confirm' => 'Confirmer',
   'Conversation' => 'Conversation',
   'Conversation tags can be used to filter conversations and are only visible to you.' => 'Les tags de conversation peuvent être utiliser pour filtrer les conversation. Ils ne sont visible que par vous.',
   'Conversations' => 'Conversations',
   'Created At' => 'Créé le',
   'Created By' => 'Créé par',
+  'Delete' => 'Supprimer',
+  'Delete conversation' => 'Supprimer la conversation',
+  'Do you really want to delete this conversation?' => 'Souhaitez-vous vraiment supprimer cette conversation ?',
+  'Do you really want to delete this message?' => 'Souhaitez-vous vraiment supprimer ce message ?',
   'Do you really want to delete this tag?' => 'Souhaitez-vous vraiment supprimer ce tag?',
+  'Do you really want to leave this conversation?' => 'Souhaitez-vous vraiment quitter cette conversation ?',
   'Edit' => 'Modifier',
+  'Edit message entry' => 'Modifier le message',
   'Edit message...' => 'Modifier le message...',
   'Filters' => 'Filtres',
   'Friday' => 'Vendredi',
+  'Groups' => 'Groupes',
   'Here you can manage your private conversation tags.' => 'Vous pouvez administrer vos tags de conversation privées',
   'Is Originator' => 'Est à l\'origine',
   'Last Viewed' => 'Dernière lecture',
+  'Leave' => 'Quitter',
+  'Leave conversation' => 'Quitter la conversation',
   'Leave fields blank in order to disable a restriction.' => 'Laisser vide pour désactiver une restriction.',
   'Manage Tags' => 'Administrer les Tags',
   'Mark Unread' => 'Marquer comme non lu',
@@ -32,24 +50,36 @@
   'Max number of messages allowed for a new user per day' => 'Nombre maximum de messages autorisés par jour pour un nouvel utilisateur',
   'Max number of new conversations allowed for a new user per day' => 'Nombre maximum de nouvelles conversations autorisées par jour pour un nouvel utilisateur',
   'Max number of new conversations allowed for a user per day' => 'Nombre maximum de nouvelles conversations autorisées par utilisateur par jour',
+  'Members' => 'Membres',
   'Message' => 'Message',
   'Messages' => 'Messages',
   'Monday' => 'Lundi',
   'My Tags' => 'Mes Tags',
+  'New conversation from {senderName}' => 'Nouvelle conversation de {senderName}',
+  'New message from {senderName}' => 'Nouveau message de {senderName}',
+  'New message in discussion from %displayName%' => 'Nouveau message dans la conversation de %displayName%',
   'Participants' => 'Participants',
   'Pin' => 'Épingler',
   'Pinned' => 'Épinglé',
   'Receive Notifications when someone opens a new conversation.' => 'Recevoir une notification lorsqu\'on lance une conversation.',
   'Receive Notifications when someone sends you a message.' => 'Recevoir une notification lorsqu\'on m\'envoie un message.',
   'Receive private messages' => 'Recevoir des messages privés',
+  'Recipient' => 'Destinataire',
+  'Reply now' => 'Répondre maintenant',
   'Saturday' => 'Samedi',
   'Search' => 'Recherche',
+  'Send' => 'Envoyer',
+  'Send message' => 'Envoyer un message',
   'Seperate restrictions for new users' => 'Restrictions spécifiques pour les nouveaux utilisateurs',
+  'Show all messages' => 'Afficher tous les messages',
   'Show menu item in top Navigation' => 'Montrer l\'élément de menu dans la navigation supérieure',
+  'Sign up now' => 'S\'inscrire maintenant',
+  'Spaces' => 'Espaces',
   'Start new conversations' => 'Lancer des nouvelles conversations',
   'Subject' => 'Objet',
   'Sunday' => 'Dimanche',
   'Tags' => 'Tags',
+  'There are no messages yet.' => 'Il n\'y a aucun message.',
   'This user is already participating in this conversation.' => 'L\'utilisateur participe déjà à cette conversation.',
   'Thursday' => 'Jeudi',
   'Title' => 'Titre',
@@ -60,13 +90,18 @@
   'Updated At' => 'Mis à jour le',
   'Updated By' => 'Mis à jour par',
   'User' => 'Utilisateur',
+  'User Posts' => 'Publications de l\'utilisateur',
+  'User {name} is already participating!' => 'L\'utilisateur {name} participe déjà.',
   'Wednesday' => 'Mercredi',
   'Write a message...' => 'Écrire un message...',
   'Yesterday' => 'Hier',
   'You' => 'Vous',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Vous n\'êtes pas autorisé à participer à cette conversation. Vous avez été bloqué par : {userNames}.',
   'You are not allowed to reply to users {userNames}!' => 'Vous n\'êtes pas autorisé à répondre aux utilisateurs {userNames} !',
+  'You are not allowed to send user {name} is already!' => 'Vous n\'êtes pas autoriser à envoyer de massage à l\'utilisateur {name}.',
   'You are not allowed to start a conversation with this user.' => 'Vous n\'êtes pas autorisé à démarrer une conversation avec cet utilisateur.',
   'You are not allowed to start a conversation with {userName}!' => 'Vous n\'êtes pas autorisé à démarrer une conversation avec {userName} !',
+  'You cannot send a email to yourself!' => 'Vous ne pouvez pas envoyer un e-mail à vous-même.',
   'You cannot send a message to yourself!' => 'Vous ne pouvez vous envoyer un message à vous-même !',
   'You cannot send a message without recipients!' => 'Vous ne pouvez pas envoyer de message sans destinataire !',
   'You joined the conversation.' => 'Vous avez rejoint la conversation.',
@@ -74,6 +109,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => 'Vous avez dépassé votre nombre quotidien autorisé de nouvelles conversations.',
   'edited' => 'modifié',
   '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# autre} other{# autres}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} a démarré une nouvelle conversation {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} vous a envoyé un nouveau message dans {conversationTitle}',
   '{username} joined the conversation.' => '{username} a rejoint la conversation.',
   '{username} left the conversation.' => '{username} a quitté la conversation.',
-);
+];
diff --git a/messages/fr/forms_CreateMessageForm.php b/messages/fr/forms_CreateMessageForm.php
deleted file mode 100644
index 63aa8014..00000000
--- a/messages/fr/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Message',
-  'Recipient' => 'Destinataire',
-  'Subject' => 'Sujet',
-  'Tags' => 'Tags',
-);
diff --git a/messages/fr/forms_InviteRecipientForm.php b/messages/fr/forms_InviteRecipientForm.php
deleted file mode 100644
index 62fb6752..00000000
--- a/messages/fr/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Destinataire',
-  'User {name} is already participating!' => 'L\'utilisateur {name} participe déjà.',
-  'You are not allowed to send user {name} is already!' => 'Vous n\'êtes pas autoriser à envoyer de massage à l\'utilisateur {name}.',
-  'You cannot send a email to yourself!' => 'Vous ne pouvez pas envoyer un e-mail à vous-même.',
-);
diff --git a/messages/fr/forms_ReplyMessageForm.php b/messages/fr/forms_ReplyMessageForm.php
deleted file mode 100644
index e748053e..00000000
--- a/messages/fr/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Message',
-);
diff --git a/messages/fr/models_Message.php b/messages/fr/models_Message.php
deleted file mode 100644
index 01f2f6b8..00000000
--- a/messages/fr/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Nouvelle conversation de {senderName}',
-  'New message from {senderName}' => 'Nouveau message de {senderName}',
-);
diff --git a/messages/fr/models_MessageEntry.php b/messages/fr/models_MessageEntry.php
deleted file mode 100644
index 52a31e50..00000000
--- a/messages/fr/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nouveau message dans la conversation de %displayName%',
-);
diff --git a/messages/fr/views_emails_NewMessage.php b/messages/fr/views_emails_NewMessage.php
deleted file mode 100644
index 3e069239..00000000
--- a/messages/fr/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Nouvelle</strong> conversation',
-  '<strong>New</strong> message' => '<strong>Nouveau</strong> message',
-  'Reply now' => 'Répondre maintenant',
-);
diff --git a/messages/fr/views_emails_NewMessageEntry.php b/messages/fr/views_emails_NewMessageEntry.php
deleted file mode 100644
index a565dd03..00000000
--- a/messages/fr/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} a démarré une nouvelle conversation {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} vous a envoyé un nouveau message dans {conversationTitle}',
-);
diff --git a/messages/fr/views_mail_adduser.php b/messages/fr/views_mail_adduser.php
deleted file mode 100644
index 327638e2..00000000
--- a/messages/fr/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Ajouter plus de participants à votre conversation...',
-];
diff --git a/messages/fr/views_mail_create.php b/messages/fr/views_mail_create.php
deleted file mode 100644
index b23a69e9..00000000
--- a/messages/fr/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nouveau</strong> message',
-  'Add recipients' => 'Ajouter des destinataires',
-  'Send' => 'Envoyer',
-);
diff --git a/messages/fr/views_mail_edit.php b/messages/fr/views_mail_edit.php
deleted file mode 100644
index f028f1ce..00000000
--- a/messages/fr/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Modifier le message',
-];
diff --git a/messages/fr/views_mail_index.php b/messages/fr/views_mail_index.php
deleted file mode 100644
index ac7290aa..00000000
--- a/messages/fr/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Conversations',
-    'There are no messages yet.' => 'Il n\'y a aucun message.',
-];
diff --git a/messages/fr/views_mail_list.php b/messages/fr/views_mail_list.php
deleted file mode 100644
index f7328fd9..00000000
--- a/messages/fr/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Il n\'y a aucun message.',
-);
diff --git a/messages/fr/views_mail_show.php b/messages/fr/views_mail_show.php
deleted file mode 100644
index 65c3c8bd..00000000
--- a/messages/fr/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmer</strong> la suppression de la conversation',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmer</strong> le départ de la conversation',
-  '<strong>Confirm</strong> message deletion' => '<strong>Confirmer</strong> la suppression du message',
-  'Add user' => 'Ajouter un utilisateur',
-  'Cancel' => 'Annuler',
-  'Delete' => 'Supprimer',
-  'Delete conversation' => 'Supprimer la conversation',
-  'Do you really want to delete this conversation?' => 'Souhaitez-vous vraiment supprimer cette conversation ?',
-  'Do you really want to delete this message?' => 'Souhaitez-vous vraiment supprimer ce message ?',
-  'Do you really want to leave this conversation?' => 'Souhaitez-vous vraiment quitter cette conversation ?',
-  'Leave' => 'Quitter',
-  'Leave conversation' => 'Quitter la conversation',
-  'There are no messages yet.' => 'Il n\'y a encore aucun message.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Vous n\'êtes pas autorisé à participer à cette conversation. Vous avez été bloqué par : {userNames}.',
-);
diff --git a/messages/fr/views_mail_sidebar.php b/messages/fr/views_mail_sidebar.php
deleted file mode 100644
index c30c87a0..00000000
--- a/messages/fr/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Groupes',
-  'Members' => 'Membres',
-  'Spaces' => 'Espaces',
-  'User Posts' => 'Publications de l\'utilisateur',
-);
diff --git a/messages/fr/views_mails_UserInviteSpace.php b/messages/fr/views_mails_UserInviteSpace.php
deleted file mode 100644
index 10748265..00000000
--- a/messages/fr/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'S\'inscrire maintenant',
-);
diff --git a/messages/fr/widgets_views_mailNotification.php b/messages/fr/widgets_views_mailNotification.php
deleted file mode 100644
index 489ac4f7..00000000
--- a/messages/fr/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Afficher tous les messages',
-];
diff --git a/messages/fr/widgets_views_newMessageButton.php b/messages/fr/widgets_views_newMessageButton.php
deleted file mode 100644
index 2c18cb15..00000000
--- a/messages/fr/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Envoyer un message',
-];
diff --git a/messages/he/base.php b/messages/he/base.php
index 4fa69e8a..00dbe1da 100644
--- a/messages/he/base.php
+++ b/messages/he/base.php
@@ -1,80 +1,110 @@
 <?php
-
 return [
-    'Confirm' => 'אשר',
-    'Edit' => 'עריכה',
-    'Search' => 'חיפוש',
-    'Title' => 'כותרת',
-    'User' => 'מִשׁתַמֵשׁ',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'ביטול',
+  'Confirm' => 'אשר',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => 'מחק',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'עריכה',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'חיפוש',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'הצג את כל ההודעות',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'כותרת',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'מִשׁתַמֵשׁ',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/he/forms_CreateMessageForm.php b/messages/he/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/he/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/he/forms_InviteRecipientForm.php b/messages/he/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/he/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/he/forms_ReplyMessageForm.php b/messages/he/forms_ReplyMessageForm.php
deleted file mode 100644
index 81f52098..00000000
--- a/messages/he/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-];
diff --git a/messages/he/models_Message.php b/messages/he/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/he/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/he/views_emails_NewMessage.php b/messages/he/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/he/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/he/views_emails_NewMessageEntry.php b/messages/he/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/he/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/he/views_mail_adduser.php b/messages/he/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/he/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/he/views_mail_create.php b/messages/he/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/he/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/he/views_mail_edit.php b/messages/he/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/he/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/he/views_mail_index.php b/messages/he/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/he/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/he/views_mail_list.php b/messages/he/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/he/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/he/views_mail_show.php b/messages/he/views_mail_show.php
deleted file mode 100644
index f8623a67..00000000
--- a/messages/he/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'ביטול',
-    'Delete' => 'מחק',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/he/widgets_views_mailNotification.php b/messages/he/widgets_views_mailNotification.php
deleted file mode 100644
index afb8f1cd..00000000
--- a/messages/he/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'הצג את כל ההודעות',
-);
diff --git a/messages/he/widgets_views_newMessageButton.php b/messages/he/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/he/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/hr/base.php b/messages/hr/base.php
index 7e4171ce..16d7c30f 100644
--- a/messages/hr/base.php
+++ b/messages/hr/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Potvrdi</strong> brisanje oznake',
-    '<strong>Edit</strong> conversation tags' => '<strong>Uredi</strong> oznake razgovora',
-    '<strong>Edit</strong> tag' => '<strong>Uredi</strong> oznaku',
-    '<strong>Manage</strong> conversation tags' => '<strong>Upravljanje</strong> tagovima razgovora',
-    'A tag with the same name already exists.' => 'Oznaka s istim imenom već postoji.',
-    'Add Tag' => 'Dodaj oznaku',
-    'Add participants' => 'Dodaj sudionike',
-    'Allow others to send you private messages' => 'Dopustite drugima da vam šalju privatne poruke',
-    'Allow users to start new conversations' => 'Omogućite korisnicima započinjanje novih razgovora',
-    'Confirm' => 'Potvrdi',
-    'Conversation' => 'Razgovor',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Oznake razgovora mogu se koristiti za filtriranje razgovora i vidljive su samo vama.',
-    'Conversations' => 'Razgovori',
-    'Created At' => 'Kreirano u',
-    'Created By' => 'Kreirano od',
-    'Do you really want to delete this tag?' => 'Želite li zaista izbrisati ovu oznaku?',
-    'Edit' => 'Uredi',
-    'Edit message...' => 'Uredi poruku ...',
-    'Filters' => 'Filteri',
-    'Friday' => 'Petak',
-    'Here you can manage your private conversation tags.' => 'Ovdje možete upravljati oznakama privatnog razgovora.',
-    'Is Originator' => 'Je pokretač',
-    'Last Viewed' => 'Zadnje pogledano',
-    'Leave fields blank in order to disable a restriction.' => 'Ostavite polja prazna da biste onemogućili ograničenje.',
-    'Manage Tags' => 'Upravljanje oznakama',
-    'Max messages allowed per day' => 'Maksimalno dopuštenih poruka dnevno',
-    'Max number of messages allowed for a new user per day' => 'Maksimalni broj poruka dopušten za novog korisnika dnevno',
-    'Max number of new conversations allowed for a new user per day' => 'Maksimalni broj novih razgovora dopušten za novog korisnika dnevno',
-    'Max number of new conversations allowed for a user per day' => 'Najveći dopušteni broj novih razgovora za korisnika dnevno',
-    'Message' => 'Poruka',
-    'Messages' => 'Poruke',
-    'Monday' => 'Ponedjeljak',
-    'My Tags' => 'Moje oznake',
-    'Participants' => 'Sudionici',
-    'Pinned' => 'Prikačeno',
-    'Receive Notifications when someone opens a new conversation.' => 'Primajte obavijesti kad netko otvori novi razgovor.',
-    'Receive Notifications when someone sends you a message.' => 'Primajte obavijesti kad vam netko pošalje poruku.',
-    'Receive private messages' => 'Primi privatne poruke',
-    'Saturday' => 'Subota',
-    'Search' => 'Pretraži',
-    'Seperate restrictions for new users' => 'Odvojena ograničenja za nove korisnike',
-    'Show menu item in top Navigation' => 'Prikaži stavku izbornika u gornjem dijelu Navigacije',
-    'Start new conversations' => 'Započnite nove razgovore',
-    'Subject' => 'Predmet',
-    'Sunday' => 'Nedjelja',
-    'Tags' => 'Tagovi',
-    'This user is already participating in this conversation.' => 'Ovaj korisnik već sudjeluje u ovom razgovoru.',
-    'Thursday' => 'Četvrtak',
-    'Title' => 'Naziv',
-    'Today' => 'Danas',
-    'Tuesday' => 'Utorak',
-    'Unpin' => 'Otkači',
-    'Until a user is member since (days)' => 'Until a user is member since (days)',
-    'Updated At' => 'Ažurirano u',
-    'Updated By' => 'Ažurirano od',
-    'User' => 'Korisnik',
-    'Wednesday' => 'Srijeda',
-    'Write a message...' => 'Napišite poruku ...',
-    'You' => 'Vi',
-    'You are not allowed to start a conversation with this user.' => 'Nemate dopuštenje započeti razgovor s ovim korisnikom.',
-    'You cannot send a message to yourself!' => 'Ne možete sebi poslati poruku!',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Premašili ste dnevnu količinu novih razgovora.',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
-    '<strong>Messenger</strong> module configuration' => '',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Potvrdi</strong> brisanje razgovora',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Potvrdi</strong> napuštanje razgovora',
+  '<strong>Confirm</strong> message deletion' => '<strong>Potvrdi</strong> brisanje poruke',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Potvrdi</strong> brisanje oznake',
+  '<strong>Edit</strong> conversation tags' => '<strong>Uredi</strong> oznake razgovora',
+  '<strong>Edit</strong> tag' => '<strong>Uredi</strong> oznaku',
+  '<strong>Manage</strong> conversation tags' => '<strong>Upravljanje</strong> tagovima razgovora',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Nova</strong> poruka',
+  'A tag with the same name already exists.' => 'Oznaka s istim imenom već postoji.',
+  'Add Tag' => 'Dodaj oznaku',
+  'Add more participants to your conversation...' => 'Dodajte još sudionika u vaš razgovor...',
+  'Add participants' => 'Dodaj sudionike',
+  'Add recipients' => 'Dodaj primatelje',
+  'Add user' => 'Dodaj korisnika',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Dopustite drugima da vam šalju privatne poruke',
+  'Allow users to start new conversations' => 'Omogućite korisnicima započinjanje novih razgovora',
+  'Cancel' => 'Poništi',
+  'Confirm' => 'Potvrdi',
+  'Conversation' => 'Razgovor',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Oznake razgovora mogu se koristiti za filtriranje razgovora i vidljive su samo vama.',
+  'Conversations' => 'Razgovori',
+  'Created At' => 'Kreirano u',
+  'Created By' => 'Kreirano od',
+  'Delete' => 'Obriši',
+  'Delete conversation' => 'Obriši razgovor',
+  'Do you really want to delete this conversation?' => 'Zaista želite obrisati ovaj razgovor?',
+  'Do you really want to delete this message?' => 'Zaista želite obrisati ovu poruku?',
+  'Do you really want to delete this tag?' => 'Želite li zaista izbrisati ovu oznaku?',
+  'Do you really want to leave this conversation?' => 'Zaista želite napustiti ovaj razgovor?',
+  'Edit' => 'Uredi',
+  'Edit message entry' => 'Uredi unos poruka',
+  'Edit message...' => 'Uredi poruku ...',
+  'Filters' => 'Filteri',
+  'Friday' => 'Petak',
+  'Here you can manage your private conversation tags.' => 'Ovdje možete upravljati oznakama privatnog razgovora.',
+  'Is Originator' => 'Je pokretač',
+  'Last Viewed' => 'Zadnje pogledano',
+  'Leave' => 'Napusti',
+  'Leave conversation' => 'Napusti razgovor',
+  'Leave fields blank in order to disable a restriction.' => 'Ostavite polja prazna da biste onemogućili ograničenje.',
+  'Manage Tags' => 'Upravljanje oznakama',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Maksimalno dopuštenih poruka dnevno',
+  'Max number of messages allowed for a new user per day' => 'Maksimalni broj poruka dopušten za novog korisnika dnevno',
+  'Max number of new conversations allowed for a new user per day' => 'Maksimalni broj novih razgovora dopušten za novog korisnika dnevno',
+  'Max number of new conversations allowed for a user per day' => 'Najveći dopušteni broj novih razgovora za korisnika dnevno',
+  'Message' => 'Poruka',
+  'Messages' => 'Poruke',
+  'Monday' => 'Ponedjeljak',
+  'My Tags' => 'Moje oznake',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Nova poruka od {senderName}',
+  'New message in discussion from %displayName%' => 'Nova poruka u raspravi od %displayName%',
+  'Participants' => 'Sudionici',
+  'Pin' => '',
+  'Pinned' => 'Prikačeno',
+  'Receive Notifications when someone opens a new conversation.' => 'Primajte obavijesti kad netko otvori novi razgovor.',
+  'Receive Notifications when someone sends you a message.' => 'Primajte obavijesti kad vam netko pošalje poruku.',
+  'Receive private messages' => 'Primi privatne poruke',
+  'Recipient' => 'Primatelj',
+  'Reply now' => 'Odgovori sada',
+  'Saturday' => 'Subota',
+  'Search' => 'Pretraži',
+  'Send' => 'Pošalji',
+  'Send message' => 'Pošalji poruku',
+  'Seperate restrictions for new users' => 'Odvojena ograničenja za nove korisnike',
+  'Show all messages' => 'Prikaži sve poruke',
+  'Show menu item in top Navigation' => 'Prikaži stavku izbornika u gornjem dijelu Navigacije',
+  'Start new conversations' => 'Započnite nove razgovore',
+  'Subject' => 'Predmet',
+  'Sunday' => 'Nedjelja',
+  'Tags' => 'Tagovi',
+  'There are no messages yet.' => 'Još nema poruka.',
+  'This user is already participating in this conversation.' => 'Ovaj korisnik već sudjeluje u ovom razgovoru.',
+  'Thursday' => 'Četvrtak',
+  'Title' => 'Naziv',
+  'Today' => 'Danas',
+  'Tuesday' => 'Utorak',
+  'Unpin' => 'Otkači',
+  'Until a user is member since (days)' => 'Until a user is member since (days)',
+  'Updated At' => 'Ažurirano u',
+  'Updated By' => 'Ažurirano od',
+  'User' => 'Korisnik',
+  'User {name} is already participating!' => 'Korisnik {name} već sudjeluje!',
+  'Wednesday' => 'Srijeda',
+  'Write a message...' => 'Napišite poruku ...',
+  'Yesterday' => '',
+  'You' => 'Vi',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => 'Ne smijete slati korisnika {name} je već!',
+  'You are not allowed to start a conversation with this user.' => 'Nemate dopuštenje započeti razgovor s ovim korisnikom.',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Ne možete poslati email sami sebi!',
+  'You cannot send a message to yourself!' => 'Ne možete sebi poslati poruku!',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Premašili ste dnevnu količinu novih razgovora.',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/hr/forms_CreateMessageForm.php b/messages/hr/forms_CreateMessageForm.php
deleted file mode 100644
index fe08aeb8..00000000
--- a/messages/hr/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Poruka',
-  'Recipient' => 'Primatelj',
-  'Subject' => 'Predmet',
-  'Tags' => 'Tagovi',
-);
diff --git a/messages/hr/forms_InviteRecipientForm.php b/messages/hr/forms_InviteRecipientForm.php
deleted file mode 100644
index 7cbed35a..00000000
--- a/messages/hr/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Primatelj',
-  'User {name} is already participating!' => 'Korisnik {name} već sudjeluje!',
-  'You are not allowed to send user {name} is already!' => 'Ne smijete slati korisnika {name} je već!',
-  'You cannot send a email to yourself!' => 'Ne možete poslati email sami sebi!',
-);
diff --git a/messages/hr/forms_ReplyMessageForm.php b/messages/hr/forms_ReplyMessageForm.php
deleted file mode 100644
index ea9d6219..00000000
--- a/messages/hr/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Poruka',
-);
diff --git a/messages/hr/models_Message.php b/messages/hr/models_Message.php
deleted file mode 100644
index b6e17f83..00000000
--- a/messages/hr/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Nova poruka od {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/hr/models_MessageEntry.php b/messages/hr/models_MessageEntry.php
deleted file mode 100644
index 0d30c20f..00000000
--- a/messages/hr/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nova poruka u raspravi od %displayName%',
-);
diff --git a/messages/hr/views_emails_NewMessage.php b/messages/hr/views_emails_NewMessage.php
deleted file mode 100644
index 695d11d2..00000000
--- a/messages/hr/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Nova</strong> poruka',
-    'Reply now' => 'Odgovori sada',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/hr/views_emails_NewMessageEntry.php b/messages/hr/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/hr/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/hr/views_mail_adduser.php b/messages/hr/views_mail_adduser.php
deleted file mode 100644
index 5410095f..00000000
--- a/messages/hr/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Dodajte još sudionika u vaš razgovor...',
-];
diff --git a/messages/hr/views_mail_create.php b/messages/hr/views_mail_create.php
deleted file mode 100644
index fef2490f..00000000
--- a/messages/hr/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nova</strong> poruka',
-  'Add recipients' => 'Dodaj primatelje',
-  'Send' => 'Pošalji',
-);
diff --git a/messages/hr/views_mail_edit.php b/messages/hr/views_mail_edit.php
deleted file mode 100644
index 357ff1cb..00000000
--- a/messages/hr/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Uredi unos poruka',
-];
diff --git a/messages/hr/views_mail_index.php b/messages/hr/views_mail_index.php
deleted file mode 100644
index 89eb5ad9..00000000
--- a/messages/hr/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Razgovori',
-    'There are no messages yet.' => 'Još nema poruka.',
-];
diff --git a/messages/hr/views_mail_list.php b/messages/hr/views_mail_list.php
deleted file mode 100644
index 4d20db6b..00000000
--- a/messages/hr/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Još nema poruka.',
-);
diff --git a/messages/hr/views_mail_show.php b/messages/hr/views_mail_show.php
deleted file mode 100644
index cabba6c0..00000000
--- a/messages/hr/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Potvrdi</strong> brisanje razgovora',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Potvrdi</strong> napuštanje razgovora',
-    '<strong>Confirm</strong> message deletion' => '<strong>Potvrdi</strong> brisanje poruke',
-    'Add user' => 'Dodaj korisnika',
-    'Cancel' => 'Poništi',
-    'Delete' => 'Obriši',
-    'Delete conversation' => 'Obriši razgovor',
-    'Do you really want to delete this conversation?' => 'Zaista želite obrisati ovaj razgovor?',
-    'Do you really want to delete this message?' => 'Zaista želite obrisati ovu poruku?',
-    'Do you really want to leave this conversation?' => 'Zaista želite napustiti ovaj razgovor?',
-    'Leave' => 'Napusti',
-    'Leave conversation' => 'Napusti razgovor',
-    'There are no messages yet.' => 'Još nema poruka.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/hr/widgets_views_mailNotification.php b/messages/hr/widgets_views_mailNotification.php
deleted file mode 100644
index 8cb53bb6..00000000
--- a/messages/hr/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'Prikaži sve poruke',
-);
diff --git a/messages/hr/widgets_views_newMessageButton.php b/messages/hr/widgets_views_newMessageButton.php
deleted file mode 100644
index 972cdcc3..00000000
--- a/messages/hr/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Pošalji poruku',
-];
diff --git a/messages/ht/base.php b/messages/ht/base.php
index 934fd98f..720bf93c 100644
--- a/messages/ht/base.php
+++ b/messages/ht/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    'Search' => 'Chèche',
-    'Title' => 'Tit',
-    'User' => 'Itilizatè',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'Chèche',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Tit',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Itilizatè',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/ht/forms_CreateMessageForm.php b/messages/ht/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/ht/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/ht/forms_InviteRecipientForm.php b/messages/ht/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/ht/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/ht/forms_ReplyMessageForm.php b/messages/ht/forms_ReplyMessageForm.php
deleted file mode 100644
index df2dc693..00000000
--- a/messages/ht/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'Message' => '',
-];
diff --git a/messages/ht/models_Message.php b/messages/ht/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/ht/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/ht/models_MessageEntry.php b/messages/ht/models_MessageEntry.php
deleted file mode 100644
index d85d0473..00000000
--- a/messages/ht/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'New message in discussion from %displayName%' => '',
-];
diff --git a/messages/ht/views_emails_NewMessage.php b/messages/ht/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/ht/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/ht/views_emails_NewMessageEntry.php b/messages/ht/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/ht/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/ht/views_mail_adduser.php b/messages/ht/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/ht/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/ht/views_mail_create.php b/messages/ht/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/ht/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/ht/views_mail_edit.php b/messages/ht/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/ht/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/ht/views_mail_index.php b/messages/ht/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/ht/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/ht/views_mail_list.php b/messages/ht/views_mail_list.php
deleted file mode 100644
index aee65815..00000000
--- a/messages/ht/views_mail_list.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/ht/views_mail_show.php b/messages/ht/views_mail_show.php
deleted file mode 100644
index 1b3f7308..00000000
--- a/messages/ht/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/ht/widgets_views_mailNotification.php b/messages/ht/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/ht/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/ht/widgets_views_newMessageButton.php b/messages/ht/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/ht/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/hu/base.php b/messages/hu/base.php
index 408777f6..1e5f8da9 100644
--- a/messages/hu/base.php
+++ b/messages/hu/base.php
@@ -1,30 +1,48 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => 'Beszélgetés <strong>törlésének</strong>  megerősítése',
+  '<strong>Confirm</strong> leaving conversation' => 'Beszélgetés <strong>elhagyása</strong>',
+  '<strong>Confirm</strong> message deletion' => 'Üzenet <strong>törlésének</strong> megerősítése',
   '<strong>Confirm</strong> tag deletion' => 'Címke törlés <strong>megerősítése</strong>',
   '<strong>Edit</strong> conversation tags' => 'Beszélgetés címkék <strong>szerkesztése</strong>',
   '<strong>Edit</strong> tag' => 'Címke <strong>szerkesztése</strong>',
   '<strong>Manage</strong> conversation tags' => 'Beszélgetés címkék <strong>kezelése</strong>',
   '<strong>Messenger</strong> module configuration' => '<strong>Messenger</strong> modul konfigurációja',
+  '<strong>New</strong> conversation' => '<strong>Új</strong> beszélgetés',
+  '<strong>New</strong> message' => '<strong>Új</strong> üzenet',
   'A tag with the same name already exists.' => 'Egy címke hasonló névvel már létezik.',
   'Add Tag' => 'Címke hozzáadása',
+  'Add more participants to your conversation...' => 'További résztvevők hozzáadása a beszélgetéshez...',
   'Add participants' => 'Résztvevők hozzáadása',
+  'Add recipients' => 'Címzett(ek)',
+  'Add user' => 'Felhasználó hozzáadása',
   'Advanced Messages Search' => 'Speciális üzenetkeresés',
   'Allow others to send you private messages' => 'Engedélyezed másoknak, hogy privát üzenetet küldjenek.',
   'Allow users to start new conversations' => 'Engedélyezze a felhasználóknak, hogy új beszélgetéseket kezdeményezzenek.',
+  'Cancel' => 'Mégsem',
   'Confirm' => 'Megerősít',
   'Conversation' => 'Beszélgetés',
   'Conversation tags can be used to filter conversations and are only visible to you.' => 'A beszélgetési címkék használhatók a beszélgetések szűrésére, és csak számodra láthatók.',
   'Conversations' => 'Beszélgetések',
   'Created At' => 'Létrehozva',
   'Created By' => 'Létrehozta',
+  'Delete' => 'Törlés',
+  'Delete conversation' => 'Beszélgetés törlése',
+  'Do you really want to delete this conversation?' => 'Biztos törlöd ezt a beszélgetést?',
+  'Do you really want to delete this message?' => 'Biztos törlöd ezt az üzenetet?',
   'Do you really want to delete this tag?' => 'Valóban törölni akarod ezt a címkét?',
+  'Do you really want to leave this conversation?' => 'Tényleg ki akarsz lépni ebből a beszélgetésből?',
   'Edit' => 'Szerkesztés',
+  'Edit message entry' => 'Üzenet szerkesztése',
   'Edit message...' => 'Üzenet szerkesztése...',
   'Filters' => 'Szűrők',
   'Friday' => 'Péntek',
+  'Groups' => 'Csoportok',
   'Here you can manage your private conversation tags.' => 'Itt tudod kezelni a privát beszélgetések címkéit.',
   'Is Originator' => 'Kezdeményező',
   'Last Viewed' => 'Utoljára megtekintve',
+  'Leave' => 'Elhagyás',
+  'Leave conversation' => 'Beszélgetés elhagyása',
   'Leave fields blank in order to disable a restriction.' => 'Hagyd üresen a mezőket a korlátozás kikapcsolásához.',
   'Manage Tags' => 'Címkék kezelése',
   'Mark Unread' => 'Megjelölés olvasatlanként',
@@ -32,24 +50,36 @@
   'Max number of messages allowed for a new user per day' => 'Engedélyezett üzenetek száma naponta az új felhasználónak',
   'Max number of new conversations allowed for a new user per day' => 'Egy új felhasználó számára engedélyezett új beszélgetések maximális száma naponta',
   'Max number of new conversations allowed for a user per day' => 'Egy felhasználó számára engedélyezett új beszélgetések maximális száma naponta',
+  'Members' => 'Tagok',
   'Message' => 'Üzenet',
   'Messages' => 'Üzenetek',
   'Monday' => 'Hétfő',
   'My Tags' => 'Címkéim',
+  'New conversation from {senderName}' => '{senderName} új beszélgetést indított',
+  'New message from {senderName}' => '{senderName} új üzenetet küldött',
+  'New message in discussion from %displayName%' => '%displayName% üzenetet küldött',
   'Participants' => 'Résztvevők',
   'Pin' => 'Rögzít',
   'Pinned' => 'Rögzítve',
   'Receive Notifications when someone opens a new conversation.' => 'Értesítések fogadása, amikor valaki új beszélgetést kezdeményez.',
   'Receive Notifications when someone sends you a message.' => 'Értesítések fogadása, amikor valaki üzenetet küld neked.',
   'Receive private messages' => 'Privát üzenetek fogadása',
+  'Recipient' => 'Címzett',
+  'Reply now' => 'Válasz írása',
   'Saturday' => 'Szombat',
   'Search' => 'Keresés',
+  'Send' => 'Küldés',
+  'Send message' => 'Üzenetküldés',
   'Seperate restrictions for new users' => 'Különálló korlátozások az új felhasználók számára',
+  'Show all messages' => 'Összes üzenet mutatása',
   'Show menu item in top Navigation' => 'Mutassa a menüt a felső navigációban',
+  'Sign up now' => 'Feliratkozás most',
+  'Spaces' => 'Közösségek',
   'Start new conversations' => 'Új beszélgetések kezdeményezése',
   'Subject' => 'Téma',
   'Sunday' => 'Vasárnap',
   'Tags' => 'Címkék',
+  'There are no messages yet.' => 'Még nincsenek üzenetek.',
   'This user is already participating in this conversation.' => 'Ez a felhasználó már tagja ennek a beszélgetésnek.',
   'Thursday' => 'Csütörtök',
   'Title' => 'Tárgy',
@@ -60,13 +90,18 @@
   'Updated At' => 'Frissítve',
   'Updated By' => 'Frissítette',
   'User' => 'Felhasználó',
+  'User Posts' => 'Felhasználó bejegyzések',
+  'User {name} is already participating!' => '{name} már a résztvevők között szerepel!',
   'Wednesday' => 'Szerda',
   'Write a message...' => 'Üzenet írása...',
   'Yesterday' => 'Tegnap',
   'You' => 'Te',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Nem vehetsz részt ebben a beszélgetésben. {userNames} blokkolt téged.',
   'You are not allowed to reply to users {userNames}!' => 'Nem válaszolhatsz {userNames} felhasználónak!',
+  'You are not allowed to send user {name} is already!' => 'Nem küldhetsz üzenetet a következőnek: {name}',
   'You are not allowed to start a conversation with this user.' => 'Nem engedélyezett számodra új beszélgetés kezdeményezése ezzel a felhasználóval.',
   'You are not allowed to start a conversation with {userName}!' => 'Számodra nem engedélyezett, hogy ezzel a felhasználóval beszélgetést kezdeményezz: {userName}',
+  'You cannot send a email to yourself!' => 'Magadnak nem küldhetsz üzenetet!',
   'You cannot send a message to yourself!' => 'Nem küldhetsz üzenet saját magadnak!',
   'You cannot send a message without recipients!' => 'Nem küldhet üzenetet címzettek nélkül!',
   'You joined the conversation.' => 'Ön csatlakozott a beszélgetéshez.',
@@ -74,6 +109,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => 'Elérted a maximális napi üzenetek számát.',
   'edited' => 'szerkesztette',
   '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# egyéb} other{# egyéb}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} új beszélgetést indított ebben a témában: {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} új üzenetet küldött ebben a témában: {conversationTitle}',
   '{username} joined the conversation.' => '{username} csatlakozott a beszélgetéshez.',
   '{username} left the conversation.' => '{username} kilépett a beszélgetésből.',
-);
+];
diff --git a/messages/hu/forms_CreateMessageForm.php b/messages/hu/forms_CreateMessageForm.php
deleted file mode 100644
index c351a496..00000000
--- a/messages/hu/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Üzenet',
-  'Recipient' => 'Címzett',
-  'Subject' => 'Tárgy',
-  'Tags' => 'Címkék',
-);
diff --git a/messages/hu/forms_InviteRecipientForm.php b/messages/hu/forms_InviteRecipientForm.php
deleted file mode 100644
index d4a286fd..00000000
--- a/messages/hu/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Címzett',
-  'User {name} is already participating!' => '{name} már a résztvevők között szerepel!',
-  'You are not allowed to send user {name} is already!' => 'Nem küldhetsz üzenetet a következőnek: {name}',
-  'You cannot send a email to yourself!' => 'Magadnak nem küldhetsz üzenetet!',
-);
diff --git a/messages/hu/forms_ReplyMessageForm.php b/messages/hu/forms_ReplyMessageForm.php
deleted file mode 100644
index ad05a5e7..00000000
--- a/messages/hu/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Üzenet',
-);
diff --git a/messages/hu/models_Message.php b/messages/hu/models_Message.php
deleted file mode 100644
index 085ebfbb..00000000
--- a/messages/hu/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => '{senderName} új beszélgetést indított',
-  'New message from {senderName}' => '{senderName} új üzenetet küldött',
-);
diff --git a/messages/hu/models_MessageEntry.php b/messages/hu/models_MessageEntry.php
deleted file mode 100644
index 2a3f4233..00000000
--- a/messages/hu/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => '%displayName% üzenetet küldött',
-);
diff --git a/messages/hu/views_emails_NewMessage.php b/messages/hu/views_emails_NewMessage.php
deleted file mode 100644
index e81dc6f6..00000000
--- a/messages/hu/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Új</strong> beszélgetés',
-  '<strong>New</strong> message' => '<strong>Új</strong> üzenet',
-  'Reply now' => 'Válasz írása',
-);
diff --git a/messages/hu/views_emails_NewMessageEntry.php b/messages/hu/views_emails_NewMessageEntry.php
deleted file mode 100644
index 225a5b74..00000000
--- a/messages/hu/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} új beszélgetést indított ebben a témában: {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} új üzenetet küldött ebben a témában: {conversationTitle}',
-);
diff --git a/messages/hu/views_mail_adduser.php b/messages/hu/views_mail_adduser.php
deleted file mode 100644
index ad1fa02f..00000000
--- a/messages/hu/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => 'További résztvevők hozzáadása a beszélgetéshez...',
-);
diff --git a/messages/hu/views_mail_create.php b/messages/hu/views_mail_create.php
deleted file mode 100644
index b7677276..00000000
--- a/messages/hu/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Új</strong> üzenet',
-  'Add recipients' => 'Címzett(ek)',
-  'Send' => 'Küldés',
-);
diff --git a/messages/hu/views_mail_edit.php b/messages/hu/views_mail_edit.php
deleted file mode 100644
index cd3e8202..00000000
--- a/messages/hu/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Üzenet szerkesztése',
-];
diff --git a/messages/hu/views_mail_index.php b/messages/hu/views_mail_index.php
deleted file mode 100644
index 96f38870..00000000
--- a/messages/hu/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Beszélgetések',
-    'There are no messages yet.' => 'Még nincsenek üzenetek.',
-];
diff --git a/messages/hu/views_mail_list.php b/messages/hu/views_mail_list.php
deleted file mode 100644
index ee1f1f47..00000000
--- a/messages/hu/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Még nincsenek üzenetek.',
-);
diff --git a/messages/hu/views_mail_show.php b/messages/hu/views_mail_show.php
deleted file mode 100644
index 96100031..00000000
--- a/messages/hu/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => 'Beszélgetés <strong>törlésének</strong>  megerősítése',
-  '<strong>Confirm</strong> leaving conversation' => 'Beszélgetés <strong>elhagyása</strong>',
-  '<strong>Confirm</strong> message deletion' => 'Üzenet <strong>törlésének</strong> megerősítése',
-  'Add user' => 'Felhasználó hozzáadása',
-  'Cancel' => 'Mégsem',
-  'Delete' => 'Törlés',
-  'Delete conversation' => 'Beszélgetés törlése',
-  'Do you really want to delete this conversation?' => 'Biztos törlöd ezt a beszélgetést?',
-  'Do you really want to delete this message?' => 'Biztos törlöd ezt az üzenetet?',
-  'Do you really want to leave this conversation?' => 'Tényleg ki akarsz lépni ebből a beszélgetésből?',
-  'Leave' => 'Elhagyás',
-  'Leave conversation' => 'Beszélgetés elhagyása',
-  'There are no messages yet.' => 'Még nincsenek üzenetek.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Nem vehetsz részt ebben a beszélgetésben. {userNames} blokkolt téged.',
-);
diff --git a/messages/hu/views_mail_sidebar.php b/messages/hu/views_mail_sidebar.php
deleted file mode 100644
index 5adb35ae..00000000
--- a/messages/hu/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Csoportok',
-  'Members' => 'Tagok',
-  'Spaces' => 'Közösségek',
-  'User Posts' => 'Felhasználó bejegyzések',
-);
diff --git a/messages/hu/views_mails_UserInviteSpace.php b/messages/hu/views_mails_UserInviteSpace.php
deleted file mode 100644
index ea44ff8d..00000000
--- a/messages/hu/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Feliratkozás most',
-);
diff --git a/messages/hu/widgets_views_mailNotification.php b/messages/hu/widgets_views_mailNotification.php
deleted file mode 100644
index 3aa02361..00000000
--- a/messages/hu/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Összes üzenet mutatása',
-];
diff --git a/messages/hu/widgets_views_newMessageButton.php b/messages/hu/widgets_views_newMessageButton.php
deleted file mode 100644
index dbac7be2..00000000
--- a/messages/hu/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Üzenetküldés',
-];
diff --git a/messages/id/base.php b/messages/id/base.php
index 5c2e44ba..0d942c85 100644
--- a/messages/id/base.php
+++ b/messages/id/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    'Allow others to send you private messages' => 'Izinkan orang lain mengirimi Anda pesan pribadi',
-    'Allow users to start new conversations' => 'Izinkan pengguna memulai percakapan baru',
-    'Confirm' => 'Konfirmasi',
-    'Conversation' => 'Percakapan',
-    'Created At' => 'Dibuat di',
-    'Created By' => 'Dibuat oleh',
-    'Edit' => 'Ubah',
-    'Edit message...' => 'Ubah pesan ...',
-    'Last Viewed' => 'Terakhir dilihat',
-    'Leave fields blank in order to disable a restriction.' => 'Biarkan bidang kosong untuk menonaktifkan pembatasan.',
-    'Max messages allowed per day' => 'Pesan diizinkan per hari',
-    'Max number of messages allowed for a new user per day' => 'Jumlah pesan maksimum yang diizinkan untuk pengguna baru per hari',
-    'Max number of new conversations allowed for a new user per day' => 'Jumlah maksimum percakapan baru yang diizinkan untuk pengguna baru per hari',
-    'Max number of new conversations allowed for a user per day' => 'Jumlah maksimum percakapan baru yang diizinkan untuk pengguna per hari',
-    'Message' => 'Pesan',
-    'Messages' => 'Pesan',
-    'Participants' => 'Partisipasi',
-    'Pinned' => 'Disematkan',
-    'Receive private messages' => 'Terima pesan pribadi',
-    'Search' => 'Cari',
-    'Start new conversations' => 'Mulau percakapan baru',
-    'This user is already participating in this conversation.' => 'Pengguna ini sudah berpartisipasi dalam percakapan ini.',
-    'Title' => 'Judul',
-    'Until a user is member since (days)' => 'Sampai seorang pengguna menjadi anggota sejak (hari)',
-    'Updated At' => 'Diperbarui di',
-    'Updated By' => 'Diperbarui oleh',
-    'User' => 'Pengguna',
-    'You' => 'Anda',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Do you really want to delete this tag?' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Izinkan orang lain mengirimi Anda pesan pribadi',
+  'Allow users to start new conversations' => 'Izinkan pengguna memulai percakapan baru',
+  'Cancel' => 'Batal',
+  'Confirm' => 'Konfirmasi',
+  'Conversation' => 'Percakapan',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => 'Dibuat di',
+  'Created By' => 'Dibuat oleh',
+  'Delete' => 'Hapus',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'Ubah',
+  'Edit message entry' => '',
+  'Edit message...' => 'Ubah pesan ...',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => 'Terakhir dilihat',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => 'Biarkan bidang kosong untuk menonaktifkan pembatasan.',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Pesan diizinkan per hari',
+  'Max number of messages allowed for a new user per day' => 'Jumlah pesan maksimum yang diizinkan untuk pengguna baru per hari',
+  'Max number of new conversations allowed for a new user per day' => 'Jumlah maksimum percakapan baru yang diizinkan untuk pengguna baru per hari',
+  'Max number of new conversations allowed for a user per day' => 'Jumlah maksimum percakapan baru yang diizinkan untuk pengguna per hari',
+  'Message' => 'Pesan',
+  'Messages' => 'Pesan',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => 'Partisipasi',
+  'Pin' => '',
+  'Pinned' => 'Disematkan',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => 'Terima pesan pribadi',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'Cari',
+  'Send' => 'Kirim',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => 'Mulau percakapan baru',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => 'Pengguna ini sudah berpartisipasi dalam percakapan ini.',
+  'Thursday' => '',
+  'Title' => 'Judul',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => 'Sampai seorang pengguna menjadi anggota sejak (hari)',
+  'Updated At' => 'Diperbarui di',
+  'Updated By' => 'Diperbarui oleh',
+  'User' => 'Pengguna',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Anda',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/id/forms_CreateMessageForm.php b/messages/id/forms_CreateMessageForm.php
deleted file mode 100644
index 8bd08c51..00000000
--- a/messages/id/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => 'Pesan',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/id/forms_InviteRecipientForm.php b/messages/id/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/id/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/id/forms_ReplyMessageForm.php b/messages/id/forms_ReplyMessageForm.php
deleted file mode 100644
index 52b2c68c..00000000
--- a/messages/id/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Pesan',
-);
diff --git a/messages/id/models_Message.php b/messages/id/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/id/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/id/models_MessageEntry.php b/messages/id/models_MessageEntry.php
deleted file mode 100644
index 17293e9e..00000000
--- a/messages/id/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => '',
-);
diff --git a/messages/id/views_emails_NewMessage.php b/messages/id/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/id/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/id/views_emails_NewMessageEntry.php b/messages/id/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/id/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/id/views_mail_adduser.php b/messages/id/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/id/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/id/views_mail_create.php b/messages/id/views_mail_create.php
deleted file mode 100644
index ab89110d..00000000
--- a/messages/id/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    'Send' => 'Kirim',
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-];
diff --git a/messages/id/views_mail_edit.php b/messages/id/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/id/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/id/views_mail_index.php b/messages/id/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/id/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/id/views_mail_list.php b/messages/id/views_mail_list.php
deleted file mode 100644
index 462cc43b..00000000
--- a/messages/id/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => '',
-);
diff --git a/messages/id/views_mail_show.php b/messages/id/views_mail_show.php
deleted file mode 100644
index 9dcc1dd3..00000000
--- a/messages/id/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'Batal',
-    'Delete' => 'Hapus',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/id/widgets_views_mailNotification.php b/messages/id/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/id/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/id/widgets_views_newMessageButton.php b/messages/id/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/id/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/it/base.php b/messages/it/base.php
index 7c430305..a031b510 100644
--- a/messages/it/base.php
+++ b/messages/it/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Conferma</strong> l\'eliminazione dei tag',
-    '<strong>Edit</strong> conversation tags' => '<strong>Modifica</strong> tag di conversazione',
-    '<strong>Edit</strong> tag' => '<strong>Modifica</strong> tag',
-    '<strong>Manage</strong> conversation tags' => '<strong>Gestisci</strong> tag di conversazione',
-    '<strong>Messenger</strong> module configuration' => 'Configurazione del modulo <strong>Messenger</strong>',
-    'A tag with the same name already exists.' => 'Esiste già un tag con lo stesso nome.',
-    'Add Tag' => 'Aggiungi Tag',
-    'Add participants' => 'Aggiungi partecipanti',
-    'Allow others to send you private messages' => 'Permetti agli altri di inviarti messaggi privati',
-    'Allow users to start new conversations' => 'Permetti agli utenti di iniziare nuove conversazioni',
-    'Confirm' => 'Conferma',
-    'Conversation' => 'Conversazione',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'I tag di conversazione possono essere utilizzati per filtrare le conversazioni e sono visibili solo a te.',
-    'Conversations' => 'Conversazioni',
-    'Created At' => 'Creato il',
-    'Created By' => 'Creato da',
-    'Do you really want to delete this tag?' => 'Vuoi davvero eliminare questo tag?',
-    'Edit' => 'Modifica',
-    'Edit message...' => 'Modifica messaggio...',
-    'Filters' => 'Filtri',
-    'Friday' => 'Venerdì',
-    'Here you can manage your private conversation tags.' => 'Qui puoi gestire i tag delle tue conversazioni private.',
-    'Is Originator' => 'È l\'Autore',
-    'Last Viewed' => 'Visto l\'ultima volta',
-    'Leave fields blank in order to disable a restriction.' => 'Lasciare vuoti i campi per disabilitare una restrizione.',
-    'Manage Tags' => 'Gestisci tag',
-    'Max messages allowed per day' => 'Numero massimo di messaggi consentiti al giorno',
-    'Max number of messages allowed for a new user per day' => 'Numero massimo di messaggi consentiti per un nuovo utente al giorno',
-    'Max number of new conversations allowed for a new user per day' => 'Numero massimo di nuove conversazioni consentite per un nuovo utente al giorno',
-    'Max number of new conversations allowed for a user per day' => 'Numero massimo di nuove conversazioni consentite per un utente al giorno',
-    'Message' => 'Messaggio',
-    'Messages' => 'Messaggi',
-    'Monday' => 'Lunedì',
-    'My Tags' => 'I miei tag',
-    'Participants' => 'Partecipanti',
-    'Pinned' => 'In evidenza',
-    'Receive Notifications when someone opens a new conversation.' => 'Ricevi una notifica quando qualcuo crea una nuova conversazione',
-    'Receive Notifications when someone sends you a message.' => 'Ricevi una notifica quando qualcuno ti invia un messaggio',
-    'Receive private messages' => 'Ricevi messaggi privati',
-    'Saturday' => 'Sabato',
-    'Search' => 'Ricerca',
-    'Seperate restrictions for new users' => 'Restrizioni separate per i nuovi utenti',
-    'Show menu item in top Navigation' => 'Mostra l\'icona del modulo nel menu superiore',
-    'Start new conversations' => 'Inizia nuove conversazioni',
-    'Subject' => 'Soggetto',
-    'Sunday' => 'Domenica',
-    'Tags' => 'Tag',
-    'This user is already participating in this conversation.' => 'Questo untente sta già partecipando a questa conversazione.',
-    'Thursday' => 'Giovedì',
-    'Title' => 'Titolo',
-    'Today' => 'Oggi',
-    'Tuesday' => 'Martedì',
-    'Unpin' => 'Scollega',
-    'Until a user is member since (days)' => 'Fino a quando un utente è membro da (giorni)',
-    'Updated At' => 'Aggiornato il',
-    'Updated By' => 'Aggiornato da',
-    'User' => 'Utente',
-    'Wednesday' => 'Mercoledì',
-    'Write a message...' => 'Scrivi un messaggio...',
-    'Yesterday' => 'Ieri',
-    'You' => 'Tu',
-    'You are not allowed to reply to users {userNames}!' => 'Non ti è consentito rispondere agli utenti {userNames}!',
-    'You are not allowed to start a conversation with this user.' => 'Non sei autorizzato da iniziare una conversazione con questo utente.',
-    'You are not allowed to start a conversation with {userName}!' => 'Non sei autorizzato ad avviare una conversazione con {userName}!',
-    'You cannot send a message to yourself!' => 'Non puoi inviare un messaggio a te stesso!',
-    'You cannot send a message without recipients!' => 'Non è possibile inviare un messaggio senza destinatari!',
-    'You joined the conversation.' => 'Ti sei unito alla conversazione.',
-    'You left the conversation.' => 'Hai lasciato la conversazione.',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Hai superato il numero giornaliero di nuove conversazioni.',
-    'edited' => 'modificato',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# altro} other{# altri}}',
-    '{username} joined the conversation.' => '{username} si è unito alla conversazione.',
-    '{username} left the conversation.' => '{username} ha lasciato la conversazione.',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Confermi</strong> l\'eliminazione della conversazione?',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Confermi</strong> di lasciare la conversazione?',
+  '<strong>Confirm</strong> message deletion' => '<strong>Confermi</strong> l\'eliminazione del messaggio?',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Conferma</strong> l\'eliminazione dei tag',
+  '<strong>Edit</strong> conversation tags' => '<strong>Modifica</strong> tag di conversazione',
+  '<strong>Edit</strong> tag' => '<strong>Modifica</strong> tag',
+  '<strong>Manage</strong> conversation tags' => '<strong>Gestisci</strong> tag di conversazione',
+  '<strong>Messenger</strong> module configuration' => 'Configurazione del modulo <strong>Messenger</strong>',
+  '<strong>New</strong> conversation' => '<strong>Nuova</strong> conversazione',
+  '<strong>New</strong> message' => '<strong>Nuovo</strong> messaggio',
+  'A tag with the same name already exists.' => 'Esiste già un tag con lo stesso nome.',
+  'Add Tag' => 'Aggiungi Tag',
+  'Add more participants to your conversation...' => 'Aggiungi più partecipanti alla tua conversazione...',
+  'Add participants' => 'Aggiungi partecipanti',
+  'Add recipients' => 'Aggiungi destinatari',
+  'Add user' => 'Aggiungi utente',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Permetti agli altri di inviarti messaggi privati',
+  'Allow users to start new conversations' => 'Permetti agli utenti di iniziare nuove conversazioni',
+  'Cancel' => 'Annulla',
+  'Confirm' => 'Conferma',
+  'Conversation' => 'Conversazione',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'I tag di conversazione possono essere utilizzati per filtrare le conversazioni e sono visibili solo a te.',
+  'Conversations' => 'Conversazioni',
+  'Created At' => 'Creato il',
+  'Created By' => 'Creato da',
+  'Delete' => 'Cancella',
+  'Delete conversation' => 'Cancella conversazione',
+  'Do you really want to delete this conversation?' => 'Vuoi eliminare questa conversazione?',
+  'Do you really want to delete this message?' => 'Vuoi eliminare questo messaggio?',
+  'Do you really want to delete this tag?' => 'Vuoi davvero eliminare questo tag?',
+  'Do you really want to leave this conversation?' => 'Vuoi abbandonare questa conversazione?',
+  'Edit' => 'Modifica',
+  'Edit message entry' => 'Modifica messaggio',
+  'Edit message...' => 'Modifica messaggio...',
+  'Filters' => 'Filtri',
+  'Friday' => 'Venerdì',
+  'Groups' => 'Gruppi',
+  'Here you can manage your private conversation tags.' => 'Qui puoi gestire i tag delle tue conversazioni private.',
+  'Is Originator' => 'È l\'Autore',
+  'Last Viewed' => 'Visto l\'ultima volta',
+  'Leave' => 'Lascia',
+  'Leave conversation' => 'Abbandona conversazione',
+  'Leave fields blank in order to disable a restriction.' => 'Lasciare vuoti i campi per disabilitare una restrizione.',
+  'Manage Tags' => 'Gestisci tag',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Numero massimo di messaggi consentiti al giorno',
+  'Max number of messages allowed for a new user per day' => 'Numero massimo di messaggi consentiti per un nuovo utente al giorno',
+  'Max number of new conversations allowed for a new user per day' => 'Numero massimo di nuove conversazioni consentite per un nuovo utente al giorno',
+  'Max number of new conversations allowed for a user per day' => 'Numero massimo di nuove conversazioni consentite per un utente al giorno',
+  'Members' => 'Membri',
+  'Message' => 'Messaggio',
+  'Messages' => 'Messaggi',
+  'Monday' => 'Lunedì',
+  'My Tags' => 'I miei tag',
+  'New conversation from {senderName}' => 'Nuova conversazione da  {senderName}',
+  'New message from {senderName}' => 'Nuovo messaggio da {senderName}',
+  'New message in discussion from %displayName%' => 'Nuovo messaggio nella discussione da %displayName%',
+  'Participants' => 'Partecipanti',
+  'Pin' => '',
+  'Pinned' => 'In evidenza',
+  'Receive Notifications when someone opens a new conversation.' => 'Ricevi una notifica quando qualcuo crea una nuova conversazione',
+  'Receive Notifications when someone sends you a message.' => 'Ricevi una notifica quando qualcuno ti invia un messaggio',
+  'Receive private messages' => 'Ricevi messaggi privati',
+  'Recipient' => 'Destinatario',
+  'Reply now' => 'Rispondi ora',
+  'Saturday' => 'Sabato',
+  'Search' => 'Ricerca',
+  'Send' => 'Invia',
+  'Send message' => 'Invia messaggio',
+  'Seperate restrictions for new users' => 'Restrizioni separate per i nuovi utenti',
+  'Show all messages' => 'Mostra tutti i messaggi',
+  'Show menu item in top Navigation' => 'Mostra l\'icona del modulo nel menu superiore',
+  'Sign up now' => 'Accedi ora',
+  'Spaces' => 'Space',
+  'Start new conversations' => 'Inizia nuove conversazioni',
+  'Subject' => 'Soggetto',
+  'Sunday' => 'Domenica',
+  'Tags' => 'Tag',
+  'There are no messages yet.' => 'Non c\'è alcun altro messaggio.',
+  'This user is already participating in this conversation.' => 'Questo untente sta già partecipando a questa conversazione.',
+  'Thursday' => 'Giovedì',
+  'Title' => 'Titolo',
+  'Today' => 'Oggi',
+  'Tuesday' => 'Martedì',
+  'Unpin' => 'Scollega',
+  'Until a user is member since (days)' => 'Fino a quando un utente è membro da (giorni)',
+  'Updated At' => 'Aggiornato il',
+  'Updated By' => 'Aggiornato da',
+  'User' => 'Utente',
+  'User Posts' => 'Messaggi utente',
+  'User {name} is already participating!' => 'L\'utente {name} sta già partecipando!',
+  'Wednesday' => 'Mercoledì',
+  'Write a message...' => 'Scrivi un messaggio...',
+  'Yesterday' => 'Ieri',
+  'You' => 'Tu',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Non sei autorizzato a partecipare a questa conversazione. Sei stato bloccatao da:  {userNames}.',
+  'You are not allowed to reply to users {userNames}!' => 'Non ti è consentito rispondere agli utenti {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'Non puoi inviare all\'utente {name}!',
+  'You are not allowed to start a conversation with this user.' => 'Non sei autorizzato da iniziare una conversazione con questo utente.',
+  'You are not allowed to start a conversation with {userName}!' => 'Non sei autorizzato ad avviare una conversazione con {userName}!',
+  'You cannot send a email to yourself!' => 'Non puoi inviare un\'email a te stesso!',
+  'You cannot send a message to yourself!' => 'Non puoi inviare un messaggio a te stesso!',
+  'You cannot send a message without recipients!' => 'Non è possibile inviare un messaggio senza destinatari!',
+  'You joined the conversation.' => 'Ti sei unito alla conversazione.',
+  'You left the conversation.' => 'Hai lasciato la conversazione.',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Hai superato il numero giornaliero di nuove conversazioni.',
+  'edited' => 'modificato',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# altro} other{# altri}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} created a new conversation {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} ti ha inviato un nuovo messaggio in {conversationTitle}',
+  '{username} joined the conversation.' => '{username} si è unito alla conversazione.',
+  '{username} left the conversation.' => '{username} ha lasciato la conversazione.',
 ];
diff --git a/messages/it/forms_CreateMessageForm.php b/messages/it/forms_CreateMessageForm.php
deleted file mode 100644
index 528bf226..00000000
--- a/messages/it/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Messaggio',
-  'Recipient' => 'Destinatario',
-  'Subject' => 'Soggetto',
-  'Tags' => 'Tag',
-);
diff --git a/messages/it/forms_InviteRecipientForm.php b/messages/it/forms_InviteRecipientForm.php
deleted file mode 100644
index d4a23f19..00000000
--- a/messages/it/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Destinatario',
-  'User {name} is already participating!' => 'L\'utente {name} sta già partecipando!',
-  'You are not allowed to send user {name} is already!' => 'Non puoi inviare all\'utente {name}!',
-  'You cannot send a email to yourself!' => 'Non puoi inviare un\'email a te stesso!',
-);
diff --git a/messages/it/forms_ReplyMessageForm.php b/messages/it/forms_ReplyMessageForm.php
deleted file mode 100644
index 327e64f5..00000000
--- a/messages/it/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Messaggio',
-);
diff --git a/messages/it/models_Message.php b/messages/it/models_Message.php
deleted file mode 100644
index 1115aa13..00000000
--- a/messages/it/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Nuova conversazione da  {senderName}',
-  'New message from {senderName}' => 'Nuovo messaggio da {senderName}',
-);
diff --git a/messages/it/models_MessageEntry.php b/messages/it/models_MessageEntry.php
deleted file mode 100644
index fdffa4ef..00000000
--- a/messages/it/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nuovo messaggio nella discussione da %displayName%',
-);
diff --git a/messages/it/views_emails_NewMessage.php b/messages/it/views_emails_NewMessage.php
deleted file mode 100644
index eed64510..00000000
--- a/messages/it/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Nuova</strong> conversazione',
-  '<strong>New</strong> message' => '<strong>Nuovo</strong> messaggio',
-  'Reply now' => 'Rispondi ora',
-);
diff --git a/messages/it/views_emails_NewMessageEntry.php b/messages/it/views_emails_NewMessageEntry.php
deleted file mode 100644
index 8f268924..00000000
--- a/messages/it/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} created a new conversation {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} ti ha inviato un nuovo messaggio in {conversationTitle}',
-);
diff --git a/messages/it/views_mail_adduser.php b/messages/it/views_mail_adduser.php
deleted file mode 100644
index 53824d54..00000000
--- a/messages/it/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Aggiungi più partecipanti alla tua conversazione...',
-];
diff --git a/messages/it/views_mail_create.php b/messages/it/views_mail_create.php
deleted file mode 100644
index a8042359..00000000
--- a/messages/it/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nuovo</strong> messaggio',
-  'Add recipients' => 'Aggiungi destinatari',
-  'Send' => 'Invia',
-);
diff --git a/messages/it/views_mail_edit.php b/messages/it/views_mail_edit.php
deleted file mode 100644
index 7337a143..00000000
--- a/messages/it/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Modifica messaggio',
-];
diff --git a/messages/it/views_mail_index.php b/messages/it/views_mail_index.php
deleted file mode 100644
index 3166920b..00000000
--- a/messages/it/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Conversazioni',
-    'There are no messages yet.' => 'Non c\'è alcun altro messaggio.',
-];
diff --git a/messages/it/views_mail_list.php b/messages/it/views_mail_list.php
deleted file mode 100644
index a34538d9..00000000
--- a/messages/it/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Non ci sono messaggi.',
-);
diff --git a/messages/it/views_mail_show.php b/messages/it/views_mail_show.php
deleted file mode 100644
index 0d173cd8..00000000
--- a/messages/it/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Confermi</strong> l\'eliminazione della conversazione?',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Confermi</strong> di lasciare la conversazione?',
-  '<strong>Confirm</strong> message deletion' => '<strong>Confermi</strong> l\'eliminazione del messaggio?',
-  'Add user' => 'Aggiungi utente',
-  'Cancel' => 'Annulla',
-  'Delete' => 'Cancella',
-  'Delete conversation' => 'Cancella conversazione',
-  'Do you really want to delete this conversation?' => 'Vuoi eliminare questa conversazione?',
-  'Do you really want to delete this message?' => 'Vuoi eliminare questo messaggio?',
-  'Do you really want to leave this conversation?' => 'Vuoi abbandonare questa conversazione?',
-  'Leave' => 'Lascia',
-  'Leave conversation' => 'Abbandona conversazione',
-  'There are no messages yet.' => 'Non ci sono ancora messaggi.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Non sei autorizzato a partecipare a questa conversazione. Sei stato bloccatao da:  {userNames}.',
-);
diff --git a/messages/it/views_mail_sidebar.php b/messages/it/views_mail_sidebar.php
deleted file mode 100644
index 814c0612..00000000
--- a/messages/it/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Gruppi',
-  'Members' => 'Membri',
-  'Spaces' => 'Space',
-  'User Posts' => 'Messaggi utente',
-);
diff --git a/messages/it/views_mails_UserInviteSpace.php b/messages/it/views_mails_UserInviteSpace.php
deleted file mode 100644
index 0d36c216..00000000
--- a/messages/it/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Accedi ora',
-);
diff --git a/messages/it/widgets_views_mailNotification.php b/messages/it/widgets_views_mailNotification.php
deleted file mode 100644
index 8c44ea24..00000000
--- a/messages/it/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Mostra tutti i messaggi',
-];
diff --git a/messages/it/widgets_views_newMessageButton.php b/messages/it/widgets_views_newMessageButton.php
deleted file mode 100644
index 9c69fd3a..00000000
--- a/messages/it/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Invia messaggio',
-];
diff --git a/messages/ja/base.php b/messages/ja/base.php
index 9d6badb5..f4a359b8 100644
--- a/messages/ja/base.php
+++ b/messages/ja/base.php
@@ -1,30 +1,48 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '会話の削除を <strong>確認</strong> します',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>確認</strong> して会話を終了',
+  '<strong>Confirm</strong> message deletion' => 'メッセージの削除の <strong>確認</strong>',
   '<strong>Confirm</strong> tag deletion' => 'タグの削除を <strong>確認</strong>',
   '<strong>Edit</strong> conversation tags' => '会話タグを<strong>編集</strong>',
   '<strong>Edit</strong> tag' => 'タグを<strong>編集</strong>',
   '<strong>Manage</strong> conversation tags' => '会話タグの <strong>管理</strong>',
   '<strong>Messenger</strong> module configuration' => 'モジュールの構成 <strong>メッセンジャー</strong>',
+  '<strong>New</strong> conversation' => '<strong>新しい</strong> 会話',
+  '<strong>New</strong> message' => '<strong>New</strong> メッセージ',
   'A tag with the same name already exists.' => '同じ名前のタグが既に存在します。',
   'Add Tag' => 'タグの追加',
+  'Add more participants to your conversation...' => 'より多くの参加者を会話に加えてください...',
   'Add participants' => '参加者を追加',
+  'Add recipients' => '宛先を追加',
+  'Add user' => 'ユーザーを追加',
   'Advanced Messages Search' => '高度なメッセージ検索',
   'Allow others to send you private messages' => '他のユーザーがあなたにプライベートメッセージを送るのを許可する',
   'Allow users to start new conversations' => 'ユーザーが新しい会話を開始できるようにする',
+  'Cancel' => 'キャンセル',
   'Confirm' => '確認',
   'Conversation' => '会話',
   'Conversation tags can be used to filter conversations and are only visible to you.' => '会話タグは会話をフィルタしてあなただけに見えるようにできます。',
   'Conversations' => '会話',
   'Created At' => '作成',
   'Created By' => '作成者',
+  'Delete' => '削除',
+  'Delete conversation' => '会話を削除',
+  'Do you really want to delete this conversation?' => '本当にこの会話を削除しますか？',
+  'Do you really want to delete this message?' => '本当にこのメッセージを削除しますか？',
   'Do you really want to delete this tag?' => '本当にこのタグを削除しますか？',
+  'Do you really want to leave this conversation?' => '本当にこの会話から退出しますか？',
   'Edit' => '編集',
+  'Edit message entry' => 'メッセージ エントリの編集',
   'Edit message...' => 'メッセージを編集...',
   'Filters' => 'フィルター',
   'Friday' => '金曜',
+  'Groups' => 'グループ',
   'Here you can manage your private conversation tags.' => 'ここでは非公開の会話タグを管理できます。',
   'Is Originator' => '作成者',
   'Last Viewed' => '最終閲覧日',
+  'Leave' => 'メッセージから去る',
+  'Leave conversation' => '会話から去る',
   'Leave fields blank in order to disable a restriction.' => '制限を無効にするにはフィールドを空白のままにします。',
   'Manage Tags' => 'タグの管理',
   'Mark Unread' => '未読マーク',
@@ -32,24 +50,36 @@
   'Max number of messages allowed for a new user per day' => '1日に新しいユーザーに許可されるメッセージの最大数',
   'Max number of new conversations allowed for a new user per day' => '新しいユーザーが 1日に許可される新しい会話の最大数',
   'Max number of new conversations allowed for a user per day' => '1日にユーザーに許可される新しい会話の最大数',
+  'Members' => 'メンバー',
   'Message' => 'メッセージ',
   'Messages' => 'メッセージ',
   'Monday' => '月曜',
   'My Tags' => '自分のタグ',
+  'New conversation from {senderName}' => '{senderName} さんからの新しい会話',
+  'New message from {senderName}' => '{senderName}さんから新しいメッセージ',
+  'New message in discussion from %displayName%' => '%displayName%さんから新しいディスカッションメッセージ',
   'Participants' => '参加者',
   'Pin' => 'ピン',
   'Pinned' => 'ピン留め',
   'Receive Notifications when someone opens a new conversation.' => '誰かが新しく会話を開始したら通知を受け取る。',
   'Receive Notifications when someone sends you a message.' => '誰かがあなたにメッセージを送ったら通知を受け取る。',
   'Receive private messages' => 'プライベートメッセージを受け取る',
+  'Recipient' => '受信者',
+  'Reply now' => '返信',
   'Saturday' => '土曜',
   'Search' => '検索',
+  'Send' => '送信',
+  'Send message' => 'メッセージを送る',
   'Seperate restrictions for new users' => '新規ユーザーの個別制限',
+  'Show all messages' => 'すべてのメッセージを表示',
   'Show menu item in top Navigation' => '上部のナビゲーションにメニュー項目を表示',
+  'Sign up now' => '今すぐ登録',
+  'Spaces' => 'スペース',
   'Start new conversations' => '新しい会話を開始する',
   'Subject' => '件名',
   'Sunday' => '日曜',
   'Tags' => 'タグ',
+  'There are no messages yet.' => 'まだ何もメッセージはありません。',
   'This user is already participating in this conversation.' => 'このユーザーはすでにこの会話に参加しています。',
   'Thursday' => '木曜',
   'Title' => 'タイトル',
@@ -60,13 +90,18 @@
   'Updated At' => '更新',
   'Updated By' => '更新者',
   'User' => 'ユーザー',
+  'User Posts' => 'ユーザー投稿',
+  'User {name} is already participating!' => 'ユーザー {name} はすでに参加しています！',
   'Wednesday' => '水曜',
   'Write a message...' => 'メッセージを書く...',
   'Yesterday' => '昨日',
   'You' => 'あなた自身',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'この会話への参加は許可されていません。あなたは {userNames} によってブロックされました。',
   'You are not allowed to reply to users {userNames}!' => 'ユーザー {userNames} に返信することは許可されていません！',
+  'You are not allowed to send user {name} is already!' => 'ユーザー {name} はすでに送信できません！',
   'You are not allowed to start a conversation with this user.' => 'このユーザーと会話を開始することは許可されていません。',
   'You are not allowed to start a conversation with {userName}!' => '{userName} と会話を開始することは許可されていません！',
+  'You cannot send a email to yourself!' => '自分宛にはメールを送れません！',
   'You cannot send a message to yourself!' => '自分にメッセージを送信できません。',
   'You cannot send a message without recipients!' => '受信者なしでメッセージを送信することはできません！',
   'You joined the conversation.' => '会話に参加しました。',
@@ -74,6 +109,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => '新しい会話の1日の上限量を超えました。',
   'edited' => '編集済み',
   '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} が新しい会話 {conversationTitle} を作成しました',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} が {conversationTitle} で新しいメッセージを送信しました',
   '{username} joined the conversation.' => '{username} が会話に参加しました。',
   '{username} left the conversation.' => '{username} さんが会話から退出しました。',
-);
+];
diff --git a/messages/ja/forms_CreateMessageForm.php b/messages/ja/forms_CreateMessageForm.php
deleted file mode 100644
index 57c0c755..00000000
--- a/messages/ja/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'メッセージ',
-  'Recipient' => '受信者',
-  'Subject' => '件名',
-  'Tags' => 'タグ',
-);
diff --git a/messages/ja/forms_InviteRecipientForm.php b/messages/ja/forms_InviteRecipientForm.php
deleted file mode 100644
index 816ea6ec..00000000
--- a/messages/ja/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => '受信者',
-  'User {name} is already participating!' => 'ユーザー {name} はすでに参加しています！',
-  'You are not allowed to send user {name} is already!' => 'ユーザー {name} はすでに送信できません！',
-  'You cannot send a email to yourself!' => '自分宛にはメールを送れません！',
-);
diff --git a/messages/ja/forms_ReplyMessageForm.php b/messages/ja/forms_ReplyMessageForm.php
deleted file mode 100644
index b1fd8a93..00000000
--- a/messages/ja/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'メッセージ',
-);
diff --git a/messages/ja/models_Message.php b/messages/ja/models_Message.php
deleted file mode 100644
index 789f66f8..00000000
--- a/messages/ja/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => '{senderName} さんからの新しい会話',
-  'New message from {senderName}' => '{senderName}さんから新しいメッセージ',
-);
diff --git a/messages/ja/models_MessageEntry.php b/messages/ja/models_MessageEntry.php
deleted file mode 100644
index 6f390f41..00000000
--- a/messages/ja/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => '%displayName%さんから新しいディスカッションメッセージ',
-);
diff --git a/messages/ja/views_emails_NewMessage.php b/messages/ja/views_emails_NewMessage.php
deleted file mode 100644
index d3507e2a..00000000
--- a/messages/ja/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>新しい</strong> 会話',
-  '<strong>New</strong> message' => '<strong>New</strong> メッセージ',
-  'Reply now' => '返信',
-);
diff --git a/messages/ja/views_emails_NewMessageEntry.php b/messages/ja/views_emails_NewMessageEntry.php
deleted file mode 100644
index f1630f4b..00000000
--- a/messages/ja/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} が新しい会話 {conversationTitle} を作成しました',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} が {conversationTitle} で新しいメッセージを送信しました',
-);
diff --git a/messages/ja/views_mail_adduser.php b/messages/ja/views_mail_adduser.php
deleted file mode 100644
index 7cbe6a71..00000000
--- a/messages/ja/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'より多くの参加者を会話に加えてください...',
-];
diff --git a/messages/ja/views_mail_create.php b/messages/ja/views_mail_create.php
deleted file mode 100644
index f4ddb02c..00000000
--- a/messages/ja/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>New</strong> メッセージ',
-  'Add recipients' => '宛先を追加',
-  'Send' => '送信',
-);
diff --git a/messages/ja/views_mail_edit.php b/messages/ja/views_mail_edit.php
deleted file mode 100644
index 737e316b..00000000
--- a/messages/ja/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => 'メッセージ エントリの編集',
-);
diff --git a/messages/ja/views_mail_index.php b/messages/ja/views_mail_index.php
deleted file mode 100644
index f2980395..00000000
--- a/messages/ja/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '会話',
-    'There are no messages yet.' => 'まだ何もメッセージはありません。',
-];
diff --git a/messages/ja/views_mail_list.php b/messages/ja/views_mail_list.php
deleted file mode 100644
index ca8cc8b3..00000000
--- a/messages/ja/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'まだ何もメッセージはありません。',
-);
diff --git a/messages/ja/views_mail_show.php b/messages/ja/views_mail_show.php
deleted file mode 100644
index d4f7df79..00000000
--- a/messages/ja/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '会話の削除を <strong>確認</strong> します',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>確認</strong> して会話を終了',
-  '<strong>Confirm</strong> message deletion' => 'メッセージの削除の <strong>確認</strong>',
-  'Add user' => 'ユーザーを追加',
-  'Cancel' => 'キャンセル',
-  'Delete' => '削除',
-  'Delete conversation' => '会話を削除',
-  'Do you really want to delete this conversation?' => '本当にこの会話を削除しますか？',
-  'Do you really want to delete this message?' => '本当にこのメッセージを削除しますか？',
-  'Do you really want to leave this conversation?' => '本当にこの会話から退出しますか？',
-  'Leave' => 'メッセージから去る',
-  'Leave conversation' => '会話から去る',
-  'There are no messages yet.' => 'まだ何もメッセージはありません。',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'この会話への参加は許可されていません。あなたは {userNames} によってブロックされました。',
-);
diff --git a/messages/ja/views_mail_sidebar.php b/messages/ja/views_mail_sidebar.php
deleted file mode 100644
index bb45fb72..00000000
--- a/messages/ja/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'グループ',
-  'Members' => 'メンバー',
-  'Spaces' => 'スペース',
-  'User Posts' => 'ユーザー投稿',
-);
diff --git a/messages/ja/views_mails_UserInviteSpace.php b/messages/ja/views_mails_UserInviteSpace.php
deleted file mode 100644
index b158e9b7..00000000
--- a/messages/ja/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => '今すぐ登録',
-);
diff --git a/messages/ja/widgets_views_mailNotification.php b/messages/ja/widgets_views_mailNotification.php
deleted file mode 100644
index 0158ef13..00000000
--- a/messages/ja/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'すべてのメッセージを表示',
-);
diff --git a/messages/ja/widgets_views_newMessageButton.php b/messages/ja/widgets_views_newMessageButton.php
deleted file mode 100644
index 444625d7..00000000
--- a/messages/ja/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'メッセージを送る',
-);
diff --git a/messages/ko/base.php b/messages/ko/base.php
index 0a8973a6..984a648c 100644
--- a/messages/ko/base.php
+++ b/messages/ko/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    'Confirm' => '확인',
-    'Created At' => '만든 위치',
-    'Created By' => '만든 사람',
-    'Edit' => '편집',
-    'Pinned' => '고정',
-    'Search' => '검색',
-    'Tags' => 'ㅡㅡ',
-    'Title' => '제목',
-    'Unpin' => '고정 해제',
-    'Updated At' => '업데이트 날짜',
-    'Updated By' => '업데이트 작성자',
-    'User' => '사용자',
-    'You' => '당신',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '취소',
+  'Confirm' => '확인',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '만든 위치',
+  'Created By' => '만든 사람',
+  'Delete' => '삭제',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '편집',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '고정',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '검색',
+  'Send' => '보내기',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => 'ㅡㅡ',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => '제목',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '고정 해제',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '업데이트 날짜',
+  'Updated By' => '업데이트 작성자',
+  'User' => '사용자',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '당신',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/ko/forms_CreateMessageForm.php b/messages/ko/forms_CreateMessageForm.php
deleted file mode 100644
index 8cc8b9a7..00000000
--- a/messages/ko/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => '',
-  'Recipient' => '',
-  'Subject' => '',
-  'Tags' => 'ㅡㅡ',
-);
diff --git a/messages/ko/forms_InviteRecipientForm.php b/messages/ko/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/ko/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/ko/forms_ReplyMessageForm.php b/messages/ko/forms_ReplyMessageForm.php
deleted file mode 100644
index daa60115..00000000
--- a/messages/ko/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => '',
-);
diff --git a/messages/ko/models_Message.php b/messages/ko/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/ko/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/ko/models_MessageEntry.php b/messages/ko/models_MessageEntry.php
deleted file mode 100644
index 17293e9e..00000000
--- a/messages/ko/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => '',
-);
diff --git a/messages/ko/views_emails_NewMessage.php b/messages/ko/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/ko/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/ko/views_emails_NewMessageEntry.php b/messages/ko/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/ko/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/ko/views_mail_adduser.php b/messages/ko/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/ko/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/ko/views_mail_create.php b/messages/ko/views_mail_create.php
deleted file mode 100644
index 39650eba..00000000
--- a/messages/ko/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '',
-  'Add recipients' => '',
-  'Send' => '보내기',
-);
diff --git a/messages/ko/views_mail_edit.php b/messages/ko/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/ko/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/ko/views_mail_index.php b/messages/ko/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/ko/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/ko/views_mail_list.php b/messages/ko/views_mail_list.php
deleted file mode 100644
index 462cc43b..00000000
--- a/messages/ko/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => '',
-);
diff --git a/messages/ko/views_mail_show.php b/messages/ko/views_mail_show.php
deleted file mode 100644
index abf96a21..00000000
--- a/messages/ko/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '',
-  '<strong>Confirm</strong> leaving conversation' => '',
-  '<strong>Confirm</strong> message deletion' => '',
-  'Add user' => '',
-  'Cancel' => '취소',
-  'Delete' => '삭제',
-  'Delete conversation' => '',
-  'Do you really want to delete this conversation?' => '',
-  'Do you really want to delete this message?' => '',
-  'Do you really want to leave this conversation?' => '',
-  'Leave' => '',
-  'Leave conversation' => '',
-  'There are no messages yet.' => '',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-);
diff --git a/messages/ko/widgets_views_mailNotification.php b/messages/ko/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/ko/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/ko/widgets_views_newMessageButton.php b/messages/ko/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/ko/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/lt/base.php b/messages/lt/base.php
index fe6dd4c4..59de2ba9 100644
--- a/messages/lt/base.php
+++ b/messages/lt/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Patvirtinti</strong> žymos ištrynimą',
-    '<strong>Edit</strong> conversation tags' => '<strong>Redaguoti</strong> pokalbio žymas',
-    '<strong>Edit</strong> tag' => '<strong>Redaguoti</strong> žymą',
-    '<strong>Manage</strong> conversation tags' => '<strong>Tvarkyti</strong> pokalbių žymas',
-    '<strong>Messenger</strong> module configuration' => '<strong>Messenger</strong> modulio konfigūracija',
-    'A tag with the same name already exists.' => 'Tokia žyma jau egzistuoja.',
-    'Add Tag' => 'Pridėti žymą',
-    'Add participants' => 'Pridėti dalyvius',
-    'Allow others to send you private messages' => 'Leisti kitiems siųsti jums privačias žinutes',
-    'Allow users to start new conversations' => 'Leisti naudotojams pradėti naujus pokalbius',
-    'Confirm' => 'Patvirtinti',
-    'Conversation' => 'Pokalbis',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Pokalbių žymos gali būti naudojamos pokalbiams filtruoti ir yra matomos tik jums.',
-    'Conversations' => 'Pokalbiai',
-    'Created At' => 'Sukurta (kada)',
-    'Created By' => 'Sukurta (kieno)',
-    'Do you really want to delete this tag?' => 'Ar tikrai norite ištrinti šią žymą?',
-    'Edit' => 'Taisyti',
-    'Edit message...' => 'Redaguoti žinutę...',
-    'Filters' => 'Filtrai',
-    'Friday' => 'Penktadienis',
-    'Here you can manage your private conversation tags.' => 'Čia galite tvarkyti privačių pokalbių žymas.',
-    'Is Originator' => 'Yra iniciatorius',
-    'Last Viewed' => 'Paskutinį kartą žiūrėta',
-    'Leave fields blank in order to disable a restriction.' => 'Norėdami išjungti apribojimą, laukus palikite tuščius.',
-    'Manage Tags' => 'Tvarkyti Žymas',
-    'Mark Unread' => 'Pažymėti kaip neperskaitytą',
-    'Max messages allowed per day' => 'Maksimalus leistinas žinučių skaičius per dieną',
-    'Max number of messages allowed for a new user per day' => 'Didžiausias leistinas naujo naudotojo žinučių skaičius per dieną',
-    'Max number of new conversations allowed for a new user per day' => 'Didžiausias leistinas naujo naudotojo naujų pokalbių skaičius per dieną',
-    'Max number of new conversations allowed for a user per day' => 'Didžiausias leistinas naudotojo naujų pokalbių skaičius per dieną',
-    'Message' => 'Žinutė',
-    'Messages' => 'Žinutės',
-    'Monday' => 'Pirmadienis',
-    'My Tags' => 'Mano žymos',
-    'Participants' => 'Dalyviai',
-    'Pin' => 'Segtukas',
-    'Pinned' => 'Prisegta',
-    'Receive Notifications when someone opens a new conversation.' => 'Gauti pranešimus, kai kas nors pradeda naują pokalbį.',
-    'Receive Notifications when someone sends you a message.' => 'Gauti pranešimus, kai kas nors siunčia jums žinutę.',
-    'Receive private messages' => 'Gauti privačių žinučių',
-    'Saturday' => 'Šeštadienis',
-    'Search' => 'Ieškoti',
-    'Seperate restrictions for new users' => 'Atskiri apribojimai naujiems naudotojams',
-    'Show menu item in top Navigation' => 'Rodyti meniu elementą viršuje Navigacija',
-    'Start new conversations' => 'Pradėkite naujus pokalbius',
-    'Subject' => 'Tema',
-    'Sunday' => 'Sekmadienis',
-    'Tags' => 'Žymos',
-    'This user is already participating in this conversation.' => 'Šis naudotojas jau dalyvauja pokalbyje.',
-    'Thursday' => 'Ketvitadienis',
-    'Title' => 'Pavadinimas',
-    'Today' => 'Šiandien',
-    'Tuesday' => 'Antradienis',
-    'Unpin' => 'Atsegti',
-    'Until a user is member since (days)' => 'Kol naudotojas yra narys nuo (dienų)',
-    'Updated At' => 'Atnaujinta (kada)',
-    'Updated By' => 'Atnaujinta',
-    'User' => 'Vartotojas',
-    'Wednesday' => 'Trečiadienis',
-    'Write a message...' => 'Rašyti žinutę',
-    'Yesterday' => 'Vakar',
-    'You' => 'Jūs',
-    'You are not allowed to reply to users {userNames}!' => 'Jums neleidžiama atsakyti naudotojams {userNames}!',
-    'You are not allowed to start a conversation with this user.' => 'Jums neleidžiama pradėti pokalbio su šiuo naudotoju.',
-    'You are not allowed to start a conversation with {userName}!' => 'Jums neleidžiama pradėti pokalbio su {userName}!',
-    'You cannot send a message to yourself!' => 'Negalite siųsti žinutės sau!',
-    'You cannot send a message without recipients!' => 'Nurodykite gavėjus!',
-    'You joined the conversation.' => 'Prisijungėte prie pokalbio',
-    'You left the conversation.' => 'Palikote pokalbį',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Viršijote dienos naujų pokalbių limitą.',
-    'edited' => 'keista',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
-    '{username} joined the conversation.' => '{username} prisijungė prie pokalbio.',
-    '{username} left the conversation.' => '{username} paliko pokalbį.',
-    'Advanced Messages Search' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Patvirtinti</strong> pokalbio pašalinimą',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Patvirtinti</strong> išėjimą iš pokalbio',
+  '<strong>Confirm</strong> message deletion' => '<strong>Patvirtinti</strong> žinutės pašalinimą',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Patvirtinti</strong> žymos ištrynimą',
+  '<strong>Edit</strong> conversation tags' => '<strong>Redaguoti</strong> pokalbio žymas',
+  '<strong>Edit</strong> tag' => '<strong>Redaguoti</strong> žymą',
+  '<strong>Manage</strong> conversation tags' => '<strong>Tvarkyti</strong> pokalbių žymas',
+  '<strong>Messenger</strong> module configuration' => '<strong>Messenger</strong> modulio konfigūracija',
+  '<strong>New</strong> conversation' => '<strong>Naujas</strong> pokalbis',
+  '<strong>New</strong> message' => '<strong>Nauja</strong> žinutė',
+  'A tag with the same name already exists.' => 'Tokia žyma jau egzistuoja.',
+  'Add Tag' => 'Pridėti žymą',
+  'Add more participants to your conversation...' => 'Pridėti daugiau dalyvių į pokalbį...',
+  'Add participants' => 'Pridėti dalyvius',
+  'Add recipients' => 'Pridėti gavėjų',
+  'Add user' => 'Pridėti vartotoją',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Leisti kitiems siųsti jums privačias žinutes',
+  'Allow users to start new conversations' => 'Leisti naudotojams pradėti naujus pokalbius',
+  'Cancel' => 'Atšaukti',
+  'Confirm' => 'Patvirtinti',
+  'Conversation' => 'Pokalbis',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Pokalbių žymos gali būti naudojamos pokalbiams filtruoti ir yra matomos tik jums.',
+  'Conversations' => 'Pokalbiai',
+  'Created At' => 'Sukurta (kada)',
+  'Created By' => 'Sukurta (kieno)',
+  'Delete' => 'Ištrinti',
+  'Delete conversation' => 'Ištrinti pokalbį',
+  'Do you really want to delete this conversation?' => 'Ar tikrai norite ištrinti šį pokalbį?',
+  'Do you really want to delete this message?' => 'Ar tikrai norite ištrinti šią žinutę?',
+  'Do you really want to delete this tag?' => 'Ar tikrai norite ištrinti šią žymą?',
+  'Do you really want to leave this conversation?' => 'Ar tikrai norite palikti šį pokalbį?',
+  'Edit' => 'Taisyti',
+  'Edit message entry' => 'Redaguoti žinutės tekstą',
+  'Edit message...' => 'Redaguoti žinutę...',
+  'Filters' => 'Filtrai',
+  'Friday' => 'Penktadienis',
+  'Here you can manage your private conversation tags.' => 'Čia galite tvarkyti privačių pokalbių žymas.',
+  'Is Originator' => 'Yra iniciatorius',
+  'Last Viewed' => 'Paskutinį kartą žiūrėta',
+  'Leave' => 'Palikti',
+  'Leave conversation' => 'Palikti pokalbį',
+  'Leave fields blank in order to disable a restriction.' => 'Norėdami išjungti apribojimą, laukus palikite tuščius.',
+  'Manage Tags' => 'Tvarkyti Žymas',
+  'Mark Unread' => 'Pažymėti kaip neperskaitytą',
+  'Max messages allowed per day' => 'Maksimalus leistinas žinučių skaičius per dieną',
+  'Max number of messages allowed for a new user per day' => 'Didžiausias leistinas naujo naudotojo žinučių skaičius per dieną',
+  'Max number of new conversations allowed for a new user per day' => 'Didžiausias leistinas naujo naudotojo naujų pokalbių skaičius per dieną',
+  'Max number of new conversations allowed for a user per day' => 'Didžiausias leistinas naudotojo naujų pokalbių skaičius per dieną',
+  'Message' => 'Žinutė',
+  'Messages' => 'Žinutės',
+  'Monday' => 'Pirmadienis',
+  'My Tags' => 'Mano žymos',
+  'New conversation from {senderName}' => 'Naujas pokalbis {senderName}',
+  'New message from {senderName}' => 'Nauja žinutė nuo {senderName}',
+  'New message in discussion from %displayName%' => 'Pokalbyje nauja žinutė nuo %displayName%',
+  'Participants' => 'Dalyviai',
+  'Pin' => 'Segtukas',
+  'Pinned' => 'Prisegta',
+  'Receive Notifications when someone opens a new conversation.' => 'Gauti pranešimus, kai kas nors pradeda naują pokalbį.',
+  'Receive Notifications when someone sends you a message.' => 'Gauti pranešimus, kai kas nors siunčia jums žinutę.',
+  'Receive private messages' => 'Gauti privačių žinučių',
+  'Recipient' => 'Gavėjas',
+  'Reply now' => 'Atsakyti dabar',
+  'Saturday' => 'Šeštadienis',
+  'Search' => 'Ieškoti',
+  'Send' => 'Išsiųsti',
+  'Send message' => 'Siųsti žinutę',
+  'Seperate restrictions for new users' => 'Atskiri apribojimai naujiems naudotojams',
+  'Show all messages' => 'Rodyti visas žinutes',
+  'Show menu item in top Navigation' => 'Rodyti meniu elementą viršuje Navigacija',
+  'Start new conversations' => 'Pradėkite naujus pokalbius',
+  'Subject' => 'Tema',
+  'Sunday' => 'Sekmadienis',
+  'Tags' => 'Žymos',
+  'There are no messages yet.' => 'Kol kas nėra žinučių.',
+  'This user is already participating in this conversation.' => 'Šis naudotojas jau dalyvauja pokalbyje.',
+  'Thursday' => 'Ketvitadienis',
+  'Title' => 'Pavadinimas',
+  'Today' => 'Šiandien',
+  'Tuesday' => 'Antradienis',
+  'Unpin' => 'Atsegti',
+  'Until a user is member since (days)' => 'Kol naudotojas yra narys nuo (dienų)',
+  'Updated At' => 'Atnaujinta (kada)',
+  'Updated By' => 'Atnaujinta',
+  'User' => 'Vartotojas',
+  'User {name} is already participating!' => 'Vartotojas {name} jau dalyvauja!',
+  'Wednesday' => 'Trečiadienis',
+  'Write a message...' => 'Rašyti žinutę',
+  'Yesterday' => 'Vakar',
+  'You' => 'Jūs',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Jums neleidžiama dalyvauti šiame pokalbyje. Jus užblokavo: Užblokuotas esate užsiregistravęs: {userNames}.',
+  'You are not allowed to reply to users {userNames}!' => 'Jums neleidžiama atsakyti naudotojams {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'Jums neleidžiama siųsti vartotojo {name} jau yra!',
+  'You are not allowed to start a conversation with this user.' => 'Jums neleidžiama pradėti pokalbio su šiuo naudotoju.',
+  'You are not allowed to start a conversation with {userName}!' => 'Jums neleidžiama pradėti pokalbio su {userName}!',
+  'You cannot send a email to yourself!' => 'Negalite sau siųsti el. laiško!',
+  'You cannot send a message to yourself!' => 'Negalite siųsti žinutės sau!',
+  'You cannot send a message without recipients!' => 'Nurodykite gavėjus!',
+  'You joined the conversation.' => 'Prisijungėte prie pokalbio',
+  'You left the conversation.' => 'Palikote pokalbį',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Viršijote dienos naujų pokalbių limitą.',
+  'edited' => 'keista',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} sukūrė naują pokalbį {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} atsiuntė jums naują žinutę {conversationTitle}',
+  '{username} joined the conversation.' => '{username} prisijungė prie pokalbio.',
+  '{username} left the conversation.' => '{username} paliko pokalbį.',
 ];
diff --git a/messages/lt/forms_CreateMessageForm.php b/messages/lt/forms_CreateMessageForm.php
deleted file mode 100644
index f8dca08b..00000000
--- a/messages/lt/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Žinutė',
-  'Recipient' => 'Gavėjas',
-  'Subject' => 'Tema',
-  'Tags' => 'Žymos',
-);
diff --git a/messages/lt/forms_InviteRecipientForm.php b/messages/lt/forms_InviteRecipientForm.php
deleted file mode 100644
index e02d1b07..00000000
--- a/messages/lt/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Gavėjas',
-  'User {name} is already participating!' => 'Vartotojas {name} jau dalyvauja!',
-  'You are not allowed to send user {name} is already!' => 'Jums neleidžiama siųsti vartotojo {name} jau yra!',
-  'You cannot send a email to yourself!' => 'Negalite sau siųsti el. laiško!',
-);
diff --git a/messages/lt/forms_ReplyMessageForm.php b/messages/lt/forms_ReplyMessageForm.php
deleted file mode 100644
index 6b20c533..00000000
--- a/messages/lt/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Žinutė',
-);
diff --git a/messages/lt/models_Message.php b/messages/lt/models_Message.php
deleted file mode 100644
index 19b00072..00000000
--- a/messages/lt/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Naujas pokalbis {senderName}',
-  'New message from {senderName}' => 'Nauja žinutė nuo {senderName}',
-);
diff --git a/messages/lt/models_MessageEntry.php b/messages/lt/models_MessageEntry.php
deleted file mode 100644
index 161dbfb7..00000000
--- a/messages/lt/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Pokalbyje nauja žinutė nuo %displayName%',
-);
diff --git a/messages/lt/views_emails_NewMessage.php b/messages/lt/views_emails_NewMessage.php
deleted file mode 100644
index 1caa2efa..00000000
--- a/messages/lt/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Naujas</strong> pokalbis',
-  '<strong>New</strong> message' => '<strong>Nauja</strong> žinutė',
-  'Reply now' => 'Atsakyti dabar',
-);
diff --git a/messages/lt/views_emails_NewMessageEntry.php b/messages/lt/views_emails_NewMessageEntry.php
deleted file mode 100644
index 08200335..00000000
--- a/messages/lt/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} sukūrė naują pokalbį {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} atsiuntė jums naują žinutę {conversationTitle}',
-);
diff --git a/messages/lt/views_mail_adduser.php b/messages/lt/views_mail_adduser.php
deleted file mode 100644
index d822d7e8..00000000
--- a/messages/lt/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Pridėti daugiau dalyvių į pokalbį...',
-];
diff --git a/messages/lt/views_mail_create.php b/messages/lt/views_mail_create.php
deleted file mode 100644
index 28c06260..00000000
--- a/messages/lt/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nauja</strong> žinutė',
-  'Add recipients' => 'Pridėti gavėjų',
-  'Send' => 'Išsiųsti',
-);
diff --git a/messages/lt/views_mail_edit.php b/messages/lt/views_mail_edit.php
deleted file mode 100644
index 6160ebd0..00000000
--- a/messages/lt/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Redaguoti žinutės tekstą',
-];
diff --git a/messages/lt/views_mail_index.php b/messages/lt/views_mail_index.php
deleted file mode 100644
index 209ecf98..00000000
--- a/messages/lt/views_mail_index.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'Conversations' => 'Pokalbiai',
-  'There are no messages yet.' => 'Kol kas nėra žinučių.',
-);
diff --git a/messages/lt/views_mail_list.php b/messages/lt/views_mail_list.php
deleted file mode 100644
index 26d88b56..00000000
--- a/messages/lt/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Kol kas nėra žinučių.',
-);
diff --git a/messages/lt/views_mail_show.php b/messages/lt/views_mail_show.php
deleted file mode 100644
index 29c7e435..00000000
--- a/messages/lt/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Patvirtinti</strong> pokalbio pašalinimą',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Patvirtinti</strong> išėjimą iš pokalbio',
-  '<strong>Confirm</strong> message deletion' => '<strong>Patvirtinti</strong> žinutės pašalinimą',
-  'Add user' => 'Pridėti vartotoją',
-  'Cancel' => 'Atšaukti',
-  'Delete' => 'Ištrinti',
-  'Delete conversation' => 'Ištrinti pokalbį',
-  'Do you really want to delete this conversation?' => 'Ar tikrai norite ištrinti šį pokalbį?',
-  'Do you really want to delete this message?' => 'Ar tikrai norite ištrinti šią žinutę?',
-  'Do you really want to leave this conversation?' => 'Ar tikrai norite palikti šį pokalbį?',
-  'Leave' => 'Palikti',
-  'Leave conversation' => 'Palikti pokalbį',
-  'There are no messages yet.' => 'Kol kas nėra žinučių.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Jums neleidžiama dalyvauti šiame pokalbyje. Jus užblokavo: Užblokuotas esate užsiregistravęs: {userNames}.',
-);
diff --git a/messages/lt/widgets_views_mailNotification.php b/messages/lt/widgets_views_mailNotification.php
deleted file mode 100644
index 3255cf07..00000000
--- a/messages/lt/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Rodyti visas žinutes',
-];
diff --git a/messages/lt/widgets_views_newMessageButton.php b/messages/lt/widgets_views_newMessageButton.php
deleted file mode 100644
index 015509ff..00000000
--- a/messages/lt/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Siųsti žinutę',
-];
diff --git a/messages/lv/base.php b/messages/lv/base.php
index fedf8e1f..c59eb04f 100644
--- a/messages/lv/base.php
+++ b/messages/lv/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    'Confirm' => 'Apstiprināt',
-    'Conversations' => 'Sarunas',
-    'Created At' => 'Izveidota',
-    'Created By' => 'Izveidoja',
-    'Edit' => 'Rediģēt',
-    'Is Originator' => 'Ir iniciātors',
-    'Last Viewed' => 'Pēdējo reizi skatīts',
-    'Message' => 'Ziņa',
-    'Messages' => 'Ziņas',
-    'Participants' => 'Dalībnieki',
-    'Pinned' => 'Pielīmēts',
-    'Search' => 'Meklēt',
-    'Subject' => 'Tēma',
-    'Title' => 'Nosaukums',
-    'Unpin' => 'Atspraust',
-    'Updated At' => 'Atjaunots',
-    'Updated By' => 'Atjaunoja',
-    'User' => 'Lietotājs',
-    'You' => 'Tu',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Jauna</strong> ziņa',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'Pievieno vairāk dalībniekus savai sarunai...',
+  'Add participants' => '',
+  'Add recipients' => 'Pievieno saņēmējus',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Atcelt',
+  'Confirm' => 'Apstiprināt',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => 'Sarunas',
+  'Created At' => 'Izveidota',
+  'Created By' => 'Izveidoja',
+  'Delete' => 'Dzēst',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'Rediģēt',
+  'Edit message entry' => 'Labot ziņas ierakstu',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => 'Ir iniciātors',
+  'Last Viewed' => 'Pēdējo reizi skatīts',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => 'Ziņa',
+  'Messages' => 'Ziņas',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Jauna ziņa no {senderName}',
+  'New message in discussion from %displayName%' => 'Jauna ziņa diskusijā no %displayName%',
+  'Participants' => 'Dalībnieki',
+  'Pin' => '',
+  'Pinned' => 'Pielīmēts',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => 'Saņēmējs',
+  'Reply now' => 'Atbildēt tagad',
+  'Saturday' => '',
+  'Search' => 'Meklēt',
+  'Send' => 'Sūtīt',
+  'Send message' => 'Sūtīt ziņojumu',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'Rādīt visas ziņas',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => 'Tēma',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => 'Šeit vēl nav nevienas ziņas.',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Nosaukums',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => 'Atspraust',
+  'Until a user is member since (days)' => '',
+  'Updated At' => 'Atjaunots',
+  'Updated By' => 'Atjaunoja',
+  'User' => 'Lietotājs',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Tu',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Tu nevari nosūtīt ziņojumu sev pašam',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/lv/forms_CreateMessageForm.php b/messages/lv/forms_CreateMessageForm.php
deleted file mode 100644
index 098e517b..00000000
--- a/messages/lv/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => 'Ziņojums',
-    'Recipient' => 'Saņēmējs',
-    'Subject' => 'Tēma',
-    'Tags' => '',
-];
diff --git a/messages/lv/forms_InviteRecipientForm.php b/messages/lv/forms_InviteRecipientForm.php
deleted file mode 100644
index cf9db9fd..00000000
--- a/messages/lv/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'Recipient' => 'Saņēmējs',
-    'You cannot send a email to yourself!' => 'Tu nevari nosūtīt ziņojumu sev pašam',
-];
diff --git a/messages/lv/forms_ReplyMessageForm.php b/messages/lv/forms_ReplyMessageForm.php
deleted file mode 100644
index 7761ea5f..00000000
--- a/messages/lv/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Ziņa',
-);
diff --git a/messages/lv/models_Message.php b/messages/lv/models_Message.php
deleted file mode 100644
index ce2e9883..00000000
--- a/messages/lv/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Jauna ziņa no {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/lv/models_MessageEntry.php b/messages/lv/models_MessageEntry.php
deleted file mode 100644
index 278a1fdc..00000000
--- a/messages/lv/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Jauna ziņa diskusijā no %displayName%',
-);
diff --git a/messages/lv/views_emails_NewMessage.php b/messages/lv/views_emails_NewMessage.php
deleted file mode 100644
index ae00117f..00000000
--- a/messages/lv/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Jauna</strong> ziņa',
-    'Reply now' => 'Atbildēt tagad',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/lv/views_emails_NewMessageEntry.php b/messages/lv/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/lv/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/lv/views_mail_adduser.php b/messages/lv/views_mail_adduser.php
deleted file mode 100644
index 2dc83b0f..00000000
--- a/messages/lv/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Pievieno vairāk dalībniekus savai sarunai...',
-];
diff --git a/messages/lv/views_mail_create.php b/messages/lv/views_mail_create.php
deleted file mode 100644
index 111bf447..00000000
--- a/messages/lv/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Jauna</strong> ziņa',
-  'Add recipients' => 'Pievieno saņēmējus',
-  'Send' => 'Sūtīt',
-);
diff --git a/messages/lv/views_mail_edit.php b/messages/lv/views_mail_edit.php
deleted file mode 100644
index c9049794..00000000
--- a/messages/lv/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Labot ziņas ierakstu',
-];
diff --git a/messages/lv/views_mail_index.php b/messages/lv/views_mail_index.php
deleted file mode 100644
index 5f457e8c..00000000
--- a/messages/lv/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Sarunas',
-    'There are no messages yet.' => 'Šeit vēl nav nevienas ziņas.',
-];
diff --git a/messages/lv/views_mail_list.php b/messages/lv/views_mail_list.php
deleted file mode 100644
index 94f88e6c..00000000
--- a/messages/lv/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Šeit vēl nav nevienas ziņas.',
-);
diff --git a/messages/lv/views_mail_show.php b/messages/lv/views_mail_show.php
deleted file mode 100644
index fc478c34..00000000
--- a/messages/lv/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'Atcelt',
-    'Delete' => 'Dzēst',
-    'There are no messages yet.' => 'Šeit vēl nav nevienas ziņas.',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/lv/widgets_views_mailNotification.php b/messages/lv/widgets_views_mailNotification.php
deleted file mode 100644
index 7bfc41a3..00000000
--- a/messages/lv/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Rādīt visas ziņas',
-];
diff --git a/messages/lv/widgets_views_newMessageButton.php b/messages/lv/widgets_views_newMessageButton.php
deleted file mode 100644
index 036715a6..00000000
--- a/messages/lv/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Sūtīt ziņojumu',
-];
diff --git a/messages/nb-NO/base.php b/messages/nb-NO/base.php
index 7d22e74e..a577bbea 100644
--- a/messages/nb-NO/base.php
+++ b/messages/nb-NO/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Add participants' => 'Legg til deltagere',
-    'Allow others to send you private messages' => 'Tillat at andre kan sende deg private meldinger',
-    'Allow users to start new conversations' => 'Tillat brukere å starte nye samtaler',
-    'Confirm' => 'Bekreft',
-    'Conversation' => 'Samtale',
-    'Conversations' => 'Samtaler',
-    'Created At' => 'Postet',
-    'Created By' => 'Skrevet av',
-    'Edit' => 'Rediger',
-    'Edit message...' => 'Rediger melding...',
-    'Is Originator' => 'Er forfatter',
-    'Last Viewed' => 'Sist sett',
-    'Leave fields blank in order to disable a restriction.' => 'La feltene være tomme for å skru av en begrensning.',
-    'Max messages allowed per day' => 'Maks meldinger tillatt per dag',
-    'Max number of messages allowed for a new user per day' => 'Maks antall meldinger tillat for en ny bruker hver dag',
-    'Max number of new conversations allowed for a new user per day' => 'Maks antall nye samtaler tillatt for en ny bruker per dag',
-    'Max number of new conversations allowed for a user per day' => 'Maks antall nye samtaler tillatt for en bruker per dag',
-    'Message' => 'Melding',
-    'Messages' => 'Meldinger',
-    'Participants' => 'Deltakere',
-    'Pinned' => 'Lås',
-    'Receive Notifications when someone opens a new conversation.' => 'Motta varsel når noen starter en ny samtale.',
-    'Receive Notifications when someone sends you a message.' => 'Motta varsel når noen sender deg en melding.',
-    'Receive private messages' => 'Motta private meldinger',
-    'Search' => 'Søk',
-    'Seperate restrictions for new users' => 'Egne begrensninger for nye brukere',
-    'Show menu item in top Navigation' => 'Vis menyvalg i toppnavigasjonen',
-    'Start new conversations' => 'Start nye samtaler',
-    'Subject' => 'Tittel',
-    'Tags' => 'Tags',
-    'This user is already participating in this conversation.' => 'Brukeren deltar allerede i denne samtalen.',
-    'Title' => 'Tittel',
-    'Today' => 'I dag',
-    'Unpin' => 'Fjern pin',
-    'Until a user is member since (days)' => 'Til en bruker er medlem siden (dager)',
-    'Updated At' => 'Oppdatert',
-    'Updated By' => 'Oppdatert av',
-    'User' => 'Bruker',
-    'Write a message...' => 'Skriv en melding...',
-    'You' => 'Du',
-    'You are not allowed to start a conversation with this user.' => 'Du er kan ikke starte en samtale med denne brukeren.',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Du har overskredet ditt tillatte antall nye samtaler.',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Advanced Messages Search' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Saturday' => '',
-    'Sunday' => '',
-    'Thursday' => '',
-    'Tuesday' => '',
-    'Wednesday' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Bekreft</strong> sletting av samtale',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Bekreft</strong> utmelding av samtale',
+  '<strong>Confirm</strong> message deletion' => '<strong>Bekreft</strong> sletting av melding',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Ny</strong> melding',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'Legg til flere deltagere i denne samtalen...',
+  'Add participants' => 'Legg til deltagere',
+  'Add recipients' => 'Legg til mottakere',
+  'Add user' => 'Legg til bruker',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Tillat at andre kan sende deg private meldinger',
+  'Allow users to start new conversations' => 'Tillat brukere å starte nye samtaler',
+  'Cancel' => 'Avbryt',
+  'Confirm' => 'Bekreft',
+  'Conversation' => 'Samtale',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => 'Samtaler',
+  'Created At' => 'Postet',
+  'Created By' => 'Skrevet av',
+  'Delete' => 'Slett',
+  'Delete conversation' => 'Slett samtale',
+  'Do you really want to delete this conversation?' => 'Ønsker du virkelig og slette denne samtalen?',
+  'Do you really want to delete this message?' => 'Ønsker du virkelig og slette denne meldingen?',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'Ønsker du virkelig og forlate denne samtalen?',
+  'Edit' => 'Rediger',
+  'Edit message entry' => 'Rediger melding',
+  'Edit message...' => 'Rediger melding...',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => 'Grupper',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => 'Er forfatter',
+  'Last Viewed' => 'Sist sett',
+  'Leave' => 'Forlat',
+  'Leave conversation' => 'Forlat samtale',
+  'Leave fields blank in order to disable a restriction.' => 'La feltene være tomme for å skru av en begrensning.',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Maks meldinger tillatt per dag',
+  'Max number of messages allowed for a new user per day' => 'Maks antall meldinger tillat for en ny bruker hver dag',
+  'Max number of new conversations allowed for a new user per day' => 'Maks antall nye samtaler tillatt for en ny bruker per dag',
+  'Max number of new conversations allowed for a user per day' => 'Maks antall nye samtaler tillatt for en bruker per dag',
+  'Members' => 'Medlemmer',
+  'Message' => 'Melding',
+  'Messages' => 'Meldinger',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Ny melding fra {senderName}',
+  'New message in discussion from %displayName%' => 'Ny melding i samtalen fra %displayName%',
+  'Participants' => 'Deltakere',
+  'Pin' => '',
+  'Pinned' => 'Lås',
+  'Receive Notifications when someone opens a new conversation.' => 'Motta varsel når noen starter en ny samtale.',
+  'Receive Notifications when someone sends you a message.' => 'Motta varsel når noen sender deg en melding.',
+  'Receive private messages' => 'Motta private meldinger',
+  'Recipient' => 'Mottaker',
+  'Reply now' => 'Svar nå',
+  'Saturday' => '',
+  'Search' => 'Søk',
+  'Send' => 'Send',
+  'Send message' => 'Send melding',
+  'Seperate restrictions for new users' => 'Egne begrensninger for nye brukere',
+  'Show all messages' => 'Vis alle meldinger',
+  'Show menu item in top Navigation' => 'Vis menyvalg i toppnavigasjonen',
+  'Sign up now' => 'Registrer deg nå',
+  'Spaces' => 'Grupper',
+  'Start new conversations' => 'Start nye samtaler',
+  'Subject' => 'Tittel',
+  'Sunday' => '',
+  'Tags' => 'Tags',
+  'There are no messages yet.' => 'Det er ingen meldinger her enda.',
+  'This user is already participating in this conversation.' => 'Brukeren deltar allerede i denne samtalen.',
+  'Thursday' => '',
+  'Title' => 'Tittel',
+  'Today' => 'I dag',
+  'Tuesday' => '',
+  'Unpin' => 'Fjern pin',
+  'Until a user is member since (days)' => 'Til en bruker er medlem siden (dager)',
+  'Updated At' => 'Oppdatert',
+  'Updated By' => 'Oppdatert av',
+  'User' => 'Bruker',
+  'User Posts' => 'Bruker Innlegg',
+  'User {name} is already participating!' => 'Brukeren {name} deltar allerede!',
+  'Wednesday' => '',
+  'Write a message...' => 'Skriv en melding...',
+  'Yesterday' => '',
+  'You' => 'Du',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => 'Du har ikke lov til å sende bruker {name} er allerede!',
+  'You are not allowed to start a conversation with this user.' => 'Du er kan ikke starte en samtale med denne brukeren.',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Du kan ikke sende en e-post til deg selv!',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Du har overskredet ditt tillatte antall nye samtaler.',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/nb-NO/forms_CreateMessageForm.php b/messages/nb-NO/forms_CreateMessageForm.php
deleted file mode 100644
index 6bbdba8a..00000000
--- a/messages/nb-NO/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Melding',
-  'Recipient' => 'Mottaker',
-  'Subject' => 'Tittel',
-  'Tags' => 'Tags',
-);
diff --git a/messages/nb-NO/forms_InviteRecipientForm.php b/messages/nb-NO/forms_InviteRecipientForm.php
deleted file mode 100644
index 5fc895df..00000000
--- a/messages/nb-NO/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Mottaker',
-  'User {name} is already participating!' => 'Brukeren {name} deltar allerede!',
-  'You are not allowed to send user {name} is already!' => 'Du har ikke lov til å sende bruker {name} er allerede!',
-  'You cannot send a email to yourself!' => 'Du kan ikke sende en e-post til deg selv!',
-);
diff --git a/messages/nb-NO/forms_ReplyMessageForm.php b/messages/nb-NO/forms_ReplyMessageForm.php
deleted file mode 100644
index 9ddc4cea..00000000
--- a/messages/nb-NO/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Melding',
-);
diff --git a/messages/nb-NO/models_Message.php b/messages/nb-NO/models_Message.php
deleted file mode 100644
index 354f525c..00000000
--- a/messages/nb-NO/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Ny melding fra {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/nb-NO/models_MessageEntry.php b/messages/nb-NO/models_MessageEntry.php
deleted file mode 100644
index 7178a34e..00000000
--- a/messages/nb-NO/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Ny melding i samtalen fra %displayName%',
-);
diff --git a/messages/nb-NO/views_emails_NewMessage.php b/messages/nb-NO/views_emails_NewMessage.php
deleted file mode 100644
index 74065feb..00000000
--- a/messages/nb-NO/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Ny</strong> melding',
-    'Reply now' => 'Svar nå',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/nb-NO/views_emails_NewMessageEntry.php b/messages/nb-NO/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/nb-NO/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/nb-NO/views_mail_adduser.php b/messages/nb-NO/views_mail_adduser.php
deleted file mode 100644
index 6f1a6ae3..00000000
--- a/messages/nb-NO/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Legg til flere deltagere i denne samtalen...',
-];
diff --git a/messages/nb-NO/views_mail_create.php b/messages/nb-NO/views_mail_create.php
deleted file mode 100644
index 349da6a8..00000000
--- a/messages/nb-NO/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Ny</strong> melding',
-  'Add recipients' => 'Legg til mottakere',
-  'Send' => 'Send',
-);
diff --git a/messages/nb-NO/views_mail_edit.php b/messages/nb-NO/views_mail_edit.php
deleted file mode 100644
index 000ed78b..00000000
--- a/messages/nb-NO/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Rediger melding',
-];
diff --git a/messages/nb-NO/views_mail_index.php b/messages/nb-NO/views_mail_index.php
deleted file mode 100644
index 673b44c9..00000000
--- a/messages/nb-NO/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Samtaler',
-    'There are no messages yet.' => 'Det er ingen meldinger her enda.',
-];
diff --git a/messages/nb-NO/views_mail_list.php b/messages/nb-NO/views_mail_list.php
deleted file mode 100644
index ecf11b49..00000000
--- a/messages/nb-NO/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Det er ingen meldinger her enda.',
-);
diff --git a/messages/nb-NO/views_mail_show.php b/messages/nb-NO/views_mail_show.php
deleted file mode 100644
index 148a08d2..00000000
--- a/messages/nb-NO/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Bekreft</strong> sletting av samtale',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Bekreft</strong> utmelding av samtale',
-    '<strong>Confirm</strong> message deletion' => '<strong>Bekreft</strong> sletting av melding',
-    'Add user' => 'Legg til bruker',
-    'Cancel' => 'Avbryt',
-    'Delete' => 'Slett',
-    'Delete conversation' => 'Slett samtale',
-    'Do you really want to delete this conversation?' => 'Ønsker du virkelig og slette denne samtalen?',
-    'Do you really want to delete this message?' => 'Ønsker du virkelig og slette denne meldingen?',
-    'Do you really want to leave this conversation?' => 'Ønsker du virkelig og forlate denne samtalen?',
-    'Leave' => 'Forlat',
-    'Leave conversation' => 'Forlat samtale',
-    'There are no messages yet.' => 'Det er ingen meldinger her enda.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/nb-NO/views_mail_sidebar.php b/messages/nb-NO/views_mail_sidebar.php
deleted file mode 100644
index 46723528..00000000
--- a/messages/nb-NO/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupper',
-  'Members' => 'Medlemmer',
-  'Spaces' => 'Grupper',
-  'User Posts' => 'Bruker Innlegg',
-);
diff --git a/messages/nb-NO/views_mails_UserInviteSpace.php b/messages/nb-NO/views_mails_UserInviteSpace.php
deleted file mode 100644
index fcd420ea..00000000
--- a/messages/nb-NO/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Registrer deg nå',
-);
diff --git a/messages/nb-NO/widgets_views_mailNotification.php b/messages/nb-NO/widgets_views_mailNotification.php
deleted file mode 100644
index 8e433636..00000000
--- a/messages/nb-NO/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Vis alle meldinger',
-];
diff --git a/messages/nb-NO/widgets_views_newMessageButton.php b/messages/nb-NO/widgets_views_newMessageButton.php
deleted file mode 100644
index 7e7e4876..00000000
--- a/messages/nb-NO/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Send melding',
-];
diff --git a/messages/nl/base.php b/messages/nl/base.php
index 9c0f3afb..a990fd1f 100644
--- a/messages/nl/base.php
+++ b/messages/nl/base.php
@@ -1,30 +1,48 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Gesprek</strong> verwijderen',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Gesprek</strong> verlaten',
+  '<strong>Confirm</strong> message deletion' => '<strong>Bericht</strong> verwijderen',
   '<strong>Confirm</strong> tag deletion' => '<strong>Bevestig</strong> label verwijdering',
   '<strong>Edit</strong> conversation tags' => '<strong>Bewerk</strong> conversatielabels',
   '<strong>Edit</strong> tag' => '<strong>Bewerk</strong> label',
   '<strong>Manage</strong> conversation tags' => '<strong>Beheer</strong> conversatielabels',
   '<strong>Messenger</strong> module configuration' => 'Configuratie van <strong>Berichten</strong>-module',
+  '<strong>New</strong> conversation' => '<strong>Nieuw</strong> gesprek',
+  '<strong>New</strong> message' => '<strong>Nieuw</strong> bericht',
   'A tag with the same name already exists.' => 'Een label met dezelfde naam bestaat al.',
   'Add Tag' => 'Label toeveogen',
+  'Add more participants to your conversation...' => 'Voeg meer deelnemers toe aan je conversatie...',
   'Add participants' => 'Voeg deelnemers toe',
+  'Add recipients' => 'Ontvangers toevoegen',
+  'Add user' => 'Gebruiker toevoegen',
   'Advanced Messages Search' => 'Geavanceerd berichten zoeken',
   'Allow others to send you private messages' => 'Sta anderen toe om u privéberichten te sturen',
   'Allow users to start new conversations' => 'Sta gebruikers toe om nieuwe gesprekken te starten',
+  'Cancel' => 'Annuleren',
   'Confirm' => 'Bevestig',
   'Conversation' => 'Gesprek',
   'Conversation tags can be used to filter conversations and are only visible to you.' => 'Gesprekslabel kunt u gebruiken om gesprekken te filteren en zijn alleen zichtbaar voor u.',
   'Conversations' => 'Gesprekken',
   'Created At' => 'Gemaakt op',
   'Created By' => 'Gemaakt door',
+  'Delete' => 'Verwijder',
+  'Delete conversation' => 'Verwijder gesprek',
+  'Do you really want to delete this conversation?' => 'Wilt u dit gesprek echt verwijderen?',
+  'Do you really want to delete this message?' => 'Wilt u dit bericht echt verwijderen?',
   'Do you really want to delete this tag?' => 'Wil u dit label echt verwijderen?',
+  'Do you really want to leave this conversation?' => 'Wilt u dit gesprek echt verlaten?',
   'Edit' => 'Bijwerken',
+  'Edit message entry' => 'Bericht bewerken',
   'Edit message...' => 'Bewerk bericht ...',
   'Filters' => 'Filters',
   'Friday' => 'Vrijdag',
+  'Groups' => 'Groepen',
   'Here you can manage your private conversation tags.' => 'Hier kunt u uw privégesprekslabels beheren.',
   'Is Originator' => 'Is bedenker',
   'Last Viewed' => 'Laatst weergegeven',
+  'Leave' => 'Verlaat',
+  'Leave conversation' => 'Verlaat gesprek',
   'Leave fields blank in order to disable a restriction.' => 'Een leeg veld schakelt een beperking uit.',
   'Manage Tags' => 'Beheer labels',
   'Mark Unread' => 'Markeer als ongelezen',
@@ -32,24 +50,36 @@
   'Max number of messages allowed for a new user per day' => 'Maximale aantal toegestane berichten voor een nieuwe gebruiker per dag',
   'Max number of new conversations allowed for a new user per day' => 'Maximale aantal toegestane nieuwe gesprekken voor een nieuwe gebruiker per dag',
   'Max number of new conversations allowed for a user per day' => 'Maximale aantal toegestane nieuwe gesprekken voor een gebruiker per dag',
+  'Members' => 'Leden',
   'Message' => 'Bericht',
   'Messages' => 'Berichten',
   'Monday' => 'Maandag',
   'My Tags' => 'Mijn labels',
+  'New conversation from {senderName}' => 'Nieuw gesprek van {senderName}',
+  'New message from {senderName}' => 'Nieuw bericht van {senderName}',
+  'New message in discussion from %displayName%' => 'Nieuw bericht in discussie van %displayName%',
   'Participants' => 'Deelnemers',
   'Pin' => 'Vastzetten',
   'Pinned' => 'Vastgezet',
   'Receive Notifications when someone opens a new conversation.' => 'Meldingen ontvangen wanneer iemand een nieuw gesprek opent.',
   'Receive Notifications when someone sends you a message.' => 'Ontvang meldingen wanneer iemand u een bericht stuurt.',
   'Receive private messages' => 'Ontvang privéberichten',
+  'Recipient' => 'Ontvanger',
+  'Reply now' => 'Antwoord nu',
   'Saturday' => 'Zaterdag',
   'Search' => 'Zoek',
+  'Send' => 'Verstuur',
+  'Send message' => 'Verstuur bericht',
   'Seperate restrictions for new users' => 'Aparte beperkingen voor nieuwe gebruikers',
+  'Show all messages' => 'Toon alle berichten',
   'Show menu item in top Navigation' => 'Toon het menu-item in de navigatiebalk (bovenaan).',
+  'Sign up now' => 'Nu registreren!',
+  'Spaces' => 'Spaces',
   'Start new conversations' => 'Begin nieuwe gesprekken',
   'Subject' => 'Onderwerp',
   'Sunday' => 'Zondag',
   'Tags' => 'Labels',
+  'There are no messages yet.' => 'Er zijn nog geen berichten.',
   'This user is already participating in this conversation.' => 'Deze gebruiker neemt al deel aan dit gesprek.',
   'Thursday' => 'Donderdag',
   'Title' => 'Titel',
@@ -60,13 +90,18 @@
   'Updated At' => 'Bijgewerkt op',
   'Updated By' => 'Bijgewerkt door',
   'User' => 'Gebruiker',
+  'User Posts' => 'Gebruikersberichten',
+  'User {name} is already participating!' => 'Gebruiker {name} doet al mee!',
   'Wednesday' => 'Woensdag',
   'Write a message...' => 'Schrijf een bericht...',
   'Yesterday' => 'Gisteren',
   'You' => 'U',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'U mag niet deelnemen aan dit gesprek. U bent geblokkeerd door: {userNames}.',
   'You are not allowed to reply to users {userNames}!' => 'U mag niet reageren op gebruikers {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'U mag {naam} niet uitnodigen. Deze naam is al in gebruik!',
   'You are not allowed to start a conversation with this user.' => 'Het is niet toegestaan om een gesprek met deze gebruiker te starten.',
   'You are not allowed to start a conversation with {userName}!' => 'U mag geen gesprek beginnen met {userName}!',
+  'You cannot send a email to yourself!' => 'U  kunt geen e-mail naar uzelf sturen!',
   'You cannot send a message to yourself!' => 'U kunt geen bericht naar uzelf sturen!',
   'You cannot send a message without recipients!' => 'Elk bericht moet minimaal een geadresseerde hebben',
   'You joined the conversation.' => 'U neemt deel aan het gesprek.',
@@ -74,6 +109,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => 'U heeft uw dagelijkse hoeveelheid nieuwe gesprekken overschreden.',
   'edited' => 'bewerkt',
   '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# ander} other{# anderen}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} heeft een nieuw gesprek gemaakt {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} heeft u een nieuw bericht gestuurd in {conversationTitle}',
   '{username} joined the conversation.' => '{username}  neemt deel aan het gesprek.',
   '{username} left the conversation.' => '{username} verliet het gesprek.',
-);
+];
diff --git a/messages/nl/forms_CreateMessageForm.php b/messages/nl/forms_CreateMessageForm.php
deleted file mode 100644
index 918d14f3..00000000
--- a/messages/nl/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Bericht',
-  'Recipient' => 'Ontvanger',
-  'Subject' => 'Onderwerp',
-  'Tags' => 'Labels',
-);
diff --git a/messages/nl/forms_InviteRecipientForm.php b/messages/nl/forms_InviteRecipientForm.php
deleted file mode 100644
index b939afd1..00000000
--- a/messages/nl/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Ontvanger',
-  'User {name} is already participating!' => 'Gebruiker {name} doet al mee!',
-  'You are not allowed to send user {name} is already!' => 'U mag {naam} niet uitnodigen. Deze naam is al in gebruik!',
-  'You cannot send a email to yourself!' => 'U  kunt geen e-mail naar uzelf sturen!',
-);
diff --git a/messages/nl/forms_ReplyMessageForm.php b/messages/nl/forms_ReplyMessageForm.php
deleted file mode 100644
index 9bd30d22..00000000
--- a/messages/nl/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Bericht',
-);
diff --git a/messages/nl/models_Message.php b/messages/nl/models_Message.php
deleted file mode 100644
index a392676f..00000000
--- a/messages/nl/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Nieuw gesprek van {senderName}',
-  'New message from {senderName}' => 'Nieuw bericht van {senderName}',
-);
diff --git a/messages/nl/models_MessageEntry.php b/messages/nl/models_MessageEntry.php
deleted file mode 100644
index 5cc676bb..00000000
--- a/messages/nl/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nieuw bericht in discussie van %displayName%',
-);
diff --git a/messages/nl/views_emails_NewMessage.php b/messages/nl/views_emails_NewMessage.php
deleted file mode 100644
index a5557469..00000000
--- a/messages/nl/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Nieuw</strong> gesprek',
-  '<strong>New</strong> message' => '<strong>Nieuw</strong> bericht',
-  'Reply now' => 'Antwoord nu',
-);
diff --git a/messages/nl/views_emails_NewMessageEntry.php b/messages/nl/views_emails_NewMessageEntry.php
deleted file mode 100644
index 47add14f..00000000
--- a/messages/nl/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} heeft een nieuw gesprek gemaakt {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} heeft u een nieuw bericht gestuurd in {conversationTitle}',
-);
diff --git a/messages/nl/views_mail_adduser.php b/messages/nl/views_mail_adduser.php
deleted file mode 100644
index ea026fbf..00000000
--- a/messages/nl/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Voeg meer deelnemers toe aan je conversatie...',
-];
diff --git a/messages/nl/views_mail_create.php b/messages/nl/views_mail_create.php
deleted file mode 100644
index f94890bb..00000000
--- a/messages/nl/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nieuw</strong> bericht',
-  'Add recipients' => 'Ontvangers toevoegen',
-  'Send' => 'Verstuur',
-);
diff --git a/messages/nl/views_mail_edit.php b/messages/nl/views_mail_edit.php
deleted file mode 100644
index 75b6c39b..00000000
--- a/messages/nl/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Bericht bewerken',
-];
diff --git a/messages/nl/views_mail_index.php b/messages/nl/views_mail_index.php
deleted file mode 100644
index 495070a1..00000000
--- a/messages/nl/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Gesprekken',
-    'There are no messages yet.' => 'Er zijn nog geen berichten.',
-];
diff --git a/messages/nl/views_mail_list.php b/messages/nl/views_mail_list.php
deleted file mode 100644
index 324c32cc..00000000
--- a/messages/nl/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Er zijn nog geen berichten.',
-);
diff --git a/messages/nl/views_mail_show.php b/messages/nl/views_mail_show.php
deleted file mode 100644
index 52dab611..00000000
--- a/messages/nl/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Gesprek</strong> verwijderen',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Gesprek</strong> verlaten',
-  '<strong>Confirm</strong> message deletion' => '<strong>Bericht</strong> verwijderen',
-  'Add user' => 'Gebruiker toevoegen',
-  'Cancel' => 'Annuleren',
-  'Delete' => 'Verwijder',
-  'Delete conversation' => 'Verwijder gesprek',
-  'Do you really want to delete this conversation?' => 'Wilt u dit gesprek echt verwijderen?',
-  'Do you really want to delete this message?' => 'Wilt u dit bericht echt verwijderen?',
-  'Do you really want to leave this conversation?' => 'Wilt u dit gesprek echt verlaten?',
-  'Leave' => 'Verlaat',
-  'Leave conversation' => 'Verlaat gesprek',
-  'There are no messages yet.' => 'Er zijn nog geen berichten.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'U mag niet deelnemen aan dit gesprek. U bent geblokkeerd door: {userNames}.',
-);
diff --git a/messages/nl/views_mail_sidebar.php b/messages/nl/views_mail_sidebar.php
deleted file mode 100644
index 1800e80b..00000000
--- a/messages/nl/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Groepen',
-  'Members' => 'Leden',
-  'Spaces' => 'Spaces',
-  'User Posts' => 'Gebruikersberichten',
-);
diff --git a/messages/nl/views_mails_UserInviteSpace.php b/messages/nl/views_mails_UserInviteSpace.php
deleted file mode 100644
index 5213b2dd..00000000
--- a/messages/nl/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Nu registreren!',
-);
diff --git a/messages/nl/widgets_views_mailNotification.php b/messages/nl/widgets_views_mailNotification.php
deleted file mode 100644
index 3c963ce0..00000000
--- a/messages/nl/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Toon alle berichten',
-];
diff --git a/messages/nl/widgets_views_newMessageButton.php b/messages/nl/widgets_views_newMessageButton.php
deleted file mode 100644
index 239a2938..00000000
--- a/messages/nl/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Verstuur bericht',
-];
diff --git a/messages/nn-NO/base.php b/messages/nn-NO/base.php
index 352e1eb0..fa68387b 100644
--- a/messages/nn-NO/base.php
+++ b/messages/nn-NO/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    'Title' => 'Tittel',
-    'User' => 'Bruker',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Search' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Tittel',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Bruker',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/nn-NO/forms_CreateMessageForm.php b/messages/nn-NO/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/nn-NO/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/nn-NO/forms_InviteRecipientForm.php b/messages/nn-NO/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/nn-NO/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/nn-NO/forms_ReplyMessageForm.php b/messages/nn-NO/forms_ReplyMessageForm.php
deleted file mode 100644
index df2dc693..00000000
--- a/messages/nn-NO/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'Message' => '',
-];
diff --git a/messages/nn-NO/models_Message.php b/messages/nn-NO/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/nn-NO/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/nn-NO/models_MessageEntry.php b/messages/nn-NO/models_MessageEntry.php
deleted file mode 100644
index d85d0473..00000000
--- a/messages/nn-NO/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'New message in discussion from %displayName%' => '',
-];
diff --git a/messages/nn-NO/views_emails_NewMessage.php b/messages/nn-NO/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/nn-NO/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/nn-NO/views_emails_NewMessageEntry.php b/messages/nn-NO/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/nn-NO/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/nn-NO/views_mail_adduser.php b/messages/nn-NO/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/nn-NO/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/nn-NO/views_mail_create.php b/messages/nn-NO/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/nn-NO/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/nn-NO/views_mail_edit.php b/messages/nn-NO/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/nn-NO/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/nn-NO/views_mail_index.php b/messages/nn-NO/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/nn-NO/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/nn-NO/views_mail_list.php b/messages/nn-NO/views_mail_list.php
deleted file mode 100644
index aee65815..00000000
--- a/messages/nn-NO/views_mail_list.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/nn-NO/views_mail_show.php b/messages/nn-NO/views_mail_show.php
deleted file mode 100644
index 1b3f7308..00000000
--- a/messages/nn-NO/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/nn-NO/widgets_views_mailNotification.php b/messages/nn-NO/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/nn-NO/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/nn-NO/widgets_views_newMessageButton.php b/messages/nn-NO/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/nn-NO/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/pl/base.php b/messages/pl/base.php
index 43eb3759..7c2a8423 100644
--- a/messages/pl/base.php
+++ b/messages/pl/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Potwierdź</strong> usunięcie oznaczenia',
-    '<strong>Edit</strong> conversation tags' => '<strong>Edytuj</strong> oznaczenia konwersacji',
-    '<strong>Edit</strong> tag' => '<strong>Edytuj</strong> oznaczenie',
-    '<strong>Manage</strong> conversation tags' => '<strong>Zarządzaj</strong> oznaczeniami konwersacji',
-    '<strong>Messenger</strong> module configuration' => '<strong>Komunikator</strong> konfiguracja modułu',
-    'A tag with the same name already exists.' => 'Istnieje już oznaczenie o podanej nazwie.',
-    'Add Tag' => 'Dodaj Oznaczenie',
-    'Add participants' => 'Dodaj uczestników',
-    'Allow others to send you private messages' => 'Pozwól innym wysyłać Ci prywatne wiadomości',
-    'Allow users to start new conversations' => 'Pozwól użytkownikom rozpoczynać nowe rozmowy',
-    'Confirm' => 'Potwierdź',
-    'Conversation' => 'Rozmowa',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Oznaczenia konwersacji mogą być użyte w celu filtrowania rozmów i są widoczne tylko dla Ciebie.',
-    'Conversations' => 'Rozmowy',
-    'Created At' => 'Utworzono',
-    'Created By' => 'Utworzone przez',
-    'Do you really want to delete this tag?' => 'Czy a pewno chcesz usunąć to oznaczenie?',
-    'Edit' => 'Edytuj',
-    'Edit message...' => 'Edycja wiadomości...',
-    'Filters' => 'Filtry',
-    'Friday' => 'Piątek',
-    'Here you can manage your private conversation tags.' => 'Tutaj możesz zarządzać Twoimi prywatnymi oznaczeniami konwersacji.',
-    'Is Originator' => 'jest inicjatorem',
-    'Last Viewed' => 'Ostatnio oglądane',
-    'Leave fields blank in order to disable a restriction.' => 'Zostaw te pola puste w celu wyłączenia restrykcji.',
-    'Manage Tags' => 'Zarządzaj Oznaczeniami',
-    'Mark Unread' => 'Oznacz jako nieprzeczytane',
-    'Max messages allowed per day' => 'Maksymalna liczba wiadomości w ciągu dnia',
-    'Max number of messages allowed for a new user per day' => 'Maksymalna liczba wiadomości dla nowych użytkowników w ciągu dnia',
-    'Max number of new conversations allowed for a new user per day' => 'Maksymalna liczba nowych rozmów dla nowych użytkowników w ciągu dnia',
-    'Max number of new conversations allowed for a user per day' => 'Maksymalna liczba nowych rozmów dla użytkowników w ciągu dnia',
-    'Message' => 'Wiadomość',
-    'Messages' => 'Wiadomości',
-    'Monday' => 'Poniedziałek',
-    'My Tags' => 'Moje Oznaczenia',
-    'Participants' => 'Uczestnicy',
-    'Pin' => 'Wyróżnij',
-    'Pinned' => 'Przypnij',
-    'Receive Notifications when someone opens a new conversation.' => 'Otrzymywanie powiadomień kiedy ktoś rozpocznie nową rozmowę',
-    'Receive Notifications when someone sends you a message.' => 'Otrzymywanie powiadomień kiedy ktoś wyśle Ci wiadomość',
-    'Receive private messages' => 'Otrzymywanie prywatnych wiadomości',
-    'Saturday' => 'Sobota',
-    'Search' => 'Szukaj',
-    'Seperate restrictions for new users' => 'Oddzielne ograniczenia dla nowych użytkowników',
-    'Show menu item in top Navigation' => 'Pokaż pozycję w górnym menu nawigacyjnym',
-    'Start new conversations' => 'Zacznij nowe rozmowy',
-    'Subject' => 'Temat',
-    'Sunday' => 'Niedziela',
-    'Tags' => 'Tagi',
-    'This user is already participating in this conversation.' => 'Ten użytkownik uczestniczy już w tej rozmowie.',
-    'Thursday' => 'Czwartek',
-    'Title' => 'Tytuł',
-    'Today' => 'Dziś',
-    'Tuesday' => 'Wtorek',
-    'Unpin' => 'Odepnij',
-    'Until a user is member since (days)' => 'Dopóki użytkownik jest członkiem (dni)',
-    'Updated At' => 'Zaktualizowana o',
-    'Updated By' => 'Zaktualizowane przez',
-    'User' => 'Użytkownik',
-    'Wednesday' => 'Środa',
-    'Write a message...' => 'Napisz wiadomość...',
-    'Yesterday' => 'Wczoraj',
-    'You' => 'Ty',
-    'You are not allowed to reply to users {userNames}!' => 'Nie masz uprawnień aby odpowiadać użytkownikom {userNames}!',
-    'You are not allowed to start a conversation with this user.' => 'Nie mam uprawnień aby rozpocząć rozmowę z tym użytkownikiem.',
-    'You are not allowed to start a conversation with {userName}!' => 'Nie masz uprawnień aby zacząć rozmowę z {userName}!',
-    'You cannot send a message to yourself!' => 'Nie możesz wysłać wiadomości do siebie!',
-    'You cannot send a message without recipients!' => 'Nie możesz wysłać wiadomości, która nie ma odbiorcy!',
-    'You joined the conversation.' => 'Dołączyłeś do konwersacji.',
-    'You left the conversation.' => 'Opuściłeś konwersację.',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Osiągnąłeś swój dzienny limit ilości nowych rozmów.',
-    'edited' => 'zmieniono',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# inny} other{# inne}}',
-    '{username} joined the conversation.' => '{username} dołączył do konwersacji.',
-    '{username} left the conversation.' => '{username} opuścił konwersację.',
-    'Advanced Messages Search' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Potwierdź</strong> usunięcie rozmowy',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Potwierdź</strong>  opuszczenie rozmowy',
+  '<strong>Confirm</strong> message deletion' => '<strong>Potwierdź</strong> usunięcie wiadomości',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Potwierdź</strong> usunięcie oznaczenia',
+  '<strong>Edit</strong> conversation tags' => '<strong>Edytuj</strong> oznaczenia konwersacji',
+  '<strong>Edit</strong> tag' => '<strong>Edytuj</strong> oznaczenie',
+  '<strong>Manage</strong> conversation tags' => '<strong>Zarządzaj</strong> oznaczeniami konwersacji',
+  '<strong>Messenger</strong> module configuration' => '<strong>Komunikator</strong> konfiguracja modułu',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Nowa</strong> wiadomość ',
+  'A tag with the same name already exists.' => 'Istnieje już oznaczenie o podanej nazwie.',
+  'Add Tag' => 'Dodaj Oznaczenie',
+  'Add more participants to your conversation...' => 'Dodaj więcej odbiorców do twojej konwersacji ',
+  'Add participants' => 'Dodaj uczestników',
+  'Add recipients' => 'Dodaj odbiorców',
+  'Add user' => 'Dodaj użytkownika',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Pozwól innym wysyłać Ci prywatne wiadomości',
+  'Allow users to start new conversations' => 'Pozwól użytkownikom rozpoczynać nowe rozmowy',
+  'Cancel' => 'Anuluj',
+  'Confirm' => 'Potwierdź',
+  'Conversation' => 'Rozmowa',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Oznaczenia konwersacji mogą być użyte w celu filtrowania rozmów i są widoczne tylko dla Ciebie.',
+  'Conversations' => 'Rozmowy',
+  'Created At' => 'Utworzono',
+  'Created By' => 'Utworzone przez',
+  'Delete' => 'Usuń',
+  'Delete conversation' => 'Usuń rozmowę',
+  'Do you really want to delete this conversation?' => 'Na pewno chcesz usunąć rozmowę?',
+  'Do you really want to delete this message?' => 'Na pewno chcesz usunąć wiadomość?',
+  'Do you really want to delete this tag?' => 'Czy a pewno chcesz usunąć to oznaczenie?',
+  'Do you really want to leave this conversation?' => 'Na pewno chcesz opuścić rozmowę?',
+  'Edit' => 'Edytuj',
+  'Edit message entry' => 'Edytuj treść wiadomości',
+  'Edit message...' => 'Edycja wiadomości...',
+  'Filters' => 'Filtry',
+  'Friday' => 'Piątek',
+  'Groups' => 'Grupy ',
+  'Here you can manage your private conversation tags.' => 'Tutaj możesz zarządzać Twoimi prywatnymi oznaczeniami konwersacji.',
+  'Is Originator' => 'jest inicjatorem',
+  'Last Viewed' => 'Ostatnio oglądane',
+  'Leave' => 'Opuść',
+  'Leave conversation' => 'Opuść rozmowę',
+  'Leave fields blank in order to disable a restriction.' => 'Zostaw te pola puste w celu wyłączenia restrykcji.',
+  'Manage Tags' => 'Zarządzaj Oznaczeniami',
+  'Mark Unread' => 'Oznacz jako nieprzeczytane',
+  'Max messages allowed per day' => 'Maksymalna liczba wiadomości w ciągu dnia',
+  'Max number of messages allowed for a new user per day' => 'Maksymalna liczba wiadomości dla nowych użytkowników w ciągu dnia',
+  'Max number of new conversations allowed for a new user per day' => 'Maksymalna liczba nowych rozmów dla nowych użytkowników w ciągu dnia',
+  'Max number of new conversations allowed for a user per day' => 'Maksymalna liczba nowych rozmów dla użytkowników w ciągu dnia',
+  'Members' => 'Członkowie ',
+  'Message' => 'Wiadomość',
+  'Messages' => 'Wiadomości',
+  'Monday' => 'Poniedziałek',
+  'My Tags' => 'Moje Oznaczenia',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Nowa wiadomość od {senderName} ',
+  'New message in discussion from %displayName%' => 'Nowa wiadomość w dyskusji od %displayName% ',
+  'Participants' => 'Uczestnicy',
+  'Pin' => 'Wyróżnij',
+  'Pinned' => 'Przypnij',
+  'Receive Notifications when someone opens a new conversation.' => 'Otrzymywanie powiadomień kiedy ktoś rozpocznie nową rozmowę',
+  'Receive Notifications when someone sends you a message.' => 'Otrzymywanie powiadomień kiedy ktoś wyśle Ci wiadomość',
+  'Receive private messages' => 'Otrzymywanie prywatnych wiadomości',
+  'Recipient' => 'Odbiorca ',
+  'Reply now' => 'Odpowiedz teraz ',
+  'Saturday' => 'Sobota',
+  'Search' => 'Szukaj',
+  'Send' => 'Wyślij ',
+  'Send message' => 'Wyślij wiadomość',
+  'Seperate restrictions for new users' => 'Oddzielne ograniczenia dla nowych użytkowników',
+  'Show all messages' => 'Pokaż wszystkie wiadomości ',
+  'Show menu item in top Navigation' => 'Pokaż pozycję w górnym menu nawigacyjnym',
+  'Sign up now' => 'Zarejestruj się teraz ',
+  'Spaces' => 'Strefy ',
+  'Start new conversations' => 'Zacznij nowe rozmowy',
+  'Subject' => 'Temat',
+  'Sunday' => 'Niedziela',
+  'Tags' => 'Tagi',
+  'There are no messages yet.' => 'Nie ma jeszcze wiadomości.',
+  'This user is already participating in this conversation.' => 'Ten użytkownik uczestniczy już w tej rozmowie.',
+  'Thursday' => 'Czwartek',
+  'Title' => 'Tytuł',
+  'Today' => 'Dziś',
+  'Tuesday' => 'Wtorek',
+  'Unpin' => 'Odepnij',
+  'Until a user is member since (days)' => 'Dopóki użytkownik jest członkiem (dni)',
+  'Updated At' => 'Zaktualizowana o',
+  'Updated By' => 'Zaktualizowane przez',
+  'User' => 'Użytkownik',
+  'User Posts' => 'Posty użytkownika ',
+  'User {name} is already participating!' => 'Użytkownik {name} już uczestniczy!',
+  'Wednesday' => 'Środa',
+  'Write a message...' => 'Napisz wiadomość...',
+  'Yesterday' => 'Wczoraj',
+  'You' => 'Ty',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => 'Nie masz uprawnień aby odpowiadać użytkownikom {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'Nie masz uprawnień aby wysyłać osobie {name} wiadomości!',
+  'You are not allowed to start a conversation with this user.' => 'Nie mam uprawnień aby rozpocząć rozmowę z tym użytkownikiem.',
+  'You are not allowed to start a conversation with {userName}!' => 'Nie masz uprawnień aby zacząć rozmowę z {userName}!',
+  'You cannot send a email to yourself!' => 'Nie możesz wysłać wiadomości do samego siebie!',
+  'You cannot send a message to yourself!' => 'Nie możesz wysłać wiadomości do siebie!',
+  'You cannot send a message without recipients!' => 'Nie możesz wysłać wiadomości, która nie ma odbiorcy!',
+  'You joined the conversation.' => 'Dołączyłeś do konwersacji.',
+  'You left the conversation.' => 'Opuściłeś konwersację.',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Osiągnąłeś swój dzienny limit ilości nowych rozmów.',
+  'edited' => 'zmieniono',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# inny} other{# inne}}',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '{username} dołączył do konwersacji.',
+  '{username} left the conversation.' => '{username} opuścił konwersację.',
 ];
diff --git a/messages/pl/forms_CreateMessageForm.php b/messages/pl/forms_CreateMessageForm.php
deleted file mode 100644
index 3bf57494..00000000
--- a/messages/pl/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Wiadomość ',
-  'Recipient' => 'Odbiorca ',
-  'Subject' => 'Temat ',
-  'Tags' => 'Tagi',
-);
diff --git a/messages/pl/forms_InviteRecipientForm.php b/messages/pl/forms_InviteRecipientForm.php
deleted file mode 100644
index 2aefc443..00000000
--- a/messages/pl/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Odbiorca',
-  'User {name} is already participating!' => 'Użytkownik {name} już uczestniczy!',
-  'You are not allowed to send user {name} is already!' => 'Nie masz uprawnień aby wysyłać osobie {name} wiadomości!',
-  'You cannot send a email to yourself!' => 'Nie możesz wysłać wiadomości do samego siebie!',
-);
diff --git a/messages/pl/forms_ReplyMessageForm.php b/messages/pl/forms_ReplyMessageForm.php
deleted file mode 100644
index 33837a24..00000000
--- a/messages/pl/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Wiadomość ',
-);
diff --git a/messages/pl/models_Message.php b/messages/pl/models_Message.php
deleted file mode 100644
index 8f47e4a4..00000000
--- a/messages/pl/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Nowa wiadomość od {senderName} ',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/pl/models_MessageEntry.php b/messages/pl/models_MessageEntry.php
deleted file mode 100644
index d6367b2e..00000000
--- a/messages/pl/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nowa wiadomość w dyskusji od %displayName% ',
-);
diff --git a/messages/pl/views_emails_NewMessage.php b/messages/pl/views_emails_NewMessage.php
deleted file mode 100644
index 8f7644b5..00000000
--- a/messages/pl/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Nowa</strong> wiadomość ',
-    'Reply now' => 'Odpowiedz teraz ',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/pl/views_emails_NewMessageEntry.php b/messages/pl/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/pl/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/pl/views_mail_adduser.php b/messages/pl/views_mail_adduser.php
deleted file mode 100644
index ed45bf79..00000000
--- a/messages/pl/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Dodaj więcej odbiorców do twojej konwersacji ',
-];
diff --git a/messages/pl/views_mail_create.php b/messages/pl/views_mail_create.php
deleted file mode 100644
index cb656728..00000000
--- a/messages/pl/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nowa</strong> wiadomość ',
-  'Add recipients' => 'Dodaj odbiorców',
-  'Send' => 'Wyślij ',
-);
diff --git a/messages/pl/views_mail_edit.php b/messages/pl/views_mail_edit.php
deleted file mode 100644
index 39ef289b..00000000
--- a/messages/pl/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Edytuj treść wiadomości',
-];
diff --git a/messages/pl/views_mail_index.php b/messages/pl/views_mail_index.php
deleted file mode 100644
index e9672b8e..00000000
--- a/messages/pl/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Rozmowy',
-    'There are no messages yet.' => 'Nie ma jeszcze wiadomości.',
-];
diff --git a/messages/pl/views_mail_list.php b/messages/pl/views_mail_list.php
deleted file mode 100644
index dc78eb84..00000000
--- a/messages/pl/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Nie ma jeszcze wiadomości. ',
-);
diff --git a/messages/pl/views_mail_show.php b/messages/pl/views_mail_show.php
deleted file mode 100644
index 9ee46223..00000000
--- a/messages/pl/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Potwierdź</strong> usunięcie rozmowy',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Potwierdź</strong>  opuszczenie rozmowy',
-    '<strong>Confirm</strong> message deletion' => '<strong>Potwierdź</strong> usunięcie wiadomości',
-    'Add user' => 'Dodaj użytkownika',
-    'Cancel' => 'Anuluj',
-    'Delete' => 'Usuń',
-    'Delete conversation' => 'Usuń rozmowę',
-    'Do you really want to delete this conversation?' => 'Na pewno chcesz usunąć rozmowę?',
-    'Do you really want to delete this message?' => 'Na pewno chcesz usunąć wiadomość?',
-    'Do you really want to leave this conversation?' => 'Na pewno chcesz opuścić rozmowę?',
-    'Leave' => 'Opuść',
-    'Leave conversation' => 'Opuść rozmowę',
-    'There are no messages yet.' => 'Nie ma jeszcze wiadomości.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/pl/views_mail_sidebar.php b/messages/pl/views_mail_sidebar.php
deleted file mode 100644
index ef8bbdbd..00000000
--- a/messages/pl/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupy ',
-  'Members' => 'Członkowie ',
-  'Spaces' => 'Strefy ',
-  'User Posts' => 'Posty użytkownika ',
-);
diff --git a/messages/pl/views_mails_UserInviteSpace.php b/messages/pl/views_mails_UserInviteSpace.php
deleted file mode 100644
index dc688621..00000000
--- a/messages/pl/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Zarejestruj się teraz ',
-);
diff --git a/messages/pl/widgets_views_mailNotification.php b/messages/pl/widgets_views_mailNotification.php
deleted file mode 100644
index 20da9262..00000000
--- a/messages/pl/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Pokaż wszystkie wiadomości ',
-];
diff --git a/messages/pl/widgets_views_newMessageButton.php b/messages/pl/widgets_views_newMessageButton.php
deleted file mode 100644
index 5b10a378..00000000
--- a/messages/pl/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Wyślij wiadomość',
-];
diff --git a/messages/pt-BR/base.php b/messages/pt-BR/base.php
index 7a7c46f1..1dfed11e 100644
--- a/messages/pt-BR/base.php
+++ b/messages/pt-BR/base.php
@@ -1,30 +1,48 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> a exclusão da conversa',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> saída da conversa',
+  '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> exclusão da mensagem',
   '<strong>Confirm</strong> tag deletion' => '<strong>Confirmar</strong> exclusão da tag',
   '<strong>Edit</strong> conversation tags' => '<strong>Editar</strong> tags de conversação',
   '<strong>Edit</strong> tag' => '<strong>Editar</strong> tag',
   '<strong>Manage</strong> conversation tags' => '<strong>Gerenciar</strong> tags de conversa',
   '<strong>Messenger</strong> module configuration' => 'Configuração do módulo <strong>Messenger</strong>',
+  '<strong>New</strong> conversation' => '<strong>Nova</strong> conversa',
+  '<strong>New</strong> message' => '<strong>Nova</strong> mensagem',
   'A tag with the same name already exists.' => 'Já existe uma tag com o mesmo nome.',
   'Add Tag' => 'Adicionar etiqueta',
+  'Add more participants to your conversation...' => 'Adicionar mais participantes na sua conversa ...',
   'Add participants' => 'Adicionar participantes',
+  'Add recipients' => 'Adicionar destinatários',
+  'Add user' => 'Adicionar usuário',
   'Advanced Messages Search' => 'Pesquisa avançada de mensagens',
   'Allow others to send you private messages' => 'Permitir que outros enviem mensagens privadas para você',
   'Allow users to start new conversations' => 'Permitir que os usuários iniciem novas conversas',
+  'Cancel' => 'Cancelar',
   'Confirm' => 'Confirmar',
   'Conversation' => 'Conversação',
   'Conversation tags can be used to filter conversations and are only visible to you.' => 'As tags de conversação podem ser usadas para filtrar conversas e são visíveis apenas para você.',
   'Conversations' => 'Conversas',
   'Created At' => 'Criado Em',
   'Created By' => 'Criado Por',
+  'Delete' => 'Apagar',
+  'Delete conversation' => 'Apagar conversa',
+  'Do you really want to delete this conversation?' => 'Você quer realmente apagar esta conversa?',
+  'Do you really want to delete this message?' => 'Você realmente quer apagar esta mensagem?',
   'Do you really want to delete this tag?' => 'Tem certeza de que deseja excluir esta tag?',
+  'Do you really want to leave this conversation?' => 'Você quer realmente sair desta conversa?',
   'Edit' => 'Editar',
+  'Edit message entry' => 'Editar mensagem',
   'Edit message...' => 'Editar mensagem ...',
   'Filters' => 'Filtros',
   'Friday' => 'sexta-feira',
+  'Groups' => 'Grupos',
   'Here you can manage your private conversation tags.' => 'Aqui você pode gerenciar suas tags de conversas privadas.',
   'Is Originator' => 'É Originador',
   'Last Viewed' => 'Última Visualização',
+  'Leave' => 'Sair',
+  'Leave conversation' => 'Deixar conversa',
   'Leave fields blank in order to disable a restriction.' => 'Deixe os campos em branco para desativar uma restrição.',
   'Manage Tags' => 'Gerenciar tags',
   'Mark Unread' => 'Marcar como não lido',
@@ -32,24 +50,36 @@
   'Max number of messages allowed for a new user per day' => 'Número máximo de mensagens permitido para um novo usuário por dia',
   'Max number of new conversations allowed for a new user per day' => 'Número máximo de novas conversas permitidas para um novo usuário por dia',
   'Max number of new conversations allowed for a user per day' => 'Número máximo de novas conversas permitidas para um usuário por dia',
+  'Members' => 'Usuários',
   'Message' => 'Mensagem',
   'Messages' => 'Mensagens',
   'Monday' => 'Segunda-feira',
   'My Tags' => 'Minhas Tags',
+  'New conversation from {senderName}' => 'Nova conversa de {senderName}',
+  'New message from {senderName}' => 'Nova mensagem de {senderName}',
+  'New message in discussion from %displayName%' => 'Nova mensagem em discussão de %displayName%',
   'Participants' => 'Participantes',
   'Pin' => 'Fixar',
   'Pinned' => 'Fixado',
   'Receive Notifications when someone opens a new conversation.' => 'Receber notificações quando alguém abrir uma nova conversa.',
   'Receive Notifications when someone sends you a message.' => 'Receber notificações quando alguém lhe enviar uma mensagem.',
   'Receive private messages' => 'Receber mensagens privadas',
+  'Recipient' => 'Destinatário',
+  'Reply now' => 'Responder agora',
   'Saturday' => 'Sábado',
   'Search' => 'Procurar',
+  'Send' => 'Enviar',
+  'Send message' => 'Enviar mensagem',
   'Seperate restrictions for new users' => 'Restrições separadas para novos usuários',
+  'Show all messages' => 'Mostrar todas as mensagens',
   'Show menu item in top Navigation' => 'Mostrar item de menu no topo Navegação',
+  'Sign up now' => 'Registre-se agora',
+  'Spaces' => 'Espaços',
   'Start new conversations' => 'Iniciar novas conversas',
   'Subject' => 'Assunto',
   'Sunday' => 'Domingo',
   'Tags' => 'Tags',
+  'There are no messages yet.' => 'Não há mensagens ainda.',
   'This user is already participating in this conversation.' => 'Este usuário já está participando desta conversa.',
   'Thursday' => 'Quinta-feira',
   'Title' => 'Título',
@@ -60,13 +90,18 @@
   'Updated At' => 'Atualizado Em',
   'Updated By' => 'Atualizado Por',
   'User' => 'Usuário',
+  'User Posts' => 'Posts do Usuário',
+  'User {name} is already participating!' => 'O usuário {name} já está participando!',
   'Wednesday' => 'Quarta-feira',
   'Write a message...' => 'Escreva uma mensagem...',
   'Yesterday' => 'Ontem',
   'You' => 'Você',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Você não tem permissão para participar desta conversa. Você foi bloqueado por: {userNames}.',
   'You are not allowed to reply to users {userNames}!' => 'Você não tem permissão para responder aos usuários {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'Você ainda não pode enviar uma mensagem ao usuário {name}!',
   'You are not allowed to start a conversation with this user.' => 'Você não tem permissão para iniciar uma conversa com este usuário.',
   'You are not allowed to start a conversation with {userName}!' => 'Você não tem permissão para iniciar uma conversa com {userName}!',
+  'You cannot send a email to yourself!' => 'Você NÃO PODE enviar um e-mail para si mesmo!',
   'You cannot send a message to yourself!' => 'Você não pode enviar uma mensagem para si mesmo!',
   'You cannot send a message without recipients!' => 'Você não pode enviar uma mensagem sem destinatários!',
   'You joined the conversation.' => 'Você entrou na conversa.',
@@ -74,6 +109,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => 'Você excedeu sua quantidade diária de novas conversas.',
   'edited' => 'editado',
   '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} criou uma nova conversa {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} lhe enviou uma nova mensagem em {conversationTitle}',
   '{username} joined the conversation.' => '{username} entrou na conversa.',
   '{username} left the conversation.' => '{username} saiu da conversa.',
-);
+];
diff --git a/messages/pt-BR/forms_CreateMessageForm.php b/messages/pt-BR/forms_CreateMessageForm.php
deleted file mode 100644
index 7f6e83be..00000000
--- a/messages/pt-BR/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensagem',
-  'Recipient' => 'Destinatário',
-  'Subject' => 'Assunto',
-  'Tags' => 'Tags',
-);
diff --git a/messages/pt-BR/forms_InviteRecipientForm.php b/messages/pt-BR/forms_InviteRecipientForm.php
deleted file mode 100644
index 8308d641..00000000
--- a/messages/pt-BR/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Destinatário',
-  'User {name} is already participating!' => 'O usuário {name} já está participando!',
-  'You are not allowed to send user {name} is already!' => 'Você ainda não pode enviar uma mensagem ao usuário {name}!',
-  'You cannot send a email to yourself!' => 'Você NÃO PODE enviar um e-mail para si mesmo!',
-);
diff --git a/messages/pt-BR/forms_ReplyMessageForm.php b/messages/pt-BR/forms_ReplyMessageForm.php
deleted file mode 100644
index 7d00b21a..00000000
--- a/messages/pt-BR/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensagem',
-);
diff --git a/messages/pt-BR/models_Message.php b/messages/pt-BR/models_Message.php
deleted file mode 100644
index 5d5a30bf..00000000
--- a/messages/pt-BR/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Nova conversa de {senderName}',
-  'New message from {senderName}' => 'Nova mensagem de {senderName}',
-);
diff --git a/messages/pt-BR/models_MessageEntry.php b/messages/pt-BR/models_MessageEntry.php
deleted file mode 100644
index 8d8ee084..00000000
--- a/messages/pt-BR/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nova mensagem em discussão de %displayName%',
-);
diff --git a/messages/pt-BR/views_emails_NewMessage.php b/messages/pt-BR/views_emails_NewMessage.php
deleted file mode 100644
index 366a28db..00000000
--- a/messages/pt-BR/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Nova</strong> conversa',
-  '<strong>New</strong> message' => '<strong>Nova</strong> mensagem',
-  'Reply now' => 'Responder agora',
-);
diff --git a/messages/pt-BR/views_emails_NewMessageEntry.php b/messages/pt-BR/views_emails_NewMessageEntry.php
deleted file mode 100644
index c68eec53..00000000
--- a/messages/pt-BR/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} criou uma nova conversa {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} lhe enviou uma nova mensagem em {conversationTitle}',
-);
diff --git a/messages/pt-BR/views_mail_adduser.php b/messages/pt-BR/views_mail_adduser.php
deleted file mode 100644
index b3ab6c6b..00000000
--- a/messages/pt-BR/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Adicionar mais participantes na sua conversa ...',
-];
diff --git a/messages/pt-BR/views_mail_create.php b/messages/pt-BR/views_mail_create.php
deleted file mode 100644
index 9bc1c090..00000000
--- a/messages/pt-BR/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nova</strong> mensagem',
-  'Add recipients' => 'Adicionar destinatários',
-  'Send' => 'Enviar',
-);
diff --git a/messages/pt-BR/views_mail_edit.php b/messages/pt-BR/views_mail_edit.php
deleted file mode 100644
index 020b9c1d..00000000
--- a/messages/pt-BR/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Editar mensagem',
-];
diff --git a/messages/pt-BR/views_mail_index.php b/messages/pt-BR/views_mail_index.php
deleted file mode 100644
index de13f966..00000000
--- a/messages/pt-BR/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Conversas',
-    'There are no messages yet.' => 'Não há mensagens ainda.',
-];
diff --git a/messages/pt-BR/views_mail_list.php b/messages/pt-BR/views_mail_list.php
deleted file mode 100644
index 64a028b7..00000000
--- a/messages/pt-BR/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Não há mensagens ainda.',
-);
diff --git a/messages/pt-BR/views_mail_show.php b/messages/pt-BR/views_mail_show.php
deleted file mode 100644
index af3d6b85..00000000
--- a/messages/pt-BR/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> a exclusão da conversa',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> saída da conversa',
-  '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> exclusão da mensagem',
-  'Add user' => 'Adicionar usuário',
-  'Cancel' => 'Cancelar',
-  'Delete' => 'Apagar',
-  'Delete conversation' => 'Apagar conversa',
-  'Do you really want to delete this conversation?' => 'Você quer realmente apagar esta conversa?',
-  'Do you really want to delete this message?' => 'Você realmente quer apagar esta mensagem?',
-  'Do you really want to leave this conversation?' => 'Você quer realmente sair desta conversa?',
-  'Leave' => 'Sair',
-  'Leave conversation' => 'Deixar conversa',
-  'There are no messages yet.' => 'Não há mensagens ainda.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Você não tem permissão para participar desta conversa. Você foi bloqueado por: {userNames}.',
-);
diff --git a/messages/pt-BR/views_mail_sidebar.php b/messages/pt-BR/views_mail_sidebar.php
deleted file mode 100644
index 6ca765d8..00000000
--- a/messages/pt-BR/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupos',
-  'Members' => 'Usuários',
-  'Spaces' => 'Espaços',
-  'User Posts' => 'Posts do Usuário',
-);
diff --git a/messages/pt-BR/views_mails_UserInviteSpace.php b/messages/pt-BR/views_mails_UserInviteSpace.php
deleted file mode 100644
index c5b1c976..00000000
--- a/messages/pt-BR/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Registre-se agora',
-);
diff --git a/messages/pt-BR/widgets_views_mailNotification.php b/messages/pt-BR/widgets_views_mailNotification.php
deleted file mode 100644
index 516142cd..00000000
--- a/messages/pt-BR/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Mostrar todas as mensagens',
-];
diff --git a/messages/pt-BR/widgets_views_newMessageButton.php b/messages/pt-BR/widgets_views_newMessageButton.php
deleted file mode 100644
index e3484981..00000000
--- a/messages/pt-BR/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Enviar mensagem',
-];
diff --git a/messages/pt/base.php b/messages/pt/base.php
index 2bcdd269..8752b913 100644
--- a/messages/pt/base.php
+++ b/messages/pt/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Confirmar</strong> eliminação de signa',
-    '<strong>Edit</strong> conversation tags' => '<strong>Editar</strong> signas da conversa',
-    '<strong>Edit</strong> tag' => '<strong>Editar</strong> etiqueta',
-    '<strong>Manage</strong> conversation tags' => '<strong>Gerir</strong> etiquetas da conversa',
-    '<strong>Messenger</strong> module configuration' => 'Configuração do Módulo <strong>Messenger</strong>',
-    'A tag with the same name already exists.' => 'Já há uma etiqueta com esse nome.',
-    'Add Tag' => 'Adicionar Etiqueta',
-    'Add participants' => 'Adicionar participantes',
-    'Allow others to send you private messages' => 'Permitir que te enviem mensagens privadas',
-    'Allow users to start new conversations' => 'Permitir que pessoas comecem novas conversas',
-    'Confirm' => 'Confirmar',
-    'Conversation' => 'Conversa',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Signas de conversas podem ser usadas para filtrar conversas e são apenas visíveis para ti.',
-    'Conversations' => 'Conversas',
-    'Created At' => 'Criado Em',
-    'Created By' => 'Criado Por',
-    'Do you really want to delete this tag?' => 'Queres mesmo apagar esta etiqueta?',
-    'Edit' => 'Editar',
-    'Edit message...' => 'Editar mensagem...',
-    'Filters' => 'Filtros',
-    'Friday' => 'Sexta-feira',
-    'Here you can manage your private conversation tags.' => 'Aqui podes gerir as tuas etiquetas de mensagens privadas.',
-    'Is Originator' => 'É Autor',
-    'Last Viewed' => 'Última Visualização',
-    'Leave fields blank in order to disable a restriction.' => 'Deixar campos em branco para desativar uma restrição.',
-    'Manage Tags' => 'Gerir Etiquetas',
-    'Max messages allowed per day' => 'Número máximo de mensagens permitido por dia',
-    'Max number of messages allowed for a new user per day' => 'Número máximo de mensagens permitido por dia para uma nova pessoa',
-    'Max number of new conversations allowed for a new user per day' => 'Número máximo de novas conversas permitidas por dia para uma nova pessoa',
-    'Max number of new conversations allowed for a user per day' => 'Número máximo de novas conversas por dia para uma pessoa',
-    'Message' => 'Mensagem',
-    'Messages' => 'Mensagens',
-    'Monday' => 'Segunda-feira',
-    'My Tags' => 'Minhas Etiquetas',
-    'Participants' => 'Participantes',
-    'Pinned' => 'Afixado',
-    'Receive Notifications when someone opens a new conversation.' => 'Receber notificações quando alguém abre uma nova conversa.',
-    'Receive Notifications when someone sends you a message.' => 'Receber notificações quando alguém te envia uma mensagem.',
-    'Receive private messages' => 'Receber mensagens privadas',
-    'Saturday' => 'Sábado',
-    'Search' => 'Pesquisar',
-    'Seperate restrictions for new users' => 'Restrições separadas para novas pessoas',
-    'Show menu item in top Navigation' => 'Mostrar item no menu de navegação no topo',
-    'Start new conversations' => 'Começar novas conversas',
-    'Subject' => 'Assunto',
-    'Sunday' => 'Domingo',
-    'Tags' => 'Etiquetas',
-    'This user is already participating in this conversation.' => 'Esta pessoa já está nesta conversa.',
-    'Thursday' => 'Quinta-feira',
-    'Title' => 'Título',
-    'Today' => 'Hoje',
-    'Tuesday' => 'Terça-feira',
-    'Unpin' => 'Desafixar',
-    'Until a user is member since (days)' => 'Até que uma pessoa seja membro desde (dias)',
-    'Updated At' => 'Atualizado Em',
-    'Updated By' => 'Atualizado Por',
-    'User' => 'Utilizador',
-    'Wednesday' => 'Quarta-feira',
-    'Write a message...' => 'Escrever uma mensagem...',
-    'Yesterday' => 'Ontem',
-    'You' => 'Tu',
-    'You are not allowed to reply to users {userNames}!' => 'Não pode responder aos utilizadores {userNames}!',
-    'You are not allowed to start a conversation with this user.' => 'Não tem permissões suficientes para começar uma conversa com esta pessoa.',
-    'You are not allowed to start a conversation with {userName}!' => 'Não tem permissões suficientes para começar uma conversa com {userName}!',
-    'You cannot send a message to yourself!' => 'Não pode enviar uma mensagem para ti mesmo!',
-    'You cannot send a message without recipients!' => 'Não pode enviar uma mensagem sem destinatários!',
-    'You joined the conversation.' => 'Juntou-se à conversa.',
-    'You left the conversation.' => 'Abandonou a conversa.',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Excedeu o teu número de novas conversas por dia.',
-    'edited' => 'editado',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# outro} other{# outros}}',
-    '{username} joined the conversation.' => '{username} juntou-se à conversa.',
-    '{username} left the conversation.' => '{username} abandonou a conversa.',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> eliminação da conversa',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> sair da conversa',
+  '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> eliminação da mensagem',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Confirmar</strong> eliminação de signa',
+  '<strong>Edit</strong> conversation tags' => '<strong>Editar</strong> signas da conversa',
+  '<strong>Edit</strong> tag' => '<strong>Editar</strong> etiqueta',
+  '<strong>Manage</strong> conversation tags' => '<strong>Gerir</strong> etiquetas da conversa',
+  '<strong>Messenger</strong> module configuration' => 'Configuração do Módulo <strong>Messenger</strong>',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Nova</strong> mensagem',
+  'A tag with the same name already exists.' => 'Já há uma etiqueta com esse nome.',
+  'Add Tag' => 'Adicionar Etiqueta',
+  'Add more participants to your conversation...' => 'Adicionar mais participantes à conversa...',
+  'Add participants' => 'Adicionar participantes',
+  'Add recipients' => 'Adicionar pessoas destinatárias',
+  'Add user' => 'Adicionar pessoa',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Permitir que te enviem mensagens privadas',
+  'Allow users to start new conversations' => 'Permitir que pessoas comecem novas conversas',
+  'Cancel' => 'Cancelar',
+  'Confirm' => 'Confirmar',
+  'Conversation' => 'Conversa',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Signas de conversas podem ser usadas para filtrar conversas e são apenas visíveis para ti.',
+  'Conversations' => 'Conversas',
+  'Created At' => 'Criado Em',
+  'Created By' => 'Criado Por',
+  'Delete' => 'Apagar',
+  'Delete conversation' => 'Apagar conversa',
+  'Do you really want to delete this conversation?' => 'Queres mesmo apagar esta conversa?',
+  'Do you really want to delete this message?' => 'Queres mesmo apagar esta mensagem?',
+  'Do you really want to delete this tag?' => 'Queres mesmo apagar esta etiqueta?',
+  'Do you really want to leave this conversation?' => 'Queres mesmo sair desta conversa?',
+  'Edit' => 'Editar',
+  'Edit message entry' => 'Editar entrada de mensagem',
+  'Edit message...' => 'Editar mensagem...',
+  'Filters' => 'Filtros',
+  'Friday' => 'Sexta-feira',
+  'Groups' => 'Grupos',
+  'Here you can manage your private conversation tags.' => 'Aqui podes gerir as tuas etiquetas de mensagens privadas.',
+  'Is Originator' => 'É Autor',
+  'Last Viewed' => 'Última Visualização',
+  'Leave' => 'Sair',
+  'Leave conversation' => 'Sair da conversa',
+  'Leave fields blank in order to disable a restriction.' => 'Deixar campos em branco para desativar uma restrição.',
+  'Manage Tags' => 'Gerir Etiquetas',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Número máximo de mensagens permitido por dia',
+  'Max number of messages allowed for a new user per day' => 'Número máximo de mensagens permitido por dia para uma nova pessoa',
+  'Max number of new conversations allowed for a new user per day' => 'Número máximo de novas conversas permitidas por dia para uma nova pessoa',
+  'Max number of new conversations allowed for a user per day' => 'Número máximo de novas conversas por dia para uma pessoa',
+  'Members' => 'Participantes',
+  'Message' => 'Mensagem',
+  'Messages' => 'Mensagens',
+  'Monday' => 'Segunda-feira',
+  'My Tags' => 'Minhas Etiquetas',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Nova mensagem de {senderName}',
+  'New message in discussion from %displayName%' => 'Nova mensagem em discussão de %displayName%',
+  'Participants' => 'Participantes',
+  'Pin' => '',
+  'Pinned' => 'Afixado',
+  'Receive Notifications when someone opens a new conversation.' => 'Receber notificações quando alguém abre uma nova conversa.',
+  'Receive Notifications when someone sends you a message.' => 'Receber notificações quando alguém te envia uma mensagem.',
+  'Receive private messages' => 'Receber mensagens privadas',
+  'Recipient' => 'Pessoas destinatárias',
+  'Reply now' => 'Responder agora',
+  'Saturday' => 'Sábado',
+  'Search' => 'Pesquisar',
+  'Send' => 'Enviar',
+  'Send message' => 'Enviar mensagem',
+  'Seperate restrictions for new users' => 'Restrições separadas para novas pessoas',
+  'Show all messages' => 'Mostrar todas as mensagens',
+  'Show menu item in top Navigation' => 'Mostrar item no menu de navegação no topo',
+  'Sign up now' => 'Registar agora',
+  'Spaces' => 'Espaços',
+  'Start new conversations' => 'Começar novas conversas',
+  'Subject' => 'Assunto',
+  'Sunday' => 'Domingo',
+  'Tags' => 'Etiquetas',
+  'There are no messages yet.' => 'Ainda não há mensagens.',
+  'This user is already participating in this conversation.' => 'Esta pessoa já está nesta conversa.',
+  'Thursday' => 'Quinta-feira',
+  'Title' => 'Título',
+  'Today' => 'Hoje',
+  'Tuesday' => 'Terça-feira',
+  'Unpin' => 'Desafixar',
+  'Until a user is member since (days)' => 'Até que uma pessoa seja membro desde (dias)',
+  'Updated At' => 'Atualizado Em',
+  'Updated By' => 'Atualizado Por',
+  'User' => 'Utilizador',
+  'User Posts' => 'Postas da pessoa',
+  'User {name} is already participating!' => 'A pessoa {name} já é participante!',
+  'Wednesday' => 'Quarta-feira',
+  'Write a message...' => 'Escrever uma mensagem...',
+  'Yesterday' => 'Ontem',
+  'You' => 'Tu',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => 'Não pode responder aos utilizadores {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'Já ias enviar para {name}!',
+  'You are not allowed to start a conversation with this user.' => 'Não tem permissões suficientes para começar uma conversa com esta pessoa.',
+  'You are not allowed to start a conversation with {userName}!' => 'Não tem permissões suficientes para começar uma conversa com {userName}!',
+  'You cannot send a email to yourself!' => 'Não podes enviar um email para ti!',
+  'You cannot send a message to yourself!' => 'Não pode enviar uma mensagem para ti mesmo!',
+  'You cannot send a message without recipients!' => 'Não pode enviar uma mensagem sem destinatários!',
+  'You joined the conversation.' => 'Juntou-se à conversa.',
+  'You left the conversation.' => 'Abandonou a conversa.',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Excedeu o teu número de novas conversas por dia.',
+  'edited' => 'editado',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# outro} other{# outros}}',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '{username} juntou-se à conversa.',
+  '{username} left the conversation.' => '{username} abandonou a conversa.',
 ];
diff --git a/messages/pt/forms_CreateMessageForm.php b/messages/pt/forms_CreateMessageForm.php
deleted file mode 100644
index 193f3759..00000000
--- a/messages/pt/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensagem',
-  'Recipient' => 'Pessoas destinatárias',
-  'Subject' => 'Assunto',
-  'Tags' => 'Signas',
-);
diff --git a/messages/pt/forms_InviteRecipientForm.php b/messages/pt/forms_InviteRecipientForm.php
deleted file mode 100644
index 8b748648..00000000
--- a/messages/pt/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Pessoa destinatária',
-  'User {name} is already participating!' => 'A pessoa {name} já é participante!',
-  'You are not allowed to send user {name} is already!' => 'Já ias enviar para {name}!',
-  'You cannot send a email to yourself!' => 'Não podes enviar um email para ti!',
-);
diff --git a/messages/pt/forms_ReplyMessageForm.php b/messages/pt/forms_ReplyMessageForm.php
deleted file mode 100644
index 7d00b21a..00000000
--- a/messages/pt/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mensagem',
-);
diff --git a/messages/pt/models_Message.php b/messages/pt/models_Message.php
deleted file mode 100644
index 1252f6da..00000000
--- a/messages/pt/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Nova mensagem de {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/pt/models_MessageEntry.php b/messages/pt/models_MessageEntry.php
deleted file mode 100644
index 8d8ee084..00000000
--- a/messages/pt/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nova mensagem em discussão de %displayName%',
-);
diff --git a/messages/pt/views_emails_NewMessage.php b/messages/pt/views_emails_NewMessage.php
deleted file mode 100644
index 74fba003..00000000
--- a/messages/pt/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Nova</strong> mensagem',
-    'Reply now' => 'Responder agora',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/pt/views_emails_NewMessageEntry.php b/messages/pt/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/pt/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/pt/views_mail_adduser.php b/messages/pt/views_mail_adduser.php
deleted file mode 100644
index b228d4c5..00000000
--- a/messages/pt/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => 'Adicionar mais participantes à conversa...',
-);
diff --git a/messages/pt/views_mail_create.php b/messages/pt/views_mail_create.php
deleted file mode 100644
index 6297e800..00000000
--- a/messages/pt/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nova</strong> mensagem',
-  'Add recipients' => 'Adicionar pessoas destinatárias',
-  'Send' => 'Enviar',
-);
diff --git a/messages/pt/views_mail_edit.php b/messages/pt/views_mail_edit.php
deleted file mode 100644
index b9f54758..00000000
--- a/messages/pt/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => 'Editar entrada de mensagem',
-);
diff --git a/messages/pt/views_mail_index.php b/messages/pt/views_mail_index.php
deleted file mode 100644
index 82b3ff93..00000000
--- a/messages/pt/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Conversas',
-    'There are no messages yet.' => 'Ainda não há mensagens.',
-];
diff --git a/messages/pt/views_mail_list.php b/messages/pt/views_mail_list.php
deleted file mode 100644
index 70e62b0d..00000000
--- a/messages/pt/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Ainda não há mensagens.',
-);
diff --git a/messages/pt/views_mail_show.php b/messages/pt/views_mail_show.php
deleted file mode 100644
index 76561f91..00000000
--- a/messages/pt/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Confirmar</strong> eliminação da conversa',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Confirmar</strong> sair da conversa',
-    '<strong>Confirm</strong> message deletion' => '<strong>Confirmar</strong> eliminação da mensagem',
-    'Add user' => 'Adicionar pessoa',
-    'Cancel' => 'Cancelar',
-    'Delete' => 'Apagar',
-    'Delete conversation' => 'Apagar conversa',
-    'Do you really want to delete this conversation?' => 'Queres mesmo apagar esta conversa?',
-    'Do you really want to delete this message?' => 'Queres mesmo apagar esta mensagem?',
-    'Do you really want to leave this conversation?' => 'Queres mesmo sair desta conversa?',
-    'Leave' => 'Sair',
-    'Leave conversation' => 'Sair da conversa',
-    'There are no messages yet.' => 'Ainda não há mensagens.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/pt/views_mail_sidebar.php b/messages/pt/views_mail_sidebar.php
deleted file mode 100644
index a99695f4..00000000
--- a/messages/pt/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupos',
-  'Members' => 'Participantes',
-  'Spaces' => 'Espaços',
-  'User Posts' => 'Postas da pessoa',
-);
diff --git a/messages/pt/views_mails_UserInviteSpace.php b/messages/pt/views_mails_UserInviteSpace.php
deleted file mode 100644
index 99be7b9f..00000000
--- a/messages/pt/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Registar agora',
-);
diff --git a/messages/pt/widgets_views_mailNotification.php b/messages/pt/widgets_views_mailNotification.php
deleted file mode 100644
index 9c7a22b5..00000000
--- a/messages/pt/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'Mostrar todas as mensagens',
-);
diff --git a/messages/pt/widgets_views_newMessageButton.php b/messages/pt/widgets_views_newMessageButton.php
deleted file mode 100644
index 3f5e909f..00000000
--- a/messages/pt/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'Enviar mensagem',
-);
diff --git a/messages/ro/base.php b/messages/ro/base.php
index 7023c38f..b62c3508 100644
--- a/messages/ro/base.php
+++ b/messages/ro/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => 'Confirmă',
-    'Edit' => 'Editează',
-    'Message' => 'Mesaj',
-    'Participants' => 'Participanți',
-    'Pinned' => 'Fixat',
-    'Search' => 'Căutare',
-    'Subject' => '제목',
-    'Title' => 'Titlul',
-    'Unpin' => 'Anulează Anunț',
-    'User' => 'Utilizator',
-    'You' => 'Tu',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Anulează',
+  'Confirm' => 'Confirmă',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => 'Șterge',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'Editează',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => 'Grupuri',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Membri',
+  'Message' => 'Mesaj',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => 'Participanți',
+  'Pin' => '',
+  'Pinned' => 'Fixat',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'Căutare',
+  'Send' => 'Trimite',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => '',
+  'Spaces' => 'Spatii',
+  'Start new conversations' => '',
+  'Subject' => '제목',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Titlul',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => 'Anulează Anunț',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Utilizator',
+  'User Posts' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Tu',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/ro/forms_CreateMessageForm.php b/messages/ro/forms_CreateMessageForm.php
deleted file mode 100644
index 0a5f0172..00000000
--- a/messages/ro/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => 'Mesaj',
-    'Subject' => '제목',
-    'Recipient' => '',
-    'Tags' => '',
-];
diff --git a/messages/ro/forms_InviteRecipientForm.php b/messages/ro/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/ro/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/ro/forms_ReplyMessageForm.php b/messages/ro/forms_ReplyMessageForm.php
deleted file mode 100644
index 02232dd4..00000000
--- a/messages/ro/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mesaj',
-);
diff --git a/messages/ro/models_Message.php b/messages/ro/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/ro/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/ro/models_MessageEntry.php b/messages/ro/models_MessageEntry.php
deleted file mode 100644
index 17293e9e..00000000
--- a/messages/ro/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => '',
-);
diff --git a/messages/ro/views_emails_NewMessage.php b/messages/ro/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/ro/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/ro/views_emails_NewMessageEntry.php b/messages/ro/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/ro/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/ro/views_mail_adduser.php b/messages/ro/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/ro/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/ro/views_mail_create.php b/messages/ro/views_mail_create.php
deleted file mode 100644
index a95190e1..00000000
--- a/messages/ro/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    'Send' => 'Trimite',
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-];
diff --git a/messages/ro/views_mail_edit.php b/messages/ro/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/ro/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/ro/views_mail_index.php b/messages/ro/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/ro/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/ro/views_mail_list.php b/messages/ro/views_mail_list.php
deleted file mode 100644
index 462cc43b..00000000
--- a/messages/ro/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => '',
-);
diff --git a/messages/ro/views_mail_show.php b/messages/ro/views_mail_show.php
deleted file mode 100644
index ea3ccb86..00000000
--- a/messages/ro/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'Anulează',
-    'Delete' => 'Șterge',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/ro/views_mail_sidebar.php b/messages/ro/views_mail_sidebar.php
deleted file mode 100644
index 6c510d0b..00000000
--- a/messages/ro/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupuri',
-  'Members' => 'Membri',
-  'Spaces' => 'Spatii',
-  'User Posts' => '',
-);
diff --git a/messages/ro/views_mails_UserInviteSpace.php b/messages/ro/views_mails_UserInviteSpace.php
deleted file mode 100644
index a144e515..00000000
--- a/messages/ro/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => '',
-);
diff --git a/messages/ro/widgets_views_mailNotification.php b/messages/ro/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/ro/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/ro/widgets_views_newMessageButton.php b/messages/ro/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/ro/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/ru/base.php b/messages/ru/base.php
index 064ea12d..bb8ddc98 100644
--- a/messages/ru/base.php
+++ b/messages/ru/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Подтвердите</strong> удаление метки',
-    '<strong>Edit</strong> conversation tags' => '<strong>Изменить</strong> метки чата',
-    '<strong>Edit</strong> tag' => '<strong>Изменить</strong> метку',
-    '<strong>Manage</strong> conversation tags' => '<strong>Управлять</strong> метками чатов',
-    '<strong>Messenger</strong> module configuration' => '<strong>Сообщения</strong> настройки модуля',
-    'A tag with the same name already exists.' => 'Такая метка уже существует.',
-    'Add Tag' => 'Добавить метку.',
-    'Add participants' => 'Add participants',
-    'Allow others to send you private messages' => 'Разрешить другим пользователям писать вам личные сообщения',
-    'Allow users to start new conversations' => 'Разрешить пользователям начинать новые чаты',
-    'Confirm' => 'Подтвердить',
-    'Conversation' => 'Чат',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Метки видны только вам, но не другим пользователям. Используя их, можно труктурировать чаты так, как удобно вам.',
-    'Conversations' => 'Чаты',
-    'Created At' => 'Создано в',
-    'Created By' => 'Создано',
-    'Do you really want to delete this tag?' => 'Вы действительно хотите удалить эту метку?',
-    'Edit' => 'Изменить',
-    'Edit message...' => 'Изменить сообщение...',
-    'Filters' => 'Фильтры',
-    'Friday' => 'Пятница',
-    'Here you can manage your private conversation tags.' => 'На этой странице вы можете управлять вашими метками для чатов.',
-    'Is Originator' => 'Создатель чата',
-    'Last Viewed' => 'Просмотрено в',
-    'Leave fields blank in order to disable a restriction.' => 'При пустых полях органичения на количество сообщений не используются.',
-    'Manage Tags' => 'Управлять метками',
-    'Mark Unread' => 'Пометить как непрочитанное',
-    'Max messages allowed per day' => 'Максимально разрешенное количество сообщений в сутки',
-    'Max number of messages allowed for a new user per day' => 'Максимально разрешенное количество сообщений для новых пользователей в сутки',
-    'Max number of new conversations allowed for a new user per day' => 'Максимально разрешенное количество новых чатов для новых пользователей в сутки',
-    'Max number of new conversations allowed for a user per day' => 'Максимально разрешенное количество новых чатов в сутки',
-    'Message' => 'Сообщение',
-    'Messages' => 'Сообщения',
-    'Monday' => 'Понедельник',
-    'My Tags' => 'Мои метки',
-    'Participants' => 'Участники',
-    'Pin' => 'Пометить',
-    'Pinned' => 'Закреплено',
-    'Receive Notifications when someone opens a new conversation.' => 'Получать уведомление, когда кто-то начинает чат с вами',
-    'Receive Notifications when someone sends you a message.' => 'Получать уведомление, когда кто-то пишет вам сообщение',
-    'Receive private messages' => 'Принимать личные сообщения',
-    'Saturday' => 'Суббота',
-    'Search' => 'Поиск',
-    'Seperate restrictions for new users' => 'Отдельные ограничения для новых пользователей',
-    'Show menu item in top Navigation' => 'Показывать в главном меню',
-    'Start new conversations' => 'Создавать чаты с другими пользователями',
-    'Subject' => 'Тема',
-    'Sunday' => 'Воскресенье',
-    'Tags' => 'Теги',
-    'This user is already participating in this conversation.' => 'Этот пользователь уже участвует в этом чате',
-    'Thursday' => 'Четверг',
-    'Title' => 'Заголовок',
-    'Today' => 'Сегодня',
-    'Tuesday' => 'Вторник',
-    'Unpin' => 'Открепить',
-    'Until a user is member since (days)' => 'Дней, в течение которых пользователь считается новым',
-    'Updated At' => 'Обновлено в',
-    'Updated By' => 'Обновлено',
-    'User' => 'Пользователь',
-    'Wednesday' => 'Среда',
-    'Write a message...' => 'Текст сообщения',
-    'Yesterday' => 'Вчера',
-    'You' => 'Вы',
-    'You are not allowed to reply to users {userNames}!' => 'Вам не разрешено отвечать пользователям {userNames}!',
-    'You are not allowed to start a conversation with this user.' => 'У вас недостаточно прав для того, чтобы писать сообщения этому пользователю.',
-    'You are not allowed to start a conversation with {userName}!' => 'У вас недостаточно прав для того, чтобы писать сообщения пользователю {userName}.',
-    'You cannot send a message to yourself!' => 'Вы не можете писать сообщения самому себе.',
-    'You cannot send a message without recipients!' => 'Вы не можете отправить сообщение без получателей!',
-    'You joined the conversation.' => 'Вы присоединились к разговору.',
-    'You left the conversation.' => 'Вы вышли из разговора.',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Вы превысили ограничение на максимальное количество писем в день, установленное администратором.',
-    'edited' => 'отредактировано',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,one{и еще # участник} few{и еще # участника} many{и еще # участников} other{и еще # участника}}',
-    '{username} joined the conversation.' => '{username} присоединился к разговору.',
-    '{username} left the conversation.' => '{username} покинул разговор.',
-    'Advanced Messages Search' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Подтвердите</strong> удаление переписки',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Подтвердите</strong> выход из переписки',
+  '<strong>Confirm</strong> message deletion' => '<strong>Подтвердите</strong> удаление сообщения',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Подтвердите</strong> удаление метки',
+  '<strong>Edit</strong> conversation tags' => '<strong>Изменить</strong> метки чата',
+  '<strong>Edit</strong> tag' => '<strong>Изменить</strong> метку',
+  '<strong>Manage</strong> conversation tags' => '<strong>Управлять</strong> метками чатов',
+  '<strong>Messenger</strong> module configuration' => '<strong>Сообщения</strong> настройки модуля',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Новое</strong> сообщение',
+  'A tag with the same name already exists.' => 'Такая метка уже существует.',
+  'Add Tag' => 'Добавить метку.',
+  'Add more participants to your conversation...' => 'Добавить участников в переписку...',
+  'Add participants' => 'Add participants',
+  'Add recipients' => 'Добавить получателей',
+  'Add user' => 'Добавить пользователя',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Разрешить другим пользователям писать вам личные сообщения',
+  'Allow users to start new conversations' => 'Разрешить пользователям начинать новые чаты',
+  'Cancel' => 'Отменить',
+  'Confirm' => 'Подтвердить',
+  'Conversation' => 'Чат',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Метки видны только вам, но не другим пользователям. Используя их, можно труктурировать чаты так, как удобно вам.',
+  'Conversations' => 'Чаты',
+  'Created At' => 'Создано в',
+  'Created By' => 'Создано',
+  'Delete' => 'Удалить',
+  'Delete conversation' => 'Удалить диалог',
+  'Do you really want to delete this conversation?' => 'Вы действительно хотите удалить эту переписку?',
+  'Do you really want to delete this message?' => 'Вы действительно хотите удалить это сообщение?',
+  'Do you really want to delete this tag?' => 'Вы действительно хотите удалить эту метку?',
+  'Do you really want to leave this conversation?' => 'Вы действительно хотите покинуть эту переписку?',
+  'Edit' => 'Изменить',
+  'Edit message entry' => 'Редактирование сообщения',
+  'Edit message...' => 'Изменить сообщение...',
+  'Filters' => 'Фильтры',
+  'Friday' => 'Пятница',
+  'Groups' => 'Группы',
+  'Here you can manage your private conversation tags.' => 'На этой странице вы можете управлять вашими метками для чатов.',
+  'Is Originator' => 'Создатель чата',
+  'Last Viewed' => 'Просмотрено в',
+  'Leave' => 'Покинуть',
+  'Leave conversation' => 'Покинуть диалог',
+  'Leave fields blank in order to disable a restriction.' => 'При пустых полях органичения на количество сообщений не используются.',
+  'Manage Tags' => 'Управлять метками',
+  'Mark Unread' => 'Пометить как непрочитанное',
+  'Max messages allowed per day' => 'Максимально разрешенное количество сообщений в сутки',
+  'Max number of messages allowed for a new user per day' => 'Максимально разрешенное количество сообщений для новых пользователей в сутки',
+  'Max number of new conversations allowed for a new user per day' => 'Максимально разрешенное количество новых чатов для новых пользователей в сутки',
+  'Max number of new conversations allowed for a user per day' => 'Максимально разрешенное количество новых чатов в сутки',
+  'Members' => 'Участники',
+  'Message' => 'Сообщение',
+  'Messages' => 'Сообщения',
+  'Monday' => 'Понедельник',
+  'My Tags' => 'Мои метки',
+  'New conversation from {senderName}' => 'Новый разговор от пользователя {senderName}',
+  'New message from {senderName}' => 'Новое сообщение от {senderName}',
+  'New message in discussion from %displayName%' => 'Новое сообщение в переписке от %displayName%',
+  'Participants' => 'Участники',
+  'Pin' => 'Пометить',
+  'Pinned' => 'Закреплено',
+  'Receive Notifications when someone opens a new conversation.' => 'Получать уведомление, когда кто-то начинает чат с вами',
+  'Receive Notifications when someone sends you a message.' => 'Получать уведомление, когда кто-то пишет вам сообщение',
+  'Receive private messages' => 'Принимать личные сообщения',
+  'Recipient' => 'Получатель',
+  'Reply now' => 'Ответить сейчас',
+  'Saturday' => 'Суббота',
+  'Search' => 'Поиск',
+  'Send' => 'Отправить',
+  'Send message' => 'Отправить сообщение',
+  'Seperate restrictions for new users' => 'Отдельные ограничения для новых пользователей',
+  'Show all messages' => 'Показать все сообщения',
+  'Show menu item in top Navigation' => 'Показывать в главном меню',
+  'Sign up now' => 'Зарегистрируйтесь',
+  'Spaces' => 'Пространства',
+  'Start new conversations' => 'Создавать чаты с другими пользователями',
+  'Subject' => 'Тема',
+  'Sunday' => 'Воскресенье',
+  'Tags' => 'Теги',
+  'There are no messages yet.' => 'Здесь пока нет сообщений.',
+  'This user is already participating in this conversation.' => 'Этот пользователь уже участвует в этом чате',
+  'Thursday' => 'Четверг',
+  'Title' => 'Заголовок',
+  'Today' => 'Сегодня',
+  'Tuesday' => 'Вторник',
+  'Unpin' => 'Открепить',
+  'Until a user is member since (days)' => 'Дней, в течение которых пользователь считается новым',
+  'Updated At' => 'Обновлено в',
+  'Updated By' => 'Обновлено',
+  'User' => 'Пользователь',
+  'User Posts' => 'Сообщения пользователей',
+  'User {name} is already participating!' => 'Пользователь {name} уже участвует!',
+  'Wednesday' => 'Среда',
+  'Write a message...' => 'Текст сообщения',
+  'Yesterday' => 'Вчера',
+  'You' => 'Вы',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Вам не разрешено участвовать в этом разговоре. Вас заблокировал пользователь: {userNames}.',
+  'You are not allowed to reply to users {userNames}!' => 'Вам не разрешено отвечать пользователям {userNames}!',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => 'У вас недостаточно прав для того, чтобы писать сообщения этому пользователю.',
+  'You are not allowed to start a conversation with {userName}!' => 'У вас недостаточно прав для того, чтобы писать сообщения пользователю {userName}.',
+  'You cannot send a email to yourself!' => 'Вы не можете отправить сообщение самому себе!',
+  'You cannot send a message to yourself!' => 'Вы не можете писать сообщения самому себе.',
+  'You cannot send a message without recipients!' => 'Вы не можете отправить сообщение без получателей!',
+  'You joined the conversation.' => 'Вы присоединились к разговору.',
+  'You left the conversation.' => 'Вы вышли из разговора.',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Вы превысили ограничение на максимальное количество писем в день, установленное администратором.',
+  'edited' => 'отредактировано',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,one{и еще # участник} few{и еще # участника} many{и еще # участников} other{и еще # участника}}',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '{username} присоединился к разговору.',
+  '{username} left the conversation.' => '{username} покинул разговор.',
 ];
diff --git a/messages/ru/forms_CreateMessageForm.php b/messages/ru/forms_CreateMessageForm.php
deleted file mode 100644
index 34c4753a..00000000
--- a/messages/ru/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Сообщение',
-  'Recipient' => 'Получатель',
-  'Subject' => 'Тема',
-  'Tags' => 'Теги',
-);
diff --git a/messages/ru/forms_InviteRecipientForm.php b/messages/ru/forms_InviteRecipientForm.php
deleted file mode 100644
index 7ef11311..00000000
--- a/messages/ru/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Получатель',
-  'User {name} is already participating!' => 'Пользователь {name} уже участвует!',
-  'You are not allowed to send user {name} is already!' => '',
-  'You cannot send a email to yourself!' => 'Вы не можете отправить сообщение самому себе!',
-);
diff --git a/messages/ru/forms_ReplyMessageForm.php b/messages/ru/forms_ReplyMessageForm.php
deleted file mode 100644
index 8fd01626..00000000
--- a/messages/ru/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Сообщение',
-);
diff --git a/messages/ru/models_Message.php b/messages/ru/models_Message.php
deleted file mode 100644
index b06c88f7..00000000
--- a/messages/ru/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Новый разговор от пользователя {senderName}',
-  'New message from {senderName}' => 'Новое сообщение от {senderName}',
-);
diff --git a/messages/ru/models_MessageEntry.php b/messages/ru/models_MessageEntry.php
deleted file mode 100644
index e5ff35a5..00000000
--- a/messages/ru/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Новое сообщение в переписке от %displayName%',
-);
diff --git a/messages/ru/views_emails_NewMessage.php b/messages/ru/views_emails_NewMessage.php
deleted file mode 100644
index d730ca1a..00000000
--- a/messages/ru/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Новое</strong> сообщение',
-    'Reply now' => 'Ответить сейчас',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/ru/views_emails_NewMessageEntry.php b/messages/ru/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/ru/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/ru/views_mail_adduser.php b/messages/ru/views_mail_adduser.php
deleted file mode 100644
index e4ad7fe1..00000000
--- a/messages/ru/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Добавить участников в переписку...',
-];
diff --git a/messages/ru/views_mail_create.php b/messages/ru/views_mail_create.php
deleted file mode 100644
index fd458377..00000000
--- a/messages/ru/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Новое</strong> сообщение',
-  'Add recipients' => 'Добавить получателей',
-  'Send' => 'Отправить',
-);
diff --git a/messages/ru/views_mail_edit.php b/messages/ru/views_mail_edit.php
deleted file mode 100644
index aa02e97f..00000000
--- a/messages/ru/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Редактирование сообщения',
-];
diff --git a/messages/ru/views_mail_index.php b/messages/ru/views_mail_index.php
deleted file mode 100644
index 7e98f34f..00000000
--- a/messages/ru/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Чаты',
-    'There are no messages yet.' => 'Здесь пока нет сообщений.',
-];
diff --git a/messages/ru/views_mail_list.php b/messages/ru/views_mail_list.php
deleted file mode 100644
index 0620d4bc..00000000
--- a/messages/ru/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Здесь пока нет сообщений.',
-);
diff --git a/messages/ru/views_mail_show.php b/messages/ru/views_mail_show.php
deleted file mode 100644
index e8e76d2f..00000000
--- a/messages/ru/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Подтвердите</strong> удаление переписки',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Подтвердите</strong> выход из переписки',
-  '<strong>Confirm</strong> message deletion' => '<strong>Подтвердите</strong> удаление сообщения',
-  'Add user' => 'Добавить пользователя',
-  'Cancel' => 'Отменить',
-  'Delete' => 'Удалить',
-  'Delete conversation' => 'Удалить диалог',
-  'Do you really want to delete this conversation?' => 'Вы действительно хотите удалить эту переписку?',
-  'Do you really want to delete this message?' => 'Вы действительно хотите удалить это сообщение?',
-  'Do you really want to leave this conversation?' => 'Вы действительно хотите покинуть эту переписку?',
-  'Leave' => 'Покинуть',
-  'Leave conversation' => 'Покинуть диалог',
-  'There are no messages yet.' => 'Здесь пока нет сообщений.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Вам не разрешено участвовать в этом разговоре. Вас заблокировал пользователь: {userNames}.',
-);
diff --git a/messages/ru/views_mail_sidebar.php b/messages/ru/views_mail_sidebar.php
deleted file mode 100644
index 72da8651..00000000
--- a/messages/ru/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Группы',
-  'Members' => 'Участники',
-  'Spaces' => 'Пространства',
-  'User Posts' => 'Сообщения пользователей',
-);
diff --git a/messages/ru/views_mails_UserInviteSpace.php b/messages/ru/views_mails_UserInviteSpace.php
deleted file mode 100644
index f1f07364..00000000
--- a/messages/ru/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Зарегистрируйтесь',
-);
diff --git a/messages/ru/widgets_views_mailNotification.php b/messages/ru/widgets_views_mailNotification.php
deleted file mode 100644
index b9c787c4..00000000
--- a/messages/ru/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Показать все сообщения',
-];
diff --git a/messages/ru/widgets_views_newMessageButton.php b/messages/ru/widgets_views_newMessageButton.php
deleted file mode 100644
index 784999a2..00000000
--- a/messages/ru/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Отправить сообщение',
-];
diff --git a/messages/sk/base.php b/messages/sk/base.php
index 76f902a5..df1eb23f 100644
--- a/messages/sk/base.php
+++ b/messages/sk/base.php
@@ -1,30 +1,48 @@
 <?php
-return array (
+return [
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Potvrďte</strong> odstránenie konverzácie',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Potvrďte</strong> opustenie konverzácie',
+  '<strong>Confirm</strong> message deletion' => '<strong>Potvrďte</strong> odstránenie správy',
   '<strong>Confirm</strong> tag deletion' => '<strong>Potvrďte</strong> odstránenie štítku',
   '<strong>Edit</strong> conversation tags' => '<strong>Upraviť</strong> značky konverzácie',
   '<strong>Edit</strong> tag' => '<strong>Upraviť</strong> štítok',
   '<strong>Manage</strong> conversation tags' => '<strong>Spravovať</strong> štítky konverzácií',
   '<strong>Messenger</strong> module configuration' => 'Konfigurácia modulu <strong>Správy</strong>',
+  '<strong>New</strong> conversation' => '<strong>Nová</strong> konverzácia',
+  '<strong>New</strong> message' => '<strong>Nová</strong> správa',
   'A tag with the same name already exists.' => 'Štítok s rovnakým názvom už existuje.',
   'Add Tag' => 'Pridať štítok',
+  'Add more participants to your conversation...' => 'Pridajte do konverzácie ďalších účastníkov...',
   'Add participants' => 'Pridajte účastníkov',
+  'Add recipients' => 'Pridajte príjemcov',
+  'Add user' => 'Pridať používateľa',
   'Advanced Messages Search' => 'Rozšírené vyhľadávanie Správ',
   'Allow others to send you private messages' => 'Umožnite ostatným posielať vám súkromné ​​správy',
   'Allow users to start new conversations' => 'Umožniť používateľom začať nové konverzácie',
+  'Cancel' => 'Zrušiť',
   'Confirm' => 'Potvrdiť',
   'Conversation' => 'Konverzácia',
   'Conversation tags can be used to filter conversations and are only visible to you.' => 'Štítky konverzácií možno použiť na filtrovanie konverzácií a sú viditeľné iba pre vás.',
   'Conversations' => 'Rozhovory',
   'Created At' => 'Vytvorené v',
   'Created By' => 'Vytvoril',
+  'Delete' => 'Odstrániť',
+  'Delete conversation' => 'Odstrániť konverzáciu',
+  'Do you really want to delete this conversation?' => 'Naozaj chcete odstrániť túto konverzáciu?',
+  'Do you really want to delete this message?' => 'Naozaj chcete odstrániť túto správu?',
   'Do you really want to delete this tag?' => 'Naozaj chcete odstrániť tento štítok?',
+  'Do you really want to leave this conversation?' => 'Naozaj chcete opustiť túto konverzáciu?',
   'Edit' => 'Upraviť',
+  'Edit message entry' => 'Upravte záznam správy',
   'Edit message...' => 'Upraviť správu...',
   'Filters' => 'Filtre',
   'Friday' => 'Piatok',
+  'Groups' => 'Skupiny',
   'Here you can manage your private conversation tags.' => 'Tu môžete spravovať štítky súkromných konverzácií.',
   'Is Originator' => 'Je Pôvodcom',
   'Last Viewed' => 'Naposledy zobrazené',
+  'Leave' => 'Odísť',
+  'Leave conversation' => 'Opustiť konverzáciu',
   'Leave fields blank in order to disable a restriction.' => 'Ak chcete zakázať obmedzenia, ponechajte polia prázdne.',
   'Manage Tags' => 'Spravovať Štítky',
   'Mark Unread' => 'Označiť ako Neprečítané',
@@ -32,24 +50,36 @@
   'Max number of messages allowed for a new user per day' => 'Maximálny počet správ povolený pre nového používateľa za deň',
   'Max number of new conversations allowed for a new user per day' => 'Maximálny počet nových konverzácií povolených pre nového používateľa za deň',
   'Max number of new conversations allowed for a user per day' => 'Maximálny počet nových konverzácií povolených pre používateľa za deň',
+  'Members' => 'Členovia',
   'Message' => 'Správa',
   'Messages' => 'Správy',
   'Monday' => 'Pondelok',
   'My Tags' => 'Moje štítky',
+  'New conversation from {senderName}' => 'Nová konverzácia od {senderName}',
+  'New message from {senderName}' => 'Nová správa od {senderName}',
+  'New message in discussion from %displayName%' => 'Nová správa v diskusii od %displayName%',
   'Participants' => 'Účastníci',
   'Pin' => 'Špendlík',
   'Pinned' => 'Pripnuté',
   'Receive Notifications when someone opens a new conversation.' => 'Dostávajte upozornenia, keď niekto otvorí novú konverzáciu.',
   'Receive Notifications when someone sends you a message.' => 'Dostávajte upozornenia, keď vám niekto pošle správu.',
   'Receive private messages' => 'Prijímať súkromné ​​správy',
+  'Recipient' => 'Príjemca',
+  'Reply now' => 'Odpovedať teraz',
   'Saturday' => 'Sobota',
   'Search' => 'Hľadať',
+  'Send' => 'Odoslať',
+  'Send message' => 'Poslať správu',
   'Seperate restrictions for new users' => 'Samostatné obmedzenia pre nových používateľov',
+  'Show all messages' => 'Zobraziť všetky správy',
   'Show menu item in top Navigation' => 'Zobraziť položku ponuky v hornej časti navigácie',
+  'Sign up now' => 'Prihlásiť sa teraz',
+  'Spaces' => 'Priestory',
   'Start new conversations' => 'Začať nové konverzácie',
   'Subject' => 'Predmet',
   'Sunday' => 'Nedeľa',
   'Tags' => 'Štítky',
+  'There are no messages yet.' => 'Zatiaľ nie sú žiadne správy.',
   'This user is already participating in this conversation.' => 'Tento používateľ sa už tejto konverzácie zúčastňuje.',
   'Thursday' => 'Štvrtok',
   'Title' => 'Názov',
@@ -60,13 +90,18 @@
   'Updated At' => 'Aktualizované v',
   'Updated By' => 'Aktualizoval',
   'User' => 'Používateľ',
+  'User Posts' => 'Používateľské príspevky',
+  'User {name} is already participating!' => 'Používateľ {name} sa už zúčastňuje!',
   'Wednesday' => 'Streda',
   'Write a message...' => 'Napíšte správu...',
   'Yesterday' => 'Včera',
   'You' => 'Ty',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Nemáte povolené zúčastniť sa tejto konverzácie. Boli ste zablokovaní používateľom: {userNames}.',
   'You are not allowed to reply to users {userNames}!' => 'Nemáte povolené odpovedať používateľom {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'Už nemáte povolené posielať správy používateľovi {name}!',
   'You are not allowed to start a conversation with this user.' => 'Nemáte povolené začať konverzáciu s týmto používateľom.',
   'You are not allowed to start a conversation with {userName}!' => 'Nemáte povolenie začať konverzáciu s používateľom {userName}!',
+  'You cannot send a email to yourself!' => 'Nemôžete poslať e-mail sebe!',
   'You cannot send a message to yourself!' => 'Nemôžete poslať správu sebe!',
   'You cannot send a message without recipients!' => 'Nemôžete odoslať správu bez príjemcov!',
   'You joined the conversation.' => 'Pripojili ste sa ku konverzácii.',
@@ -74,6 +109,8 @@
   'You\'ve exceeded your daily amount of new conversations.' => 'Prekročili ste denný počet nových konverzácií.',
   'edited' => 'upravené',
   '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# iná} =2{# iné} =3{# iné} =4{# iné} other{# iných}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} vytvoril novú konverzáciu {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} vám poslal novú správu v {conversationTitle}',
   '{username} joined the conversation.' => '{username} sa pripojil ku konverzácii.',
   '{username} left the conversation.' => 'Používateľ {username} opustil konverzáciu.',
-);
+];
diff --git a/messages/sk/forms_CreateMessageForm.php b/messages/sk/forms_CreateMessageForm.php
deleted file mode 100644
index 620014db..00000000
--- a/messages/sk/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Správa',
-  'Recipient' => 'Príjemca',
-  'Subject' => 'Predmet',
-  'Tags' => 'Štítok',
-);
diff --git a/messages/sk/forms_InviteRecipientForm.php b/messages/sk/forms_InviteRecipientForm.php
deleted file mode 100644
index 6862a5dd..00000000
--- a/messages/sk/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Príjemca',
-  'User {name} is already participating!' => 'Používateľ {name} sa už zúčastňuje!',
-  'You are not allowed to send user {name} is already!' => 'Už nemáte povolené posielať správy používateľovi {name}!',
-  'You cannot send a email to yourself!' => 'Nemôžete poslať e-mail sebe!',
-);
diff --git a/messages/sk/forms_ReplyMessageForm.php b/messages/sk/forms_ReplyMessageForm.php
deleted file mode 100644
index 48babcca..00000000
--- a/messages/sk/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Správa',
-);
diff --git a/messages/sk/models_Message.php b/messages/sk/models_Message.php
deleted file mode 100644
index 59de4323..00000000
--- a/messages/sk/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Nová konverzácia od {senderName}',
-  'New message from {senderName}' => 'Nová správa od {senderName}',
-);
diff --git a/messages/sk/models_MessageEntry.php b/messages/sk/models_MessageEntry.php
deleted file mode 100644
index 4a594463..00000000
--- a/messages/sk/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nová správa v diskusii od %displayName%',
-);
diff --git a/messages/sk/views_emails_NewMessage.php b/messages/sk/views_emails_NewMessage.php
deleted file mode 100644
index 94c6f29c..00000000
--- a/messages/sk/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Nová</strong> konverzácia',
-  '<strong>New</strong> message' => '<strong>Nová</strong> správa',
-  'Reply now' => 'Odpovedať teraz',
-);
diff --git a/messages/sk/views_emails_NewMessageEntry.php b/messages/sk/views_emails_NewMessageEntry.php
deleted file mode 100644
index 5b352ffc..00000000
--- a/messages/sk/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} vytvoril novú konverzáciu {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} vám poslal novú správu v {conversationTitle}',
-);
diff --git a/messages/sk/views_mail_adduser.php b/messages/sk/views_mail_adduser.php
deleted file mode 100644
index 682fee62..00000000
--- a/messages/sk/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => 'Pridajte do konverzácie ďalších účastníkov...',
-);
diff --git a/messages/sk/views_mail_create.php b/messages/sk/views_mail_create.php
deleted file mode 100644
index b99487da..00000000
--- a/messages/sk/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nová</strong> správa',
-  'Add recipients' => 'Pridajte príjemcov',
-  'Send' => 'Odoslať',
-);
diff --git a/messages/sk/views_mail_edit.php b/messages/sk/views_mail_edit.php
deleted file mode 100644
index a31aa2a2..00000000
--- a/messages/sk/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => 'Upravte záznam správy',
-);
diff --git a/messages/sk/views_mail_index.php b/messages/sk/views_mail_index.php
deleted file mode 100644
index 61cf9d9d..00000000
--- a/messages/sk/views_mail_index.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'Conversations' => 'Rozhovory',
-  'There are no messages yet.' => 'Zatiaľ nie sú žiadne správy.',
-);
diff --git a/messages/sk/views_mail_list.php b/messages/sk/views_mail_list.php
deleted file mode 100644
index 68d2889f..00000000
--- a/messages/sk/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Zatiaľ nie sú žiadne správy.',
-);
diff --git a/messages/sk/views_mail_show.php b/messages/sk/views_mail_show.php
deleted file mode 100644
index 9abbb850..00000000
--- a/messages/sk/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Potvrďte</strong> odstránenie konverzácie',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Potvrďte</strong> opustenie konverzácie',
-  '<strong>Confirm</strong> message deletion' => '<strong>Potvrďte</strong> odstránenie správy',
-  'Add user' => 'Pridať používateľa',
-  'Cancel' => 'Zrušiť',
-  'Delete' => 'Odstrániť',
-  'Delete conversation' => 'Odstrániť konverzáciu',
-  'Do you really want to delete this conversation?' => 'Naozaj chcete odstrániť túto konverzáciu?',
-  'Do you really want to delete this message?' => 'Naozaj chcete odstrániť túto správu?',
-  'Do you really want to leave this conversation?' => 'Naozaj chcete opustiť túto konverzáciu?',
-  'Leave' => 'Odísť',
-  'Leave conversation' => 'Opustiť konverzáciu',
-  'There are no messages yet.' => 'Zatiaľ nie sú žiadne správy.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Nemáte povolené zúčastniť sa tejto konverzácie. Boli ste zablokovaní používateľom: {userNames}.',
-);
diff --git a/messages/sk/views_mail_sidebar.php b/messages/sk/views_mail_sidebar.php
deleted file mode 100644
index d56ce834..00000000
--- a/messages/sk/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Skupiny',
-  'Members' => 'Členovia',
-  'Spaces' => 'Priestory',
-  'User Posts' => 'Používateľské príspevky',
-);
diff --git a/messages/sk/views_mails_UserInviteSpace.php b/messages/sk/views_mails_UserInviteSpace.php
deleted file mode 100644
index 5f91a95e..00000000
--- a/messages/sk/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Prihlásiť sa teraz',
-);
diff --git a/messages/sk/widgets_views_mailNotification.php b/messages/sk/widgets_views_mailNotification.php
deleted file mode 100644
index f0eab419..00000000
--- a/messages/sk/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'Zobraziť všetky správy',
-);
diff --git a/messages/sk/widgets_views_newMessageButton.php b/messages/sk/widgets_views_newMessageButton.php
deleted file mode 100644
index 81457736..00000000
--- a/messages/sk/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'Poslať správu',
-);
diff --git a/messages/sl/base.php b/messages/sl/base.php
index 9c126ad3..b3b0fe86 100644
--- a/messages/sl/base.php
+++ b/messages/sl/base.php
@@ -1,80 +1,111 @@
 <?php
-
 return [
-    'Title' => 'Naslov',
-    'User' => 'Uporabnik',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Search' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Naslov',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Uporabnik',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/sl/forms_CreateMessageForm.php b/messages/sl/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/sl/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/sl/forms_InviteRecipientForm.php b/messages/sl/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/sl/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/sl/forms_ReplyMessageForm.php b/messages/sl/forms_ReplyMessageForm.php
deleted file mode 100644
index df2dc693..00000000
--- a/messages/sl/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'Message' => '',
-];
diff --git a/messages/sl/models_Message.php b/messages/sl/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/sl/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/sl/models_MessageEntry.php b/messages/sl/models_MessageEntry.php
deleted file mode 100644
index d85d0473..00000000
--- a/messages/sl/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'New message in discussion from %displayName%' => '',
-];
diff --git a/messages/sl/views_emails_NewMessage.php b/messages/sl/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/sl/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/sl/views_emails_NewMessageEntry.php b/messages/sl/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/sl/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/sl/views_mail_adduser.php b/messages/sl/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/sl/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/sl/views_mail_create.php b/messages/sl/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/sl/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/sl/views_mail_edit.php b/messages/sl/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/sl/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/sl/views_mail_index.php b/messages/sl/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/sl/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/sl/views_mail_list.php b/messages/sl/views_mail_list.php
deleted file mode 100644
index aee65815..00000000
--- a/messages/sl/views_mail_list.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract-module' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/sl/views_mail_show.php b/messages/sl/views_mail_show.php
deleted file mode 100644
index 1b3f7308..00000000
--- a/messages/sl/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/sl/widgets_views_mailNotification.php b/messages/sl/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/sl/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/sl/widgets_views_newMessageButton.php b/messages/sl/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/sl/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/sq/base.php b/messages/sq/base.php
index afb5dd8c..6663df3d 100644
--- a/messages/sq/base.php
+++ b/messages/sq/base.php
@@ -1,80 +1,110 @@
 <?php
-
 return [
-    'Edit' => 'Ndrysho',
-    'Search' => 'Kërko',
-    'Title' => 'Titulli',
-    'User' => 'Përdoruesi',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Anulo',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => 'Fshij',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'Ndrysho',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'Kërko',
+  'Send' => 'Dërgo',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Titulli',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Përdoruesi',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/sq/forms_CreateMessageForm.php b/messages/sq/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/sq/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/sq/forms_InviteRecipientForm.php b/messages/sq/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/sq/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/sq/forms_ReplyMessageForm.php b/messages/sq/forms_ReplyMessageForm.php
deleted file mode 100644
index 81f52098..00000000
--- a/messages/sq/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-];
diff --git a/messages/sq/models_Message.php b/messages/sq/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/sq/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/sq/views_emails_NewMessage.php b/messages/sq/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/sq/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/sq/views_emails_NewMessageEntry.php b/messages/sq/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/sq/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/sq/views_mail_adduser.php b/messages/sq/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/sq/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/sq/views_mail_create.php b/messages/sq/views_mail_create.php
deleted file mode 100644
index ad250af1..00000000
--- a/messages/sq/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '',
-  'Add recipients' => '',
-  'Send' => 'Dërgo',
-);
diff --git a/messages/sq/views_mail_edit.php b/messages/sq/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/sq/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/sq/views_mail_index.php b/messages/sq/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/sq/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/sq/views_mail_list.php b/messages/sq/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/sq/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/sq/views_mail_show.php b/messages/sq/views_mail_show.php
deleted file mode 100644
index a01e5a25..00000000
--- a/messages/sq/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    'Cancel' => 'Anulo',
-    'Delete' => 'Fshij',
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/sq/widgets_views_mailNotification.php b/messages/sq/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/sq/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/sq/widgets_views_newMessageButton.php b/messages/sq/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/sq/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/sr/base.php b/messages/sr/base.php
index 6d03be0b..b269f2aa 100644
--- a/messages/sr/base.php
+++ b/messages/sr/base.php
@@ -1,80 +1,109 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Potvrdi</strong> brisanje oznake',
-    '<strong>Edit</strong> conversation tags' => '<strong>Uredi</strong> oznake razgovora',
-    '<strong>Edit</strong> tag' => '<strong>Uredi</strong> oznaku',
-    '<strong>Manage</strong> conversation tags' => '<strong>Upravljanje</strong> oznakama razgovora',
-    'A tag with the same name already exists.' => 'Oznaka s istim imenom već postoji.',
-    'Add Tag' => 'Dodaj oznaku',
-    'Add participants' => 'Dodaj učesnike',
-    'Allow others to send you private messages' => 'Dopustite drugima da vam šalju privatne poruke',
-    'Allow users to start new conversations' => 'Omogućite korisnicima započinjanje novih razgovora',
-    'Confirm' => 'Potvrdi',
-    'Conversation' => 'Razgovor',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Oznake razgovora mogu se koristiti za filtriranje razgovora i vidljive su samo vama.',
-    'Conversations' => 'Razgovori',
-    'Created At' => 'Kreirano u',
-    'Created By' => 'Kreirano od',
-    'Do you really want to delete this tag?' => 'Želite li zaista izbrisati ovu oznaku?',
-    'Edit' => 'Uredi',
-    'Edit message...' => 'Uredi poruku ...',
-    'Filters' => 'Filteri',
-    'Friday' => 'Petak',
-    'Here you can manage your private conversation tags.' => 'Ovdje možete upravljati oznakama privatnog razgovora.',
-    'Is Originator' => 'Je pokretač',
-    'Last Viewed' => 'Poslednje pogledano',
-    'Leave fields blank in order to disable a restriction.' => 'Ostavite polja prazna da biste onemogućili ograničenje.',
-    'Manage Tags' => 'Upravljanje oznakama',
-    'Max messages allowed per day' => 'Maksimalno dopuštenih poruka dnevno',
-    'Max number of messages allowed for a new user per day' => 'Maksimalni broj poruka dopušten za novog korisnika dnevno',
-    'Max number of new conversations allowed for a new user per day' => 'Maksimalni broj novih razgovora dopušten za novog korisnika dnevno',
-    'Max number of new conversations allowed for a user per day' => 'Najveći dopušteni broj novih razgovora za korisnika dnevno',
-    'Message' => 'Poruka',
-    'Messages' => 'Poruke',
-    'Monday' => 'Ponedjeljak',
-    'My Tags' => 'Moje oznake',
-    'Participants' => 'Učesnici',
-    'Pinned' => 'Prikačeno',
-    'Receive Notifications when someone opens a new conversation.' => 'Primajte obaveštenja kad neko otvori novi razgovor.',
-    'Receive Notifications when someone sends you a message.' => 'Primajte obaveštenja kad vam neko pošalje poruku.',
-    'Receive private messages' => 'Primaj privatne poruke',
-    'Saturday' => 'Subota',
-    'Search' => 'Pretraži',
-    'Seperate restrictions for new users' => 'Odvojena ograničenja za nove korisnike',
-    'Show menu item in top Navigation' => 'Prikaži stavku menija u navigaciji na vrhu',
-    'Start new conversations' => 'Započnite nove razgovore',
-    'Subject' => 'Predmet',
-    'Sunday' => 'Nedjelja',
-    'Tags' => 'Tagovi',
-    'This user is already participating in this conversation.' => 'Ovaj korisnik već učestvuje u ovom razgovoru.',
-    'Thursday' => 'Četvrtak',
-    'Title' => 'Funkcija',
-    'Today' => 'Danas',
-    'Tuesday' => 'Utorak',
-    'Unpin' => 'Otkači',
-    'Until a user is member since (days)' => 'Dok je korisnik član od (days)',
-    'Updated At' => 'Ažurirano u',
-    'Updated By' => 'Ažurirano od',
-    'User' => 'Korisnik',
-    'Wednesday' => 'Sreda',
-    'Write a message...' => 'Napišite poruku ...',
-    'You' => 'Vi',
-    'You are not allowed to start a conversation with this user.' => 'Nemate dopuštenje započeti razgovor s ovim korisnikom.',
-    'You cannot send a message to yourself!' => 'Ne možete sebi poslati poruku!',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Premašili ste dnevnu granicu novih razgovora.',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
-    '<strong>Messenger</strong> module configuration' => '',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Potvrdi</strong> brisanje razgovora',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Potvrdi</strong> napuštanje razgovora',
+  '<strong>Confirm</strong> message deletion' => '<strong>Potvrdi</strong> brisanje poruke',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Potvrdi</strong> brisanje oznake',
+  '<strong>Edit</strong> conversation tags' => '<strong>Uredi</strong> oznake razgovora',
+  '<strong>Edit</strong> tag' => '<strong>Uredi</strong> oznaku',
+  '<strong>Manage</strong> conversation tags' => '<strong>Upravljanje</strong> oznakama razgovora',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Nova</strong> poruka',
+  'A tag with the same name already exists.' => 'Oznaka s istim imenom već postoji.',
+  'Add Tag' => 'Dodaj oznaku',
+  'Add participants' => 'Dodaj učesnike',
+  'Add recipients' => 'Dodaj primaoce',
+  'Add user' => 'Dodaj korisnika',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Dopustite drugima da vam šalju privatne poruke',
+  'Allow users to start new conversations' => 'Omogućite korisnicima započinjanje novih razgovora',
+  'Cancel' => 'Poništi',
+  'Confirm' => 'Potvrdi',
+  'Conversation' => 'Razgovor',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Oznake razgovora mogu se koristiti za filtriranje razgovora i vidljive su samo vama.',
+  'Conversations' => 'Razgovori',
+  'Created At' => 'Kreirano u',
+  'Created By' => 'Kreirano od',
+  'Delete' => 'Obriši',
+  'Delete conversation' => 'Obriši razgovor',
+  'Do you really want to delete this conversation?' => 'Zaista želite obrisati ovaj razgovor?',
+  'Do you really want to delete this message?' => 'Da li zaista želite obrisati ovu poruku?',
+  'Do you really want to delete this tag?' => 'Želite li zaista izbrisati ovu oznaku?',
+  'Do you really want to leave this conversation?' => 'Da li zaista želite da napustite ovaj razgovor?',
+  'Edit' => 'Uredi',
+  'Edit message entry' => 'Uredi unesenu poruku',
+  'Edit message...' => 'Uredi poruku ...',
+  'Filters' => 'Filteri',
+  'Friday' => 'Petak',
+  'Here you can manage your private conversation tags.' => 'Ovdje možete upravljati oznakama privatnog razgovora.',
+  'Is Originator' => 'Je pokretač',
+  'Last Viewed' => 'Poslednje pogledano',
+  'Leave' => 'Napusti',
+  'Leave conversation' => 'Napusti razgovor',
+  'Leave fields blank in order to disable a restriction.' => 'Ostavite polja prazna da biste onemogućili ograničenje.',
+  'Manage Tags' => 'Upravljanje oznakama',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Maksimalno dopuštenih poruka dnevno',
+  'Max number of messages allowed for a new user per day' => 'Maksimalni broj poruka dopušten za novog korisnika dnevno',
+  'Max number of new conversations allowed for a new user per day' => 'Maksimalni broj novih razgovora dopušten za novog korisnika dnevno',
+  'Max number of new conversations allowed for a user per day' => 'Najveći dopušteni broj novih razgovora za korisnika dnevno',
+  'Message' => 'Poruka',
+  'Messages' => 'Poruke',
+  'Monday' => 'Ponedjeljak',
+  'My Tags' => 'Moje oznake',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Nova poruka od {senderName}',
+  'Participants' => 'Učesnici',
+  'Pin' => '',
+  'Pinned' => 'Prikačeno',
+  'Receive Notifications when someone opens a new conversation.' => 'Primajte obaveštenja kad neko otvori novi razgovor.',
+  'Receive Notifications when someone sends you a message.' => 'Primajte obaveštenja kad vam neko pošalje poruku.',
+  'Receive private messages' => 'Primaj privatne poruke',
+  'Recipient' => 'Primalac',
+  'Reply now' => 'Odgovori sada',
+  'Saturday' => 'Subota',
+  'Search' => 'Pretraži',
+  'Send' => 'Pošalji',
+  'Send message' => 'Pošalji poruku',
+  'Seperate restrictions for new users' => 'Odvojena ograničenja za nove korisnike',
+  'Show all messages' => 'Prikaži sve poruke',
+  'Show menu item in top Navigation' => 'Prikaži stavku menija u navigaciji na vrhu',
+  'Start new conversations' => 'Započnite nove razgovore',
+  'Subject' => 'Predmet',
+  'Sunday' => 'Nedjelja',
+  'Tags' => 'Tagovi',
+  'There are no messages yet.' => 'Još nema poruka.',
+  'This user is already participating in this conversation.' => 'Ovaj korisnik već učestvuje u ovom razgovoru.',
+  'Thursday' => 'Četvrtak',
+  'Title' => 'Funkcija',
+  'Today' => 'Danas',
+  'Tuesday' => 'Utorak',
+  'Unpin' => 'Otkači',
+  'Until a user is member since (days)' => 'Dok je korisnik član od (days)',
+  'Updated At' => 'Ažurirano u',
+  'Updated By' => 'Ažurirano od',
+  'User' => 'Korisnik',
+  'User {name} is already participating!' => 'Korisnik {name} već učestvuje!',
+  'Wednesday' => 'Sreda',
+  'Write a message...' => 'Napišite poruku ...',
+  'Yesterday' => '',
+  'You' => 'Vi',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => 'Ne smete slati korisnika {name} je već!',
+  'You are not allowed to start a conversation with this user.' => 'Nemate dopuštenje započeti razgovor s ovim korisnikom.',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Ne možete poslati email sami sebi!',
+  'You cannot send a message to yourself!' => 'Ne možete sebi poslati poruku!',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Premašili ste dnevnu granicu novih razgovora.',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/sr/forms_CreateMessageForm.php b/messages/sr/forms_CreateMessageForm.php
deleted file mode 100644
index b14dc7c4..00000000
--- a/messages/sr/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Poruka',
-  'Recipient' => 'Primalac',
-  'Subject' => 'Predmet',
-  'Tags' => 'Tagovi',
-);
diff --git a/messages/sr/forms_InviteRecipientForm.php b/messages/sr/forms_InviteRecipientForm.php
deleted file mode 100644
index 94203e65..00000000
--- a/messages/sr/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Primalac',
-  'User {name} is already participating!' => 'Korisnik {name} već učestvuje!',
-  'You are not allowed to send user {name} is already!' => 'Ne smete slati korisnika {name} je već!',
-  'You cannot send a email to yourself!' => 'Ne možete poslati email sami sebi!',
-);
diff --git a/messages/sr/forms_ReplyMessageForm.php b/messages/sr/forms_ReplyMessageForm.php
deleted file mode 100644
index ea9d6219..00000000
--- a/messages/sr/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Poruka',
-);
diff --git a/messages/sr/models_Message.php b/messages/sr/models_Message.php
deleted file mode 100644
index 8e670bf9..00000000
--- a/messages/sr/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => '',
-  'New message from {senderName}' => 'Nova poruka od {senderName}',
-);
diff --git a/messages/sr/views_emails_NewMessage.php b/messages/sr/views_emails_NewMessage.php
deleted file mode 100644
index ed61ba5b..00000000
--- a/messages/sr/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '',
-  '<strong>New</strong> message' => '<strong>Nova</strong> poruka',
-  'Reply now' => 'Odgovori sada',
-);
diff --git a/messages/sr/views_emails_NewMessageEntry.php b/messages/sr/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/sr/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/sr/views_mail_create.php b/messages/sr/views_mail_create.php
deleted file mode 100644
index 9ba6a7fb..00000000
--- a/messages/sr/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nova</strong> poruka',
-  'Add recipients' => 'Dodaj primaoce',
-  'Send' => 'Pošalji',
-);
diff --git a/messages/sr/views_mail_edit.php b/messages/sr/views_mail_edit.php
deleted file mode 100644
index 5e6eb470..00000000
--- a/messages/sr/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => 'Uredi unesenu poruku',
-);
diff --git a/messages/sr/views_mail_index.php b/messages/sr/views_mail_index.php
deleted file mode 100644
index abb7d9a4..00000000
--- a/messages/sr/views_mail_index.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'Conversations' => 'Razgovori',
-  'There are no messages yet.' => 'Još nema poruka.',
-);
diff --git a/messages/sr/views_mail_list.php b/messages/sr/views_mail_list.php
deleted file mode 100644
index 4d20db6b..00000000
--- a/messages/sr/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Još nema poruka.',
-);
diff --git a/messages/sr/views_mail_show.php b/messages/sr/views_mail_show.php
deleted file mode 100644
index ddea63ae..00000000
--- a/messages/sr/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Potvrdi</strong> brisanje razgovora',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Potvrdi</strong> napuštanje razgovora',
-  '<strong>Confirm</strong> message deletion' => '<strong>Potvrdi</strong> brisanje poruke',
-  'Add user' => 'Dodaj korisnika',
-  'Cancel' => 'Poništi',
-  'Delete' => 'Obriši',
-  'Delete conversation' => 'Obriši razgovor',
-  'Do you really want to delete this conversation?' => 'Zaista želite obrisati ovaj razgovor?',
-  'Do you really want to delete this message?' => 'Da li zaista želite obrisati ovu poruku?',
-  'Do you really want to leave this conversation?' => 'Da li zaista želite da napustite ovaj razgovor?',
-  'Leave' => 'Napusti',
-  'Leave conversation' => 'Napusti razgovor',
-  'There are no messages yet.' => 'Još nema poruka.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-);
diff --git a/messages/sr/widgets_views_mailNotification.php b/messages/sr/widgets_views_mailNotification.php
deleted file mode 100644
index 8cb53bb6..00000000
--- a/messages/sr/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'Prikaži sve poruke',
-);
diff --git a/messages/sr/widgets_views_newMessageButton.php b/messages/sr/widgets_views_newMessageButton.php
deleted file mode 100644
index 6b284ff0..00000000
--- a/messages/sr/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'Pošalji poruku',
-);
diff --git a/messages/sv/base.php b/messages/sv/base.php
index 4deb3df6..059b947b 100644
--- a/messages/sv/base.php
+++ b/messages/sv/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>Bekräfta</strong> borttag av tagg',
-    '<strong>Edit</strong> conversation tags' => '<strong>Redigera</strong> konversations-tagg',
-    '<strong>Edit</strong> tag' => '<strong>Redigera</strong> tagg',
-    '<strong>Manage</strong> conversation tags' => '<strong>Hantera</strong> konversations-taggar',
-    '<strong>Messenger</strong> module configuration' => 'Konfigurera <strong>Meddelande</strong>-modul',
-    'A tag with the same name already exists.' => 'En tagg med samma namn finns redan.',
-    'Add Tag' => 'Lägg till tagg',
-    'Add participants' => 'Lägg till deltagare',
-    'Allow others to send you private messages' => 'Tillåt andra att sända dig privata meddelanden',
-    'Allow users to start new conversations' => 'Tillåt användare att starta nya konversationer',
-    'Confirm' => 'Bekräfta',
-    'Conversation' => 'Konversation',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'Konversationstaggar kan användas för att filtrera konversationer och är bara synliga för dig.',
-    'Conversations' => 'Konversationer',
-    'Created At' => 'Skapad',
-    'Created By' => 'Skapad av',
-    'Do you really want to delete this tag?' => 'Vill du verkligen ta bort den här taggen?',
-    'Edit' => 'Redigera',
-    'Edit message...' => 'Redigera meddelande...',
-    'Filters' => 'Filter',
-    'Friday' => 'Fredag',
-    'Here you can manage your private conversation tags.' => 'Här kan du hantera dina privata konversationstaggar.',
-    'Is Originator' => 'Kommer ifrån',
-    'Last Viewed' => 'Senast visad',
-    'Leave fields blank in order to disable a restriction.' => 'Lämna fält tomma för att inaktivera begränsning.',
-    'Manage Tags' => 'Hantera taggar',
-    'Max messages allowed per day' => 'Maximalt antal meddelanden per dag',
-    'Max number of messages allowed for a new user per day' => 'Maximalt antal meddelanden som tillåts för en ny användare per dag',
-    'Max number of new conversations allowed for a new user per day' => 'Maximalt antal nya konversationer som tillåts för en ny användare per dag',
-    'Max number of new conversations allowed for a user per day' => 'Maximalt antal nya konversationer som tillåts för en användare per dag',
-    'Message' => 'Meddelande',
-    'Messages' => 'Meddelanden',
-    'Monday' => 'Måndag',
-    'My Tags' => 'Mina taggar',
-    'Participants' => 'Deltagare',
-    'Pinned' => 'Fastnålad',
-    'Receive Notifications when someone opens a new conversation.' => 'Erhåll notis när någon startar en ny konversation',
-    'Receive Notifications when someone sends you a message.' => 'Erhåll notis när någon sänder dig ett meddelande',
-    'Receive private messages' => 'Erhåll privata meddelanden',
-    'Saturday' => 'Lördag',
-    'Search' => 'Sök',
-    'Seperate restrictions for new users' => 'Särskilda begränsningar för nya användare',
-    'Show menu item in top Navigation' => 'Visa menyalternativ i toppnavigering',
-    'Start new conversations' => 'Starta ny konversation',
-    'Subject' => 'Ämne',
-    'Sunday' => 'Söndag',
-    'Tags' => 'Taggar',
-    'This user is already participating in this conversation.' => 'Den här användaren deltar redan i denna konversation.',
-    'Thursday' => 'Torsdag',
-    'Title' => 'Rubrik',
-    'Today' => 'I dag',
-    'Tuesday' => 'Tisdag',
-    'Unpin' => 'Ta bort nål',
-    'Until a user is member since (days)' => 'Tills en användare har varit medlem sedan (dagar)',
-    'Updated At' => 'Uppdaterad',
-    'Updated By' => 'Uppdaterad av',
-    'User' => 'Användare',
-    'Wednesday' => 'Onsdag',
-    'Write a message...' => 'Skriv ett meddelande...',
-    'Yesterday' => 'Igår',
-    'You' => 'Du',
-    'You are not allowed to reply to users {userNames}!' => 'Du har inte behörighet att svara användarna {userNames}!',
-    'You are not allowed to start a conversation with this user.' => 'Du har inte tillåtelse att starta en konversation med den här användaren.',
-    'You are not allowed to start a conversation with {userName}!' => 'Du har inte tillåtelse att starta en konversation med {userName}!',
-    'You cannot send a message to yourself!' => 'Du kan inte skicka ett meddelande till dig själv!',
-    'You cannot send a message without recipients!' => 'Du kan inte skicka ett meddelande som saknar mottagare',
-    'You joined the conversation.' => 'Du anslöt till konversationen',
-    'You left the conversation.' => 'Du lämnade konversationen',
-    'You\'ve exceeded your daily amount of new conversations.' => 'Du har överskridit din dagliga mängd av nya konversationer.',
-    'edited' => 'redigerad',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
-    '{username} joined the conversation.' => '{username} anslöt till konversationen.',
-    '{username} left the conversation.' => '{username} lämnade konversationen.',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Bekräfta</strong> radering av konversation',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Bekräfta</strong> att du lämnar konversationen',
+  '<strong>Confirm</strong> message deletion' => '<strong>Bekräfta</strong> radering av meddelande',
+  '<strong>Confirm</strong> tag deletion' => '<strong>Bekräfta</strong> borttag av tagg',
+  '<strong>Edit</strong> conversation tags' => '<strong>Redigera</strong> konversations-tagg',
+  '<strong>Edit</strong> tag' => '<strong>Redigera</strong> tagg',
+  '<strong>Manage</strong> conversation tags' => '<strong>Hantera</strong> konversations-taggar',
+  '<strong>Messenger</strong> module configuration' => 'Konfigurera <strong>Meddelande</strong>-modul',
+  '<strong>New</strong> conversation' => '<strong>Ny</strong> konversation',
+  '<strong>New</strong> message' => '<strong>Nytt</strong> medelande',
+  'A tag with the same name already exists.' => 'En tagg med samma namn finns redan.',
+  'Add Tag' => 'Lägg till tagg',
+  'Add more participants to your conversation...' => 'Lägg till fler deltagare i din diskussion...',
+  'Add participants' => 'Lägg till deltagare',
+  'Add recipients' => 'Lägg till mottagare',
+  'Add user' => 'Lägg till användare',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Tillåt andra att sända dig privata meddelanden',
+  'Allow users to start new conversations' => 'Tillåt användare att starta nya konversationer',
+  'Cancel' => 'Avbryt',
+  'Confirm' => 'Bekräfta',
+  'Conversation' => 'Konversation',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'Konversationstaggar kan användas för att filtrera konversationer och är bara synliga för dig.',
+  'Conversations' => 'Konversationer',
+  'Created At' => 'Skapad',
+  'Created By' => 'Skapad av',
+  'Delete' => 'Ta bort',
+  'Delete conversation' => 'Radera konversation',
+  'Do you really want to delete this conversation?' => 'Vill du verkligen radera konversationen?',
+  'Do you really want to delete this message?' => 'Vill du verkligen radera detta meddelande?',
+  'Do you really want to delete this tag?' => 'Vill du verkligen ta bort den här taggen?',
+  'Do you really want to leave this conversation?' => 'Vill du verkligen lämna denna konversation?',
+  'Edit' => 'Redigera',
+  'Edit message entry' => 'Ändra meddelandeinlägg',
+  'Edit message...' => 'Redigera meddelande...',
+  'Filters' => 'Filter',
+  'Friday' => 'Fredag',
+  'Groups' => 'Grupper',
+  'Here you can manage your private conversation tags.' => 'Här kan du hantera dina privata konversationstaggar.',
+  'Is Originator' => 'Kommer ifrån',
+  'Last Viewed' => 'Senast visad',
+  'Leave' => 'Lämna',
+  'Leave conversation' => 'Lämna konversation',
+  'Leave fields blank in order to disable a restriction.' => 'Lämna fält tomma för att inaktivera begränsning.',
+  'Manage Tags' => 'Hantera taggar',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'Maximalt antal meddelanden per dag',
+  'Max number of messages allowed for a new user per day' => 'Maximalt antal meddelanden som tillåts för en ny användare per dag',
+  'Max number of new conversations allowed for a new user per day' => 'Maximalt antal nya konversationer som tillåts för en ny användare per dag',
+  'Max number of new conversations allowed for a user per day' => 'Maximalt antal nya konversationer som tillåts för en användare per dag',
+  'Members' => 'Medlemmar',
+  'Message' => 'Meddelande',
+  'Messages' => 'Meddelanden',
+  'Monday' => 'Måndag',
+  'My Tags' => 'Mina taggar',
+  'New conversation from {senderName}' => 'Ny konversation från {senderName}',
+  'New message from {senderName}' => 'Nytt meddelande från {senderName}',
+  'New message in discussion from %displayName%' => 'Nytt meddelande i diskussionen med %displayName%',
+  'Participants' => 'Deltagare',
+  'Pin' => '',
+  'Pinned' => 'Fastnålad',
+  'Receive Notifications when someone opens a new conversation.' => 'Erhåll notis när någon startar en ny konversation',
+  'Receive Notifications when someone sends you a message.' => 'Erhåll notis när någon sänder dig ett meddelande',
+  'Receive private messages' => 'Erhåll privata meddelanden',
+  'Recipient' => 'Mottagare',
+  'Reply now' => 'Svara nu',
+  'Saturday' => 'Lördag',
+  'Search' => 'Sök',
+  'Send' => 'Skicka',
+  'Send message' => 'Skicka meddelande',
+  'Seperate restrictions for new users' => 'Särskilda begränsningar för nya användare',
+  'Show all messages' => 'Visa alla meddelanden',
+  'Show menu item in top Navigation' => 'Visa menyalternativ i toppnavigering',
+  'Sign up now' => 'Anmäl dig nu',
+  'Spaces' => 'Forum',
+  'Start new conversations' => 'Starta ny konversation',
+  'Subject' => 'Ämne',
+  'Sunday' => 'Söndag',
+  'Tags' => 'Taggar',
+  'There are no messages yet.' => 'Det finns inga meddelanden ännu.',
+  'This user is already participating in this conversation.' => 'Den här användaren deltar redan i denna konversation.',
+  'Thursday' => 'Torsdag',
+  'Title' => 'Rubrik',
+  'Today' => 'I dag',
+  'Tuesday' => 'Tisdag',
+  'Unpin' => 'Ta bort nål',
+  'Until a user is member since (days)' => 'Tills en användare har varit medlem sedan (dagar)',
+  'Updated At' => 'Uppdaterad',
+  'Updated By' => 'Uppdaterad av',
+  'User' => 'Användare',
+  'User Posts' => 'Användarinlägg',
+  'User {name} is already participating!' => 'Användare {name} deltar redan!',
+  'Wednesday' => 'Onsdag',
+  'Write a message...' => 'Skriv ett meddelande...',
+  'Yesterday' => 'Igår',
+  'You' => 'Du',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Du får inte delta i denna konversation. Du har blivit blockerad av: {userNames}.',
+  'You are not allowed to reply to users {userNames}!' => 'Du har inte behörighet att svara användarna {userNames}!',
+  'You are not allowed to send user {name} is already!' => 'Du har inte tillåtelse att skicka användaren {name} is already!',
+  'You are not allowed to start a conversation with this user.' => 'Du har inte tillåtelse att starta en konversation med den här användaren.',
+  'You are not allowed to start a conversation with {userName}!' => 'Du har inte tillåtelse att starta en konversation med {userName}!',
+  'You cannot send a email to yourself!' => 'Du kan inte skicka e-post till dig själv!',
+  'You cannot send a message to yourself!' => 'Du kan inte skicka ett meddelande till dig själv!',
+  'You cannot send a message without recipients!' => 'Du kan inte skicka ett meddelande som saknar mottagare',
+  'You joined the conversation.' => 'Du anslöt till konversationen',
+  'You left the conversation.' => 'Du lämnade konversationen',
+  'You\'ve exceeded your daily amount of new conversations.' => 'Du har överskridit din dagliga mängd av nya konversationer.',
+  'edited' => 'redigerad',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName} skapade en ny konversation {conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} skickade ett nytt meddelande till dig i {conversationTitle}',
+  '{username} joined the conversation.' => '{username} anslöt till konversationen.',
+  '{username} left the conversation.' => '{username} lämnade konversationen.',
 ];
diff --git a/messages/sv/forms_CreateMessageForm.php b/messages/sv/forms_CreateMessageForm.php
deleted file mode 100644
index 3deeb0fe..00000000
--- a/messages/sv/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Medelande',
-  'Recipient' => 'Mottagare',
-  'Subject' => 'Ämne',
-  'Tags' => 'Taggar',
-);
diff --git a/messages/sv/forms_InviteRecipientForm.php b/messages/sv/forms_InviteRecipientForm.php
deleted file mode 100644
index a6cf6d7f..00000000
--- a/messages/sv/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'Mottagare',
-  'User {name} is already participating!' => 'Användare {name} deltar redan!',
-  'You are not allowed to send user {name} is already!' => 'Du har inte tillåtelse att skicka användaren {name} is already!',
-  'You cannot send a email to yourself!' => 'Du kan inte skicka e-post till dig själv!',
-);
diff --git a/messages/sv/forms_ReplyMessageForm.php b/messages/sv/forms_ReplyMessageForm.php
deleted file mode 100644
index 85e1ac51..00000000
--- a/messages/sv/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Meddelande',
-);
diff --git a/messages/sv/models_Message.php b/messages/sv/models_Message.php
deleted file mode 100644
index 811de7c0..00000000
--- a/messages/sv/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => 'Ny konversation från {senderName}',
-  'New message from {senderName}' => 'Nytt meddelande från {senderName}',
-);
diff --git a/messages/sv/models_MessageEntry.php b/messages/sv/models_MessageEntry.php
deleted file mode 100644
index 24e27999..00000000
--- a/messages/sv/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Nytt meddelande i diskussionen med %displayName%',
-);
diff --git a/messages/sv/views_emails_NewMessage.php b/messages/sv/views_emails_NewMessage.php
deleted file mode 100644
index 3f16f5e7..00000000
--- a/messages/sv/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>Ny</strong> konversation',
-  '<strong>New</strong> message' => '<strong>Nytt</strong> medelande',
-  'Reply now' => 'Svara nu',
-);
diff --git a/messages/sv/views_emails_NewMessageEntry.php b/messages/sv/views_emails_NewMessageEntry.php
deleted file mode 100644
index 72e5ff7a..00000000
--- a/messages/sv/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName} skapade en ny konversation {conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName} skickade ett nytt meddelande till dig i {conversationTitle}',
-);
diff --git a/messages/sv/views_mail_adduser.php b/messages/sv/views_mail_adduser.php
deleted file mode 100644
index 20ca92a7..00000000
--- a/messages/sv/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => 'Lägg till fler deltagare i din diskussion...',
-);
diff --git a/messages/sv/views_mail_create.php b/messages/sv/views_mail_create.php
deleted file mode 100644
index ae478eda..00000000
--- a/messages/sv/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Nytt</strong> meddelande',
-  'Add recipients' => 'Lägg till mottagare',
-  'Send' => 'Skicka',
-);
diff --git a/messages/sv/views_mail_edit.php b/messages/sv/views_mail_edit.php
deleted file mode 100644
index 1e800f2c..00000000
--- a/messages/sv/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Ändra meddelandeinlägg',
-];
diff --git a/messages/sv/views_mail_index.php b/messages/sv/views_mail_index.php
deleted file mode 100644
index cd1414f5..00000000
--- a/messages/sv/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Konversationer',
-    'There are no messages yet.' => 'Det finns inga meddelanden ännu.',
-];
diff --git a/messages/sv/views_mail_list.php b/messages/sv/views_mail_list.php
deleted file mode 100644
index 90415cc3..00000000
--- a/messages/sv/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Det finns inga meddelanden ännu.',
-);
diff --git a/messages/sv/views_mail_show.php b/messages/sv/views_mail_show.php
deleted file mode 100644
index d0fc4ca9..00000000
--- a/messages/sv/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>Bekräfta</strong> radering av konversation',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>Bekräfta</strong> att du lämnar konversationen',
-  '<strong>Confirm</strong> message deletion' => '<strong>Bekräfta</strong> radering av meddelande',
-  'Add user' => 'Lägg till användare',
-  'Cancel' => 'Avbryt',
-  'Delete' => 'Ta bort',
-  'Delete conversation' => 'Radera konversation',
-  'Do you really want to delete this conversation?' => 'Vill du verkligen radera konversationen?',
-  'Do you really want to delete this message?' => 'Vill du verkligen radera detta meddelande?',
-  'Do you really want to leave this conversation?' => 'Vill du verkligen lämna denna konversation?',
-  'Leave' => 'Lämna',
-  'Leave conversation' => 'Lämna konversation',
-  'There are no messages yet.' => 'Det finns inga meddelanden ännu.',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => 'Du får inte delta i denna konversation. Du har blivit blockerad av: {userNames}.',
-);
diff --git a/messages/sv/views_mail_sidebar.php b/messages/sv/views_mail_sidebar.php
deleted file mode 100644
index 3e609488..00000000
--- a/messages/sv/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Grupper',
-  'Members' => 'Medlemmar',
-  'Spaces' => 'Forum',
-  'User Posts' => 'Användarinlägg',
-);
diff --git a/messages/sv/views_mails_UserInviteSpace.php b/messages/sv/views_mails_UserInviteSpace.php
deleted file mode 100644
index 55267313..00000000
--- a/messages/sv/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Anmäl dig nu',
-);
diff --git a/messages/sv/widgets_views_mailNotification.php b/messages/sv/widgets_views_mailNotification.php
deleted file mode 100644
index 465b411c..00000000
--- a/messages/sv/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Visa alla meddelanden',
-];
diff --git a/messages/sv/widgets_views_newMessageButton.php b/messages/sv/widgets_views_newMessageButton.php
deleted file mode 100644
index 4b4e193e..00000000
--- a/messages/sv/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'Skicka meddelande',
-);
diff --git a/messages/sw/base.php b/messages/sw/base.php
index ac4b75fb..b6fb7049 100644
--- a/messages/sw/base.php
+++ b/messages/sw/base.php
@@ -1,80 +1,110 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Search' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Title' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'User' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => '',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/sw/forms_CreateMessageForm.php b/messages/sw/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/sw/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/sw/forms_InviteRecipientForm.php b/messages/sw/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/sw/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/sw/forms_ReplyMessageForm.php b/messages/sw/forms_ReplyMessageForm.php
deleted file mode 100644
index 81f52098..00000000
--- a/messages/sw/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-];
diff --git a/messages/sw/models_Message.php b/messages/sw/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/sw/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/sw/views_emails_NewMessage.php b/messages/sw/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/sw/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/sw/views_emails_NewMessageEntry.php b/messages/sw/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/sw/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/sw/views_mail_adduser.php b/messages/sw/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/sw/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/sw/views_mail_create.php b/messages/sw/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/sw/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/sw/views_mail_edit.php b/messages/sw/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/sw/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/sw/views_mail_index.php b/messages/sw/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/sw/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/sw/views_mail_list.php b/messages/sw/views_mail_list.php
deleted file mode 100644
index 3a576b85..00000000
--- a/messages/sw/views_mail_list.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'There are no messages yet.' => '',
-];
diff --git a/messages/sw/views_mail_show.php b/messages/sw/views_mail_show.php
deleted file mode 100644
index 1b3f7308..00000000
--- a/messages/sw/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/sw/widgets_views_mailNotification.php b/messages/sw/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/sw/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/sw/widgets_views_newMessageButton.php b/messages/sw/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/sw/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/th/base.php b/messages/th/base.php
index 037e5199..e1cf1b68 100644
--- a/messages/th/base.php
+++ b/messages/th/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>ยืนยัน</strong> การลบแท็ก',
-    '<strong>Edit</strong> conversation tags' => '<strong>แก้ไข</strong> แท็กการสนทนา',
-    '<strong>Edit</strong> tag' => '<strong>แก้ไข</strong> แท็ก',
-    '<strong>Manage</strong> conversation tags' => '<strong>จัดการ</strong> แท็กการสนทนา',
-    'A tag with the same name already exists.' => 'มีแท็กชื่อเดียวกันนี้แล้ว',
-    'Add Tag' => 'เพิ่มแท็ก',
-    'Allow others to send you private messages' => 'อนุญาตให้ผู้อื่นส่งข้อความส่วนตัวถึงคุณ',
-    'Allow users to start new conversations' => 'อนุญาตให้ผู้ใช้เริ่มการสนทนาใหม่',
-    'Confirm' => 'ยืนยัน',
-    'Conversation' => 'บทสนทนา',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => 'คุณสามารถใช้แท็กการสนทนาเพื่อกรองการสนทนาและมีเพียงคุณเท่านั้นที่เห็น',
-    'Conversations' => 'บทสนทนา',
-    'Created At' => 'สร้าง At',
-    'Created By' => 'สร้างโดย',
-    'Do you really want to delete this tag?' => 'คุณต้องการลบแท็กนี้จริงหรือ',
-    'Edit' => 'แก้ไข',
-    'Edit message...' => 'แก้ไขข้อความ...',
-    'Filters' => 'ตัวกรอง',
-    'Friday' => 'วันศุกร์',
-    'Here you can manage your private conversation tags.' => 'คุณสามารถจัดการแท็กการสนทนาส่วนตัวได้ที่นี่',
-    'Is Originator' => 'เป็นผู้ริเริ่ม',
-    'Last Viewed' => 'ดูล่าสุด',
-    'Leave fields blank in order to disable a restriction.' => 'เว้นฟิลด์ว่างไว้เพื่อปิดใช้งานข้อจำกัด',
-    'Manage Tags' => 'จัดการแท็ก',
-    'Max messages allowed per day' => 'อนุญาตข้อความสูงสุดต่อวัน',
-    'Max number of messages allowed for a new user per day' => 'จำนวนข้อความสูงสุดที่อนุญาตสำหรับผู้ใช้ใหม่ต่อวัน',
-    'Max number of new conversations allowed for a new user per day' => 'จำนวนการสนทนาใหม่สูงสุดที่อนุญาตสำหรับผู้ใช้ใหม่ต่อวัน',
-    'Max number of new conversations allowed for a user per day' => 'จำนวนการสนทนาใหม่สูงสุดที่อนุญาตสำหรับผู้ใช้ต่อวัน',
-    'Message' => 'ข้อความ',
-    'Messages' => 'ข้อความ',
-    'Monday' => 'วันจันทร์',
-    'My Tags' => 'แท็กของฉัน',
-    'Participants' => 'ผู้เข้าร่วม',
-    'Pinned' => 'ปักหมุด',
-    'Receive Notifications when someone opens a new conversation.' => 'รับการแจ้งเตือนเมื่อมีคนเปิดการสนทนาใหม่',
-    'Receive Notifications when someone sends you a message.' => 'รับการแจ้งเตือนเมื่อมีคนส่งข้อความถึงคุณ',
-    'Receive private messages' => 'รับข้อความส่วนตัว',
-    'Saturday' => 'วันเสาร์',
-    'Search' => 'ค้นหา',
-    'Seperate restrictions for new users' => 'แยกข้อจำกัดสำหรับผู้ใช้ใหม่',
-    'Show menu item in top Navigation' => 'แสดงรายการเมนูในการนำทางด้านบน',
-    'Start new conversations' => 'เริ่มบทสนทนาใหม่',
-    'Subject' => 'เรื่อง',
-    'Sunday' => 'วันอาทิตย์',
-    'Tags' => 'แท็ก',
-    'This user is already participating in this conversation.' => 'ผู้ใช้รายนี้เข้าร่วมการสนทนานี้แล้ว',
-    'Thursday' => 'วันพฤหัสบดี',
-    'Title' => 'หัวข้อ',
-    'Today' => 'วันนี้',
-    'Tuesday' => 'วันอังคาร',
-    'Unpin' => 'เลิกตรึง',
-    'Until a user is member since (days)' => 'จนกว่าผู้ใช้จะเป็นสมาชิกตั้งแต่ (วัน)',
-    'Updated At' => 'อัปเดตที่',
-    'Updated By' => 'อัพเดทโดย',
-    'User' => 'ผู้ใช้',
-    'Wednesday' => 'วันพุธ',
-    'Write a message...' => 'เขียนข้อความ...',
-    'You' => 'คุณ',
-    'You are not allowed to start a conversation with this user.' => 'คุณไม่ได้รับอนุญาตให้เริ่มการสนทนากับผู้ใช้รายนี้',
-    'You are not allowed to start a conversation with {userName}!' => 'คุณไม่ได้รับอนุญาตให้เริ่มการสนทนากับ {userName}!',
-    'You cannot send a message to yourself!' => 'คุณไม่สามารถส่งข้อความถึงตัวเอง!',
-    'You\'ve exceeded your daily amount of new conversations.' => 'คุณมีการสนทนาใหม่เกินจำนวนครั้งในแต่ละวันแล้ว',
-    '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
-    '<strong>Messenger</strong> module configuration' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Mark Unread' => '',
-    'Pin' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>ยืนยัน</strong> กำลังลบการสนทนา',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>ยืนยัน</strong> ออกจากการสนทนา',
+  '<strong>Confirm</strong> message deletion' => '<strong>ยืนยัน</strong> การลบข้อความ',
+  '<strong>Confirm</strong> tag deletion' => '<strong>ยืนยัน</strong> การลบแท็ก',
+  '<strong>Edit</strong> conversation tags' => '<strong>แก้ไข</strong> แท็กการสนทนา',
+  '<strong>Edit</strong> tag' => '<strong>แก้ไข</strong> แท็ก',
+  '<strong>Manage</strong> conversation tags' => '<strong>จัดการ</strong> แท็กการสนทนา',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>ใหม่</strong> ข้อความ',
+  'A tag with the same name already exists.' => 'มีแท็กชื่อเดียวกันนี้แล้ว',
+  'Add Tag' => 'เพิ่มแท็ก',
+  'Add more participants to your conversation...' => 'เพิ่มผู้เข้าร่วมในการสนทนาของคุณ...',
+  'Add participants' => '',
+  'Add recipients' => 'เพิ่มผู้รับ',
+  'Add user' => 'เพิ่มผู้ใช้',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'อนุญาตให้ผู้อื่นส่งข้อความส่วนตัวถึงคุณ',
+  'Allow users to start new conversations' => 'อนุญาตให้ผู้ใช้เริ่มการสนทนาใหม่',
+  'Cancel' => 'ยกเลิก',
+  'Confirm' => 'ยืนยัน',
+  'Conversation' => 'บทสนทนา',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => 'คุณสามารถใช้แท็กการสนทนาเพื่อกรองการสนทนาและมีเพียงคุณเท่านั้นที่เห็น',
+  'Conversations' => 'บทสนทนา',
+  'Created At' => 'สร้าง At',
+  'Created By' => 'สร้างโดย',
+  'Delete' => 'ลบ',
+  'Delete conversation' => 'ลบบทสนทนา',
+  'Do you really want to delete this conversation?' => 'คุณต้องการลบการสนทนานี้จริงหรือ',
+  'Do you really want to delete this message?' => 'คุณต้องการลบข้อความนี้จริงหรือ',
+  'Do you really want to delete this tag?' => 'คุณต้องการลบแท็กนี้จริงหรือ',
+  'Do you really want to leave this conversation?' => 'คุณต้องการออกจากการสนทนานี้หรือไม่?',
+  'Edit' => 'แก้ไข',
+  'Edit message entry' => 'แก้ไขรายการข้อความ',
+  'Edit message...' => 'แก้ไขข้อความ...',
+  'Filters' => 'ตัวกรอง',
+  'Friday' => 'วันศุกร์',
+  'Groups' => 'กลุ่ม',
+  'Here you can manage your private conversation tags.' => 'คุณสามารถจัดการแท็กการสนทนาส่วนตัวได้ที่นี่',
+  'Is Originator' => 'เป็นผู้ริเริ่ม',
+  'Last Viewed' => 'ดูล่าสุด',
+  'Leave' => 'ออกจาก',
+  'Leave conversation' => 'ออกจากการสนทนา',
+  'Leave fields blank in order to disable a restriction.' => 'เว้นฟิลด์ว่างไว้เพื่อปิดใช้งานข้อจำกัด',
+  'Manage Tags' => 'จัดการแท็ก',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => 'อนุญาตข้อความสูงสุดต่อวัน',
+  'Max number of messages allowed for a new user per day' => 'จำนวนข้อความสูงสุดที่อนุญาตสำหรับผู้ใช้ใหม่ต่อวัน',
+  'Max number of new conversations allowed for a new user per day' => 'จำนวนการสนทนาใหม่สูงสุดที่อนุญาตสำหรับผู้ใช้ใหม่ต่อวัน',
+  'Max number of new conversations allowed for a user per day' => 'จำนวนการสนทนาใหม่สูงสุดที่อนุญาตสำหรับผู้ใช้ต่อวัน',
+  'Members' => 'สมาชิก',
+  'Message' => 'ข้อความ',
+  'Messages' => 'ข้อความ',
+  'Monday' => 'วันจันทร์',
+  'My Tags' => 'แท็กของฉัน',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'ข้อความใหม่จาก {senderName}',
+  'New message in discussion from %displayName%' => 'ข้อความใหม่ในการสนทนาจาก %displayName%',
+  'Participants' => 'ผู้เข้าร่วม',
+  'Pin' => '',
+  'Pinned' => 'ปักหมุด',
+  'Receive Notifications when someone opens a new conversation.' => 'รับการแจ้งเตือนเมื่อมีคนเปิดการสนทนาใหม่',
+  'Receive Notifications when someone sends you a message.' => 'รับการแจ้งเตือนเมื่อมีคนส่งข้อความถึงคุณ',
+  'Receive private messages' => 'รับข้อความส่วนตัว',
+  'Recipient' => 'ผู้รับ',
+  'Reply now' => 'ตอบกลับตอนนี้',
+  'Saturday' => 'วันเสาร์',
+  'Search' => 'ค้นหา',
+  'Send' => 'ส่ง',
+  'Send message' => 'ส่งข้อความ',
+  'Seperate restrictions for new users' => 'แยกข้อจำกัดสำหรับผู้ใช้ใหม่',
+  'Show all messages' => 'แสดงข้อความทั้งหมด',
+  'Show menu item in top Navigation' => 'แสดงรายการเมนูในการนำทางด้านบน',
+  'Sign up now' => 'สมัครตอนนี้เลย',
+  'Spaces' => 'ช่องว่าง',
+  'Start new conversations' => 'เริ่มบทสนทนาใหม่',
+  'Subject' => 'เรื่อง',
+  'Sunday' => 'วันอาทิตย์',
+  'Tags' => 'แท็ก',
+  'There are no messages yet.' => 'ยังไม่มีข้อความ.',
+  'This user is already participating in this conversation.' => 'ผู้ใช้รายนี้เข้าร่วมการสนทนานี้แล้ว',
+  'Thursday' => 'วันพฤหัสบดี',
+  'Title' => 'หัวข้อ',
+  'Today' => 'วันนี้',
+  'Tuesday' => 'วันอังคาร',
+  'Unpin' => 'เลิกตรึง',
+  'Until a user is member since (days)' => 'จนกว่าผู้ใช้จะเป็นสมาชิกตั้งแต่ (วัน)',
+  'Updated At' => 'อัปเดตที่',
+  'Updated By' => 'อัพเดทโดย',
+  'User' => 'ผู้ใช้',
+  'User Posts' => 'โพสต์ของผู้ใช้',
+  'User {name} is already participating!' => 'ผู้ใช้ {name} เข้าร่วมแล้ว!',
+  'Wednesday' => 'วันพุธ',
+  'Write a message...' => 'เขียนข้อความ...',
+  'Yesterday' => '',
+  'You' => 'คุณ',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => 'คุณไม่ได้รับอนุญาตให้ส่งผู้ใช้ {name} อยู่แล้ว!',
+  'You are not allowed to start a conversation with this user.' => 'คุณไม่ได้รับอนุญาตให้เริ่มการสนทนากับผู้ใช้รายนี้',
+  'You are not allowed to start a conversation with {userName}!' => 'คุณไม่ได้รับอนุญาตให้เริ่มการสนทนากับ {userName}!',
+  'You cannot send a email to yourself!' => 'คุณไม่สามารถส่งอีเมลถึงตัวเองได้!',
+  'You cannot send a message to yourself!' => 'คุณไม่สามารถส่งข้อความถึงตัวเอง!',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => 'คุณมีการสนทนาใหม่เกินจำนวนครั้งในแต่ละวันแล้ว',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '{n,plural,=1{# other} other{# others}}',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/th/forms_CreateMessageForm.php b/messages/th/forms_CreateMessageForm.php
deleted file mode 100644
index 5942947b..00000000
--- a/messages/th/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'ข้อความ',
-  'Recipient' => 'ผู้รับ',
-  'Subject' => 'เรื่อง',
-  'Tags' => 'แท็ก',
-);
diff --git a/messages/th/forms_InviteRecipientForm.php b/messages/th/forms_InviteRecipientForm.php
deleted file mode 100644
index 43987ffb..00000000
--- a/messages/th/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => 'ผู้รับ',
-  'User {name} is already participating!' => 'ผู้ใช้ {name} เข้าร่วมแล้ว!',
-  'You are not allowed to send user {name} is already!' => 'คุณไม่ได้รับอนุญาตให้ส่งผู้ใช้ {name} อยู่แล้ว!',
-  'You cannot send a email to yourself!' => 'คุณไม่สามารถส่งอีเมลถึงตัวเองได้!',
-);
diff --git a/messages/th/forms_ReplyMessageForm.php b/messages/th/forms_ReplyMessageForm.php
deleted file mode 100644
index ccb8c044..00000000
--- a/messages/th/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'ข้อความ',
-);
diff --git a/messages/th/models_Message.php b/messages/th/models_Message.php
deleted file mode 100644
index f50c372f..00000000
--- a/messages/th/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'ข้อความใหม่จาก {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/th/models_MessageEntry.php b/messages/th/models_MessageEntry.php
deleted file mode 100644
index c0e944ed..00000000
--- a/messages/th/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'ข้อความใหม่ในการสนทนาจาก %displayName%',
-);
diff --git a/messages/th/views_emails_NewMessage.php b/messages/th/views_emails_NewMessage.php
deleted file mode 100644
index 7267ee52..00000000
--- a/messages/th/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>ใหม่</strong> ข้อความ',
-    'Reply now' => 'ตอบกลับตอนนี้',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/th/views_emails_NewMessageEntry.php b/messages/th/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/th/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/th/views_mail_adduser.php b/messages/th/views_mail_adduser.php
deleted file mode 100644
index bfc3d752..00000000
--- a/messages/th/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => 'เพิ่มผู้เข้าร่วมในการสนทนาของคุณ...',
-);
diff --git a/messages/th/views_mail_create.php b/messages/th/views_mail_create.php
deleted file mode 100644
index 851efeeb..00000000
--- a/messages/th/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>ใหม่</strong> ข้อความ',
-  'Add recipients' => 'เพิ่มผู้รับ',
-  'Send' => 'ส่ง',
-);
diff --git a/messages/th/views_mail_edit.php b/messages/th/views_mail_edit.php
deleted file mode 100644
index a2d54242..00000000
--- a/messages/th/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => 'แก้ไขรายการข้อความ',
-);
diff --git a/messages/th/views_mail_index.php b/messages/th/views_mail_index.php
deleted file mode 100644
index 6f5ac133..00000000
--- a/messages/th/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'บทสนทนา',
-    'There are no messages yet.' => 'ยังไม่มีข้อความ.',
-];
diff --git a/messages/th/views_mail_list.php b/messages/th/views_mail_list.php
deleted file mode 100644
index d3d43377..00000000
--- a/messages/th/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'ยังไม่มีข้อความ.',
-);
diff --git a/messages/th/views_mail_show.php b/messages/th/views_mail_show.php
deleted file mode 100644
index dafe2a7e..00000000
--- a/messages/th/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>ยืนยัน</strong> กำลังลบการสนทนา',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>ยืนยัน</strong> ออกจากการสนทนา',
-    '<strong>Confirm</strong> message deletion' => '<strong>ยืนยัน</strong> การลบข้อความ',
-    'Add user' => 'เพิ่มผู้ใช้',
-    'Cancel' => 'ยกเลิก',
-    'Delete' => 'ลบ',
-    'Delete conversation' => 'ลบบทสนทนา',
-    'Do you really want to delete this conversation?' => 'คุณต้องการลบการสนทนานี้จริงหรือ',
-    'Do you really want to delete this message?' => 'คุณต้องการลบข้อความนี้จริงหรือ',
-    'Do you really want to leave this conversation?' => 'คุณต้องการออกจากการสนทนานี้หรือไม่?',
-    'Leave' => 'ออกจาก',
-    'Leave conversation' => 'ออกจากการสนทนา',
-    'There are no messages yet.' => 'ยังไม่มีข้อความ.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/th/views_mail_sidebar.php b/messages/th/views_mail_sidebar.php
deleted file mode 100644
index 3b80fe3f..00000000
--- a/messages/th/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'กลุ่ม',
-  'Members' => 'สมาชิก',
-  'Spaces' => 'ช่องว่าง',
-  'User Posts' => 'โพสต์ของผู้ใช้',
-);
diff --git a/messages/th/views_mails_UserInviteSpace.php b/messages/th/views_mails_UserInviteSpace.php
deleted file mode 100644
index 8fc948b7..00000000
--- a/messages/th/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'สมัครตอนนี้เลย',
-);
diff --git a/messages/th/widgets_views_mailNotification.php b/messages/th/widgets_views_mailNotification.php
deleted file mode 100644
index cdd2cf30..00000000
--- a/messages/th/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => 'แสดงข้อความทั้งหมด',
-);
diff --git a/messages/th/widgets_views_newMessageButton.php b/messages/th/widgets_views_newMessageButton.php
deleted file mode 100644
index f5d6103c..00000000
--- a/messages/th/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => 'ส่งข้อความ',
-);
diff --git a/messages/tr/base.php b/messages/tr/base.php
index c522fe74..681cb55b 100644
--- a/messages/tr/base.php
+++ b/messages/tr/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => 'Doğrula',
-    'Conversation' => 'Sohbet',
-    'Conversations' => 'Konuşmalar',
-    'Created At' => 'Oluşturma zamanı',
-    'Created By' => 'Oluşturan',
-    'Edit' => 'Düzenle',
-    'Last Viewed' => 'Son görüntülenen',
-    'Message' => 'Mesaj',
-    'Messages' => 'Mesajlar',
-    'Participants' => 'Katılımcılar',
-    'Pinned' => 'Başa Tuttur',
-    'Search' => 'Arama',
-    'Subject' => 'Konu',
-    'Tags' => 'Etiketler',
-    'Title' => 'Başlık',
-    'Unpin' => 'Sabitlemeyi kaldır',
-    'Updated At' => 'Güncelleme zamanı',
-    'Updated By' => 'Güncelleyen',
-    'User' => 'Kullanıcı',
-    'You' => 'Sen',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Konuşmayı</strong> sil',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Konuşmadan</strong> ayrıl',
+  '<strong>Confirm</strong> message deletion' => '<strong>Mesajı</strong> sil',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '<strong>Yeni</strong> mesaj',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'Konuşmaya daha fazla katılımcı ekleyin...',
+  'Add participants' => '',
+  'Add recipients' => 'Alıcıları ekle',
+  'Add user' => 'Kullanıcı ekle',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'İptal',
+  'Confirm' => 'Doğrula',
+  'Conversation' => 'Sohbet',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => 'Konuşmalar',
+  'Created At' => 'Oluşturma zamanı',
+  'Created By' => 'Oluşturan',
+  'Delete' => 'Sil',
+  'Delete conversation' => 'Konuşmayı sil',
+  'Do you really want to delete this conversation?' => 'Konuşmayı silmek istiyor musun?',
+  'Do you really want to delete this message?' => 'Mesajı silmek istiyor musun?',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'Konuşmadan ayrılmak istiyor musun?',
+  'Edit' => 'Düzenle',
+  'Edit message entry' => 'Mesaj düzenleme',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => 'Gruplar',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => 'Son görüntülenen',
+  'Leave' => 'Ayrıl',
+  'Leave conversation' => 'Konuşmadan ayrıl',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Kullanıcılar',
+  'Message' => 'Mesaj',
+  'Messages' => 'Mesajlar',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Yeni mesaj var. Gönderen {senderName}',
+  'New message in discussion from %displayName%' => 'Tartışmaya %displayName% yeni mesaj gönderdi',
+  'Participants' => 'Katılımcılar',
+  'Pin' => '',
+  'Pinned' => 'Başa Tuttur',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => 'Alıcı',
+  'Reply now' => 'Cevapla',
+  'Saturday' => '',
+  'Search' => 'Arama',
+  'Send' => 'Gönder',
+  'Send message' => 'Mesaj gönder',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'Tüm mesajları göster',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => 'Şimdi kayıt ol',
+  'Spaces' => 'Mekanlar',
+  'Start new conversations' => '',
+  'Subject' => 'Konu',
+  'Sunday' => '',
+  'Tags' => 'Etiketler',
+  'There are no messages yet.' => 'Henüz mesaj bulunmuyor.',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Başlık',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => 'Sabitlemeyi kaldır',
+  'Until a user is member since (days)' => '',
+  'Updated At' => 'Güncelleme zamanı',
+  'Updated By' => 'Güncelleyen',
+  'User' => 'Kullanıcı',
+  'User Posts' => 'Gönderiler',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Sen',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Kendinize e-posta gönderemessiniz!',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/tr/forms_CreateMessageForm.php b/messages/tr/forms_CreateMessageForm.php
deleted file mode 100644
index 9161939a..00000000
--- a/messages/tr/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mesaj',
-  'Recipient' => 'Alıcı',
-  'Subject' => 'Konu',
-  'Tags' => 'Etiketler',
-);
diff --git a/messages/tr/forms_InviteRecipientForm.php b/messages/tr/forms_InviteRecipientForm.php
deleted file mode 100644
index da91b035..00000000
--- a/messages/tr/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'Recipient' => 'Alıcı',
-    'You cannot send a email to yourself!' => 'Kendinize e-posta gönderemessiniz!',
-];
diff --git a/messages/tr/forms_ReplyMessageForm.php b/messages/tr/forms_ReplyMessageForm.php
deleted file mode 100644
index 02232dd4..00000000
--- a/messages/tr/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Mesaj',
-);
diff --git a/messages/tr/models_Message.php b/messages/tr/models_Message.php
deleted file mode 100644
index 9e6d876b..00000000
--- a/messages/tr/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Yeni mesaj var. Gönderen {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/tr/models_MessageEntry.php b/messages/tr/models_MessageEntry.php
deleted file mode 100644
index b12878c6..00000000
--- a/messages/tr/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Tartışmaya %displayName% yeni mesaj gönderdi',
-);
diff --git a/messages/tr/views_emails_NewMessage.php b/messages/tr/views_emails_NewMessage.php
deleted file mode 100644
index 81aa1f7b..00000000
--- a/messages/tr/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '<strong>Yeni</strong> mesaj',
-    'Reply now' => 'Cevapla',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/tr/views_emails_NewMessageEntry.php b/messages/tr/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/tr/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/tr/views_mail_adduser.php b/messages/tr/views_mail_adduser.php
deleted file mode 100644
index 244d35ca..00000000
--- a/messages/tr/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Konuşmaya daha fazla katılımcı ekleyin...',
-];
diff --git a/messages/tr/views_mail_create.php b/messages/tr/views_mail_create.php
deleted file mode 100644
index 78435091..00000000
--- a/messages/tr/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>Yeni</strong> mesaj',
-  'Add recipients' => 'Alıcıları ekle',
-  'Send' => 'Gönder',
-);
diff --git a/messages/tr/views_mail_edit.php b/messages/tr/views_mail_edit.php
deleted file mode 100644
index 7cbfa912..00000000
--- a/messages/tr/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Mesaj düzenleme',
-];
diff --git a/messages/tr/views_mail_index.php b/messages/tr/views_mail_index.php
deleted file mode 100644
index c40a3847..00000000
--- a/messages/tr/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Konuşmalar',
-    'There are no messages yet.' => 'Henüz mesaj bulunmuyor.',
-];
diff --git a/messages/tr/views_mail_list.php b/messages/tr/views_mail_list.php
deleted file mode 100644
index 7b707ec2..00000000
--- a/messages/tr/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Henüz mesaj bulunmuyor.',
-);
diff --git a/messages/tr/views_mail_show.php b/messages/tr/views_mail_show.php
deleted file mode 100644
index e51f4793..00000000
--- a/messages/tr/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Konuşmayı</strong> sil',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Konuşmadan</strong> ayrıl',
-    '<strong>Confirm</strong> message deletion' => '<strong>Mesajı</strong> sil',
-    'Add user' => 'Kullanıcı ekle',
-    'Cancel' => 'İptal',
-    'Delete' => 'Sil',
-    'Delete conversation' => 'Konuşmayı sil',
-    'Do you really want to delete this conversation?' => 'Konuşmayı silmek istiyor musun?',
-    'Do you really want to delete this message?' => 'Mesajı silmek istiyor musun?',
-    'Do you really want to leave this conversation?' => 'Konuşmadan ayrılmak istiyor musun?',
-    'Leave' => 'Ayrıl',
-    'Leave conversation' => 'Konuşmadan ayrıl',
-    'There are no messages yet.' => 'Henüz mesaj bulunmuyor.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/tr/views_mail_sidebar.php b/messages/tr/views_mail_sidebar.php
deleted file mode 100644
index 52c68327..00000000
--- a/messages/tr/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Gruplar',
-  'Members' => 'Kullanıcılar',
-  'Spaces' => 'Mekanlar',
-  'User Posts' => 'Gönderiler',
-);
diff --git a/messages/tr/views_mails_UserInviteSpace.php b/messages/tr/views_mails_UserInviteSpace.php
deleted file mode 100644
index 1fedb96a..00000000
--- a/messages/tr/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Şimdi kayıt ol',
-);
diff --git a/messages/tr/widgets_views_mailNotification.php b/messages/tr/widgets_views_mailNotification.php
deleted file mode 100644
index f1164eb6..00000000
--- a/messages/tr/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Tüm mesajları göster',
-];
diff --git a/messages/tr/widgets_views_newMessageButton.php b/messages/tr/widgets_views_newMessageButton.php
deleted file mode 100644
index 27a1a7b8..00000000
--- a/messages/tr/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Mesaj gönder',
-];
diff --git a/messages/uk/base.php b/messages/uk/base.php
index ffeff36d..081e1eb0 100644
--- a/messages/uk/base.php
+++ b/messages/uk/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => 'Підтвердити',
-    'Edit' => 'Редагувати',
-    'Search' => 'Пошук',
-    'Tags' => 'Теги',
-    'Title' => 'Заголовок',
-    'User' => 'Користувач',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Скасувати',
+  'Confirm' => 'Підтвердити',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => 'Видалити',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => 'Редагувати',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Члени',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => 'Пошук',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => 'Зареєструватися зараз',
+  'Spaces' => 'Спільноти',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => 'Теги',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Заголовок',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Користувач',
+  'User Posts' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/uk/forms_CreateMessageForm.php b/messages/uk/forms_CreateMessageForm.php
deleted file mode 100644
index 918b6746..00000000
--- a/messages/uk/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => '',
-  'Recipient' => '',
-  'Subject' => '',
-  'Tags' => 'Теги',
-);
diff --git a/messages/uk/forms_InviteRecipientForm.php b/messages/uk/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/uk/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/uk/forms_ReplyMessageForm.php b/messages/uk/forms_ReplyMessageForm.php
deleted file mode 100644
index 0f378741..00000000
--- a/messages/uk/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'Message' => '',
-);
diff --git a/messages/uk/models_Message.php b/messages/uk/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/uk/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/uk/models_MessageEntry.php b/messages/uk/models_MessageEntry.php
deleted file mode 100644
index c6cd1f38..00000000
--- a/messages/uk/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'New message in discussion from %displayName%' => '',
-);
diff --git a/messages/uk/views_emails_NewMessage.php b/messages/uk/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/uk/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/uk/views_emails_NewMessageEntry.php b/messages/uk/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/uk/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/uk/views_mail_adduser.php b/messages/uk/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/uk/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/uk/views_mail_create.php b/messages/uk/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/uk/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/uk/views_mail_edit.php b/messages/uk/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/uk/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/uk/views_mail_index.php b/messages/uk/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/uk/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/uk/views_mail_list.php b/messages/uk/views_mail_list.php
deleted file mode 100644
index e5ebcb0b..00000000
--- a/messages/uk/views_mail_list.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'There are no messages yet.' => '',
-);
diff --git a/messages/uk/views_mail_show.php b/messages/uk/views_mail_show.php
deleted file mode 100644
index 45b10612..00000000
--- a/messages/uk/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '',
-  '<strong>Confirm</strong> leaving conversation' => '',
-  '<strong>Confirm</strong> message deletion' => '',
-  'Add user' => '',
-  'Cancel' => 'Скасувати',
-  'Delete' => 'Видалити',
-  'Delete conversation' => '',
-  'Do you really want to delete this conversation?' => '',
-  'Do you really want to delete this message?' => '',
-  'Do you really want to leave this conversation?' => '',
-  'Leave' => '',
-  'Leave conversation' => '',
-  'There are no messages yet.' => '',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-);
diff --git a/messages/uk/views_mail_sidebar.php b/messages/uk/views_mail_sidebar.php
deleted file mode 100644
index 5d256640..00000000
--- a/messages/uk/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => '',
-  'Members' => 'Члени',
-  'Spaces' => 'Спільноти',
-  'User Posts' => '',
-);
diff --git a/messages/uk/views_mails_UserInviteSpace.php b/messages/uk/views_mails_UserInviteSpace.php
deleted file mode 100644
index b3badba2..00000000
--- a/messages/uk/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Зареєструватися зараз',
-);
diff --git a/messages/uk/widgets_views_mailNotification.php b/messages/uk/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/uk/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/uk/widgets_views_newMessageButton.php b/messages/uk/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/uk/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/uz/base.php b/messages/uz/base.php
index 62db89a7..2b80f1d2 100644
--- a/messages/uz/base.php
+++ b/messages/uz/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Title' => 'Sarlavha',
-    'User' => 'Foydalanuvchi',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Confirm' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Conversations' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Message' => '',
-    'Messages' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Pinned' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Search' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Subject' => '',
-    'Sunday' => '',
-    'Tags' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Unpin' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '',
+  '<strong>Confirm</strong> leaving conversation' => '',
+  '<strong>Confirm</strong> message deletion' => '',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '',
+  'Add participants' => '',
+  'Add recipients' => '',
+  'Add user' => '',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '',
+  'Confirm' => '',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '',
+  'Delete conversation' => '',
+  'Do you really want to delete this conversation?' => '',
+  'Do you really want to delete this message?' => '',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '',
+  'Edit' => '',
+  'Edit message entry' => '',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => '',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '',
+  'Leave conversation' => '',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => '',
+  'Message' => '',
+  'Messages' => '',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '',
+  'New message in discussion from %displayName%' => '',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '',
+  'Reply now' => '',
+  'Saturday' => '',
+  'Search' => '',
+  'Send' => '',
+  'Send message' => '',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => '',
+  'Spaces' => '',
+  'Start new conversations' => '',
+  'Subject' => '',
+  'Sunday' => '',
+  'Tags' => '',
+  'There are no messages yet.' => '',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => 'Sarlavha',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => 'Foydalanuvchi',
+  'User Posts' => '',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/uz/forms_CreateMessageForm.php b/messages/uz/forms_CreateMessageForm.php
deleted file mode 100644
index 94e031cb..00000000
--- a/messages/uz/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Message' => '',
-    'Recipient' => '',
-    'Subject' => '',
-    'Tags' => '',
-];
diff --git a/messages/uz/forms_InviteRecipientForm.php b/messages/uz/forms_InviteRecipientForm.php
deleted file mode 100644
index 84dc60da..00000000
--- a/messages/uz/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Recipient' => '',
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'You cannot send a email to yourself!' => '',
-];
diff --git a/messages/uz/forms_ReplyMessageForm.php b/messages/uz/forms_ReplyMessageForm.php
deleted file mode 100644
index 0f378741..00000000
--- a/messages/uz/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'Message' => '',
-);
diff --git a/messages/uz/models_Message.php b/messages/uz/models_Message.php
deleted file mode 100644
index 6e092444..00000000
--- a/messages/uz/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New conversation from {senderName}' => '',
-    'New message from {senderName}' => '',
-];
diff --git a/messages/uz/models_MessageEntry.php b/messages/uz/models_MessageEntry.php
deleted file mode 100644
index c6cd1f38..00000000
--- a/messages/uz/models_MessageEntry.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'New message in discussion from %displayName%' => '',
-);
diff --git a/messages/uz/views_emails_NewMessage.php b/messages/uz/views_emails_NewMessage.php
deleted file mode 100644
index 3e81bf8e..00000000
--- a/messages/uz/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> conversation' => '',
-    '<strong>New</strong> message' => '',
-    'Reply now' => '',
-];
diff --git a/messages/uz/views_emails_NewMessageEntry.php b/messages/uz/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/uz/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/uz/views_mail_adduser.php b/messages/uz/views_mail_adduser.php
deleted file mode 100644
index 329bec5f..00000000
--- a/messages/uz/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '',
-];
diff --git a/messages/uz/views_mail_create.php b/messages/uz/views_mail_create.php
deleted file mode 100644
index 7a245ec2..00000000
--- a/messages/uz/views_mail_create.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '',
-    'Add recipients' => '',
-    'Send' => '',
-];
diff --git a/messages/uz/views_mail_edit.php b/messages/uz/views_mail_edit.php
deleted file mode 100644
index c2f5274b..00000000
--- a/messages/uz/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '',
-];
diff --git a/messages/uz/views_mail_index.php b/messages/uz/views_mail_index.php
deleted file mode 100644
index d557e84e..00000000
--- a/messages/uz/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '',
-    'There are no messages yet.' => '',
-];
diff --git a/messages/uz/views_mail_list.php b/messages/uz/views_mail_list.php
deleted file mode 100644
index e5ebcb0b..00000000
--- a/messages/uz/views_mail_list.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'There are no messages yet.' => '',
-);
diff --git a/messages/uz/views_mail_show.php b/messages/uz/views_mail_show.php
deleted file mode 100644
index 1b3f7308..00000000
--- a/messages/uz/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '',
-    '<strong>Confirm</strong> leaving conversation' => '',
-    '<strong>Confirm</strong> message deletion' => '',
-    'Add user' => '',
-    'Cancel' => '',
-    'Delete' => '',
-    'Delete conversation' => '',
-    'Do you really want to delete this conversation?' => '',
-    'Do you really want to delete this message?' => '',
-    'Do you really want to leave this conversation?' => '',
-    'Leave' => '',
-    'Leave conversation' => '',
-    'There are no messages yet.' => '',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/uz/views_mail_sidebar.php b/messages/uz/views_mail_sidebar.php
deleted file mode 100644
index 1f5538e2..00000000
--- a/messages/uz/views_mail_sidebar.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'Groups' => '',
-  'Members' => '',
-  'Spaces' => '',
-  'User Posts' => '',
-);
diff --git a/messages/uz/views_mails_UserInviteSpace.php b/messages/uz/views_mails_UserInviteSpace.php
deleted file mode 100644
index 8c8a6c05..00000000
--- a/messages/uz/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return array (
-  'Sign up now' => '',
-);
diff --git a/messages/uz/widgets_views_mailNotification.php b/messages/uz/widgets_views_mailNotification.php
deleted file mode 100644
index 97b732d7..00000000
--- a/messages/uz/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '',
-];
diff --git a/messages/uz/widgets_views_newMessageButton.php b/messages/uz/widgets_views_newMessageButton.php
deleted file mode 100644
index ee3d3dfb..00000000
--- a/messages/uz/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '',
-];
diff --git a/messages/vi/base.php b/messages/vi/base.php
index 9db9928d..22667ce2 100644
--- a/messages/vi/base.php
+++ b/messages/vi/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Add participants' => 'Thêm người tham gia',
-    'Allow others to send you private messages' => 'Cho phép người khác gửi bạn thư riêng',
-    'Confirm' => 'Xác nhận',
-    'Conversations' => 'Hội thoại',
-    'Created At' => 'Tạo lúc',
-    'Created By' => 'Tạo bởi',
-    'Edit' => 'Chỉnh sửa',
-    'Friday' => 'Thứ sáu',
-    'Is Originator' => 'Là người khởi phát',
-    'Last Viewed' => 'Xem lần cuối',
-    'Message' => 'Tin nhắn',
-    'Messages' => 'Tin nhắn',
-    'Monday' => 'Thứ hai',
-    'Participants' => 'Thành viên tham gia',
-    'Pinned' => 'Ghim',
-    'Receive private messages' => 'Nhận tin nhắn riêng tư ',
-    'Saturday' => 'Thứ bảy',
-    'Search' => 'Tìm kiếm',
-    'Subject' => 'Chủ đề',
-    'Sunday' => 'Chủ nhật',
-    'Tags' => 'Thẻ',
-    'Thursday' => 'Thứ năm',
-    'Title' => 'Tiêu đề',
-    'Today' => 'Hôm nay',
-    'Tuesday' => 'Thứ ba',
-    'Unpin' => 'Hủy ghim',
-    'Updated At' => 'Cập nhật lúc',
-    'Updated By' => 'Cập nhật bởi',
-    'User' => 'User',
-    'Wednesday' => 'Thứ tư',
-    'You' => 'Bạn',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Advanced Messages Search' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'My Tags' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'This user is already participating in this conversation.' => '',
-    'Until a user is member since (days)' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>Xác nhận</strong> xóa hội thoại',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>Xác nhận</strong> rời khỏi hội thoại',
+  '<strong>Confirm</strong> message deletion' => '<strong>Xác nhận</strong> xóa tin nhắn',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => 'Tin nhắn <strong>mới</strong>',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => 'Thêm người tham gia vào cuộc hội thoại...',
+  'Add participants' => 'Thêm người tham gia',
+  'Add recipients' => 'Thêm người nhận',
+  'Add user' => 'Thêm người trò chuyện',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => 'Cho phép người khác gửi bạn thư riêng',
+  'Allow users to start new conversations' => '',
+  'Cancel' => 'Hủy',
+  'Confirm' => 'Xác nhận',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => 'Hội thoại',
+  'Created At' => 'Tạo lúc',
+  'Created By' => 'Tạo bởi',
+  'Delete' => 'Xóa',
+  'Delete conversation' => 'Xóa hội thoại',
+  'Do you really want to delete this conversation?' => 'Bạn thực sự muốn xóa cuộc hội thoại này?',
+  'Do you really want to delete this message?' => 'Bạn thực sự muốn xóa tin nhắn này?',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => 'Bạn thực sự muốn rời cuộc hội thoại này?',
+  'Edit' => 'Chỉnh sửa',
+  'Edit message entry' => 'Chỉnh sửa tin nhắn',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => 'Thứ sáu',
+  'Groups' => 'Nhóm',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => 'Là người khởi phát',
+  'Last Viewed' => 'Xem lần cuối',
+  'Leave' => 'Rời',
+  'Leave conversation' => 'Rời cuộc hội thoại',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => 'Thành viên',
+  'Message' => 'Tin nhắn',
+  'Messages' => 'Tin nhắn',
+  'Monday' => 'Thứ hai',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => 'Tin nhắn mới từ {senderName}',
+  'New message in discussion from %displayName%' => 'Tin nhắn mới trong cuộc thảo luận từ %displayName%',
+  'Participants' => 'Thành viên tham gia',
+  'Pin' => '',
+  'Pinned' => 'Ghim',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => 'Nhận tin nhắn riêng tư ',
+  'Recipient' => 'Người nhận',
+  'Reply now' => 'Trả lời bây giờ',
+  'Saturday' => 'Thứ bảy',
+  'Search' => 'Tìm kiếm',
+  'Send' => 'Gửi',
+  'Send message' => 'Gửi tin nhắn',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => 'Hiển thị toàn bộ tin nhắn',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => 'Đăng ký ngay',
+  'Spaces' => 'Phòng làm việc',
+  'Start new conversations' => '',
+  'Subject' => 'Chủ đề',
+  'Sunday' => 'Chủ nhật',
+  'Tags' => 'Thẻ',
+  'There are no messages yet.' => 'Chưa có tin nhắn nào.',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => 'Thứ năm',
+  'Title' => 'Tiêu đề',
+  'Today' => 'Hôm nay',
+  'Tuesday' => 'Thứ ba',
+  'Unpin' => 'Hủy ghim',
+  'Until a user is member since (days)' => '',
+  'Updated At' => 'Cập nhật lúc',
+  'Updated By' => 'Cập nhật bởi',
+  'User' => 'User',
+  'User Posts' => 'User Posts',
+  'User {name} is already participating!' => '',
+  'Wednesday' => 'Thứ tư',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => 'Bạn',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => 'Bạn không thể gửi thư cho chính mình!',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/vi/forms_CreateMessageForm.php b/messages/vi/forms_CreateMessageForm.php
deleted file mode 100644
index 664efff1..00000000
--- a/messages/vi/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => 'Tin nhắn',
-  'Recipient' => 'Người nhận',
-  'Subject' => 'Chủ đề',
-  'Tags' => 'Thẻ',
-);
diff --git a/messages/vi/forms_InviteRecipientForm.php b/messages/vi/forms_InviteRecipientForm.php
deleted file mode 100644
index af10a1e7..00000000
--- a/messages/vi/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'Recipient' => 'Người nhận',
-    'You cannot send a email to yourself!' => 'Bạn không thể gửi thư cho chính mình!',
-];
diff --git a/messages/vi/forms_ReplyMessageForm.php b/messages/vi/forms_ReplyMessageForm.php
deleted file mode 100644
index db22522e..00000000
--- a/messages/vi/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => 'Tin nhắn',
-);
diff --git a/messages/vi/models_Message.php b/messages/vi/models_Message.php
deleted file mode 100644
index e3ed27c1..00000000
--- a/messages/vi/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => 'Tin nhắn mới từ {senderName}',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/vi/models_MessageEntry.php b/messages/vi/models_MessageEntry.php
deleted file mode 100644
index e353e52c..00000000
--- a/messages/vi/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => 'Tin nhắn mới trong cuộc thảo luận từ %displayName%',
-);
diff --git a/messages/vi/views_emails_NewMessage.php b/messages/vi/views_emails_NewMessage.php
deleted file mode 100644
index c5fe5037..00000000
--- a/messages/vi/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => 'Tin nhắn <strong>mới</strong>',
-    'Reply now' => 'Trả lời bây giờ',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/vi/views_emails_NewMessageEntry.php b/messages/vi/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/vi/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/vi/views_mail_adduser.php b/messages/vi/views_mail_adduser.php
deleted file mode 100644
index 81fb01f4..00000000
--- a/messages/vi/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => 'Thêm người tham gia vào cuộc hội thoại...',
-];
diff --git a/messages/vi/views_mail_create.php b/messages/vi/views_mail_create.php
deleted file mode 100644
index e69e8775..00000000
--- a/messages/vi/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => 'Tin nhắn <strong>mới</strong>',
-  'Add recipients' => 'Thêm người nhận',
-  'Send' => 'Gửi',
-);
diff --git a/messages/vi/views_mail_edit.php b/messages/vi/views_mail_edit.php
deleted file mode 100644
index 01092236..00000000
--- a/messages/vi/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => 'Chỉnh sửa tin nhắn',
-];
diff --git a/messages/vi/views_mail_index.php b/messages/vi/views_mail_index.php
deleted file mode 100644
index 2f1cdf62..00000000
--- a/messages/vi/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => 'Hội thoại',
-    'There are no messages yet.' => 'Chưa có tin nhắn nào.',
-];
diff --git a/messages/vi/views_mail_list.php b/messages/vi/views_mail_list.php
deleted file mode 100644
index de188d8b..00000000
--- a/messages/vi/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => 'Chưa có tin nhắn nào.',
-);
diff --git a/messages/vi/views_mail_show.php b/messages/vi/views_mail_show.php
deleted file mode 100644
index bbdce1dc..00000000
--- a/messages/vi/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '<strong>Xác nhận</strong> xóa hội thoại',
-    '<strong>Confirm</strong> leaving conversation' => '<strong>Xác nhận</strong> rời khỏi hội thoại',
-    '<strong>Confirm</strong> message deletion' => '<strong>Xác nhận</strong> xóa tin nhắn',
-    'Add user' => 'Thêm người trò chuyện',
-    'Cancel' => 'Hủy',
-    'Delete' => 'Xóa',
-    'Delete conversation' => 'Xóa hội thoại',
-    'Do you really want to delete this conversation?' => 'Bạn thực sự muốn xóa cuộc hội thoại này?',
-    'Do you really want to delete this message?' => 'Bạn thực sự muốn xóa tin nhắn này?',
-    'Do you really want to leave this conversation?' => 'Bạn thực sự muốn rời cuộc hội thoại này?',
-    'Leave' => 'Rời',
-    'Leave conversation' => 'Rời cuộc hội thoại',
-    'There are no messages yet.' => 'Chưa có tin nhắn nào',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/vi/views_mail_sidebar.php b/messages/vi/views_mail_sidebar.php
deleted file mode 100644
index 06d440ee..00000000
--- a/messages/vi/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => 'Nhóm',
-  'Members' => 'Thành viên',
-  'Spaces' => 'Phòng làm việc',
-  'User Posts' => 'User Posts',
-);
diff --git a/messages/vi/views_mails_UserInviteSpace.php b/messages/vi/views_mails_UserInviteSpace.php
deleted file mode 100644
index 64e32078..00000000
--- a/messages/vi/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => 'Đăng ký ngay',
-);
diff --git a/messages/vi/widgets_views_mailNotification.php b/messages/vi/widgets_views_mailNotification.php
deleted file mode 100644
index 338b94d8..00000000
--- a/messages/vi/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => 'Hiển thị toàn bộ tin nhắn',
-];
diff --git a/messages/vi/widgets_views_newMessageButton.php b/messages/vi/widgets_views_newMessageButton.php
deleted file mode 100644
index 0aa3b4dd..00000000
--- a/messages/vi/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => 'Gửi tin nhắn',
-];
diff --git a/messages/zh-CN/base.php b/messages/zh-CN/base.php
index 81f8425d..63b11ba3 100644
--- a/messages/zh-CN/base.php
+++ b/messages/zh-CN/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    'Confirm' => '确认',
-    'Conversations' => '对话',
-    'Created At' => '创建于',
-    'Created By' => '创建人',
-    'Edit' => '编辑',
-    'Is Originator' => '是发起人',
-    'Last Viewed' => '最后浏览时间',
-    'Message' => '消息',
-    'Messages' => '<strong>消息</strong>',
-    'Pinned' => '标记',
-    'Search' => '搜 索',
-    'Subject' => '主题',
-    'Tags' => '标签',
-    'Title' => '标题',
-    'Unpin' => '取消置顶',
-    'Updated At' => '修改于',
-    'Updated By' => '修改人',
-    'User' => '用户',
-    'You' => '你',
-    '<strong>Confirm</strong> tag deletion' => '',
-    '<strong>Edit</strong> conversation tags' => '',
-    '<strong>Edit</strong> tag' => '',
-    '<strong>Manage</strong> conversation tags' => '',
-    '<strong>Messenger</strong> module configuration' => '',
-    'A tag with the same name already exists.' => '',
-    'Add Tag' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Allow others to send you private messages' => '',
-    'Allow users to start new conversations' => '',
-    'Conversation' => '',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '',
-    'Do you really want to delete this tag?' => '',
-    'Edit message...' => '',
-    'Filters' => '',
-    'Friday' => '',
-    'Here you can manage your private conversation tags.' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Manage Tags' => '',
-    'Mark Unread' => '',
-    'Max messages allowed per day' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'My Tags' => '',
-    'Participants' => '',
-    'Pin' => '',
-    'Receive Notifications when someone opens a new conversation.' => '',
-    'Receive Notifications when someone sends you a message.' => '',
-    'Receive private messages' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Show menu item in top Navigation' => '',
-    'Start new conversations' => '',
-    'Sunday' => '',
-    'This user is already participating in this conversation.' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Wednesday' => '',
-    'Write a message...' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message to yourself!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'You\'ve exceeded your daily amount of new conversations.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '确认<strong>删除讨论</strong>',
+  '<strong>Confirm</strong> leaving conversation' => '确认<strong>退出讨论</strong>',
+  '<strong>Confirm</strong> message deletion' => '确认<strong>删除消息</strong>',
+  '<strong>Confirm</strong> tag deletion' => '',
+  '<strong>Edit</strong> conversation tags' => '',
+  '<strong>Edit</strong> tag' => '',
+  '<strong>Manage</strong> conversation tags' => '',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '',
+  '<strong>New</strong> message' => '新<strong>消息</strong>',
+  'A tag with the same name already exists.' => '',
+  'Add Tag' => '',
+  'Add more participants to your conversation...' => '添加更多人参与讨论...',
+  'Add participants' => '',
+  'Add recipients' => '增加收件人',
+  'Add user' => '添加用户',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '',
+  'Allow users to start new conversations' => '',
+  'Cancel' => '取消',
+  'Confirm' => '确认',
+  'Conversation' => '',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '',
+  'Conversations' => '对话',
+  'Created At' => '创建于',
+  'Created By' => '创建人',
+  'Delete' => '删除',
+  'Delete conversation' => '删除讨论',
+  'Do you really want to delete this conversation?' => '你真的要删除此讨论？',
+  'Do you really want to delete this message?' => '你真的要删除此消息？',
+  'Do you really want to delete this tag?' => '',
+  'Do you really want to leave this conversation?' => '你真的要退出此讨论？',
+  'Edit' => '编辑',
+  'Edit message entry' => '编辑',
+  'Edit message...' => '',
+  'Filters' => '',
+  'Friday' => '',
+  'Groups' => '组',
+  'Here you can manage your private conversation tags.' => '',
+  'Is Originator' => '是发起人',
+  'Last Viewed' => '最后浏览时间',
+  'Leave' => '退出',
+  'Leave conversation' => '退出讨论',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => '成员',
+  'Message' => '消息',
+  'Messages' => '<strong>消息</strong>',
+  'Monday' => '',
+  'My Tags' => '',
+  'New conversation from {senderName}' => '',
+  'New message from {senderName}' => '来自 {senderName} 的新消息',
+  'New message in discussion from %displayName%' => '来自 %displayName% 的新讨论消息',
+  'Participants' => '',
+  'Pin' => '',
+  'Pinned' => '标记',
+  'Receive Notifications when someone opens a new conversation.' => '',
+  'Receive Notifications when someone sends you a message.' => '',
+  'Receive private messages' => '',
+  'Recipient' => '收件人',
+  'Reply now' => '现在回复',
+  'Saturday' => '',
+  'Search' => '搜 索',
+  'Send' => '发送',
+  'Send message' => '发送消息',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '显示所有的信息',
+  'Show menu item in top Navigation' => '',
+  'Sign up now' => '现在报名',
+  'Spaces' => '版块',
+  'Start new conversations' => '',
+  'Subject' => '主题',
+  'Sunday' => '',
+  'Tags' => '标签',
+  'There are no messages yet.' => '还没有消息.',
+  'This user is already participating in this conversation.' => '',
+  'Thursday' => '',
+  'Title' => '标题',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '取消置顶',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '修改于',
+  'Updated By' => '修改人',
+  'User' => '用户',
+  'User Posts' => '用户的帖子',
+  'User {name} is already participating!' => '',
+  'Wednesday' => '',
+  'Write a message...' => '',
+  'Yesterday' => '',
+  'You' => '你',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '你不能给自己发邮件！',
+  'You cannot send a message to yourself!' => '',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '',
+  '{senderName} sent you a new message in {conversationTitle}' => '',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/zh-CN/forms_CreateMessageForm.php b/messages/zh-CN/forms_CreateMessageForm.php
deleted file mode 100644
index e5213f9d..00000000
--- a/messages/zh-CN/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => '消息',
-  'Recipient' => '收件人',
-  'Subject' => '主题',
-  'Tags' => '标签',
-);
diff --git a/messages/zh-CN/forms_InviteRecipientForm.php b/messages/zh-CN/forms_InviteRecipientForm.php
deleted file mode 100644
index 356ad858..00000000
--- a/messages/zh-CN/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'User {name} is already participating!' => '',
-    'You are not allowed to send user {name} is already!' => '',
-    'Recipient' => '收件人',
-    'You cannot send a email to yourself!' => '你不能给自己发邮件！',
-];
diff --git a/messages/zh-CN/forms_ReplyMessageForm.php b/messages/zh-CN/forms_ReplyMessageForm.php
deleted file mode 100644
index e0513172..00000000
--- a/messages/zh-CN/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => '消息',
-);
diff --git a/messages/zh-CN/models_Message.php b/messages/zh-CN/models_Message.php
deleted file mode 100644
index 41395ab8..00000000
--- a/messages/zh-CN/models_Message.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'New message from {senderName}' => '来自 {senderName} 的新消息',
-    'New conversation from {senderName}' => '',
-];
diff --git a/messages/zh-CN/models_MessageEntry.php b/messages/zh-CN/models_MessageEntry.php
deleted file mode 100644
index 91de621b..00000000
--- a/messages/zh-CN/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => '来自 %displayName% 的新讨论消息',
-);
diff --git a/messages/zh-CN/views_emails_NewMessage.php b/messages/zh-CN/views_emails_NewMessage.php
deleted file mode 100644
index 51408ff3..00000000
--- a/messages/zh-CN/views_emails_NewMessage.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    '<strong>New</strong> message' => '新<strong>消息</strong>',
-    'Reply now' => '现在回复',
-    '<strong>New</strong> conversation' => '',
-];
diff --git a/messages/zh-CN/views_emails_NewMessageEntry.php b/messages/zh-CN/views_emails_NewMessageEntry.php
deleted file mode 100644
index 11aa0134..00000000
--- a/messages/zh-CN/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    '{senderName} created a new conversation {conversationTitle}' => '',
-    '{senderName} sent you a new message in {conversationTitle}' => '',
-];
diff --git a/messages/zh-CN/views_mail_adduser.php b/messages/zh-CN/views_mail_adduser.php
deleted file mode 100644
index 30615072..00000000
--- a/messages/zh-CN/views_mail_adduser.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Add more participants to your conversation...' => '添加更多人参与讨论...',
-];
diff --git a/messages/zh-CN/views_mail_create.php b/messages/zh-CN/views_mail_create.php
deleted file mode 100644
index 71f7b601..00000000
--- a/messages/zh-CN/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '新<strong>消息</strong>',
-  'Add recipients' => '增加收件人',
-  'Send' => '发送',
-);
diff --git a/messages/zh-CN/views_mail_edit.php b/messages/zh-CN/views_mail_edit.php
deleted file mode 100644
index ececf778..00000000
--- a/messages/zh-CN/views_mail_edit.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Edit message entry' => '编辑',
-];
diff --git a/messages/zh-CN/views_mail_index.php b/messages/zh-CN/views_mail_index.php
deleted file mode 100644
index 18db96cd..00000000
--- a/messages/zh-CN/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '对话',
-    'There are no messages yet.' => '还没有消息.',
-];
diff --git a/messages/zh-CN/views_mail_list.php b/messages/zh-CN/views_mail_list.php
deleted file mode 100644
index 3f5493e4..00000000
--- a/messages/zh-CN/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => '还没有消息.',
-);
diff --git a/messages/zh-CN/views_mail_show.php b/messages/zh-CN/views_mail_show.php
deleted file mode 100644
index 64918669..00000000
--- a/messages/zh-CN/views_mail_show.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    '<strong>Confirm</strong> deleting conversation' => '确认<strong>删除讨论</strong>',
-    '<strong>Confirm</strong> leaving conversation' => '确认<strong>退出讨论</strong>',
-    '<strong>Confirm</strong> message deletion' => '确认<strong>删除消息</strong>',
-    'Add user' => '添加用户',
-    'Cancel' => '取消',
-    'Delete' => '删除',
-    'Delete conversation' => '删除讨论',
-    'Do you really want to delete this conversation?' => '你真的要删除此讨论？',
-    'Do you really want to delete this message?' => '你真的要删除此消息？',
-    'Do you really want to leave this conversation?' => '你真的要退出此讨论？',
-    'Leave' => '退出',
-    'Leave conversation' => '退出讨论',
-    'There are no messages yet.' => '还没有消息.',
-    'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '',
-];
diff --git a/messages/zh-CN/views_mail_sidebar.php b/messages/zh-CN/views_mail_sidebar.php
deleted file mode 100644
index 8c515e3a..00000000
--- a/messages/zh-CN/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => '组',
-  'Members' => '成员',
-  'Spaces' => '版块',
-  'User Posts' => '用户的帖子',
-);
diff --git a/messages/zh-CN/views_mails_UserInviteSpace.php b/messages/zh-CN/views_mails_UserInviteSpace.php
deleted file mode 100644
index 59ae01e0..00000000
--- a/messages/zh-CN/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => '现在报名',
-);
diff --git a/messages/zh-CN/widgets_views_mailNotification.php b/messages/zh-CN/widgets_views_mailNotification.php
deleted file mode 100644
index 9d03d34f..00000000
--- a/messages/zh-CN/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Show all messages' => '显示所有的信息',
-];
diff --git a/messages/zh-CN/widgets_views_newMessageButton.php b/messages/zh-CN/widgets_views_newMessageButton.php
deleted file mode 100644
index 546cccf4..00000000
--- a/messages/zh-CN/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'Send message' => '发送消息',
-];
diff --git a/messages/zh-TW/base.php b/messages/zh-TW/base.php
index 09595d0d..732854a3 100644
--- a/messages/zh-TW/base.php
+++ b/messages/zh-TW/base.php
@@ -1,80 +1,116 @@
 <?php
-
 return [
-    '<strong>Confirm</strong> tag deletion' => '<strong>確認</strong>刪除標籤',
-    '<strong>Edit</strong> conversation tags' => '<strong>編輯</strong>對話標籤',
-    '<strong>Edit</strong> tag' => '<strong>編輯</strong>標籤',
-    '<strong>Manage</strong> conversation tags' => '<strong>管理</strong>對話標籤',
-    'A tag with the same name already exists.' => '已經存在相同名稱的標籤。',
-    'Add Tag' => '添加標籤',
-    'Allow others to send you private messages' => '允許其他人傳送私密訊息給您',
-    'Allow users to start new conversations' => '允許用戶開啟新的對話',
-    'Confirm' => '確認',
-    'Conversation' => '對話',
-    'Conversation tags can be used to filter conversations and are only visible to you.' => '對話標籤可以用來標記篩選對話，只有您自己可以看得到。',
-    'Conversations' => '對話',
-    'Do you really want to delete this tag?' => '您真的想要刪除這個標籤嗎?',
-    'Edit' => '編輯',
-    'Edit message...' => '編輯訊息....',
-    'Filters' => '篩選器',
-    'Here you can manage your private conversation tags.' => '在這裡您可以管理您個人的對話標籤。',
-    'Manage Tags' => '管理標籤',
-    'Max messages allowed per day' => '每天最多允許的訊息數',
-    'Message' => '訊息',
-    'Messages' => '訊息',
-    'My Tags' => '我的標籤',
-    'Participants' => '參與者',
-    'Pinned' => '已釘選',
-    'Receive Notifications when someone opens a new conversation.' => '每當有人開始新對話時接收通知。',
-    'Receive Notifications when someone sends you a message.' => '每當有人傳送訊息給您時接收通知。',
-    'Receive private messages' => '接收私密訊息',
-    'Search' => '搜尋',
-    'Show menu item in top Navigation' => '在頂部導覽列顯示選單項目',
-    'Start new conversations' => '開始一個新對話',
-    'Subject' => '主旨',
-    'Tags' => '標籤',
-    'This user is already participating in this conversation.' => '此用戶已經參加這個對話。',
-    'Title' => '標題',
-    'Unpin' => '取消釘選',
-    'User' => '用戶',
-    'Write a message...' => '寫一則新訊息...',
-    'You' => '您',
-    'You cannot send a message to yourself!' => '您無法傳送訊息給自己!',
-    'You\'ve exceeded your daily amount of new conversations.' => '您已經超出每日的新對話上限。',
-    '<strong>Messenger</strong> module configuration' => '',
-    'Add participants' => '',
-    'Advanced Messages Search' => '',
-    'Created At' => '',
-    'Created By' => '',
-    'Friday' => '',
-    'Is Originator' => '',
-    'Last Viewed' => '',
-    'Leave fields blank in order to disable a restriction.' => '',
-    'Mark Unread' => '',
-    'Max number of messages allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a new user per day' => '',
-    'Max number of new conversations allowed for a user per day' => '',
-    'Monday' => '',
-    'Pin' => '',
-    'Saturday' => '',
-    'Seperate restrictions for new users' => '',
-    'Sunday' => '',
-    'Thursday' => '',
-    'Today' => '',
-    'Tuesday' => '',
-    'Until a user is member since (days)' => '',
-    'Updated At' => '',
-    'Updated By' => '',
-    'Wednesday' => '',
-    'Yesterday' => '',
-    'You are not allowed to reply to users {userNames}!' => '',
-    'You are not allowed to start a conversation with this user.' => '',
-    'You are not allowed to start a conversation with {userName}!' => '',
-    'You cannot send a message without recipients!' => '',
-    'You joined the conversation.' => '',
-    'You left the conversation.' => '',
-    'edited' => '',
-    '{n,plural,=1{# other} other{# others}}' => '',
-    '{username} joined the conversation.' => '',
-    '{username} left the conversation.' => '',
+  '<strong>Confirm</strong> deleting conversation' => '<strong>確認</strong>刪除對話',
+  '<strong>Confirm</strong> leaving conversation' => '<strong>確認</strong>離開對話',
+  '<strong>Confirm</strong> message deletion' => '<strong>確認</strong>刪除訊息',
+  '<strong>Confirm</strong> tag deletion' => '<strong>確認</strong>刪除標籤',
+  '<strong>Edit</strong> conversation tags' => '<strong>編輯</strong>對話標籤',
+  '<strong>Edit</strong> tag' => '<strong>編輯</strong>標籤',
+  '<strong>Manage</strong> conversation tags' => '<strong>管理</strong>對話標籤',
+  '<strong>Messenger</strong> module configuration' => '',
+  '<strong>New</strong> conversation' => '<strong>新</strong>對話',
+  '<strong>New</strong> message' => '<strong>新</strong>訊息',
+  'A tag with the same name already exists.' => '已經存在相同名稱的標籤。',
+  'Add Tag' => '添加標籤',
+  'Add more participants to your conversation...' => '在您的對話串添加更多參與者...',
+  'Add participants' => '',
+  'Add recipients' => '添加收件人',
+  'Add user' => '添加使用者',
+  'Advanced Messages Search' => '',
+  'Allow others to send you private messages' => '允許其他人傳送私密訊息給您',
+  'Allow users to start new conversations' => '允許用戶開啟新的對話',
+  'Cancel' => '取消',
+  'Confirm' => '確認',
+  'Conversation' => '對話',
+  'Conversation tags can be used to filter conversations and are only visible to you.' => '對話標籤可以用來標記篩選對話，只有您自己可以看得到。',
+  'Conversations' => '對話',
+  'Created At' => '',
+  'Created By' => '',
+  'Delete' => '刪除',
+  'Delete conversation' => '刪除對話',
+  'Do you really want to delete this conversation?' => '您確定真的要刪除這個對話嗎?',
+  'Do you really want to delete this message?' => '您確定真的要刪除這個訊息嗎?',
+  'Do you really want to delete this tag?' => '您真的想要刪除這個標籤嗎?',
+  'Do you really want to leave this conversation?' => '您確定真的要離開這個對話嗎?',
+  'Edit' => '編輯',
+  'Edit message entry' => '編輯訊息',
+  'Edit message...' => '編輯訊息....',
+  'Filters' => '篩選器',
+  'Friday' => '',
+  'Groups' => '群組',
+  'Here you can manage your private conversation tags.' => '在這裡您可以管理您個人的對話標籤。',
+  'Is Originator' => '',
+  'Last Viewed' => '',
+  'Leave' => '離開',
+  'Leave conversation' => '離開對話',
+  'Leave fields blank in order to disable a restriction.' => '',
+  'Manage Tags' => '管理標籤',
+  'Mark Unread' => '',
+  'Max messages allowed per day' => '每天最多允許的訊息數',
+  'Max number of messages allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a new user per day' => '',
+  'Max number of new conversations allowed for a user per day' => '',
+  'Members' => '成員',
+  'Message' => '訊息',
+  'Messages' => '訊息',
+  'Monday' => '',
+  'My Tags' => '我的標籤',
+  'New conversation from {senderName}' => '來自{senderName}的新對話',
+  'New message from {senderName}' => '來自{senderName}的新訊息',
+  'New message in discussion from %displayName%' => '來自%displayName%的新訊息正在討論中',
+  'Participants' => '參與者',
+  'Pin' => '',
+  'Pinned' => '已釘選',
+  'Receive Notifications when someone opens a new conversation.' => '每當有人開始新對話時接收通知。',
+  'Receive Notifications when someone sends you a message.' => '每當有人傳送訊息給您時接收通知。',
+  'Receive private messages' => '接收私密訊息',
+  'Recipient' => '收件者',
+  'Reply now' => '現在回覆',
+  'Saturday' => '',
+  'Search' => '搜尋',
+  'Send' => '傳送',
+  'Send message' => '傳送訊息',
+  'Seperate restrictions for new users' => '',
+  'Show all messages' => '顯示所有訊息',
+  'Show menu item in top Navigation' => '在頂部導覽列顯示選單項目',
+  'Sign up now' => '現在參加',
+  'Spaces' => 'Space',
+  'Start new conversations' => '開始一個新對話',
+  'Subject' => '主旨',
+  'Sunday' => '',
+  'Tags' => '標籤',
+  'There are no messages yet.' => '目前還沒有訊息。',
+  'This user is already participating in this conversation.' => '此用戶已經參加這個對話。',
+  'Thursday' => '',
+  'Title' => '標題',
+  'Today' => '',
+  'Tuesday' => '',
+  'Unpin' => '取消釘選',
+  'Until a user is member since (days)' => '',
+  'Updated At' => '',
+  'Updated By' => '',
+  'User' => '用戶',
+  'User Posts' => '用戶的貼文',
+  'User {name} is already participating!' => '用戶{name}已經參加了!',
+  'Wednesday' => '',
+  'Write a message...' => '寫一則新訊息...',
+  'Yesterday' => '',
+  'You' => '您',
+  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '您無法參加這個對話。您已經被{userNames}封鎖。',
+  'You are not allowed to reply to users {userNames}!' => '',
+  'You are not allowed to send user {name} is already!' => '您無法傳送邀請給已經參加的用戶{name}!',
+  'You are not allowed to start a conversation with this user.' => '',
+  'You are not allowed to start a conversation with {userName}!' => '',
+  'You cannot send a email to yourself!' => '您無法傳送邀請給自己!',
+  'You cannot send a message to yourself!' => '您無法傳送訊息給自己!',
+  'You cannot send a message without recipients!' => '',
+  'You joined the conversation.' => '',
+  'You left the conversation.' => '',
+  'You\'ve exceeded your daily amount of new conversations.' => '您已經超出每日的新對話上限。',
+  'edited' => '',
+  '{n,plural,=1{# other} other{# others}}' => '',
+  '{senderName} created a new conversation {conversationTitle}' => '{senderName}建立了一個新的對話{conversationTitle}',
+  '{senderName} sent you a new message in {conversationTitle}' => '{senderName}在{conversationTitle}對話傳送給您一則新訊息',
+  '{username} joined the conversation.' => '',
+  '{username} left the conversation.' => '',
 ];
diff --git a/messages/zh-TW/forms_CreateMessageForm.php b/messages/zh-TW/forms_CreateMessageForm.php
deleted file mode 100644
index c5ebcf9e..00000000
--- a/messages/zh-TW/forms_CreateMessageForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Message' => '訊息',
-  'Recipient' => '收件者',
-  'Subject' => '主旨',
-  'Tags' => '標籤',
-);
diff --git a/messages/zh-TW/forms_InviteRecipientForm.php b/messages/zh-TW/forms_InviteRecipientForm.php
deleted file mode 100644
index 6392088a..00000000
--- a/messages/zh-TW/forms_InviteRecipientForm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Recipient' => '收件人',
-  'User {name} is already participating!' => '用戶{name}已經參加了!',
-  'You are not allowed to send user {name} is already!' => '您無法傳送邀請給已經參加的用戶{name}!',
-  'You cannot send a email to yourself!' => '您無法傳送邀請給自己!',
-);
diff --git a/messages/zh-TW/forms_ReplyMessageForm.php b/messages/zh-TW/forms_ReplyMessageForm.php
deleted file mode 100644
index 5a3bcbc4..00000000
--- a/messages/zh-TW/forms_ReplyMessageForm.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Message' => '訊息',
-);
diff --git a/messages/zh-TW/models_Message.php b/messages/zh-TW/models_Message.php
deleted file mode 100644
index 121f4095..00000000
--- a/messages/zh-TW/models_Message.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  'New conversation from {senderName}' => '來自{senderName}的新對話',
-  'New message from {senderName}' => '來自{senderName}的新訊息',
-);
diff --git a/messages/zh-TW/models_MessageEntry.php b/messages/zh-TW/models_MessageEntry.php
deleted file mode 100644
index 35c3c78c..00000000
--- a/messages/zh-TW/models_MessageEntry.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'New message in discussion from %displayName%' => '來自%displayName%的新訊息正在討論中',
-);
diff --git a/messages/zh-TW/views_emails_NewMessage.php b/messages/zh-TW/views_emails_NewMessage.php
deleted file mode 100644
index d6c876fb..00000000
--- a/messages/zh-TW/views_emails_NewMessage.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> conversation' => '<strong>新</strong>對話',
-  '<strong>New</strong> message' => '<strong>新</strong>訊息',
-  'Reply now' => '現在回覆',
-);
diff --git a/messages/zh-TW/views_emails_NewMessageEntry.php b/messages/zh-TW/views_emails_NewMessageEntry.php
deleted file mode 100644
index 577d3b9b..00000000
--- a/messages/zh-TW/views_emails_NewMessageEntry.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return array (
-  '{senderName} created a new conversation {conversationTitle}' => '{senderName}建立了一個新的對話{conversationTitle}',
-  '{senderName} sent you a new message in {conversationTitle}' => '{senderName}在{conversationTitle}對話傳送給您一則新訊息',
-);
diff --git a/messages/zh-TW/views_mail_adduser.php b/messages/zh-TW/views_mail_adduser.php
deleted file mode 100644
index a14fa1d4..00000000
--- a/messages/zh-TW/views_mail_adduser.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Add more participants to your conversation...' => '在您的對話串添加更多參與者...',
-);
diff --git a/messages/zh-TW/views_mail_create.php b/messages/zh-TW/views_mail_create.php
deleted file mode 100644
index 4ca72668..00000000
--- a/messages/zh-TW/views_mail_create.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-return array (
-  '<strong>New</strong> message' => '<strong>建立新</strong>訊息',
-  'Add recipients' => '添加收件人',
-  'Send' => '傳送',
-);
diff --git a/messages/zh-TW/views_mail_edit.php b/messages/zh-TW/views_mail_edit.php
deleted file mode 100644
index a10affad..00000000
--- a/messages/zh-TW/views_mail_edit.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Edit message entry' => '編輯訊息',
-);
diff --git a/messages/zh-TW/views_mail_index.php b/messages/zh-TW/views_mail_index.php
deleted file mode 100644
index 99235fa5..00000000
--- a/messages/zh-TW/views_mail_index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'Conversations' => '對話',
-    'There are no messages yet.' => '目前還沒有訊息。',
-];
diff --git a/messages/zh-TW/views_mail_list.php b/messages/zh-TW/views_mail_list.php
deleted file mode 100644
index 29e4bc84..00000000
--- a/messages/zh-TW/views_mail_list.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'There are no messages yet.' => '目前還沒有訊息。',
-);
diff --git a/messages/zh-TW/views_mail_show.php b/messages/zh-TW/views_mail_show.php
deleted file mode 100644
index c91c2557..00000000
--- a/messages/zh-TW/views_mail_show.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-return array (
-  '<strong>Confirm</strong> deleting conversation' => '<strong>確認</strong>刪除對話',
-  '<strong>Confirm</strong> leaving conversation' => '<strong>確認</strong>離開對話',
-  '<strong>Confirm</strong> message deletion' => '<strong>確認</strong>刪除訊息',
-  'Add user' => '添加使用者',
-  'Cancel' => '取消',
-  'Delete' => '刪除',
-  'Delete conversation' => '刪除對話',
-  'Do you really want to delete this conversation?' => '您確定真的要刪除這個對話嗎?',
-  'Do you really want to delete this message?' => '您確定真的要刪除這個訊息嗎?',
-  'Do you really want to leave this conversation?' => '您確定真的要離開這個對話嗎?',
-  'Leave' => '離開',
-  'Leave conversation' => '離開對話',
-  'There are no messages yet.' => '目前還沒有訊息。',
-  'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.' => '您無法參加這個對話。您已經被{userNames}封鎖。',
-);
diff --git a/messages/zh-TW/views_mail_sidebar.php b/messages/zh-TW/views_mail_sidebar.php
deleted file mode 100644
index 62ca5af0..00000000
--- a/messages/zh-TW/views_mail_sidebar.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-return array (
-  'Groups' => '群組',
-  'Members' => '成員',
-  'Spaces' => 'Space',
-  'User Posts' => '用戶的貼文',
-);
diff --git a/messages/zh-TW/views_mails_UserInviteSpace.php b/messages/zh-TW/views_mails_UserInviteSpace.php
deleted file mode 100644
index a36bdb61..00000000
--- a/messages/zh-TW/views_mails_UserInviteSpace.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Sign up now' => '現在參加',
-);
diff --git a/messages/zh-TW/widgets_views_mailNotification.php b/messages/zh-TW/widgets_views_mailNotification.php
deleted file mode 100644
index a21cb145..00000000
--- a/messages/zh-TW/widgets_views_mailNotification.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Show all messages' => '顯示所有訊息',
-);
diff --git a/messages/zh-TW/widgets_views_newMessageButton.php b/messages/zh-TW/widgets_views_newMessageButton.php
deleted file mode 100644
index a8c75844..00000000
--- a/messages/zh-TW/widgets_views_newMessageButton.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array (
-  'Send message' => '傳送訊息',
-);
diff --git a/models/MessageNotification.php b/models/MessageNotification.php
index c4ffddfe..14f46e4e 100644
--- a/models/MessageNotification.php
+++ b/models/MessageNotification.php
@@ -199,8 +199,8 @@ protected function getContent(User $user)
     protected function getHeadline(): string
     {
         return $this->isNewConversation
-            ? Yii::t('MailModule.views_emails_NewMessage', '<strong>New</strong> conversation')
-            : Yii::t('MailModule.views_emails_NewMessage', '<strong>New</strong> message');
+            ? Yii::t('MailModule.base', '<strong>New</strong> conversation')
+            : Yii::t('MailModule.base', '<strong>New</strong> message');
     }
 
     protected function getSubHeadline(): string
@@ -211,8 +211,8 @@ protected function getSubHeadline(): string
         ];
 
         return $this->isNewConversation
-            ? Yii::t('MailModule.views_emails_NewMessageEntry', '{senderName} created a new conversation {conversationTitle}', $params)
-            : Yii::t('MailModule.views_emails_NewMessageEntry', '{senderName} sent you a new message in {conversationTitle}', $params);
+            ? Yii::t('MailModule.base', '{senderName} created a new conversation {conversationTitle}', $params)
+            : Yii::t('MailModule.base', '{senderName} sent you a new message in {conversationTitle}', $params);
     }
 
     /**
@@ -248,8 +248,8 @@ protected function getSubject(User $user): string
         }
 
         return $this->isNewConversation
-            ? Yii::t('MailModule.models_Message', 'New conversation from {senderName}', $params)
-            : Yii::t('MailModule.models_Message', 'New message from {senderName}', $params);
+            ? Yii::t('MailModule.base', 'New conversation from {senderName}', $params)
+            : Yii::t('MailModule.base', 'New message from {senderName}', $params);
     }
 
 }
diff --git a/models/forms/CreateMessage.php b/models/forms/CreateMessage.php
index 6c1b439d..d59d5910 100644
--- a/models/forms/CreateMessage.php
+++ b/models/forms/CreateMessage.php
@@ -66,10 +66,10 @@ public function rules()
     public function attributeLabels()
     {
         return [
-            'recipient' => Yii::t('MailModule.forms_CreateMessageForm', 'Recipient'),
-            'tags' => Yii::t('MailModule.forms_CreateMessageForm', 'Tags'),
-            'title' => Yii::t('MailModule.forms_CreateMessageForm', 'Subject'),
-            'message' => Yii::t('MailModule.forms_CreateMessageForm', 'Message'),
+            'recipient' => Yii::t('MailModule.base', 'Recipient'),
+            'tags' => Yii::t('MailModule.base', 'Tags'),
+            'title' => Yii::t('MailModule.base', 'Subject'),
+            'message' => Yii::t('MailModule.base', 'Message'),
         ];
     }
 
diff --git a/models/forms/InviteParticipantForm.php b/models/forms/InviteParticipantForm.php
index 6e9cfaa4..03bfbe3b 100644
--- a/models/forms/InviteParticipantForm.php
+++ b/models/forms/InviteParticipantForm.php
@@ -54,7 +54,7 @@ public function rules()
     public function attributeLabels()
     {
         return [
-            'recipient' => Yii::t('MailModule.forms_InviteRecipientForm', 'Recipient'),
+            'recipient' => Yii::t('MailModule.base', 'Recipient'),
         ];
     }
 
@@ -71,11 +71,11 @@ public function checkRecipient($attribute, $params)
             if ($user) {
                 $name = Html::encode($user->getDisplayName());
                 if (Yii::$app->user->identity->is($user)) {
-                    $this->addError($attribute, Yii::t('MailModule.forms_InviteRecipientForm', "You cannot send a email to yourself!"));
+                    $this->addError($attribute, Yii::t('MailModule.base', "You cannot send a email to yourself!"));
                 } elseif ($this->message->isParticipant($user)) {
-                    $this->addError($attribute, Yii::t('MailModule.forms_InviteRecipientForm', "User {name} is already participating!", ['name' => $name]));
+                    $this->addError($attribute, Yii::t('MailModule.base', "User {name} is already participating!", ['name' => $name]));
                 } elseif (!$user->can(SendMail::class) && !Yii::$app->user->isAdmin()) {
-                    $this->addError($attribute, Yii::t('MailModule.forms_InviteRecipientForm', "You are not allowed to send user {name} is already!", ['name' => $name]));
+                    $this->addError($attribute, Yii::t('MailModule.base', "You are not allowed to send user {name} is already!", ['name' => $name]));
                 } else {
                     $this->recipientUsers[] = $user;
                 }
diff --git a/models/forms/ReplyForm.php b/models/forms/ReplyForm.php
index b793275f..78aabf67 100644
--- a/models/forms/ReplyForm.php
+++ b/models/forms/ReplyForm.php
@@ -62,7 +62,7 @@ public function validateRecipients($attribute)
     public function attributeLabels()
     {
         return [
-            'message' => Yii::t('MailModule.forms_ReplyMessageForm', 'Message'),
+            'message' => Yii::t('MailModule.base', 'Message'),
         ];
     }
 
diff --git a/views/emails/NewMessage.php b/views/emails/NewMessage.php
index 7ae6f4c1..2ab27d13 100644
--- a/views/emails/NewMessage.php
+++ b/views/emails/NewMessage.php
@@ -162,7 +162,7 @@
 
                                                         <span style="color: <?= $this->theme->variable('text-color-contrast') ?>; font-weight: 300;">
                                                             <a href="<?= Url::toMessenger($message, true) ?>" style="text-decoration: none; color: <?= $this->theme->variable('text-color-contrast') ?>; font-weight: 300;">
-                                                                <strong><?= Yii::t('MailModule.views_emails_NewMessage', 'Reply now'); ?></strong>
+                                                                <strong><?= Yii::t('MailModule.base', 'Reply now'); ?></strong>
                                                             </a>
                                                         </span>
                                                     </td>
diff --git a/views/emails/plaintext/NewMessage.php b/views/emails/plaintext/NewMessage.php
index 0504065f..4c45ac45 100644
--- a/views/emails/plaintext/NewMessage.php
+++ b/views/emails/plaintext/NewMessage.php
@@ -23,4 +23,4 @@
 <?= strip_tags($content) ?>
 
 
-<?= strip_tags(Yii::t('MailModule.views_emails_NewMessage', 'Reply now')) ?>: <?= urldecode(Url::toMessenger($message, true)) ?>
+<?= strip_tags(Yii::t('MailModule.base', 'Reply now')) ?>: <?= urldecode(Url::toMessenger($message, true)) ?>
diff --git a/views/mail/_conversation_sidebar.php b/views/mail/_conversation_sidebar.php
index 99132cf6..9c3f2287 100644
--- a/views/mail/_conversation_sidebar.php
+++ b/views/mail/_conversation_sidebar.php
@@ -14,7 +14,7 @@
 <div id="mail-conversation-overview" class="panel panel-default mail-inbox-messages">
     <div class="panel-heading">
         <a data-action-click="mail.inbox.toggleInbox">
-            <span class="visible-xs-inline"><?=Icon::get('bars')?></span> <?= Yii::t('MailModule.views_mail_index', 'Conversations') ?>
+            <span class="visible-xs-inline"><?=Icon::get('bars')?></span> <?= Yii::t('MailModule.base', 'Conversations') ?>
         </a>
         <?php if ($canStartConversation) : ?>
             <?= NewMessageButton::widget(['icon' => 'plus', 'label' => '', 'id' => 'mail-conversation-create-button'])?>
diff --git a/views/mail/conversation.php b/views/mail/conversation.php
index 6845126f..e5d240a3 100644
--- a/views/mail/conversation.php
+++ b/views/mail/conversation.php
@@ -28,7 +28,7 @@
     <?php if ($message === null) : ?>
 
         <div class="panel-body">
-            <?= Yii::t('MailModule.views_mail_show', 'There are no messages yet.'); ?>
+            <?= Yii::t('MailModule.base', 'There are no messages yet.'); ?>
         </div>
 
     <?php else : ?>
@@ -50,7 +50,7 @@
         <div id="'mail-create-form-<?= $message->id ?>" class="mail-message-form content_create">
             <?php if ($message->isBlocked()) : ?>
                 <div class="alert alert-danger">
-                    <?= Yii::t('MailModule.views_mail_show', 'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.', [
+                    <?= Yii::t('MailModule.base', 'You are not allowed to participate in this conversation. You have been blocked by: {userNames}.', [
                         'userNames' => implode(', ', $message->getBlockerNames())
                     ]); ?>
                 </div>
diff --git a/views/mail/create.php b/views/mail/create.php
index 5115567c..0b7f1cd5 100644
--- a/views/mail/create.php
+++ b/views/mail/create.php
@@ -28,7 +28,7 @@
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h4 id="myModalLabel" class="modal-title">
-            <?= Yii::t('MailModule.views_mail_create', '<strong>New</strong> message') ?>
+            <?= Yii::t('MailModule.base', '<strong>New</strong> message') ?>
         </h4>
     </div>
 
@@ -37,7 +37,7 @@
         <?= $form->field($model, 'recipient')->widget(UserPickerField::class,
             [
                 'url' => Url::toSearchNewParticipants(),
-                'placeholder' => Yii::t('MailModule.views_mail_create', 'Add recipients'),
+                'placeholder' => Yii::t('MailModule.base', 'Add recipients'),
             ]
         )->label(false) ?>
 
@@ -78,7 +78,7 @@
     <div class="modal-footer">
 
         <?= ModalButton::cancel() ?>
-        <?= ModalButton::submitModal(Url::toCreateConversation(), Yii::t('MailModule.views_mail_create', 'Send')) ?>
+        <?= ModalButton::submitModal(Url::toCreateConversation(), Yii::t('MailModule.base', 'Send')) ?>
 
     </div>
 
diff --git a/views/mail/editEntry.php b/views/mail/editEntry.php
index 42fdd551..7401be63 100644
--- a/views/mail/editEntry.php
+++ b/views/mail/editEntry.php
@@ -18,7 +18,7 @@
 
 <?php ModalDialog::begin([
     'id' => 'mail-edit',
-    'header' => Yii::t("MailModule.views_mail_edit", "Edit message entry"),
+    'header' => Yii::t("MailModule.base", "Edit message entry"),
     'size' => 'large',
 ]) ?>
 
@@ -67,10 +67,10 @@
         <div class="col-md-3">
             <?= Button::danger(Yii::t('base', 'Delete'))->right()->options(['data-entry-id' => $entry->id])
                 ->action('mail.conversation.deleteEntry')
-                ->confirm(Yii::t('MailModule.views_mail_show', '<strong>Confirm</strong> message deletion'),
-                    Yii::t('MailModule.views_mail_show', 'Do you really want to delete this message?'),
-                    Yii::t('MailModule.views_mail_show', 'Delete'),
-                    Yii::t('MailModule.views_mail_show', 'Cancel')) ?>
+                ->confirm(Yii::t('MailModule.base', '<strong>Confirm</strong> message deletion'),
+                    Yii::t('MailModule.base', 'Do you really want to delete this message?'),
+                    Yii::t('MailModule.base', 'Delete'),
+                    Yii::t('MailModule.base', 'Cancel')) ?>
         </div>
     </div>
 </div>
diff --git a/views/mail/notificationList.php b/views/mail/notificationList.php
index 97be504a..85a7cf1b 100644
--- a/views/mail/notificationList.php
+++ b/views/mail/notificationList.php
@@ -10,5 +10,5 @@
         <?= InboxMessagePreview::widget(['userMessage' => $userMessage]) ?>
     <?php endforeach; ?>
 <?php else: ?>
-    <li class="placeholder"> <?= Yii::t('MailModule.views_mail_list', 'There are no messages yet.'); ?></li>
-<?php endif; ?>
\ No newline at end of file
+    <li class="placeholder"> <?= Yii::t('MailModule.base', 'There are no messages yet.'); ?></li>
+<?php endif; ?>
diff --git a/widgets/NewMessageButton.php b/widgets/NewMessageButton.php
index cd7b40f7..11747c11 100644
--- a/widgets/NewMessageButton.php
+++ b/widgets/NewMessageButton.php
@@ -88,7 +88,7 @@ public function getLabel()
         }
 
         return ($this->guid)
-            ? Yii::t('MailModule.widgets_views_newMessageButton', 'Send message')
+            ? Yii::t('MailModule.base', 'Send message')
             : Yii::t('MailModule.base', 'Message');
     }
 }
diff --git a/widgets/views/conversationSettingsMenu.php b/widgets/views/conversationSettingsMenu.php
index 1519e3c6..908b4d79 100644
--- a/widgets/views/conversationSettingsMenu.php
+++ b/widgets/views/conversationSettingsMenu.php
@@ -12,15 +12,15 @@
 /* @var $canAddParticipant bool */
 
 if (!$isSingleParticipant) {
-    $leaveLinkText = Yii::t('MailModule.views_mail_show', 'Leave conversation');
-    $leaveConfirmTitle =  Yii::t('MailModule.views_mail_show', '<strong>Confirm</strong> leaving conversation');
-    $leaveConfirmText =  Yii::t('MailModule.views_mail_show', 'Do you really want to leave this conversation?');
-    $leaveConfirmButtonText = Yii::t('MailModule.views_mail_show', 'Leave');
+    $leaveLinkText = Yii::t('MailModule.base', 'Leave conversation');
+    $leaveConfirmTitle =  Yii::t('MailModule.base', '<strong>Confirm</strong> leaving conversation');
+    $leaveConfirmText =  Yii::t('MailModule.base', 'Do you really want to leave this conversation?');
+    $leaveConfirmButtonText = Yii::t('MailModule.base', 'Leave');
 } else {
-    $leaveLinkText = Yii::t('MailModule.views_mail_show', 'Delete conversation');
-    $leaveConfirmTitle = Yii::t('MailModule.views_mail_show', '<strong>Confirm</strong> deleting conversation');
-    $leaveConfirmText = Yii::t('MailModule.views_mail_show', 'Do you really want to delete this conversation?');
-    $leaveConfirmButtonText = Yii::t('MailModule.views_mail_show', 'Delete');
+    $leaveLinkText = Yii::t('MailModule.base', 'Delete conversation');
+    $leaveConfirmTitle = Yii::t('MailModule.base', '<strong>Confirm</strong> deleting conversation');
+    $leaveConfirmText = Yii::t('MailModule.base', 'Do you really want to delete this conversation?');
+    $leaveConfirmButtonText = Yii::t('MailModule.base', 'Delete');
 }
 ?>
 <div class="dropdown" style="display:inline-block">
@@ -40,7 +40,7 @@
 
         <?php if ($canAddParticipant) : ?>
             <li>
-                <?= ModalButton::none(Yii::t('MailModule.views_mail_show', 'Add user'))->icon('user-plus')
+                <?= ModalButton::none(Yii::t('MailModule.base', 'Add user'))->icon('user-plus')
                     ->load(Url::toAddParticipant($message))->link()->loader(false) ?>
             </li>
         <?php endif; ?>
diff --git a/widgets/views/inbox.php b/widgets/views/inbox.php
index 3922aa9f..2742e2f2 100644
--- a/widgets/views/inbox.php
+++ b/widgets/views/inbox.php
@@ -13,7 +13,7 @@
 
 <?= Html::beginTag('ul', $options) ?>
     <?php if (empty($userMessages)) : ?>
-        <li class="placeholder"><?= Yii::t('MailModule.views_mail_index', 'There are no messages yet.') ?></li>
+        <li class="placeholder"><?= Yii::t('MailModule.base', 'There are no messages yet.') ?></li>
     <?php else: ?>
         <?php foreach ($userMessages as $userMessage) : ?>
             <?= InboxMessagePreview::widget(['userMessage' => $userMessage]) ?>
diff --git a/widgets/views/notificationInbox.php b/widgets/views/notificationInbox.php
index c6846cba..9adc55fb 100644
--- a/widgets/views/notificationInbox.php
+++ b/widgets/views/notificationInbox.php
@@ -30,9 +30,9 @@
         <li>
             <div class="dropdown-footer">
                 <a class="btn btn-default col-md-12" href="<?= Url::toMessenger() ?>">
-                    <?= Yii::t('MailModule.widgets_views_mailNotification', 'Show all messages') ?>
+                    <?= Yii::t('MailModule.base', 'Show all messages') ?>
                 </a>
             </div>
         </li>
     </ul>
-</div>
\ No newline at end of file
+</div>