diff --git a/app/settings/app_languages.php b/app/settings/app_languages.php
index ffd1d2f025..6558bcc350 100644
--- a/app/settings/app_languages.php
+++ b/app/settings/app_languages.php
@@ -1,47 +1,47 @@
 <?php
 #This file was last reorganized on 19th of September 2017 08:54:24 AM UTC
 
-$text['title-settings-update']['en-us'] = "Setting Update";
-$text['title-settings-update']['ar-eg'] = "";
-$text['title-settings-update']['de-at'] = "Einstellungen aktualisieren"; //copied from de-de
-$text['title-settings-update']['de-ch'] = "Einstellungen aktualisieren"; //copied from de-de
-$text['title-settings-update']['de-de'] = "Einstellungen aktualisieren";
-$text['title-settings-update']['es-cl'] = "Actualizar Configuración";
-$text['title-settings-update']['es-mx'] = "Actualizar Configuración"; //copied from es-cl
-$text['title-settings-update']['fr-ca'] = "Mise à jour de la configuration"; //copied from fr-fr
-$text['title-settings-update']['fr-fr'] = "Mise à jour de la configuration";
-$text['title-settings-update']['he-il'] = "";
-$text['title-settings-update']['it-it'] = "Aggiornamento Parametri";
-$text['title-settings-update']['nl-nl'] = "";
-$text['title-settings-update']['pl-pl'] = "Aktualizacja ustawienia";
-$text['title-settings-update']['pt-br'] = "Atualizar configurações";
-$text['title-settings-update']['pt-pt'] = "Actualizar a Configuração";
-$text['title-settings-update']['ro-ro'] = "";
-$text['title-settings-update']['ru-ru'] = "Обновление Параметров";
-$text['title-settings-update']['sv-se'] = "Ändra Inställningar";
-$text['title-settings-update']['uk-ua'] = "Оновлення налаштувань";
+$text['title-settings_update']['en-us'] = "Setting Update";
+$text['title-settings_update']['ar-eg'] = "";
+$text['title-settings_update']['de-at'] = "Einstellungen aktualisieren"; //copied from de-de
+$text['title-settings_update']['de-ch'] = "Einstellungen aktualisieren"; //copied from de-de
+$text['title-settings_update']['de-de'] = "Einstellungen aktualisieren";
+$text['title-settings_update']['es-cl'] = "Actualizar Configuración";
+$text['title-settings_update']['es-mx'] = "Actualizar Configuración"; //copied from es-cl
+$text['title-settings_update']['fr-ca'] = "Mise à jour de la configuration"; //copied from fr-fr
+$text['title-settings_update']['fr-fr'] = "Mise à jour de la configuration";
+$text['title-settings_update']['he-il'] = "";
+$text['title-settings_update']['it-it'] = "Aggiornamento Parametri";
+$text['title-settings_update']['nl-nl'] = "";
+$text['title-settings_update']['pl-pl'] = "Aktualizacja ustawienia";
+$text['title-settings_update']['pt-br'] = "Atualizar configurações";
+$text['title-settings_update']['pt-pt'] = "Actualizar a Configuração";
+$text['title-settings_update']['ro-ro'] = "";
+$text['title-settings_update']['ru-ru'] = "Обновление Параметров";
+$text['title-settings_update']['sv-se'] = "Ändra Inställningar";
+$text['title-settings_update']['uk-ua'] = "Оновлення налаштувань";
 
