diff --git a/app/call_center/app_languages.php b/app/call_center/app_languages.php
index 567bda1667..021dde0045 100644
--- a/app/call_center/app_languages.php
+++ b/app/call_center/app_languages.php
@@ -100,6 +100,17 @@ $text['title-call_center_agent_add']['sv-se'] = "Call Center Agent";
 $text['title-call_center_agent_add']['uk'] = "Оператор кол-центра";
 $text['title-call_center_agent_add']['de-at'] = "Callcenter Agenten";
 
+$text['title-call_center']['en-us'] = "Call Center";
+$text['title-call_center']['es-cl'] = "Centro de Llamadas";
+$text['title-call_center']['fr-fr'] = "Centre d'appel";
+$text['title-call_center']['fr-ca'] = "Centre d' appels";
+$text['title-call_center']['pt-pt'] = "Centro de Chamadas";
+$text['title-call_center']['pt-br'] = "Centro de chamadas";
+$text['title-call_center']['pl'] = "Call Center ";
+$text['title-call_center']['sv-se'] = "Call Center";
+$text['title-call_center']['uk'] = "Кол-центр";
+$text['title-call_center']['de-at'] = "Callcenter";
+
 $text['option-usring']['en-us'] = "us-ring";
 $text['option-usring']['es-cl'] = "us-ring";
 $text['option-usring']['pt-pt'] = "us-ring";
diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php
index 2ca4fef99a..9c104bff98 100644
--- a/app/conference_centers/app_languages.php
+++ b/app/conference_centers/app_languages.php
@@ -1,64 +1,64 @@
 <?php
 
-$text['title-conference-sessions']['en-us'] = "Conference Sessions";
-$text['title-conference-sessions']['es-cl'] = "Sesiones de Conferencia";
-$text['title-conference-sessions']['pt-pt'] = "Sessões";
-$text['title-conference-sessions']['fr-fr'] = "Sessions de conférences";
-$text['title-conference-sessions']['pt-br'] = "Sessões";
-$text['title-conference-sessions']['pl'] = "Sesje Konferencyjne";
-$text['title-conference-sessions']['sv-se'] = "Konferenssessioner";
-$text['title-conference-sessions']['uk'] = "Сесії конференції";
-$text['title-conference-sessions']['de-at'] = "Konferenz Sitzungen";
+$text['title-conference_sessions']['en-us'] = "Conference Sessions";
+$text['title-conference_sessions']['es-cl'] = "Sesiones de Conferencia";
+$text['title-conference_sessions']['pt-pt'] = "Sessões";
+$text['title-conference_sessions']['fr-fr'] = "Sessions de conférences";
+$text['title-conference_sessions']['pt-br'] = "Sessões";
+$text['title-conference_sessions']['pl'] = "Sesje Konferencyjne";
+$text['title-conference_sessions']['sv-se'] = "Konferenssessioner";
+$text['title-conference_sessions']['uk'] = "Сесії конференції";
+$text['title-conference_sessions']['de-at'] = "Konferenz Sitzungen";
 
-$text['title-conference-session-details']['en-us'] = "Conference Session Details";
-$text['title-conference-session-details']['es-cl'] = "Detalles de la Sesión de Conferencia";
-$text['title-conference-session-details']['pt-pt'] = "Detalhes da Sessão de Conferência";
-$text['title-conference-session-details']['fr-fr'] = "Détails de Sessions de Conference";
-$text['title-conference-session-details']['pt-br'] = "Detalhes da sessão de conferência";
-$text['title-conference-session-details']['pl'] = "Szczególy sesji konferencyjnej";
-$text['title-conference-session-details']['sv-se'] = "Konferens Session Detaljer";
-$text['title-conference-session-details']['uk'] = "Деталі сесії конференції";
-$text['title-conference-session-details']['de-at'] = "Konferenz Sitzungs Details";
+$text['title-conference_session_details']['en-us'] = "Conference Session Details";
+$text['title-conference_session_details']['es-cl'] = "Detalles de la Sesión de Conferencia";
+$text['title-conference_session_details']['pt-pt'] = "Detalhes da Sessão de Conferência";
+$text['title-conference_session_details']['fr-fr'] = "Détails de Sessions de Conference";
+$text['title-conference_session_details']['pt-br'] = "Detalhes da sessão de conferência";
+$text['title-conference_session_details']['pl'] = "Szczególy sesji konferencyjnej";
+$text['title-conference_session_details']['sv-se'] = "Konferens Session Detaljer";
+$text['title-conference_session_details']['uk'] = "Деталі сесії конференції";
+$text['title-conference_session_details']['de-at'] = "Konferenz Sitzungs Details";
 