-$text['title-settings-add']['en-us'] = "Setting Add";
-$text['title-settings-add']['ar-eg'] = "";
-$text['title-settings-add']['de-at'] = "Einstellung hinzufügen"; //copied from de-de
-$text['title-settings-add']['de-ch'] = "Einstellung hinzufügen"; //copied from de-de
-$text['title-settings-add']['de-de'] = "Einstellung hinzufügen";
-$text['title-settings-add']['es-cl'] = "Añadir Configuración";
-$text['title-settings-add']['es-mx'] = "Añadir Configuración"; //copied from es-cl
-$text['title-settings-add']['fr-ca'] = "Ajouter Cadre"; //copied from fr-fr
-$text['title-settings-add']['fr-fr'] = "Ajouter Cadre";
-$text['title-settings-add']['he-il'] = "";
-$text['title-settings-add']['it-it'] = "Inserire Parametro";
-$text['title-settings-add']['nl-nl'] = "";
-$text['title-settings-add']['pl-pl'] = "Dodaj ustawienie";
-$text['title-settings-add']['pt-br'] = "Adionar configuração";
-$text['title-settings-add']['pt-pt'] = "Adicionar Configuração";
-$text['title-settings-add']['ro-ro'] = "";
-$text['title-settings-add']['ru-ru'] = "Параметры добавлены";
-$text['title-settings-add']['sv-se'] = "Lägg Till Inställning";
-$text['title-settings-add']['uk-ua'] = "Додавання налаштувань";
+$text['title-settings_add']['en-us'] = "Setting Add";
+$text['title-settingsadd']['ar-eg'] = "";
+$text['title-settingsadd']['de-at'] = "Einstellung hinzufügen"; //copied from de-de
+$text['title-settingsadd']['de-ch'] = "Einstellung hinzufügen"; //copied from de-de
+$text['title-settingsadd']['de-de'] = "Einstellung hinzufügen";
+$text['title-settingsadd']['es-cl'] = "Añadir Configuración";
+$text['title-settingsadd']['es-mx'] = "Añadir Configuración"; //copied from es-cl
+$text['title-settingsadd']['fr-ca'] = "Ajouter Cadre"; //copied from fr-fr
+$text['title-settingsadd']['fr-fr'] = "Ajouter Cadre";
+$text['title-settingsadd']['he-il'] = "";
+$text['title-settingsadd']['it-it'] = "Inserire Parametro";
+$text['title-settingsadd']['nl-nl'] = "";
+$text['title-settingsadd']['pl-pl'] = "Dodaj ustawienie";
+$text['title-settingsadd']['pt-br'] = "Adionar configuração";
+$text['title-settingsadd']['pt-pt'] = "Adicionar Configuração";
+$text['title-settingsadd']['ro-ro'] = "";
+$text['title-settingsadd']['ru-ru'] = "Параметры добавлены";
+$text['title-settingsadd']['sv-se'] = "Lägg Till Inställning";
+$text['title-settingsadd']['uk-ua'] = "Додавання налаштувань";
 
-$text['label-xml-rpc-user']['en-us'] = "XML RPC Auth User";
+$text['label-xml_rpc_auth_user']['en-us'] = "XML RPC Auth User";
 $text['label-xml-rpc-user']['ar-eg'] = "";
 $text['label-xml-rpc-user']['de-at'] = "XML RPC Auth Benutzer"; //copied from de-de
 $text['label-xml-rpc-user']['de-ch'] = "XML RPC Auth Benutzer"; //copied from de-de
@@ -61,7 +61,7 @@ $text['label-xml-rpc-user']['ru-ru'] = "Использовать XML RPC для
 $text['label-xml-rpc-user']['sv-se'] = "XML RPC Auth User";
 $text['label-xml-rpc-user']['uk-ua'] = "XML RPC Auth User ";
 
-$text['label-xml-rpc-realm']['en-us'] = "XML RPC Auth Realm";
+$text['label-xml_rpc_auth_realm']['en-us'] = "XML RPC Auth Realm";
 $text['label-xml-rpc-realm']['ar-eg'] = "";
 $text['label-xml-rpc-realm']['de-at'] = "XML RPC Auth Realm"; //copied from de-de
 $text['label-xml-rpc-realm']['de-ch'] = "XML RPC Auth Realm"; //copied from de-de
@@ -81,7 +81,7 @@ $text['label-xml-rpc-realm']['ru-ru'] = "Область проверки под
 $text['label-xml-rpc-realm']['sv-se'] = "XML RPC Auth Realm";
 $text['label-xml-rpc-realm']['uk-ua'] = "XML RPC Auth Realm ";
 
-$text['label-xml-rpc-pw']['en-us'] = "XML RPC Auth Password";
+$text['label-xml_rpc_auth_password']['en-us'] = "XML RPC Auth Password";
 $text['label-xml-rpc-pw']['ar-eg'] = "";
 $text['label-xml-rpc-pw']['de-at'] = "XML RPC Auth Passwort"; //copied from de-de
 $text['label-xml-rpc-pw']['de-ch'] = "XML RPC Auth Passwort"; //copied from de-de