-$text['title-conference-rooms']['en-us'] = "Conference Rooms";
-$text['title-conference-rooms']['es-cl'] = "Salas de conferencia";
-$text['title-conference-rooms']['pt-pt'] = "Salas de Conferência";
-$text['title-conference-rooms']['fr-fr'] = "Salles de conférence";
-$text['title-conference-rooms']['pt-br'] = "Salas de conferência";
-$text['title-conference-rooms']['pl'] = "Pokoje konferencynje";
-$text['title-conference-rooms']['sv-se'] = "Konferensrum";
-$text['title-conference-rooms']['uk'] = "Конференц-зали";
-$text['title-conference-rooms']['de-at'] = "Konferenzräume";
+$text['title-conference_rooms']['en-us'] = "Conference Rooms";
+$text['title-conference_rooms']['es-cl'] = "Salas de conferencia";
+$text['title-conference_rooms']['pt-pt'] = "Salas de Conferência";
+$text['title-conference_rooms']['fr-fr'] = "Salles de conférence";
+$text['title-conference_rooms']['pt-br'] = "Salas de conferência";
+$text['title-conference_rooms']['pl'] = "Pokoje konferencynje";
+$text['title-conference_rooms']['sv-se'] = "Konferensrum";
+$text['title-conference_rooms']['uk'] = "Конференц-зали";
+$text['title-conference_rooms']['de-at'] = "Konferenzräume";
 
-$text['title-conference-room']['en-us'] = "Conference Room";
-$text['title-conference-room']['es-cl'] = "Sala de conferencia";
-$text['title-conference-room']['pt-pt'] = "Sala de Conferência";
-$text['title-conference-room']['fr-fr'] = "Salle de conférence";
-$text['title-conference-room']['pt-br'] = "Sala de conferência";
-$text['title-conference-room']['pl'] = "Pokoje konferencynje";
-$text['title-conference-room']['sv-se'] = "Konferensrum";
-$text['title-conference-room']['uk'] = "Конференц-зал";
-$text['title-conference-room']['de-at'] = "Konferenzraum";
+$text['title-conference_room']['en-us'] = "Conference Room";
+$text['title-conference_room']['es-cl'] = "Sala de conferencia";
+$text['title-conference_room']['pt-pt'] = "Sala de Conferência";
+$text['title-conference_room']['fr-fr'] = "Salle de conférence";
+$text['title-conference_room']['pt-br'] = "Sala de conferência";
+$text['title-conference_room']['pl'] = "Pokoje konferencynje";
+$text['title-conference_room']['sv-se'] = "Konferensrum";
+$text['title-conference_room']['uk'] = "Конференц-зал";
+$text['title-conference_room']['de-at'] = "Konferenzraum";
 
-$text['title-conference-centers']['en-us'] = "Conference Centers";
-$text['title-conference-centers']['es-cl'] = "Centro de Conferencias";
-$text['title-conference-centers']['pt-pt'] = "Centro de Conferências";
-$text['title-conference-centers']['fr-fr'] = "Conférences";
-$text['title-conference-centers']['pt-br'] = "Centro de conferências ";
-$text['title-conference-centers']['pl'] = "Centra Konferencyjne";
-$text['title-conference-centers']['sv-se'] = "Konferenscenter";
-$text['title-conference-centers']['uk'] = "Конференц-центри";
-$text['title-conference-centers']['de-at'] = "Konferenz Zentralen";
+$text['title-conference_centers']['en-us'] = "Conference Centers";
+$text['title-conference_centers']['es-cl'] = "Centro de Conferencias";
+$text['title-conference_centers']['pt-pt'] = "Centro de Conferências";
+$text['title-conference_centers']['fr-fr'] = "Conférences";
+$text['title-conference_centers']['pt-br'] = "Centro de conferências ";
+$text['title-conference_centers']['pl'] = "Centra Konferencyjne";
+$text['title-conference_centers']['sv-se'] = "Konferenscenter";
+$text['title-conference_centers']['uk'] = "Конференц-центри";
+$text['title-conference_centers']['de-at'] = "Konferenz Zentralen";
 
-$text['title-conference-center']['en-us'] = "Conference Center";
-$text['title-conference-center']['es-cl'] = "Centro de Conferencia";
-$text['title-conference-center']['pt-pt'] = "Centro de Conferência";
-$text['title-conference-center']['fr-fr'] = "Conférence";
-$text['title-conference-center']['pt-br'] = "Centro de conferência";
-$text['title-conference-center']['pl'] = "Centrum Konferencyjne";
-$text['title-conference-center']['sv-se'] = "Konferenscenter";
-$text['title-conference-center']['uk'] = "Конференц-центр";
-$text['title-conference-center']['de-at'] = "Konferenz Zentrale";
+$text['title-conference_center']['en-us'] = "Conference Center";
+$text['title-conference_center']['es-cl'] = "Centro de Conferencia";
+$text['title-conference_center']['pt-pt'] = "Centro de Conferência";
+$text['title-conference_center']['fr-fr'] = "Conférence";
+$text['title-conference_center']['pt-br'] = "Centro de conferência";
+$text['title-conference_center']['pl'] = "Centrum Konferencyjne";
+$text['title-conference_center']['sv-se'] = "Konferenscenter";
+$text['title-conference_center']['uk'] = "Конференц-центр";
+$text['title-conference_center']['de-at'] = "Konferenz Zentrale";
 
 $text['message-update']['en-us'] = "Update Completed";
 $text['message-update']['es-cl'] = "Actualización Completada";
@@ -130,25 +130,25 @@ $text['message-add']['sv-se'] = "Tillagd";
 $text['message-add']['uk'] = "Додано";
 $text['message-add']['de-at'] = "Erfolgreich hinzugefügt";
 
-$text['label-wait-moderator']['en-us'] = "Secure";
-$text['label-wait-moderator']['es-cl'] = "Seguro";
-$text['label-wait-moderator']['pt-pt'] = "Proteger";
-$text['label-wait-moderator']['fr-fr'] = "Assurer";
-$text['label-wait-moderator']['pt-br'] = "Proteger";
-$text['label-wait-moderator']['pl'] = "Zabezpieczenie";
-$text['label-wait-moderator']['sv-se'] = "Säker";
-$text['label-wait-moderator']['uk'] = "Захищено";
-$text['label-wait-moderator']['de-at'] = "Geschützt";
+$text['label-wait_moderator']['en-us'] = "Secure";
+$text['label-wait_moderator']['es-cl'] = "Seguro";
+$text['label-wait_moderator']['pt-pt'] = "Proteger";
+$text['label-wait_moderator']['fr-fr'] = "Assurer";
+$text['label-wait_moderator']['pt-br'] = "Proteger";
+$text['label-wait_moderator']['pl'] = "Zabezpieczenie";
+$text['label-wait_moderator']['sv-se'] = "Säker";
+$text['label-wait_moderator']['uk'] = "Захищено";
+$text['label-wait_moderator']['de-at'] = "Geschützt";
 
-$text['label-wait-for-moderator']['en-us'] = "Wait for Moderator";
-$text['label-wait-for-moderator']['es-cl'] = "Esperar un Moderador";
-$text['label-wait-for-moderator']['pt-pt'] = "Esperar pelo Moderador";
-$text['label-wait-for-moderator']['fr-fr'] = "Attente du Modérateur";
-$text['label-wait-for-moderator']['pt-br'] = "Esperar pelo administrador";
-$text['label-wait-for-moderator']['pl'] = "Zaczekaj na moderatora";
-$text['label-wait-for-moderator']['sv-se'] = "Vänta på Moderator";
-$text['label-wait-for-moderator']['uk'] = "Очікування на модератора";
-$text['label-wait-for-moderator']['de-at'] = "Warte auf Moderator";
+$text['label-wait_for_moderator']['en-us'] = "Wait for Moderator";
+$text['label-wait_for_moderator']['es-cl'] = "Esperar un Moderador";
+$text['label-wait_for_moderator']['pt-pt'] = "Esperar pelo Moderador";
+$text['label-wait_for_moderator']['fr-fr'] = "Attente du Modérateur";
+$text['label-wait_for_moderator']['pt-br'] = "Esperar pelo administrador";
+$text['label-wait_for_moderator']['pl'] = "Zaczekaj na moderatora";
+$text['label-wait_for_moderator']['sv-se'] = "Vänta på Moderator";
+$text['label-wait_for_moderator']['uk'] = "Очікування на модератора";
+$text['label-wait_for_moderator']['de-at'] = "Warte auf Moderator";
 
 $text['label-view']['en-us'] = "View";
 $text['label-view']['es-cl'] = "Ver";
@@ -570,15 +570,15 @@ $text['label-delete']['sv-se'] = "Ta Bort";
 $text['label-delete']['uk'] = "Видалити";
 $text['label-delete']['de-at'] = "Löschen";
 