@@ -101,7 +101,7 @@ $text['label-xml-rpc-pw']['ru-ru'] = "XML RPC Пароль проверки по
 $text['label-xml-rpc-pw']['sv-se'] = "XML RPC Auth Password";
 $text['label-xml-rpc-pw']['uk-ua'] = "XML RPC Auth Password ";
 
-$text['label-xml-rpc-port']['en-us'] = "XML RPC HTTP Port";
+$text['label-xml_rpc_http_port']['en-us'] = "XML RPC HTTP Port";
 $text['label-xml-rpc-port']['ar-eg'] = "";
 $text['label-xml-rpc-port']['de-at'] = "XML RPC HTTP Port "; //copied from de-de
 $text['label-xml-rpc-port']['de-ch'] = "XML RPC HTTP Port "; //copied from de-de
@@ -121,7 +121,7 @@ $text['label-xml-rpc-port']['ru-ru'] = "XML RPC HTTP Порт";
 $text['label-xml-rpc-port']['sv-se'] = "XML RPC HTTP Port";
 $text['label-xml-rpc-port']['uk-ua'] = "XML RPC HTTP Port ";
 
-$text['label-shout-volume']['en-us'] = "Mod Shout Volume";
+$text['label-mod_shout_volume']['en-us'] = "Mod Shout Volume";
 $text['label-shout-volume']['ar-eg'] = "";
 $text['label-shout-volume']['de-at'] = "Mod Shout Lautstärke"; //copied from de-de
 $text['label-shout-volume']['de-ch'] = "Mod Shout Lautstärke"; //copied from de-de
@@ -141,7 +141,7 @@ $text['label-shout-volume']['ru-ru'] = "Mod Shout Volume";
 $text['label-shout-volume']['sv-se'] = "Mod Shout Volume";
 $text['label-shout-volume']['uk-ua'] = "Mod Shout Volume ";
 
-$text['label-shout-decoder']['en-us'] = "Mod Shout Decoder";
+$text['label-mod_shout_decoder']['en-us'] = "Mod Shout Decoder";
 $text['label-shout-decoder']['ar-eg'] = "";
 $text['label-shout-decoder']['de-at'] = "Mod Shout Decoder"; //copied from de-de
 $text['label-shout-decoder']['de-ch'] = "Mod Shout Decoder"; //copied from de-de
@@ -161,7 +161,7 @@ $text['label-shout-decoder']['ru-ru'] = "Mod Shout Decoder";
 $text['label-shout-decoder']['sv-se'] = "Mod Shout Decoder";
 $text['label-shout-decoder']['uk-ua'] = "Mod Shout Decoder ";
 
-$text['label-event-socket-pw']['en-us'] = "Event Socket Password";
+$text['label-event_socket_password']['en-us'] = "Event Socket Password";
 $text['label-event-socket-pw']['ar-eg'] = "";
 $text['label-event-socket-pw']['de-at'] = "Event Socket Passwort"; //copied from de-de
 $text['label-event-socket-pw']['de-ch'] = "Event Socket Passwort"; //copied from de-de
@@ -181,7 +181,7 @@ $text['label-event-socket-pw']['ru-ru'] = "Пароль сокета событ
 $text['label-event-socket-pw']['sv-se'] = "Event Socket Password";
 $text['label-event-socket-pw']['uk-ua'] = "Event Socket Password ";
 
-$text['label-event-socket-port']['en-us'] = "Event Socket Port";
+$text['label-event_socket_port']['en-us'] = "Event Socket Port";
 $text['label-event-socket-port']['ar-eg'] = "";
 $text['label-event-socket-port']['de-at'] = "Event Socket Port"; //copied from de-de
 $text['label-event-socket-port']['de-ch'] = "Event Socket Port"; //copied from de-de
@@ -201,7 +201,7 @@ $text['label-event-socket-port']['ru-ru'] = "Порт сокета событи
 $text['label-event-socket-port']['sv-se'] = "Event Socket Port ";
 $text['label-event-socket-port']['uk-ua'] = "Event Socket Port ";
 
-$text['label-event-socket-ip']['en-us'] = "Event Socket IP Address";
+$text['label-event_socket_ip']['en-us'] = "Event Socket IP Address";
 $text['label-event-socket-ip']['ar-eg'] = "";
 $text['label-event-socket-ip']['de-at'] = "Event Socket IP Adresse"; //copied from de-de
 $text['label-event-socket-ip']['de-ch'] = "Event Socket IP Adresse"; //copied from de-de
@@ -241,7 +241,7 @@ $text['label-event_socket_acl']['ru-ru'] = "ACL сокета событий";
 $text['label-event_socket_acl']['sv-se'] = "Event Socket ACL";
 $text['label-event_socket_acl']['uk-ua'] = "Event Socket ACL";
 
-$text['description-xml-rpc-user']['en-us'] = "Enter the XML RPC Auth User. default: xmlrpc";
+$text['description-xml_rpc_auth_user']['en-us'] = "Enter the XML RPC Auth User. default: xmlrpc";
 $text['description-xml-rpc-user']['ar-eg'] = "";
 $text['description-xml-rpc-user']['de-at'] = "Geben Sie den XML RPC Auth Benutzer an. Standard: xmlrpc"; //copied from de-de
 $text['description-xml-rpc-user']['de-ch'] = "Geben Sie den XML RPC Auth Benutzer an. Standard: xmlrpc"; //copied from de-de
@@ -261,7 +261,7 @@ $text['description-xml-rpc-user']['ru-ru'] = "Введите XML RPC для ав
 $text['description-xml-rpc-user']['sv-se'] = "Fyll i XML RPC Auth User. default: xmlrpc";
 $text['description-xml-rpc-user']['uk-ua'] = "Enter the XML RPC Auth User. default: xmlrpc ";
 
-$text['description-xml-rpc-realm']['en-us'] = "Enter the XML RPC Auth Realm. default: freeswitch";
+$text['description-xml_rpc_auth_realm']['en-us'] = "Enter the XML RPC Auth Realm. default: freeswitch";
 $text['description-xml-rpc-realm']['ar-eg'] = "";
 $text['description-xml-rpc-realm']['de-at'] = "Geben Sie den XML RPC Auth Realm an. Standard: freeswitch"; //copied from de-de
 $text['description-xml-rpc-realm']['de-ch'] = "Geben Sie den XML RPC Auth Realm an. Standard: freeswitch"; //copied from de-de
@@ -281,7 +281,7 @@ $text['description-xml-rpc-realm']['ru-ru'] = "Введите XML RPC облас
 $text['description-xml-rpc-realm']['sv-se'] = "Fyll i XML RPC Auth Realm. default: freeswitch ";
 $text['description-xml-rpc-realm']['uk-ua'] = "Enter the XML RPC Auth Realm. default: freeswitch ";
 
-$text['description-xml-rpc-pw']['en-us'] = "Enter the XML RPC Auth Password.";
+$text['description-xml_rpc_auth_password']['en-us'] = "Enter the XML RPC Auth Password.";
 $text['description-xml-rpc-pw']['ar-eg'] = "";
 $text['description-xml-rpc-pw']['de-at'] = "Geben Sie das XML RPC Auth Passwort an."; //copied from de-de
 $text['description-xml-rpc-pw']['de-ch'] = "Geben Sie das XML RPC Auth Passwort an."; //copied from de-de
@@ -301,7 +301,7 @@ $text['description-xml-rpc-pw']['ru-ru'] = "Введите XML RPC Пароль
 $text['description-xml-rpc-pw']['sv-se'] = "Fyll i XML RPC Auth Password.";
 $text['description-xml-rpc-pw']['uk-ua'] = "Enter the XML RPC Auth Password. ";
 
-$text['description-xml-rpc-port']['en-us'] = "Enter the XML RPC HTTP Port. default: 8080";
+$text['description-xml_rpc_http_port']['en-us'] = "Enter the XML RPC HTTP Port. default: 8080";
 $text['description-xml-rpc-port']['ar-eg'] = "";
 $text['description-xml-rpc-port']['de-at'] = "Geben Sie den XML RPC HTTP Port an. Standard: 8080"; //copied from de-de
 $text['description-xml-rpc-port']['de-ch'] = "Geben Sie den XML RPC HTTP Port an. Standard: 8080"; //copied from de-de