-$text['label-conference-name']['en-us'] = "Conference Name";
-$text['label-conference-name']['es-cl'] = "Nombre de la conferencia";
-$text['label-conference-name']['pt-pt'] = "Nome da Conferência";
-$text['label-conference-name']['fr-fr'] = "Nom de la Conférence";
-$text['label-conference-name']['pt-br'] = "Nome da conferência";
-$text['label-conference-name']['pl'] = "Nazwa konferencji";
-$text['label-conference-name']['sv-se'] = "Konferens Namn";
-$text['label-conference-name']['uk'] = "Назва конференції";
-$text['label-conference-name']['de-at'] = "Konferenz Name";
+$text['label-conference_name']['en-us'] = "Conference Name";
+$text['label-conference_name']['es-cl'] = "Nombre de la conferencia";
+$text['label-conference_name']['pt-pt'] = "Nome da Conferência";
+$text['label-conference_name']['fr-fr'] = "Nom de la Conférence";
+$text['label-conference_name']['pt-br'] = "Nome da conferência";
+$text['label-conference_name']['pl'] = "Nazwa konferencji";
+$text['label-conference_name']['sv-se'] = "Konferens Namn";
+$text['label-conference_name']['uk'] = "Назва конференції";
+$text['label-conference_name']['de-at'] = "Konferenz Name";
 
 $text['label-cdr']['en-us'] = "CDR";
 $text['label-cdr']['es-cl'] = "CDR";
@@ -690,15 +690,15 @@ $text['description-name']['sv-se'] = "Ange namn på konferenscenter.";
 $text['description-name']['uk'] = "Введіть назву конференц-ценру";
 $text['description-name']['de-at'] = "Geben Sie den Namen der Konferenz Zentrale an.";
 
-$text['description-moderator-pin']['en-us'] = "Pin number for the moderators.";
-$text['description-moderator-pin']['es-cl'] = "Número PIN para moderadores";
-$text['description-moderator-pin']['pt-pt'] = "Número PIN para os moderadores.";
-$text['description-moderator-pin']['fr-fr'] = "Code PIN des modérateurs.";
-$text['description-moderator-pin']['pt-br'] = "Número PIN para os usuários";
-$text['description-moderator-pin']['pl'] = "Numer PIN dla moderatorów";
-$text['description-moderator-pin']['sv-se'] = "PIN kod för moderator.";
-$text['description-moderator-pin']['uk'] = "PIN-код для  модераторів.";
-$text['description-moderator-pin']['de-at'] = "PIN Nummer für Moderatoren.";
+$text['description-moderator_pin']['en-us'] = "Pin number for the moderators.";
+$text['description-moderator_pin']['es-cl'] = "Número PIN para moderadores";
+$text['description-moderator_pin']['pt-pt'] = "Número PIN para os moderadores.";
+$text['description-moderator_pin']['fr-fr'] = "Code PIN des modérateurs.";
+$text['description-moderator_pin']['pt-br'] = "Número PIN para os usuários";
+$text['description-moderator_pin']['pl'] = "Numer PIN dla moderatorów";
+$text['description-moderator_pin']['sv-se'] = "PIN kod för moderator.";
+$text['description-moderator_pin']['uk'] = "PIN-код для  модераторів.";
+$text['description-moderator_pin']['de-at'] = "PIN Nummer für Moderatoren.";
 
 $text['description-greeting']['en-us'] = "Select the greeting that is played before joining the conference room.";
 $text['description-greeting']['es-cl'] = "Seleccione el saludo que se juega antes de unirse a la sala de conferencias.";
@@ -740,45 +740,45 @@ $text['description-description']['sv-se'] = "Ange en beskrivning för gateway:en
 $text['description-description']['uk'] = "Введіть опис, якщо це необхідно.";
 $text['description-description']['de-at'] = "Falls gewünscht, geben Sie eine Beschreibung an.";
 