@@ -321,7 +321,7 @@ $text['description-xml-rpc-port']['ru-ru'] = "Введите XML RPC HTTP Пор
 $text['description-xml-rpc-port']['sv-se'] = "Fyll i XML RPC HTTP Port. default: 8080";
 $text['description-xml-rpc-port']['uk-ua'] = "Enter the XML RPC HTTP Port. default: 8080 ";
 
-$text['description-shout-volume']['en-us'] = "Enter Mod Shout Volume.";
+$text['description-mod_shout_volume']['en-us'] = "Enter Mod Shout Volume.";
 $text['description-shout-volume']['ar-eg'] = "";
 $text['description-shout-volume']['de-at'] = "Geben Sie Mod Shout Lautstärke an."; //copied from de-de
 $text['description-shout-volume']['de-ch'] = "Geben Sie Mod Shout Lautstärke an."; //copied from de-de
@@ -341,7 +341,7 @@ $text['description-shout-volume']['ru-ru'] = "Введите Mod Shout Volume.";
 $text['description-shout-volume']['sv-se'] = "Fyll i Mod Shout Volume.";
 $text['description-shout-volume']['uk-ua'] = "Enter Mod Shout Volume. ";
 
-$text['description-shout-decoder']['en-us'] = "Enter the Decoder. default: i386";
+$text['description-mod_shout_decoder']['en-us'] = "Enter the Decoder. default: i386";
 $text['description-shout-decoder']['ar-eg'] = "";
 $text['description-shout-decoder']['de-at'] = "Wählen Sie den Decoder. Standard: i386"; //copied from de-de
 $text['description-shout-decoder']['de-ch'] = "Wählen Sie den Decoder. Standard: i386"; //copied from de-de
@@ -361,7 +361,7 @@ $text['description-shout-decoder']['ru-ru'] = "Введите Decoder. По ум
 $text['description-shout-decoder']['sv-se'] = "Fyll i Decoder. default: i386";
 $text['description-shout-decoder']['uk-ua'] = "Enter the Decoder. default: i386 ";
 
-$text['description-event-socket-pw']['en-us'] = "Enter the event socket password.";
+$text['description-event_socket_password']['en-us'] = "Enter the event socket password.";
 $text['description-event-socket-pw']['ar-eg'] = "";
 $text['description-event-socket-pw']['de-at'] = "Geben Sie das Event Socket Passwort an."; //copied from de-de
 $text['description-event-socket-pw']['de-ch'] = "Geben Sie das Event Socket Passwort an."; //copied from de-de
@@ -381,7 +381,7 @@ $text['description-event-socket-pw']['ru-ru'] = "Введите пароль с
 $text['description-event-socket-pw']['sv-se'] = "Fyll i event socket password.";
 $text['description-event-socket-pw']['uk-ua'] = "Enter the event socket password. ";
 
-$text['description-event-socket-port']['en-us'] = "Enter the event socket port. default: 8021";
+$text['description-event_socket_port']['en-us'] = "Enter the event socket port. default: 8021";
 $text['description-event-socket-port']['ar-eg'] = "";
 $text['description-event-socket-port']['de-at'] = "Geben Sie den Event Socket Port an. Standard: 8021"; //copied from de-de
 $text['description-event-socket-port']['de-ch'] = "Geben Sie den Event Socket Port an. Standard: 8021"; //copied from de-de
@@ -401,7 +401,7 @@ $text['description-event-socket-port']['ru-ru'] = "Введите порт со
 $text['description-event-socket-port']['sv-se'] = "Fyll i event socket port. default: 8021";
 $text['description-event-socket-port']['uk-ua'] = "Enter the event socket port. default: 8021 ";
 
-$text['description-event-socket-ip']['en-us'] = "Enter the event socket IP address. default: 127.0.0.1";
+$text['description-event_socket_ip']['en-us'] = "Enter the event socket IP address. default: 127.0.0.1";
 $text['description-event-socket-ip']['ar-eg'] = "";
 $text['description-event-socket-ip']['de-at'] = "Geben Sie die Event Socket IP Addresse an. Standard: 127.0.0.1"; //copied from de-de
 $text['description-event-socket-ip']['de-ch'] = "Geben Sie die Event Socket IP Addresse an. Standard: 127.0.0.1"; //copied from de-de