-$text['description-conference-sessions']['en-us'] = "Conference Sessions are log details about the conferences.";
-$text['description-conference-sessions']['es-cl'] = "Las Sesiones de Conferencia son un registro detallado de las conferencias.";
-$text['description-conference-sessions']['pt-pt'] = "As sessões das conferências representam os detalhes dos logs das conferências.";
-$text['description-conference-sessions']['fr-fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
-$text['description-conference-sessions']['pt-br'] = "Logs das sessões de conferência";
-$text['description-conference-sessions']['pl'] = "Sesje Konferencyjne są to logi o rozmowach konferencyjnych.";
-$text['description-conference-sessions']['sv-se'] = "Konferenssessioner är detaljerad log om konferenserna.";
-$text['description-conference-sessions']['uk'] = "Сесії конференції є даних журналу про конференції.";
-$text['description-conference-sessions']['de-at'] = "Konferenz Sitzungen sind Protokolle der letzten Konferenzen.";
+$text['description-conference_sessions']['en-us'] = "Conference Sessions are log details about the conferences.";
+$text['description-conference_sessions']['es-cl'] = "Las Sesiones de Conferencia son un registro detallado de las conferencias.";
+$text['description-conference_sessions']['pt-pt'] = "As sessões das conferências representam os detalhes dos logs das conferências.";
+$text['description-conference_sessions']['fr-fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
+$text['description-conference_sessions']['pt-br'] = "Logs das sessões de conferência";
+$text['description-conference_sessions']['pl'] = "Sesje Konferencyjne są to logi o rozmowach konferencyjnych.";
+$text['description-conference_sessions']['sv-se'] = "Konferenssessioner är detaljerad log om konferenserna.";
+$text['description-conference_sessions']['uk'] = "Сесії конференції є даних журналу про конференції.";
+$text['description-conference_sessions']['de-at'] = "Konferenz Sitzungen sind Protokolle der letzten Konferenzen.";
 
-$text['description-conference-session-details']['en-us'] = "Conference Sessions are log details of the conferences calls.";
-$text['description-conference-session-details']['es-cl'] = "Las Sesiones de Conferencia son un registro detallado de las llamadas de conferencia";
-$text['description-conference-session-details']['pt-pt'] = "As sessões das conferências representam os detalhes dos logs das chamadas.";
-$text['description-conference-session-details']['fr-fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
-$text['description-conference-session-details']['pt-br'] = "Logs das sessões de camada";
-$text['description-conference-session-details']['pl'] = "Sesje Konferencyjne są to logi o rozmowach konferencyjnych.";
-$text['description-conference-session-details']['sv-se'] = "Konferenssessioner är detaljerad log om konferenserna.";
-$text['description-conference-session-details']['uk'] = "Сесії конференції є відомості з журналу викликів конференцій.";
-$text['description-conference-session-details']['de-at'] = "Konferenz Sitzungen sind Protokolle der letzten Konferenzen.";
+$text['description-conference_session_details']['en-us'] = "Conference Sessions are log details of the conferences calls.";
+$text['description-conference_session_details']['es-cl'] = "Las Sesiones de Conferencia son un registro detallado de las llamadas de conferencia";
+$text['description-conference_session_details']['pt-pt'] = "As sessões das conferências representam os detalhes dos logs das chamadas.";
+$text['description-conference_session_details']['fr-fr'] = "Sessions de conférences sont les détails des logs sur les conférences.";
+$text['description-conference_session_details']['pt-br'] = "Logs das sessões de camada";
+$text['description-conference_session_details']['pl'] = "Sesje Konferencyjne są to logi o rozmowach konferencyjnych.";
+$text['description-conference_session_details']['sv-se'] = "Konferenssessioner är detaljerad log om konferenserna.";
+$text['description-conference_session_details']['uk'] = "Сесії конференції є відомості з журналу викликів конференцій.";
+$text['description-conference_session_details']['de-at'] = "Konferenz Sitzungen sind Protokolle der letzten Konferenzen.";
 
-$text['description-conference-centers']['en-us'] = "Conference Centers are a group of conference rooms. They can be organized by cost center, geographically, or other criteria.";
-$text['description-conference-centers']['es-cl'] = "Los Centros de Conferencias son un grupo de salas de conferencias. Estas se organizan por centro de costo, geográficamente u otro criterio.";
-$text['description-conference-centers']['pt-pt'] = "Centros de Conferência são um grupo de salas de conferência. Podem ser organizadas por custo, por localização ou por outro critétio.";
-$text['description-conference-centers']['fr-fr'] = "Ce sont des groupes de salles de conférences. Pouvant être organisés par centre de coût, lieu géographique, ou tout autre critère.";
-$text['description-conference-centers']['pt-br'] = "Centros de conferência são um grupo de salas de conferência. Podem ser organizadas por custo, por localização ou por outro critétio. ";
-$text['description-conference-centers']['pl'] = "'Centra konferencyjne składają się z pokoi konferencyjnych. Mogą one być przypisane do konkretnych centrów kosztów, rejonów geograficznych lub do innych grup.";
-$text['description-conference-centers']['sv-se'] = "Konferenscenter är en grupp med konferensrum. De kan sorteras på kostnadscenter, geografisk placering eller andra kriterier.";
-$text['description-conference-centers']['uk'] = "Конференц-центри є група конференц-залів. Вони можуть бути організовані МВЗ, географічно або інших критеріїв.";
-$text['description-conference-centers']['de-at'] = "Konferenz Zentralen gruppieren mehrere Konferenzräume. Diese können über diverse Kriterien organisiert werden.";
+$text['description-conference_centers']['en-us'] = "Conference Centers are a group of conference rooms. They can be organized by cost center, geographically, or other criteria.";
+$text['description-conference_centers']['es-cl'] = "Los Centros de Conferencias son un grupo de salas de conferencias. Estas se organizan por centro de costo, geográficamente u otro criterio.";
+$text['description-conference_centers']['pt-pt'] = "Centros de Conferência são um grupo de salas de conferência. Podem ser organizadas por custo, por localização ou por outro critétio.";
+$text['description-conference_centers']['fr-fr'] = "Ce sont des groupes de salles de conférences. Pouvant être organisés par centre de coût, lieu géographique, ou tout autre critère.";
+$text['description-conference_centers']['pt-br'] = "Centros de conferência são um grupo de salas de conferência. Podem ser organizadas por custo, por localização ou por outro critétio. ";
+$text['description-conference_centers']['pl'] = "'Centra konferencyjne składają się z pokoi konferencyjnych. Mogą one być przypisane do konkretnych centrów kosztów, rejonów geograficznych lub do innych grup.";
+$text['description-conference_centers']['sv-se'] = "Konferenscenter är en grupp med konferensrum. De kan sorteras på kostnadscenter, geografisk placering eller andra kriterier.";
+$text['description-conference_centers']['uk'] = "Конференц-центри є група конференц-залів. Вони можуть бути організовані МВЗ, географічно або інших критеріїв.";
+$text['description-conference_centers']['de-at'] = "Konferenz Zentralen gruppieren mehrere Konferenzräume. Diese können über diverse Kriterien organisiert werden.";
 
-$text['description-conference-center']['en-us'] = "Conference Center is used to setup one or more conference rooms with a name, extension number, a required pin number length, and a description.";
-$text['description-conference-center']['es-cl'] = "El Centro de Conferencia se usa para configurar una o más salas con un nombre, número de extensión, un largo de número pin requerido y una descripción.";
-$text['description-conference-center']['pt-pt'] = "Centro de Conferência é usado para configurar uma ou mais salas de conferência com um nome, número de extensão, tamanho do código pin e uma descrição.";
-$text['description-conference-center']['fr-fr'] = "Il est possible de configurer une ou plusieures salles de conférence avec un nom, un neméro, une taille de code d'identification et une description.";
-$text['description-conference-center']['pt-br'] = "Centro de conferência é usado para configurar uma ou mais salas de conferência com um nome, número de extensão, tamanho do código pin e uma descrição. ";
-$text['description-conference-center']['pl'] = "Centrum Konferencyjne jest używane do tworzenia pokoi konferencyjnych. Każdy z nich otrzymuje numer wewnętrzny, nazwę, numer PIN oraz opis.";
-$text['description-conference-center']['sv-se'] = "Konferenscenter används för att sätt aupp en eller fler konferensrum med ett namn, anknytningsnummer, PIN kod och en beskrivning.";
-$text['description-conference-center']['uk'] = "Конференц-центр використовується для установки одного або декількох конференц-залів з ім'ям, додатковий номер, в необхідної довжини контактний номер та опис.";
-$text['description-conference-center']['de-at'] = "Konferenz Zentralen gruppieren mehrere Konferenzräume. Diese können über diverse Kriterien organisiert werden.";
+$text['description-conference_center']['en-us'] = "Conference Center is used to setup one or more conference rooms with a name, extension number, a required pin number length, and a description.";
+$text['description-conference_center']['es-cl'] = "El Centro de Conferencia se usa para configurar una o más salas con un nombre, número de extensión, un largo de número pin requerido y una descripción.";
+$text['description-conference_center']['pt-pt'] = "Centro de Conferência é usado para configurar uma ou mais salas de conferência com um nome, número de extensão, tamanho do código pin e uma descrição.";
+$text['description-conference_center']['fr-fr'] = "Il est possible de configurer une ou plusieures salles de conférence avec un nom, un neméro, une taille de code d'identification et une description.";
+$text['description-conference_center']['pt-br'] = "Centro de conferência é usado para configurar uma ou mais salas de conferência com um nome, número de extensão, tamanho do código pin e uma descrição. ";
+$text['description-conference_center']['pl'] = "Centrum Konferencyjne jest używane do tworzenia pokoi konferencyjnych. Każdy z nich otrzymuje numer wewnętrzny, nazwę, numer PIN oraz opis.";
+$text['description-conference_center']['sv-se'] = "Konferenscenter används för att sätt aupp en eller fler konferensrum med ett namn, anknytningsnummer, PIN kod och en beskrivning.";
+$text['description-conference_center']['uk'] = "Конференц-центр використовується для установки одного або декількох конференц-залів з ім'ям, додатковий номер, в необхідної довжини контактний номер та опис.";
+$text['description-conference_center']['de-at'] = "Konferenz Zentralen gruppieren mehrere Konferenzräume. Diese können über diverse Kriterien organisiert werden.";
 
 $text['confirm-delete']['en-us'] = "Do you really want to delete this?";
 $text['confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?";
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 24e3300bd8..296d504631 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -312,7 +312,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-conference-center']."</b></td>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-conference_center']."</b></td>\n";
 	echo "<td width='70%' align='right' valign='top'>\n";
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='conference_centers.php'\" value='".$text['button-back']."'>\n";
 	if (permission_exists('conference_active_advanced_view')) {
@@ -323,7 +323,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 	echo "</table>\n";
 	echo "<br />";
-	echo $text['description-conference-center']."\n";
+	echo $text['description-conference_center']."\n";
 	echo "<br /><br />\n";
 
 	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index ae5871afbd..303c333476 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -55,7 +55,7 @@ else {
 //show the content
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-conference-centers']."</b></td>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-conference_centers']."</b></td>\n";
 	echo "<td width='70%' align='right' valign='top'>\n";
 	if (permission_exists('conference_active_advanced_view')) {
 		echo "	<input type='button' class='btn' name='' alt='".$text['button-view']."' onclick=\"window.location='".PROJECT_PATH."/app/conferences_active/conferences_active.php'\" value='".$text['button-view']."'>\n";
@@ -65,7 +65,7 @@ else {
 	echo "</tr>\n";
 	echo "</table>\n";
 	echo "<br />\n";
-	echo $text['description-conference-centers']."\n";
+	echo $text['description-conference_centers']."\n";
 	echo "<br /><br />\n";
 
 	//prepare to page the results
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index 7d14c02169..9170244163 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -512,7 +512,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td align='left' valign='top' width='30%' nowrap='nowrap'><b>".$text['title-conference-rooms']."</b></td>\n";
+	echo "<td align='left' valign='top' width='30%' nowrap='nowrap'><b>".$text['title-conference_rooms']."</b></td>\n";
 	echo "<td width='70%' align='right' valign='top'>\n";
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='conference_rooms.php'\" value='".$text['button-back']."'>\n";
 	if (strlen($meeting_uuid) > 0) {
@@ -526,7 +526,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-conference-name']."</td>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-conference_name']."</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='conference_center_uuid'>\n";
 	foreach ($conference_centers as &$row) {
@@ -558,7 +558,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		<td class='vtable' align='left'>";
 	echo "  		<input class='formfld' type='text' name='moderator_pin' maxlength='255' value='$moderator_pin'>\n";
 	echo "			<br />\n";
-	echo "			".$text['description-moderator-pin']."\n";
+	echo "			".$text['description-moderator_pin']."\n";
 	echo "		</td>";
 	echo "	</tr>";
 
@@ -681,7 +681,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 	if (permission_exists('conference_room_wait_mod')) {
 		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-wait-for-moderator']."</td>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-wait_for_moderator']."</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select class='formfld' name='wait_mod'>\n";
 		echo "	<option value=''></option>\n";
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index 68c88b591b..bff28dbb52 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -151,7 +151,7 @@ else {
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
 	echo "		<form method='get' action=''>\n";
-	echo "			<td width='50%' align='left' valign='top' nowrap='nowrap'><b>".$text['title-conference-rooms']."</b></td>\n";
+	echo "			<td width='50%' align='left' valign='top' nowrap='nowrap'><b>".$text['title-conference_rooms']."</b></td>\n";
 	echo "			<td width='50%' align='right' valign='top'>\n";
 	echo "				<input type='text' class='txt' style='width: 150px' name='search' value='$search'>";
 	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>";
@@ -212,7 +212,7 @@ else {
 		//echo th_order_by('profile', $text['label-profile'], $order_by, $order);
 		echo th_order_by('record', $text['label-record'], $order_by, $order);
 		//echo th_order_by('max_members', 'Max', $order_by, $order);
-		echo th_order_by('wait_mod', $text['label-wait-moderator'], $order_by, $order);
+		echo th_order_by('wait_mod', $text['label-wait_moderator'], $order_by, $order);
 		echo th_order_by('announce', $text['label-announce'], $order_by, $order);
 		//echo th_order_by('enter_sound', 'Enter Sound', $order_by, $order);
 		echo th_order_by('mute', $text['label-mute'], $order_by, $order);
diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php
index a1d0594e65..eeea9296c1 100644
--- a/app/conference_centers/conference_session_details.php
+++ b/app/conference_centers/conference_session_details.php
@@ -75,7 +75,7 @@ else {
 //show the content
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-conference-session-details']."</b></td>\n";
+	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-conference_session_details']."</b></td>\n";
 	echo "		<td width='70%' align='right'>\n";
 	$tmp_dir = $_SESSION['switch']['recordings']['dir'].'/archive/'.$tmp_year.'/'.$tmp_month.'/'.$tmp_day;
 	$tmp_name = '';
@@ -105,7 +105,7 @@ else {
 	echo "	</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' colspan='2'>\n";
-	echo "			".$text['description-conference-session-details']."<br /><br />\n";
+	echo "			".$text['description-conference_session_details']."<br /><br />\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "</table>\n";
diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php
index 289a2eca90..eecd71e4fb 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -54,12 +54,12 @@ else {
 //show the content
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-conference-sessions']."</b></td>\n";
+	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-conference_sessions']."</b></td>\n";
 	echo "		<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='conference_rooms.php'\" value='".$text['button-back']."'></td>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' colspan='2'>\n";
-	echo "			".$text['description-conference-sessions']."<br /><br />\n";
+	echo "			".$text['description-conference_sessions']."<br /><br />\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "</table>\n";
diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php
index d906e6f088..2b568996e9 100644
--- a/app/conferences/app_languages.php
+++ b/app/conferences/app_languages.php
@@ -1,10 +1,10 @@
 <?php
 
 	//conferences
-	$text['title']['en-us'] = "Conferences";
-	$text['title']['es-cl'] = "Conferencias";
-	$text['title']['pt-pt'] = "Conferências";
-	$text['title']['fr-fr'] = "Conférences";
+	$text['title-conferences']['en-us'] = "Conferences";
+	$text['title-conferences']['es-cl'] = "Conferencias";
+	$text['title-conferences']['pt-pt'] = "Conferências";
+	$text['title-conferences']['fr-fr'] = "Conférences";
 
 	$text['description']['en-us'] = "Conferences is used to setup conference rooms with a name, description, and optional pin number.";
 	$text['description']['es-cl'] = "Las conferencias son usadas para configurar salas con un nombre, descripción y un número de acceso pin (opcional).";
diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php
index bfaae94500..9595fec805 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -49,7 +49,7 @@ else {
 //show the content
 	echo "<table cellpadding='0' cellspacing='0' width='100%' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td valign='top'><b>".$text['title']."</b></td>\n";
+	echo "		<td valign='top'><b>".$text['title-conferences']."</b></td>\n";
 	echo "		<td valign='top' align='right'>\n";
 	if (permission_exists('conference_active_view')) {
 		echo "		<input type='button' class='btn' alt='".$text['button-view_active']."' onclick=\"window.location='".PROJECT_PATH."/app/conferences_active/conferences_active.php';\" value='".$text['button-view_active']."'>\n";
diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index 8f56102320..474e0cc469 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -243,6 +243,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Authorized email-to-fax sender addresses.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "fax_local";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "fax_pin_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index 48453d3a19..f56a1089cc 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -1,5 +1,16 @@
 <?php
 
+$text['title-fax']['en-us'] = "Fax Server";
+$text['title-fax']['es-cl'] = "Servidor de Fax";
+$text['title-fax']['pt-pt'] = "Servidor de Fax";
+$text['title-fax']['fr-fr'] = "Serveur de Fax";
+$text['title-fax']['pt-br'] = "Configurações da Conta";
+$text['title-fax']['pl'] = "Serwer faksowy";
+$text['title-fax']['sv-se'] = "Fax Server";
+$text['title-fax']['de-at'] = "Fax Server";
+$text['title-fax']['ro'] = "Server Fax";
+$text['title-fax']['he'] = "הגדרת חשבון";
+
 $text['title-fax_logs']['en-us'] = "Fax Logs";
 $text['title-fax_logs']['es-cl'] = "Registros de fax";
 $text['title-fax_logs']['pt-pt'] = "Logs de fax";
@@ -44,17 +55,6 @@ $text['title-fax_file']['de-at'] = "Fax Datei";
 $text['title-fax_file']['ro'] = "Fișier Fax";
 $text['title-fax_file']['he'] = "";
 
-$text['title']['en-us'] = "Fax Server";
-$text['title']['es-cl'] = "Servidor de Fax";
-$text['title']['pt-pt'] = "Servidor de Fax";
-$text['title']['fr-fr'] = "Serveur de Fax";
-$text['title']['pt-br'] = "Configurações da Conta";
-$text['title']['pl'] = "Serwer faksowy";
-$text['title']['sv-se'] = "Fax Server";
-$text['title']['de-at'] = "Fax Server";
-$text['title']['ro'] = "Server Fax";
-$text['title']['he'] = "הגדרת חשבון";
-
 $text['table-view']['en-us'] = "View";
 $text['table-view']['es-cl'] = "Ver";
 $text['table-view']['pt-pt'] = "Visualizar";
diff --git a/app/fax/fax.php b/app/fax/fax.php
index ab3601dcee..2601ca7662 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -48,7 +48,7 @@ require_once "resources/paging.php";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
-	echo "			<span class=\"title\">".$text['title']."</span>";
+	echo "			<span class=\"title\">".$text['title-fax']."</span>";
 	echo "			<br /><br />\n";
 	echo "			".$text['description']."\n";
 	echo "		</td>\n";